Drop Anope update on password reset

FAForever · Dec 1, 2023 · aa9176b · aa9176b
1 parent c92acd8
commit aa9176b
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 54 deletions.
diff --git a/src/inttest/java/com/faforever/api/user/UsersControllerTest.java b/src/inttest/java/com/faforever/api/user/UsersControllerTest.java
@@ -43,9 +43,6 @@ public class UsersControllerTest extends AbstractIntegrationTest {
   private static final String NEW_PASSWORD = "newPassword";
   private static final String NEW_EMAIL = "test@faforever.com";
 
-  @MockBean
-  private AnopeUserRepository anopeUserRepository;
-
   @MockBean
   private EmailSender emailSender;
 
@@ -124,7 +121,6 @@ public void changePasswordWithSuccess() throws Exception {
 
     User user = userRepository.getById(USERID_USER);
     assertEquals(user.getPassword(), "5c29a959abce4eda5f0e7a4e7ea53dce4fa0f0abbe8eaa63717e2fed5f193d31");
-    verify(anopeUserRepository, times(1)).updatePassword(eq(AUTH_USER), anyString());
   }
 
   @Test

diff --git a/src/main/java/com/faforever/api/config/FafApiProperties.java b/src/main/java/com/faforever/api/config/FafApiProperties.java
@@ -36,7 +36,6 @@ public class FafApiProperties {
   private Challonge challonge = new Challonge();
   private User user = new User();
   private Database database = new Database();
-  private Anope anope = new Anope();
   private Rating rating = new Rating();
   private Tutorial tutorial = new Tutorial();
   private Nodebb nodebb = new Nodebb();

diff --git a/src/main/java/com/faforever/api/user/AnopeUserRepository.java b/src/main/java/com/faforever/api/user/AnopeUserRepository.java
diff --git a/src/main/java/com/faforever/api/user/UserService.java b/src/main/java/com/faforever/api/user/UserService.java
@@ -14,7 +14,6 @@
 import com.faforever.api.security.FafTokenService;
 import com.faforever.api.security.FafTokenType;
 import com.faforever.api.security.FafUserAuthenticationToken;
-import com.google.common.hash.Hashing;
 import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.MeterRegistry;
 import lombok.extern.slf4j.Slf4j;
@@ -25,7 +24,6 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -59,7 +57,6 @@ public class UserService {
   private final NameRecordRepository nameRecordRepository;
   private final FafApiProperties properties;
   private final FafPasswordEncoder passwordEncoder;
-  private final AnopeUserRepository anopeUserRepository;
   private final FafTokenService fafTokenService;
   private final SteamService steamService;
   private final GogService gogService;
@@ -84,7 +81,6 @@ public UserService(EmailService emailService,
                      AccountLinkRepository accountLinkRepository,
                      NameRecordRepository nameRecordRepository,
                      FafApiProperties properties,
-                     AnopeUserRepository anopeUserRepository,
                      FafTokenService fafTokenService,
                      SteamService steamService,
                      GogService gogService,
@@ -96,7 +92,6 @@ public UserService(EmailService emailService,
     this.accountLinkRepository = accountLinkRepository;
     this.nameRecordRepository = nameRecordRepository;
     this.properties = properties;
-    this.anopeUserRepository = anopeUserRepository;
     this.fafTokenService = fafTokenService;
     this.steamService = steamService;
     this.gogService = gogService;
@@ -343,8 +338,6 @@ private void setPassword(User user, String password) {
     log.debug("Updating FAF password for user: {}", user.getLogin());
     user.setPassword(passwordEncoder.encode(password));
     userRepository.save(user);
-    log.debug("Updating anope password for user: {}", user.getLogin());
-    anopeUserRepository.updatePassword(user.getLogin(), Hashing.md5().hashString(password, StandardCharsets.UTF_8).toString());
   }
 
   public User getUser(Authentication authentication) {

diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml
@@ -1,7 +1,5 @@
 faf-api:
   version: #faf-api.version#
-  anope:
-    database-name: ${ANOPE_DATABASE_NAME:faf-anope}
   avatar:
     max-size-bytes: ${AVATAR_MAX_SIZE_BYTES:4096}
     image-width: ${AVATAR_IMAGE_WIDTH:40}

diff --git a/src/test/java/com/faforever/api/user/UserServiceTest.java b/src/test/java/com/faforever/api/user/UserServiceTest.java
@@ -14,7 +14,6 @@
 import com.faforever.api.security.FafTokenService;
 import com.faforever.api.security.FafTokenType;
 import com.faforever.api.user.UserService.CallbackResult;
-import com.google.common.hash.Hashing;
 import io.micrometer.core.instrument.MeterRegistry;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -28,7 +27,6 @@
 import org.springframework.context.ApplicationEventPublisher;
 
 import java.math.BigInteger;
-import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.Map;
 import java.util.Optional;
@@ -83,8 +81,6 @@ public class UserServiceTest {
   @Mock
   private NameRecordRepository nameRecordRepository;
   @Mock
-  private AnopeUserRepository anopeUserRepository;
-  @Mock
   private SteamService steamService;
   @Mock
   private GogService gogService;
@@ -119,7 +115,6 @@ public void setUp() {
       accountLinkRepository,
       nameRecordRepository,
       properties,
-      anopeUserRepository,
       fafTokenService,
       steamService,
       gogService,
@@ -207,7 +202,6 @@ public void changePassword() {
     ArgumentCaptor<User> captor = ArgumentCaptor.forClass(User.class);
     verify(userRepository).save(captor.capture());
     assertEquals(captor.getValue().getPassword(), fafPasswordEncoder.encode(TEST_NEW_PASSWORD));
-    verify(anopeUserRepository).updatePassword(TEST_USERNAME, Hashing.md5().hashString(TEST_NEW_PASSWORD, StandardCharsets.UTF_8).toString());
 
     verifyNoMoreInteractions(eventPublisher);
   }
@@ -403,7 +397,6 @@ public void claimPasswordResetToken() {
     ArgumentCaptor<User> captor = ArgumentCaptor.forClass(User.class);
     verify(userRepository).save(captor.capture());
     assertEquals(captor.getValue().getPassword(), fafPasswordEncoder.encode(TEST_NEW_PASSWORD));
-    verify(anopeUserRepository).updatePassword(TEST_USERNAME, Hashing.md5().hashString(TEST_NEW_PASSWORD, StandardCharsets.UTF_8).toString());
     verifyNoMoreInteractions(eventPublisher);
   }