marcel/familienarchiv
1
0
Fork 0
Code Issues 127 Pull Requests 2 Actions Packages Projects Releases Wiki Activity

refactor(audit): extract actorId() helper in UserController

Browse Source 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Marcel
2026-04-26 15:37:50 +02:00
parent f4a4436eda
commit f6bcc4f72a
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
backend/src/main/java/org/raddatz/familienarchiv/controller/UserController.java
View File

@@ -80,8 +80,7 @@ public class UserController {
@RequirePermission(Permission.ADMIN_USER) @RequirePermission(Permission.ADMIN_USER)
public ResponseEntity<AppUser> createUser(Authentication authentication, public ResponseEntity<AppUser> createUser(Authentication authentication,
@Valid @RequestBody CreateUserRequest request) { @Valid @RequestBody CreateUserRequest request) {
AppUser actor = userService.findByEmail(authentication.getName()); return ResponseEntity.ok(userService.createUserOrUpdate(actorId(authentication), request));
return ResponseEntity.ok(userService.createUserOrUpdate(actor.getId(), request));
} }
@PutMapping("/users/{id}") @PutMapping("/users/{id}")
@@ -89,8 +88,7 @@ public class UserController {
public ResponseEntity<AppUser> adminUpdateUser(Authentication authentication, public ResponseEntity<AppUser> adminUpdateUser(Authentication authentication,
@PathVariable UUID id, @PathVariable UUID id,
@RequestBody AdminUpdateUserRequest dto) { @RequestBody AdminUpdateUserRequest dto) {
AppUser actor = userService.findByEmail(authentication.getName()); AppUser updated = userService.adminUpdateUser(actorId(authentication), id, dto);
AppUser updated = userService.adminUpdateUser(actor.getId(), id, dto);
updated.setPassword(null); updated.setPassword(null);
return ResponseEntity.ok(updated); return ResponseEntity.ok(updated);
} }
@@ -99,9 +97,12 @@ public class UserController {
@RequirePermission(Permission.ADMIN_USER) @RequirePermission(Permission.ADMIN_USER)
public ResponseEntity<Void> deleteUser(Authentication authentication, public ResponseEntity<Void> deleteUser(Authentication authentication,
@PathVariable UUID id) { @PathVariable UUID id) {
AppUser actor = userService.findByEmail(authentication.getName()); userService.deleteUser(actorId(authentication), id);
userService.deleteUser(actor.getId(), id);
return ResponseEntity.ok().build(); return ResponseEntity.ok().build();
} }
private UUID actorId(Authentication auth) {
return userService.findByEmail(auth.getName()).getId();
}
} }