RaidBuilder/RaidBuilderAPI
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Password reset working

Browse Source
This commit is contained in:
Mattrixwv
2025-03-15 21:27:18 -04:00
parent 1b31144f44
commit 73a4f9d603
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/mattrixwv/raidbuilder/controller/AccountTutorialController.java
View File

@@ -46,7 +46,7 @@ public class AccountTutorialController{
@PutMapping @PutMapping
@AccountAuthorization(permissions = {AccountPermissionType.ADMIN, AccountPermissionType.USER}) @AccountAuthorization(permissions = {AccountPermissionType.ADMIN, AccountPermissionType.USER})
public ObjectNode updateTutorialStatus(@RequestBody AccountTutorialStatus tutorialStatus, Authentication authentication){ public ObjectNode updateTutorialStatus(@RequestBody AccountTutorialStatus tutorialStatus, Authentication authentication){
log.info("Updating tutorial status for account {} to {}", authentication.getName(), tutorialStatus); log.info("Updating tutorial status for account {}", authentication.getName());
Account account = accountService.getByUsername(authentication.getName()); Account account = accountService.getByUsername(authentication.getName());

14
src/main/java/com/mattrixwv/raidbuilder/controller/AuthenticationController.java
View File

@@ -8,6 +8,7 @@ import java.util.UUID;
import org.springframework.security.authorization.AuthorizationDeniedException; import org.springframework.security.authorization.AuthorizationDeniedException;
import org.springframework.security.core.Authentication; import org.springframework.security.core.Authentication;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
@@ -40,6 +41,7 @@ import lombok.extern.slf4j.Slf4j;
@RequiredArgsConstructor @RequiredArgsConstructor
public class AuthenticationController{ public class AuthenticationController{
private final ObjectMapper mapper; private final ObjectMapper mapper;
private final PasswordEncoder passwordEncoder;
private final TokenService tokenService; private final TokenService tokenService;
private final AccountService accountService; private final AccountService accountService;
@@ -230,14 +232,20 @@ public class AuthenticationController{
log.info("Resetting password for {}", authentication.getName()); log.info("Resetting password for {}", authentication.getName());
if((requestNode == null) || (!requestNode.has("password"))){ if((requestNode == null) || (!requestNode.has("newPassword"))){
throw new IllegalArgumentException("Invalid request"); throw new IllegalArgumentException("Invalid request");
} }
String currentPassword = requestNode.get("currentPassword").asText();
String newPassword = requestNode.get("newPassword").asText();
Account account = accountService.getByUsername(authentication.getName()); Account account = accountService.getByUsername(authentication.getName());
accountService.updatePassword(account.getAccountId(), requestNode.get("password").asText()); if(!passwordEncoder.matches(currentPassword, account.getPassword())){
throw new IllegalArgumentException("Current password did not match");
}
account.setForceReset(false); account.setForceReset(false);
accountService.updateAccount(account); accountService.updatePassword(account.getAccountId(), newPassword);
ObjectNode returnNode = mapper.createObjectNode(); ObjectNode returnNode = mapper.createObjectNode();
returnNode.put("status", "success"); returnNode.put("status", "success");

4
src/main/java/com/mattrixwv/raidbuilder/service/AccountService.java
View File

@@ -92,11 +92,11 @@ public class AccountService implements UserDetailsService{
return accountRepository.save(account); return accountRepository.save(account);
} }
public Account updatePassword(UUID accountId, String password){ public Account updatePassword(UUID accountId, String newPassword){
Account account = accountRepository.findById(accountId).orElse(null); Account account = accountRepository.findById(accountId).orElse(null);
if(account != null){ if(account != null){
account.setPassword(passwordEncoder.encode(password)); account.setPassword(passwordEncoder.encode(newPassword));
account = accountRepository.save(account); account = accountRepository.save(account);
} }