diff --git a/src/main/java/no/fintlabs/authorization/adminuser/AdminUserController.java b/src/main/java/no/fintlabs/authorization/adminuser/AdminUserController.java index dee7654..bccc5c2 100644 --- a/src/main/java/no/fintlabs/authorization/adminuser/AdminUserController.java +++ b/src/main/java/no/fintlabs/authorization/adminuser/AdminUserController.java @@ -1,6 +1,5 @@ package no.fintlabs.authorization.adminuser; -import lombok.extern.slf4j.Slf4j; import no.fintlabs.authorization.user.UserPermission; import no.fintlabs.authorization.user.UserPermissionDto; import no.fintlabs.authorization.user.UserPermissionRepository; @@ -20,7 +19,6 @@ @RestController @RequestMapping(INTERNAL_API + "/authorization/adminuser") -@Slf4j public class AdminUserController { private final UserPermissionRepository userPermissionRepository; @@ -56,7 +54,7 @@ public Mono>> getUserPermissions( } @PostMapping("userpermissions") - public Mono>> setUserPermission( + public Mono>> setUserPermissions( @RequestBody List userPermissionDtos, @AuthenticationPrincipal Mono authenticationMono ) { @@ -73,11 +71,7 @@ public Mono>> setUserPermission( .getSourceApplicationIds()); userPermissionRepository.save(userPermission); - return UserPermissionDto - .builder() - .objectIdentifier(userPermission.getObjectIdentifier()) - .sourceApplicationIds(userPermission.getSourceApplicationIds()) - .build(); + return buildUserPermissionDto(userPermission); } else { UserPermission newUserPermission = UserPermission.builder() .objectIdentifier(userPermissionDto.getObjectIdentifier()) @@ -85,11 +79,7 @@ public Mono>> setUserPermission( .build(); userPermissionRepository.save(newUserPermission); - return UserPermissionDto - .builder() - .objectIdentifier(newUserPermission.getObjectIdentifier()) - .sourceApplicationIds(newUserPermission.getSourceApplicationIds()) - .build(); + return buildUserPermissionDto(newUserPermission); } }).subscribeOn(Schedulers.boundedElastic())) .collectList() @@ -100,6 +90,13 @@ public Mono>> setUserPermission( }); } + private UserPermissionDto buildUserPermissionDto(UserPermission userPermission) { + return UserPermissionDto + .builder() + .objectIdentifier(userPermission.getObjectIdentifier()) + .sourceApplicationIds(userPermission.getSourceApplicationIds()) + .build(); + } private Mono isAdmin(Mono authenticationMono) { return authenticationMono