Fixed updateUser
This commit is contained in:
parent
c35cac8b42
commit
c069028bd5
@ -42,16 +42,7 @@ public class UserRepository {
|
||||
|
||||
public void updateUser(User user) {
|
||||
r.db(config.getDatabase()).table("users")
|
||||
.filter(r.hashMap("username", user.getUsername()))
|
||||
.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))
|
||||
.filter(r.hashMap("id", user.getId()))
|
||||
.update(user)
|
||||
.run(connection);
|
||||
}
|
||||
|
@ -69,7 +69,7 @@ public class Administration extends SecureApiRestController {
|
||||
User user = optionalUser.get();
|
||||
user.setPassword(authenticationService.encodePassword(userEditRequest.getNewPassword()));
|
||||
user.setUsername(userEditRequest.getUsername());
|
||||
userRepository.updateUser(user, userEditRequest.getOriginalUsername());
|
||||
userRepository.updateUser(user);
|
||||
// Clear password before returning
|
||||
user.setPassword(null);
|
||||
return ResponseEntity.ok(user);
|
||||
|
Loading…
x
Reference in New Issue
Block a user