NPE bugfix

OpenConext · Oct 25, 2024 · 106a06e · 106a06e
1 parent 439ba2e
commit 106a06e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/server/src/main/java/access/api/RoleController.java b/server/src/main/java/access/api/RoleController.java
@@ -183,7 +183,8 @@ public ResponseEntity<Void> deleteRole(@PathVariable("id") Long id,
         manage.addManageMetaData(List.of(role));
         UserPermissions.assertAuthority(user, Authority.INSTITUTION_ADMIN);
 
-        if (limitInstitutionAdminRoleVisibility && !user.getOrganizationGUID().equals(role.getOrganizationGUID())) {
+        if (limitInstitutionAdminRoleVisibility && !user.isSuperUser() &&
+                !Objects.equals(user.getOrganizationGUID(), role.getOrganizationGUID())) {
             throw new UserRestrictionException();
         }