Fixed updateUser

This commit is contained in:
Max W. 2024-06-03 22:00:55 +02:00
parent c35cac8b42
commit c069028bd5
2 changed files with 2 additions and 11 deletions

View File

@ -42,16 +42,7 @@ public class UserRepository {
public void updateUser(User user) { public void updateUser(User user) {
r.db(config.getDatabase()).table("users") r.db(config.getDatabase()).table("users")
.filter(r.hashMap("username", user.getUsername())) .filter(r.hashMap("id", user.getId()))
.update(user)
.run(connection);
}
// If username is changed, this method must be used. Else the user will not be found
public void updateUser(User user, String originalUsername) {
// TODO: Refactor this to use the userID instead of the username (remove this and use method above)
r.db(config.getDatabase()).table("users")
.filter(r.hashMap("username", originalUsername))
.update(user) .update(user)
.run(connection); .run(connection);
} }

View File

@ -69,7 +69,7 @@ public class Administration extends SecureApiRestController {
User user = optionalUser.get(); User user = optionalUser.get();
user.setPassword(authenticationService.encodePassword(userEditRequest.getNewPassword())); user.setPassword(authenticationService.encodePassword(userEditRequest.getNewPassword()));
user.setUsername(userEditRequest.getUsername()); user.setUsername(userEditRequest.getUsername());
userRepository.updateUser(user, userEditRequest.getOriginalUsername()); userRepository.updateUser(user);
// Clear password before returning // Clear password before returning
user.setPassword(null); user.setPassword(null);
return ResponseEntity.ok(user); return ResponseEntity.ok(user);