faf-java-api-428 Fix after rebase

FAForever · Jun 4, 2023 · ca8e310 · ca8e310
1 parent c773104
commit ca8e310
Show file tree

Hide file tree

Showing 8 changed files with 201 additions and 294 deletions.
diff --git a/src/inttest/java/com/faforever/api/clan/ClanControllerTest.java b/src/inttest/java/com/faforever/api/clan/ClanControllerTest.java
@@ -8,10 +8,6 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.test.context.support.WithUserDetails;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.annotation.DirtiesContext.MethodMode;
 import org.springframework.test.context.jdbc.Sql;
 import org.springframework.test.context.jdbc.Sql.ExecutionPhase;
 import org.springframework.test.web.servlet.MvcResult;
@@ -20,16 +16,15 @@
 
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.core.IsNull.nullValue;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-@DirtiesContext(methodMode = MethodMode.BEFORE_METHOD)
 @Sql(executionPhase = ExecutionPhase.BEFORE_TEST_METHOD, scripts = "classpath:sql/truncateTables.sql")
 @Sql(executionPhase = ExecutionPhase.BEFORE_TEST_METHOD, scripts = "classpath:sql/prepDefaultData.sql")
 @Sql(executionPhase = ExecutionPhase.BEFORE_TEST_METHOD, scripts = "classpath:sql/prepClanData.sql")
@@ -115,7 +110,6 @@ public void createClanWithoutAuth() throws Exception {
   }
 
   @Test
