Fixed defaultRoleService.list() failing if presented with a bad rol…

…eMember
xh · May 20, 2024 · e468395 · e468395
1 parent d5be107
commit e468395
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/grails-app/services/io/xh/hoist/role/provided/DefaultRoleAdminService.groovy b/grails-app/services/io/xh/hoist/role/provided/DefaultRoleAdminService.groovy
@@ -39,7 +39,7 @@ class DefaultRoleAdminService extends BaseService {
             errorsForGroups = emptyMap()
 
         if (defaultRoleService.directoryGroupsSupported) {
-            Set<String> groups = roles.collectMany(new HashSet()) { it.directoryGroups }
+            Set<String> groups = roles.collectMany(new HashSet()) { it?.directoryGroups }
             if (groups) {
                 try {
                     Map<String, Object> groupsLookup = defaultRoleService.loadUsersForDirectoryGroups(groups, true)
@@ -56,8 +56,8 @@ class DefaultRoleAdminService extends BaseService {
         roles.collect {role ->
             def inheritedRoles = getInheritedRoles(role),
                 effectiveRoles = getEffectiveRoles(role),
-                effectiveGroups = getEffectiveMembers(role, effectiveRoles) { it.directoryGroups },
-                effectiveAssignedUsers = getEffectiveMembers(role, effectiveRoles) { it.users },
+                effectiveGroups = getEffectiveMembers(role, effectiveRoles) { it?.directoryGroups },
+                effectiveAssignedUsers = getEffectiveMembers(role, effectiveRoles) { it?.users },
                 effectiveUsers = getEffectiveUsers(effectiveAssignedUsers, effectiveGroups, usersForGroups),
                 effectiveGroupNames = effectiveGroups*.name.toSet()
             [