Merge pull request #75 from aservo/applications-improvements

Applications improvements
aservo · May 17, 2024 · c65d832 · c65d832
2 parents 2012983 + 5ca32b2
commit c65d832
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/main/java/de/aservo/confapi/crowd/model/util/ApplicationBeanUtil.java b/src/main/java/de/aservo/confapi/crowd/model/util/ApplicationBeanUtil.java
@@ -27,7 +27,9 @@ public static ApplicationBean toApplicationBean(
         applicationBean.setActive(application.isActive());
         applicationBean.setType(toApplicationBeanType(application.getType()));
         applicationBean.setCachedDirectoriesAuthenticationOrderOptimisationEnabled(application.isCachedDirectoriesAuthenticationOrderOptimisationEnabled());
-        applicationBean.setDirectoryMappings(toApplicationBeanDirectoryMappings(application, defaultGroupMembershipService));
+        applicationBean.setDirectoryMappings(toApplicationBeanDirectoryMappings(application, defaultGroupMembershipService).stream()
+                .sorted(Comparator.comparing(ApplicationBean.ApplicationDirectoryMapping::getDirectoryName))
+                .collect(Collectors.toList()));
         applicationBean.setAccessBasedSynchronisation(toApplicationBeanAccessBasedSynchronisation(application));
         applicationBean.setMembershipAggregationEnabled(application.isMembershipAggregationEnabled());
         applicationBean.setRemoteAddresses(toStringCollection(application.getRemoteAddresses()));

diff --git a/src/main/java/de/aservo/confapi/crowd/service/ApplicationsServiceImpl.java b/src/main/java/de/aservo/confapi/crowd/service/ApplicationsServiceImpl.java
@@ -223,7 +223,9 @@ void persistApplicationBeanAutoAssignmentGroups(
         }
 
         final Map<String, Collection<String>> autoAssignmentGroupsByDirectoryName = applicationBean.getDirectoryMappings().stream()
-                .collect(Collectors.toMap(ApplicationBean.ApplicationDirectoryMapping::getDirectoryName, ApplicationBean.ApplicationDirectoryMapping::getAutoAssignmentGroups));
+                .collect(Collectors.toMap(
+                        ApplicationBean.ApplicationDirectoryMapping::getDirectoryName,
+                        adm -> adm.getAutoAssignmentGroups() != null ? adm.getAutoAssignmentGroups() : Collections.emptyList()));
 
         for (ApplicationDirectoryMapping applicationDirectoryMapping : application.getApplicationDirectoryMappings()) {
             final Collection<String> autoAssignmentGroups = autoAssignmentGroupsByDirectoryName.getOrDefault(
@@ -269,9 +271,16 @@ ApplicationDirectoryMapping toApplicationDirectoryMapping(
         applicationDirectoryMappingBuilder.setDirectory(findDirectory(applicationBeanDirectoryMapping.getDirectoryName(), directoryManager));
 
         if (applicationBeanDirectoryMapping.getAuthenticationAllowAll() != null) {
-            applicationDirectoryMappingBuilder.setAllowAllToAuthenticate(applicationBeanDirectoryMapping.getAuthenticationAllowAll());
+            final boolean authenticationAllowAll = applicationBeanDirectoryMapping.getAuthenticationAllowAll();
+            applicationDirectoryMappingBuilder.setAllowAllToAuthenticate(authenticationAllowAll);
+
+            // don't require to set authentication groups if all users are allowed to authenticate
+            if (authenticationAllowAll) {
+                applicationDirectoryMappingBuilder.setAuthorisedGroupNames(Collections.emptySet());
+            }
         }
 
+        // even if all users are allowed to authenticate, it does not hurt to set (ignored) authentication groups if they got passed
         if (applicationBeanDirectoryMapping.getAuthenticationGroups() != null) {
             applicationDirectoryMappingBuilder.setAuthorisedGroupNames(new HashSet<>(applicationBeanDirectoryMapping.getAuthenticationGroups()));
         }