Updating to latest jquery and bootstrap, also other dependencies, the…

…n fixing some issues on security config
surajcm · Aug 2, 2023 · c08574a · c08574a
1 parent b7ebf7e
commit c08574a
Show file tree

Hide file tree

Showing 32 changed files with 98 additions and 86 deletions.
diff --git a/build.gradle b/build.gradle
@@ -15,12 +15,12 @@ buildscript {
 plugins {
     id 'java'
     id 'idea'
-    id 'org.springframework.boot' version '3.1.1'
-    id 'io.spring.dependency-management' version '1.1.0'
-    id 'net.ltgt.errorprone' version '3.0.1'
+    id 'org.springframework.boot' version '3.1.2'
+    id 'io.spring.dependency-management' version '1.1.2'
+    id 'net.ltgt.errorprone' version '3.1.0'
     //id 'com.github.spotbugs' version '1.6.8' apply false
     id 'de.aaschmid.cpd' version '3.3'
-    id "org.sonarqube" version "4.2.0.3129"
+    id "org.sonarqube" version "4.3.0.3225"
 }
 group = 'com.poseidon'
 version = '0.0.1-SNAPSHOT'

diff --git a/config/checkstyle/suppressions.xml b/config/checkstyle/suppressions.xml
@@ -47,5 +47,6 @@ WHAT AND WHY CHECKS SUPPRESSED
     <suppress files="UserController.java" checks="IllegalCatch"/>
     <suppress files="UserDAO.java" checks="IllegalCatch"/>
     <suppress files="WebSecurityConfig.java" checks="MethodLength"/>
+    <suppress files="WebSecurityConfig.java" checks="IllegalCatch"/>
     <suppress files="CustomerServiceTest.java" checks="MethodLength"/>
 </suppressions>
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -1,6 +1,6 @@
 
 dependencies {
-    errorprone("com.google.errorprone:error_prone_core:2.19.1")
+    errorprone("com.google.errorprone:error_prone_core:2.20.0")
     errorproneJavac('com.google.errorprone:javac:9+181-r4173-1')
 
     implementation("org.springframework.boot:spring-boot-starter-web")

diff --git a/gradle/staticCodeAnalysis.gradle b/gradle/staticCodeAnalysis.gradle
@@ -4,7 +4,7 @@ apply plugin: 'jacoco'
 //apply plugin: 'com.github.spotbugs'
 
 checkstyle {
-    toolVersion = '10.12.1'
+    toolVersion = '10.12.2'
     ignoreFailures = false
     maxWarnings = 0
     checkstyleMain {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/com/poseidon/init/WebSecurityConfig.java b/src/main/java/com/poseidon/init/WebSecurityConfig.java
@@ -8,9 +8,13 @@
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
+import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer;
+import org.springframework.security.config.annotation.web.configurers.LogoutConfigurer;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.web.SecurityFilterChain;
+import org.springframework.security.web.servlet.util.matcher.MvcRequestMatcher;
+import org.springframework.web.servlet.handler.HandlerMappingIntrospector;
 
 @Configuration
 @EnableWebSecurity
@@ -28,37 +32,50 @@ public BCryptPasswordEncoder bcryptPasswordEncoder() {
     }
 
     @Bean
-    public SecurityFilterChain filterChain(final HttpSecurity http) throws Exception {
+    public SecurityFilterChain filterChain(final HttpSecurity http,
+                                           final HandlerMappingIntrospector introspect) throws Exception {
         http.csrf(AbstractHttpConfigurer::disable);
-        http.authorizeHttpRequests(auth -> auth
-                .requestMatchers("/resources/**",
-                    "/registration",
-                    "/css/**", "/js/**", "/img/**",
-                    "/h2-console/**",
-                    "/console/**").permitAll()
-                .anyRequest().authenticated()
-        );
-        http.formLogin()
-                .loginPage("/login")
-                .defaultSuccessUrl("/", true).permitAll().and()
-                .headers()
-                .frameOptions().sameOrigin().and()
-                .logout()
-                .permitAll().and()
-                .requiresChannel()
-                .requestMatchers(r -> r.getHeader("X-Forwarded-Proto") != null)
-                .requiresSecure();
+        var mvcMatcherBuilder = new MvcRequestMatcher.Builder(introspect);
+        for (var paths: matchingPaths()) {
+            http.authorizeHttpRequests(auth -> auth
+                    .requestMatchers(mvcMatcherBuilder.pattern(paths)).permitAll()
+            );
+        }
+        http.authorizeHttpRequests(auth -> auth.anyRequest().authenticated());
+
+        http.formLogin((formLogin) -> {
+            try {
+                formLogin.loginPage("/login")
+                .defaultSuccessUrl("/", true).permitAll();
+            } catch (Exception ex) {
+                //todo : clean up
+                throw new RuntimeException(ex);
+            }
+        });
+        http.headers((headers) ->
+                headers.frameOptions(HeadersConfigurer.FrameOptionsConfig::sameOrigin));
+        http.logout(LogoutConfigurer::permitAll);
+        http.requiresChannel(c -> c.requestMatchers(r ->
+                r.getHeader("X-Forwarded-Proto") != null).requiresSecure());
         return http.build();
     }
 
     @Bean
     public AuthenticationManager authManager(final HttpSecurity http,
                                              final BCryptPasswordEncoder bCryptPasswordEncoder)
             throws Exception {
-        return http.getSharedObject(AuthenticationManagerBuilder.class)
+        var managerBuilder =  http.getSharedObject(AuthenticationManagerBuilder.class)
                 .userDetailsService(userDetailsService)
-                .passwordEncoder(bCryptPasswordEncoder)
-                .and()
-                .build();
+                .passwordEncoder(bCryptPasswordEncoder);
+        return managerBuilder.and().build();
+    }
+
+    private String[] matchingPaths() {
+        return new String[] {"/resources/**",
+                "/registration",
+                "/css/**", "/js/**", "/img/**",
+                "/h2-console/**",
+                "/console/**"
+        };
     }
 }
diff --git a/src/main/resources/static/css/core/bootstrap-5.3.1/bootstrap.min.css b/src/main/resources/static/css/core/bootstrap-5.3.1/bootstrap.min.css
diff --git a/src/main/resources/static/css/core/bootstrap-5.3.1/bootstrap.min.css.map b/src/main/resources/static/css/core/bootstrap-5.3.1/bootstrap.min.css.map
diff --git a/src/main/resources/static/css/core/bootstrap-5.min.css b/src/main/resources/static/css/core/bootstrap-5.min.css
diff --git a/src/main/resources/static/css/core/bootstrap.min.css.map b/src/main/resources/static/css/core/bootstrap.min.css.map
diff --git a/src/main/resources/static/js/core/bootstrap-5.3.1/bootstrap.min.js b/src/main/resources/static/js/core/bootstrap-5.3.1/bootstrap.min.js
diff --git a/src/main/resources/static/js/core/bootstrap-5.3.1/bootstrap.min.js.map b/src/main/resources/static/js/core/bootstrap-5.3.1/bootstrap.min.js.map
diff --git a/src/main/resources/static/js/core/bootstrap-5.min.js b/src/main/resources/static/js/core/bootstrap-5.min.js
diff --git a/src/main/resources/static/js/core/bootstrap.min.js.map b/src/main/resources/static/js/core/bootstrap.min.js.map
diff --git a/src/main/resources/static/js/core/jquery-3.2.1.min.js b/src/main/resources/static/js/core/jquery-3.2.1.min.js
diff --git a/src/main/resources/static/js/core/jquery-3.3.1.slim.min.js b/src/main/resources/static/js/core/jquery-3.3.1.slim.min.js
diff --git a/src/main/resources/static/js/core/jquery-3.7.0.min.js b/src/main/resources/static/js/core/jquery-3.7.0.min.js
diff --git a/src/main/resources/templates/ErrorPage.html b/src/main/resources/templates/ErrorPage.html
@@ -8,7 +8,7 @@
     <meta name="description" content="">
     <meta name="author" content="Suraj">
     <link rel="shortcut icon" href="/img/Poseidon_Ico.ico" />
-    <link rel="stylesheet" href="/css/core/bootstrap-5.min.css"  type="text/css" />
+    <link rel="stylesheet" href="/css/core/bootstrap-5.3.1/bootstrap.min.css"  type="text/css" />
     <link rel="stylesheet" href="/css/custom.css" type="text/css" />
     <link rel="stylesheet" href="/css/core/flag-icon.min.css" type="text/css" />
     <title>Error Page</title>
@@ -25,6 +25,6 @@
         </section>
     </form>
     <script src="/js/core/popper.min.js" type="text/javascript"></script>
-    <script src="/js/core/bootstrap-5.min.js" type="text/javascript"></script>
+    <script src="/js/core/bootstrap-5.3.1/bootstrap.min.js" type="text/javascript"></script>
 </body>
 </html>
diff --git a/src/main/resources/templates/MainPage.html b/src/main/resources/templates/MainPage.html
@@ -10,7 +10,7 @@
     <!--meta name="_csrf" th:content="${_csrf.token}"/>
     <meta name="_csrf_header" th:content="${_csrf.headerName}"/-->
     <link rel="shortcut icon" href="/img/Poseidon_Ico.ico" />
-    <link rel="stylesheet" href="/css/core/bootstrap-5.min.css"  type="text/css" />
+    <link rel="stylesheet" href="/css/core/bootstrap-5.3.1/bootstrap.min.css"  type="text/css" />
     <link rel="stylesheet" href="/css/custom.css" type="text/css" />
     <link rel="stylesheet" href="/css/core/flag-icon.min.css" type="text/css" />
     <title>Welcome</title>
@@ -32,6 +32,6 @@
         </section>
     </form>
     <script src="/js/core/popper.min.js" type="text/javascript"></script>
-    <script src="/js/core/bootstrap-5.min.js" type="text/javascript"></script>
+    <script src="/js/core/bootstrap-5.3.1/bootstrap.min.js" type="text/javascript"></script>
 </body>
 </html>
diff --git a/src/main/resources/templates/company/companyDetails.html b/src/main/resources/templates/company/companyDetails.html
@@ -8,7 +8,7 @@
     <meta name="description" content="">
     <meta name="author" content="Suraj">
     <link rel="shortcut icon" href="/img/Poseidon_Ico.ico" />
-    <link rel="stylesheet" href="/css/core/bootstrap-5.min.css"  type="text/css" />
+    <link rel="stylesheet" href="/css/core/bootstrap-5.3.1/bootstrap.min.css"  type="text/css" />
     <link rel="stylesheet" href="/css/custom.css" type="text/css" />
     <link rel="stylesheet" href="/css/core/flag-icon.min.css" type="text/css" />
     <title>Terms And Company details</title>
@@ -81,6 +81,6 @@
         </div>
     </div>
     <script src="/js/core/popper.min.js" type="text/javascript"></script>
-    <script src="/js/core/bootstrap-5.min.js" type="text/javascript"></script>
+    <script src="/js/core/bootstrap-5.3.1/bootstrap.min.js" type="text/javascript"></script>
 </body>
 </html>
diff --git a/src/main/resources/templates/customer/CustomerList.html b/src/main/resources/templates/customer/CustomerList.html
@@ -10,7 +10,7 @@
     <meta name="_csrf" content="${_csrf.token}"/>
     <meta name="_csrf_header" content="${_csrf.headerName}"/>
     <link rel="shortcut icon" href="/img/Poseidon_Ico.ico" />
-    <link rel="stylesheet" href="/css/core/bootstrap-5.min.css"  type="text/css" />
+    <link rel="stylesheet" href="/css/core/bootstrap-5.3.1/bootstrap.min.css"  type="text/css" />
     <link rel="stylesheet" href="/css/custom.css" type="text/css" />
     <link rel="stylesheet" href="/css/core/flag-icon.min.css" type="text/css" />
     <title>Customer List</title>
@@ -188,6 +188,6 @@ <h5 class="modal-title">Customer Details</h5>
         </div>
     </form>
     <script src="/js/core/popper.min.js" type="text/javascript"></script>
-    <script src="/js/core/bootstrap-5.min.js" type="text/javascript"></script>
+    <script src="/js/core/bootstrap-5.3.1/bootstrap.min.js" type="text/javascript"></script>
 </body>
 </html>
diff --git a/src/main/resources/templates/invoice/ListInvoice.html b/src/main/resources/templates/invoice/ListInvoice.html
@@ -10,7 +10,7 @@
     <meta name="_csrf" content="${_csrf.token}"/>
     <meta name="_csrf_header" content="${_csrf.headerName}"/>
     <link rel="shortcut icon" href="/img/Poseidon_Ico.ico" />
-    <link rel="stylesheet" href="/css/core/bootstrap-5.min.css"  type="text/css" />
+    <link rel="stylesheet" href="/css/core/bootstrap-5.3.1/bootstrap.min.css"  type="text/css" />
     <link rel="stylesheet" href="/css/custom.css" type="text/css" />
     <link rel="stylesheet" href="/css/core/flag-icon.min.css" type="text/css" />
     <title>Invoice List</title>
@@ -198,6 +198,6 @@ <h5 class="modal-title">Edit Invoice</h5>
         </div>
     </form>
     <script src="/js/core/popper.min.js" type="text/javascript"></script>
-    <script src="/js/core/bootstrap-5.min.js" type="text/javascript"></script>
+    <script src="/js/core/bootstrap-5.3.1/bootstrap.min.js" type="text/javascript"></script>
 </body>
 </html>
diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html
@@ -5,7 +5,7 @@
     <link rel="shortcut icon" href="/img/Poseidon_Ico.ico" >
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>Log In</title>
-    <link rel="stylesheet" href="/css/core/bootstrap-5.min.css"  type="text/css"/>
+    <link rel="stylesheet" href="/css/core/bootstrap-5.3.1/bootstrap.min.css"  type="text/css"/>
     <link rel="stylesheet" href="/css/logInStyles.css"  type="text/css" />
     <script type="text/javascript">
         function popupForget() {
@@ -86,6 +86,6 @@ <h5 class="modal-title" id="exampleModalLabel">Forget Password?</h5>
             </div>
         </div>
     </div>
-    <script src="/js/core/bootstrap-5.min.js" type="text/javascript"></script>
+    <script src="/js/core/bootstrap-5.3.1/bootstrap.min.js" type="text/javascript"></script>
 </body>
 </html>
diff --git a/src/main/resources/templates/make/MakeList.html b/src/main/resources/templates/make/MakeList.html
@@ -10,7 +10,7 @@
     <meta name="_csrf" content="${_csrf.token}"/>
     <meta name="_csrf_header" content="${_csrf.headerName}"/>
     <link rel="shortcut icon" href="/img/Poseidon_Ico.ico" />
-    <link rel="stylesheet" href="/css/core/bootstrap-5.min.css"  type="text/css" />
+    <link rel="stylesheet" href="/css/core/bootstrap-5.3.1/bootstrap.min.css"  type="text/css" />
     <link rel="stylesheet" href="/css/custom.css" type="text/css" />
     <link rel="stylesheet" href="/css/core/flag-icon.min.css" type="text/css" />
     <title>Make List</title>
@@ -141,6 +141,6 @@ <h5 class="modal-title">Edit Make</h5>
         </div>
     </form>
     <script src="/js/core/popper.min.js" type="text/javascript"></script>
-    <script src="/js/core/bootstrap-5.min.js" type="text/javascript"></script>
+    <script src="/js/core/bootstrap-5.3.1/bootstrap.min.js" type="text/javascript"></script>
 </body>
 </html>
diff --git a/src/main/resources/templates/make/ModelList.html b/src/main/resources/templates/make/ModelList.html
@@ -10,7 +10,7 @@
     <meta name="_csrf" content="${_csrf.token}"/>
     <meta name="_csrf_header" content="${_csrf.headerName}"/>
     <link rel="shortcut icon" href="/img/Poseidon_Ico.ico" />
-    <link rel="stylesheet" href="/css/core/bootstrap-5.min.css"  type="text/css" />
+    <link rel="stylesheet" href="/css/core/bootstrap-5.3.1/bootstrap.min.css"  type="text/css" />
     <link rel="stylesheet" href="/css/custom.css" type="text/css" />
     <link rel="stylesheet" href="/css/core/flag-icon.min.css" type="text/css" />
     <title>Make and Model List</title>
@@ -172,6 +172,6 @@ <h5 class="modal-title">Edit Model</h5>
         </div>
     </form>
     <script src="/js/core/popper.min.js" type="text/javascript"></script>
-    <script src="/js/core/bootstrap-5.min.js" type="text/javascript"></script>
+    <script src="/js/core/bootstrap-5.3.1/bootstrap.min.js" type="text/javascript"></script>
 </body>
 </html>
diff --git a/src/main/resources/templates/registration.html b/src/main/resources/templates/registration.html
@@ -8,7 +8,7 @@
     <meta name="description" content="">
     <meta name="author" content="Suraj">
     <link rel="shortcut icon" href="/img/Poseidon_Ico.ico" >
-    <link rel="stylesheet" href="/css/core/bootstrap-5.min.css"  type="text/css"/>
+    <link rel="stylesheet" href="/css/core/bootstrap-5.3.1/bootstrap.min.css"  type="text/css"/>
     <link rel="stylesheet" href="/css/logInStyles.css"  type="text/css" />
     <title>Registration</title>
 </head>
@@ -70,6 +70,6 @@ <h1 class="mb-0 h3">Registration</h1>
         </div>
     </section>
 </main>
-<script src="/js/core/bootstrap-5.min.js" type="text/javascript"></script>
+<script src="/js/core/bootstrap-5.3.1/bootstrap.min.js" type="text/javascript"></script>
 </body>
 </html>
diff --git a/src/main/resources/templates/reports/List.html b/src/main/resources/templates/reports/List.html
@@ -10,7 +10,7 @@
     <meta name="description" content="">
     <meta name="author" content="Suraj">
     <link rel="shortcut icon" href="/img/Poseidon_Ico.ico" />
-    <link rel="stylesheet" href="/css/core/bootstrap-5.min.css"  type="text/css" />
+    <link rel="stylesheet" href="/css/core/bootstrap-5.3.1/bootstrap.min.css"  type="text/css" />
     <link rel="stylesheet" href="/css/custom.css" type="text/css" />
     <link rel="stylesheet" href="/css/core/flag-icon.min.css" type="text/css" />
     <title>Reports List</title>
@@ -243,6 +243,6 @@
         </div>
     </form>
     <script src="/js/core/popper.min.js" type="text/javascript"></script>
-    <script src="/js/core/bootstrap-5.min.js" type="text/javascript"></script>
+    <script src="/js/core/bootstrap-5.3.1/bootstrap.min.js" type="text/javascript"></script>
 </body>
 </html>
diff --git a/src/main/resources/templates/txs/TransactionList.html b/src/main/resources/templates/txs/TransactionList.html
@@ -11,7 +11,7 @@
     <meta name="author" content="Suraj">
     <link rel="shortcut icon" href="/img/Poseidon_Ico.ico" />
     <link rel="stylesheet" href="/css/jquery-ui.css" type="text/css" />
-    <link rel="stylesheet" href="/css/core/bootstrap-5.min.css"  type="text/css" />
+    <link rel="stylesheet" href="/css/core/bootstrap-5.3.1/bootstrap.min.css"  type="text/css" />
     <link rel="stylesheet" href="/css/custom.css" type="text/css" />
     <link rel="stylesheet" href="/css/core/flag-icon.min.css" type="text/css" />
     <title>Transaction List</title>
@@ -201,9 +201,9 @@ <h5 class="modal-title">Invoice transaction</h5>
             </div>
         </div>
     </form>
-    <script src="/js/core/jquery-3.2.1.min.js" type="text/javascript"></script>
+    <script src="/js/core/jquery-3.7.0.min.js" type="text/javascript"></script>
     <script src="/js/core/popper.min.js" type="text/javascript"></script>
-    <script src="/js/core/bootstrap-5.min.js" type="text/javascript"></script>
+    <script src="/js/core/bootstrap-5.3.1/bootstrap.min.js" type="text/javascript"></script>
     <script src="/js/core/jquery-ui.min.js" type="text/javascript"></script>
     <script type="text/javascript">
         $(document).ready(function() {

diff --git a/src/main/resources/templates/txs/TxnAdd.html b/src/main/resources/templates/txs/TxnAdd.html
@@ -11,7 +11,7 @@
         <meta name="author" content="Suraj">
         <link rel="shortcut icon" href="/img/Poseidon_Ico.ico" />
         <link rel="stylesheet" href="/css/jquery-ui.css" type="text/css" />
-        <link rel="stylesheet" href="/css/core/bootstrap-5.min.css"  type="text/css" />
+        <link rel="stylesheet" href="/css/core/bootstrap-5.3.1/bootstrap.min.css"  type="text/css" />
         <link rel="stylesheet" href="/css/custom.css" type="text/css" />
         <link rel="stylesheet" href="/css/core/flag-icon.min.css" type="text/css" />
         <title>Add Transaction</title>
@@ -186,9 +186,9 @@ <h5 class="modal-title">Find Customer</h5>
                 </div>
             </div>
         </form>
-        <script src="/js/core/jquery-3.2.1.min.js" type="text/javascript"></script>
+        <script src="/js/core/jquery-3.7.0.min.js" type="text/javascript"></script>
         <script src="/js/core/popper.min.js" type="text/javascript"></script>
-        <script src="/js/core/bootstrap-5.min.js" type="text/javascript"></script>
+        <script src="/js/core/bootstrap-5.3.1/bootstrap.min.js" type="text/javascript"></script>
         <script src="/js/core/jquery-ui.min.js" type="text/javascript"></script>
         <script type="text/javascript">
             $(document).ready(function() {

diff --git a/src/main/resources/templates/txs/TxnEdit.html b/src/main/resources/templates/txs/TxnEdit.html
@@ -11,7 +11,7 @@
         <meta name="author" content="Suraj">
         <link rel="shortcut icon" href="/img/Poseidon_Ico.ico" />
         <link rel="stylesheet" href="/css/jquery-ui.css" type="text/css" />
-        <link rel="stylesheet" href="/css/core/bootstrap-5.min.css"  type="text/css" />
+        <link rel="stylesheet" href="/css/core/bootstrap-5.3.1/bootstrap.min.css"  type="text/css" />
         <link rel="stylesheet" href="/css/custom.css" type="text/css" />
         <link rel="stylesheet" href="/css/core/flag-icon.min.css" type="text/css" />
         <title>Edit Transaction</title>
@@ -211,9 +211,9 @@ <h5 class="modal-title">Add Customer</h5>
                 </div>
             </div>
         </form>
-        <script src="/js/core/jquery-3.2.1.min.js" type="text/javascript"></script>
+        <script src="/js/core/jquery-3.7.0.min.js" type="text/javascript"></script>
         <script src="/js/core/popper.min.js" type="text/javascript"></script>
-        <script src="/js/core/bootstrap-5.min.js" type="text/javascript"></script>
+        <script src="/js/core/bootstrap-5.3.1/bootstrap.min.js" type="text/javascript"></script>
         <script src="/js/core/jquery-ui.min.js" type="text/javascript"></script>
         <script type="text/javascript">
             $(document).ready(function()

diff --git a/src/main/resources/templates/user/PasswordReset.html b/src/main/resources/templates/user/PasswordReset.html
@@ -10,7 +10,7 @@
     <meta name="_csrf" content="${_csrf.token}"/>
     <meta name="_csrf_header" content="${_csrf.headerName}"/>
     <link rel="shortcut icon" href="/img/Poseidon_Ico.ico" />
-    <link rel="stylesheet" href="/css/core/bootstrap-5.min.css"  type="text/css" />
+    <link rel="stylesheet" href="/css/core/bootstrap-5.3.1/bootstrap.min.css"  type="text/css" />
     <link rel="stylesheet" href="/css/custom.css" type="text/css" />
     <link rel="stylesheet" href="/css/core/flag-icon.min.css" type="text/css" />
     <title>Password Reset</title>
@@ -61,6 +61,6 @@ <h6 class="text-center col-12 mb-0">Reset Password</h6>
         </div>
     </form>
     <script src="/js/core/popper.min.js" type="text/javascript"></script>
-    <script src="/js/core/bootstrap-5.min.js" type="text/javascript"></script>
+    <script src="/js/core/bootstrap-5.3.1/bootstrap.min.js" type="text/javascript"></script>
 </body>
 </html>