-  @DirtiesContext(methodMode = MethodMode.BEFORE_METHOD)
   public void createClanWithExistingName() throws Exception {
     Player player = playerRepository.getById(USERID_USER);
 
@@ -138,7 +132,6 @@ public void createClanWithExistingName() throws Exception {
   }
 
   @Test
-  @DirtiesContext(methodMode = MethodMode.BEFORE_METHOD)
   public void createClanWithExistingTag() throws Exception {
     Player player = playerRepository.getById(USERID_USER);
 
@@ -161,7 +154,6 @@ public void createClanWithExistingTag() throws Exception {
   }
 
   @Test
-  @DirtiesContext(methodMode = MethodMode.BEFORE_METHOD)
   public void createSecondClan() throws Exception {
     Player player = playerRepository.getById(USERID_CLAN_MEMBER);
 

diff --git a/src/main/java/com/faforever/api/clan/ClanService.java b/src/main/java/com/faforever/api/clan/ClanService.java
@@ -15,8 +15,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
-import org.springframework.security.jwt.Jwt;
-import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
@@ -69,15 +67,16 @@ public void preCreate(Clan clan) {
   @SneakyThrows
   @Transactional
   @Deprecated
-    // use POST via Elide instead
-  Clan create(String name, String tag, String description) {
+  // use POST via Elide instead
+  public Clan create(String name, String tag, String description) {
     Clan clan = new Clan();
     clan.setName(name);
     clan.setTag(tag);
     clan.setDescription(description);
     clan.setRequiresInvitation(true);
-    clan.setFounder(playerService.getCurrentPlayer());
-    clan.setLeader(playerService.getCurrentPlayer());
+    Player currentPlayer = playerService.getCurrentPlayer();
+    clan.setFounder(currentPlayer);
+    clan.setLeader(currentPlayer);
 
     // validation is done at preCreate() called by ClanListener
     clanRepository.save(clan);
@@ -86,7 +85,7 @@ Clan create(String name, String tag, String description) {
 
   @SneakyThrows
   @Transactional
-  String generatePlayerInvitationToken(int newMemberId, int clanId) {
+  public String generatePlayerInvitationToken(int newMemberId, int clanId) {
     Player requester = playerService.getCurrentPlayer();
 
     Clan clan = clanRepository.findById(clanId)
@@ -102,16 +101,14 @@ String generatePlayerInvitationToken(int newMemberId, int clanId) {
       .plus(fafApiProperties.getClan().getInviteLinkExpireDurationMinutes(), ChronoUnit.MINUTES)
       .toEpochMilli();
 
-    InvitationResult result = new InvitationResult(expire,
-      ClanResult.of(clan),
-      PlayerResult.of(newMember));
+    InvitationResult result = new InvitationResult(expire, ClanResult.of(clan), PlayerResult.of(newMember));
     return jwtService.sign(result);
   }
 
   @SneakyThrows
   void acceptPlayerInvitationToken(String stringToken) {
-    Jwt token = jwtService.decodeAndVerify(stringToken);
-    InvitationResult invitation = objectMapper.readValue(token.getClaims(), InvitationResult.class);
+    String decodedToken = jwtService.decodeAndVerify(stringToken);
+    InvitationResult invitation = objectMapper.readValue(decodedToken, InvitationResult.class);
 
     if (invitation.isExpired()) {
       throw ApiException.of(ErrorCode.CLAN_ACCEPT_TOKEN_EXPIRE);
@@ -122,7 +119,7 @@ void acceptPlayerInvitationToken(String stringToken) {
     Clan clan = clanRepository.findById(clanId)
       .orElseThrow(() -> new ApiException(new Error(ErrorCode.CLAN_NOT_EXISTS, clanId)));
 
-    Player newMember = playerService.getById(invitation.newMember().getId());
+    Player newMember = playerService.getById(invitation.newMember().id());
 
     if (!Objects.equals(player.getId(), newMember.getId())) {
       throw ApiException.of(ErrorCode.CLAN_ACCEPT_WRONG_PLAYER);

diff --git a/src/main/java/com/faforever/api/config/IgnoreOctetStreamToObjectHttpMessageConverter.java b/src/main/java/com/faforever/api/config/IgnoreOctetStreamToObjectHttpMessageConverter.java
@@ -6,7 +6,6 @@
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.AbstractHttpMessageConverter;
 import org.springframework.lang.Nullable;
-import org.springframework.security.core.Authentication;
 import org.springframework.util.StreamUtils;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -16,7 +15,7 @@
  * This class is used to support having both @RequestParam and @RequestPart with same multipart name in one request handler.
  * When multipart request contains simple request param octet-stream, this class is used to ignore parsing
  * of byte stream to {@link MapUploadMetadata}.
- * See {@link com.faforever.api.map.MapsController#uploadMap(MultipartFile, String, MapUploadMetadata, Authentication)}
+ * See {@link com.faforever.api.map.MapsController#uploadMap(MultipartFile, String, MapUploadMetadata)}
  */
 public class IgnoreOctetStreamToObjectHttpMessageConverter extends AbstractHttpMessageConverter<byte[]> {
 

diff --git a/src/main/java/com/faforever/api/config/NoopMultipartFileToStringConverter.java b/src/main/java/com/faforever/api/config/NoopMultipartFileToStringConverter.java
@@ -2,14 +2,13 @@
 
 import com.faforever.api.map.MapUploadMetadata;
 import org.springframework.core.convert.converter.Converter;
-import org.springframework.security.core.Authentication;
 import org.springframework.web.multipart.MultipartFile;
 
 /**
  * This class is used to support having both @RequestParam and @RequestPart with same multipart name in one request handler.
  * When multipart request contains json multipart, this class is used to ignore conversion
  * of MultipartFile to String.
- * See {@link com.faforever.api.map.MapsController#uploadMap(MultipartFile, String, MapUploadMetadata, Authentication)}
+ * See {@link com.faforever.api.map.MapsController#uploadMap(MultipartFile, String, MapUploadMetadata)}
  */
 public class NoopMultipartFileToStringConverter implements Converter<MultipartFile, String> {
 

diff --git a/src/main/java/com/faforever/api/map/MapsController.java b/src/main/java/com/faforever/api/map/MapsController.java
@@ -1,6 +1,5 @@
 package com.faforever.api.map;
 
-import com.faforever.api.config.FafApiProperties;
 import com.faforever.api.data.domain.Player;
 import com.faforever.api.error.ApiException;
 import com.faforever.api.error.ErrorCode;
@@ -14,9 +13,9 @@
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.security.core.Authentication;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.bind.annotation.RestController;
@@ -34,12 +33,11 @@
 @AllArgsConstructor
 public class MapsController {
   private final MapService mapService;
-  private final FafApiProperties fafApiProperties;
   private final ObjectMapper objectMapper;
   private final PlayerService playerService;
 
 
-  @RequestMapping(path = "/validate", method = RequestMethod.GET, produces = APPLICATION_JSON_UTF8_VALUE)
+  @GetMapping(path = "/validate", produces = APPLICATION_JSON_UTF8_VALUE)
   public ModelAndView showValidationForm(Map<String, Object> model) {
     return new ModelAndView("validate_map_metadata.html");
   }
@@ -49,11 +47,7 @@ public ModelAndView showValidationForm(Map<String, Object> model) {
     @ApiResponse(code = 200, message = "Information about derived names to be used in the scenario.lua"),
     @ApiResponse(code = 422, message = "A list of reasons why the name is not valid.")
   })
-  @RequestMapping(
-    path = "/validateMapName",
-    method = RequestMethod.POST,
-    produces = APPLICATION_JSON_UTF8_VALUE
-  )
+  @PostMapping(path = "/validateMapName", produces = APPLICATION_JSON_UTF8_VALUE)
   public MapNameValidationResponse validateMapName(@RequestParam("mapName") String mapName) {
     return mapService.requestMapNameValidation(mapName);
   }
@@ -62,11 +56,7 @@ public MapNameValidationResponse validateMapName(@RequestParam("mapName") String
   @ApiResponses(value = {
     @ApiResponse(code = 200, message = "Valid without further information"),
     @ApiResponse(code = 422, message = "A list of errors in the scenario.lua")})
-  @RequestMapping(
-    path = "/validateScenarioLua",
-    method = RequestMethod.POST,
-    produces = APPLICATION_JSON_UTF8_VALUE
-  )
+  @PostMapping(path = "/validateScenarioLua", produces = APPLICATION_JSON_UTF8_VALUE)
   public void validateScenarioLua(@RequestParam(name = "scenarioLua") String scenarioLua) {
     mapService.validateScenarioLua(scenarioLua);
   }
@@ -76,12 +66,13 @@ public void validateScenarioLua(@RequestParam(name = "scenarioLua") String scena
     @ApiResponse(code = 200, message = "Success"),
     @ApiResponse(code = 401, message = "Unauthorized"),
     @ApiResponse(code = 500, message = "Failure")})
-  @RequestMapping(path = "/upload", method = RequestMethod.POST, produces = APPLICATION_JSON_UTF8_VALUE)
+  @PostMapping(path = "/upload", produces = APPLICATION_JSON_UTF8_VALUE)
   @PreAuthorize("hasScope('" + OAuthScope._UPLOAD_MAP + "')")
-  public void uploadMap(@RequestParam("file") MultipartFile file,
-                        @Deprecated @RequestParam(value = "metadata", required = false) String metadataJsonString,
-                        @RequestPart(value = "metadata", required = false) MapUploadMetadata metadata,
-                        Authentication authentication) throws IOException {
+  public void uploadMap(
+    @RequestParam("file") MultipartFile file,
+    @Deprecated @RequestParam(value = "metadata", required = false) String metadataJsonString,
+    @RequestPart(value = "metadata", required = false) MapUploadMetadata metadata
+  ) throws IOException {
     if (metadataJsonString == null && metadata == null) {
       throw ApiException.of(ErrorCode.PARAMETER_MISSING, "metadata");
     }
@@ -102,7 +93,7 @@ public void uploadMap(@RequestParam("file") MultipartFile file,
       licenseId = metadata.licenseId();
     }
 
-    Player player = playerService.getPlayer(authentication);
+    Player player = playerService.getCurrentPlayer();
     mapService.uploadMap(file.getInputStream(), file.getOriginalFilename(), player, ranked, licenseId);
   }
 }
diff --git a/src/main/java/com/faforever/api/mod/ModsController.java b/src/main/java/com/faforever/api/mod/ModsController.java
@@ -1,16 +1,14 @@
 package com.faforever.api.mod;
 
-import com.faforever.api.config.FafApiProperties;
 import com.faforever.api.player.PlayerService;
 import com.faforever.api.security.OAuthScope;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.security.core.Authentication;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.bind.annotation.RestController;
@@ -28,27 +26,26 @@ public class ModsController {
 
   private final PlayerService playerService;
   private final ModService modService;
-  private final FafApiProperties fafApiProperties;
 
   @ApiOperation("Upload a mod")
   @ApiResponses(value = {
     @ApiResponse(code = 200, message = "Success"),
     @ApiResponse(code = 401, message = "Unauthorized"),
     @ApiResponse(code = 500, message = "Failure")})
-  @RequestMapping(path = "/upload", method = RequestMethod.POST, produces = APPLICATION_JSON_UTF8_VALUE)
+  @PostMapping(path = "/upload", produces = APPLICATION_JSON_UTF8_VALUE)
   @PreAuthorize("hasScope('" + OAuthScope._UPLOAD_MOD + "')")
   public void uploadMod(
     @RequestParam("file") MultipartFile file,
-    @RequestPart(value = "metadata", required = false) ModUploadMetadata metadata, //TODO make required when implemented by client
-    Authentication authentication) throws IOException {
+    @RequestPart(value = "metadata", required = false) ModUploadMetadata metadata //TODO make required when implemented by client
+  ) throws IOException {
 
     Path tempFile = java.nio.file.Files.createTempFile("mod", ".tmp");
     file.transferTo(tempFile.toFile());
 
     modService.processUploadedMod(
       tempFile,
       file.getOriginalFilename(),
-      playerService.getPlayer(authentication),
+      playerService.getCurrentPlayer(),
       metadata != null ? metadata.licenseId() : null,
       metadata != null ? metadata.repositoryUrl() : null
     );

diff --git a/src/main/java/com/faforever/api/player/PlayerService.java b/src/main/java/com/faforever/api/player/PlayerService.java
@@ -16,7 +16,7 @@ public class PlayerService {
 
   private final PlayerRepository playerRepository;
 
-  public Player getPlayer() {
+  public Player getCurrentPlayer() {
     Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
 
     if (authentication instanceof FafAuthenticationToken fafAuthenticationToken) {