Fixes

Author: lopenchi

build.gradle

@@ -1,18 +1,24 @@
 plugins {
+    id 'org.springframework.boot' version '3.3.2'
     id 'java'
     id 'org.gretty' version '4.1.6'
     id 'idea'
     id 'groovy'
 }
 
-ext['springBootVer'] = '2.7.18'
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
+
+ext['springBootVer'] = '3.3.2'
 
 repositories {
     mavenCentral()
 }
 
 gretty {
-    springBootVersion = '2.7.18'
+    springBootVersion = '3.3.2'
     springBoot = true
     servletContainer = 'jetty11'
     contextPath = ''

src/main/java/com/twilio/accountsecurity/config/SQLiteDialect.java

@@ -6,39 +6,29 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 
 
 @Configuration
-@EnableWebSecurity
-public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
-
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-        http.addFilterAfter(new TwoFAFilter(), UsernamePasswordAuthenticationFilter.class)
-            .csrf().disable().authorizeRequests()
-                .antMatchers("/protected/**", "/2fa/**").authenticated()
-                .antMatchers("/", "/register/**", "/api/**", "/**.js", "/**.html").permitAll()
-                .and()
-            .logout().permitAll();
-    }
+public class WebSecurityConfig {
 
     @Autowired
     private UserDetailsServiceImpl userDetailsService;
-
     @Autowired
     private PasswordEncoder encoder;
 
-    @Override
-    protected void configure(AuthenticationManagerBuilder auth)
-            throws Exception {
-        auth.userDetailsService(userDetailsService);
-        auth.authenticationProvider(authProvider());
+    @Bean
+    public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
+        http
+                .addFilterAfter(new TwoFAFilter(), UsernamePasswordAuthenticationFilter.class)
+                .authorizeHttpRequests((authz) -> authz
+                        .requestMatchers("/protected/**", "/2fa/**").authenticated()
+                        .requestMatchers("/", "/register/**", "/api/**", "/**.js", "/**.html").permitAll()
+                );
+        return http.build();
     }
 
     @Bean

src/main/java/com/twilio/accountsecurity/config/WebSecurityConfig.java

@@ -14,7 +14,7 @@
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.io.IOException;
 
 @RestController

src/main/java/com/twilio/accountsecurity/controllers/LoginController.java

@@ -12,7 +12,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import jakarta.servlet.http.HttpSession;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 @RestController
 @RequestMapping(path = "/api/phone-verification")

src/main/java/com/twilio/accountsecurity/controllers/PhoneVerificationController.java

@@ -17,7 +17,7 @@
 
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 @RestController
 public class RegisterController {

src/main/java/com/twilio/accountsecurity/controllers/RegisterController.java

@@ -14,7 +14,7 @@
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpSession;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 @RestController
 @RequestMapping(value = "/api/token")

src/main/java/com/twilio/accountsecurity/controllers/TokenController.java

@@ -1,6 +1,6 @@
 package com.twilio.accountsecurity.controllers.requests;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 public class LoginRequest {
 

src/main/java/com/twilio/accountsecurity/controllers/requests/LoginRequest.java

@@ -1,6 +1,6 @@
 package com.twilio.accountsecurity.controllers.requests;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 public class PhoneVerificationStartRequest {
 

src/main/java/com/twilio/accountsecurity/controllers/requests/PhoneVerificationStartRequest.java

@@ -1,6 +1,6 @@
 package com.twilio.accountsecurity.controllers.requests;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 public class PhoneVerificationVerifyRequest {
     @NotNull