change getUserPermissions to return list of user permissions

FINTLabs · May 29, 2024 · 14a0c4f · 14a0c4f
1 parent 2c6dc95
commit 14a0c4f
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/main/java/no/fintlabs/authorization/adminuser/AdminUserController.java b/src/main/java/no/fintlabs/authorization/adminuser/AdminUserController.java
@@ -38,15 +38,19 @@ public Mono<ResponseEntity<AdminUser>> checkAdminUser(
     }
 
     @GetMapping("userpermissions")
-    public Mono<ResponseEntity<List<UserPermission>>> getUserPermissions(
+    public Mono<ResponseEntity<List<UserPermissionDto>>> getUserPermissions(
             @AuthenticationPrincipal Mono<Authentication> authenticationMono
     ) {
         return isAdmin(authenticationMono)
                 .flatMap(isAdmin -> {
                     if (isAdmin) {
                         return Mono.fromCallable(userPermissionRepository::findAll)
                                 .subscribeOn(Schedulers.boundedElastic())
-                                .map(userPermissions -> ResponseEntity.ok().body(userPermissions));
+                                .map(userPermissions -> {
+                                    List<UserPermissionDto> userPermissionDtos = new java.util.ArrayList<>(List.of());
+                                    userPermissions.forEach(userPermission -> userPermissionDtos.add(buildUserPermissionDto(userPermission)));
+                                    return ResponseEntity.ok().body(userPermissionDtos);
+                                });
                     } else {
                         return Mono.just(ResponseEntity.status(HttpStatus.FORBIDDEN).build());
                     }