SB 4.0.1

Author: bukajsytlos

src/inttest/resources/config/application.yml

@@ -103,8 +103,7 @@ faf-api:
     region: auto
     user-upload-bucket: user-uploads
 
-#logging:
-#  level:
-#    org.hibernate.SQL: DEBUG
-#    org.hibernate.engine.spi.EntityEntry: TRACE
-#    org.springframework.security: DEBUG
+logging:
+  level:
+    org.hibernate.SQL: DEBUG
+    org.hibernate.engine.spi.EntityEntry: TRACE

src/main/java/com/faforever/api/config/security/WebSecurityConfig.java

@@ -56,8 +56,9 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
         "/users/register",
         "/users/activate",
         "/users/requestPasswordReset",
-        "/users/requestPasswordReset",
         "/users/performPasswordReset",
+        "/users/buildSteamPasswordResetUrl",
+        "/users/requestPasswordResetViaSteam",
         "/users/linkToSteam/**"
       ).permitAll();
       authorizeConfig.anyRequest().authenticated();

src/main/java/com/faforever/api/map/MapsController.java

@@ -22,7 +22,7 @@
 import org.springframework.web.servlet.ModelAndView;
 import tools.jackson.core.JacksonException;
 import tools.jackson.databind.JsonNode;
-import tools.jackson.databind.ObjectMapper;
+import tools.jackson.databind.json.JsonMapper;
 
 import java.io.IOException;
 import java.util.Map;
@@ -36,7 +36,7 @@
 public class MapsController {
   private final MapService mapService;
   private final FafApiProperties fafApiProperties;
-  private final ObjectMapper objectMapper;
+  private final JsonMapper objectMapper;
   private final PlayerService playerService;
 
 

src/main/java/com/faforever/api/security/FafTokenService.java

@@ -20,7 +20,7 @@
 import org.springframework.util.Assert;
 import tools.jackson.core.JacksonException;
 import tools.jackson.core.type.TypeReference;
-import tools.jackson.databind.ObjectMapper;
+import tools.jackson.databind.json.JsonMapper;
 
 import jakarta.validation.constraints.NotNull;
 import java.nio.file.Files;
@@ -38,11 +38,11 @@ public class FafTokenService {
   static final String KEY_ACTION = "action";
   static final String KEY_LIFETIME = "lifetime";
 
-  private final ObjectMapper objectMapper;
+  private final JsonMapper objectMapper;
   private final RSASSASigner rsaSigner;
   private final RSASSAVerifier rsaVerifier;
 
-  public FafTokenService(ObjectMapper objectMapper, FafApiProperties properties) throws Exception {
+  public FafTokenService(JsonMapper objectMapper, FafApiProperties properties) throws Exception {
     String secretKey = Files.readString(properties.getJwt().getSecretKeyPath());
     String publicKey = Files.readString(properties.getJwt().getPublicKeyPath());
 

src/main/java/com/faforever/api/security/JwtService.java

@@ -14,7 +14,7 @@
 import com.nimbusds.jose.crypto.RSASSAVerifier;
 import com.nimbusds.jose.jwk.RSAKey;
 import org.springframework.stereotype.Service;
-import tools.jackson.databind.ObjectMapper;
+import tools.jackson.databind.json.JsonMapper;
 
 import jakarta.inject.Inject;
 import java.io.IOException;
@@ -26,10 +26,10 @@
 public class JwtService {
   private final RSASSASigner rsaSigner;
   private final RSASSAVerifier rsaVerifier;
-  private final ObjectMapper objectMapper;
+  private final JsonMapper objectMapper;
 
   @Inject
-  public JwtService(FafApiProperties fafApiProperties, ObjectMapper objectMapper) throws Exception {
+  public JwtService(FafApiProperties fafApiProperties, JsonMapper objectMapper) throws Exception {
     String secretKey = Files.readString(fafApiProperties.getJwt().getSecretKeyPath());
     String publicKey = Files.readString(fafApiProperties.getJwt().getPublicKeyPath());
 

src/main/java/com/faforever/api/user/UsersController.java

@@ -194,5 +194,4 @@ private void redirectCallbackResult(HttpServletResponse response, CallbackResult
       response.sendRedirect(uriBuilder.toUriString());
     }
   }
-
 }

src/main/resources/config/application.yml

@@ -129,7 +129,7 @@ spring:
     properties:
       hibernate:
         dialect: org.hibernate.dialect.MariaDBDialect
-  jackson:
+  jackson2:
     serialization:
       WRITE_DATES_AS_TIMESTAMPS: false
   profiles:

src/test/java/com/faforever/api/security/FafTokenServiceTest.java

@@ -11,7 +11,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import tools.jackson.core.type.TypeReference;
-import tools.jackson.databind.ObjectMapper;
+import tools.jackson.databind.json.JsonMapper;
 
 import java.nio.file.Files;
 import java.nio.file.Paths;
@@ -59,7 +59,7 @@ public class FafTokenServiceTest {
   private final RSASSASigner rsaSigner;
   private final RSASSAVerifier rsaVerifier;
 
-  private ObjectMapper objectMapper;
+  private JsonMapper objectMapper;
   private FafTokenService instance;
 
   public FafTokenServiceTest() throws Exception {
@@ -75,7 +75,7 @@ public FafTokenServiceTest() throws Exception {
 
   @BeforeEach
   public void setUp() throws Exception {
-    objectMapper = new ObjectMapper();
+    objectMapper = new JsonMapper();
 
     FafApiProperties properties = new FafApiProperties();
     properties.getJwt().setSecretKeyPath(Paths.get("test-pki-private.key"));