Rename ldapGroup to externalGroup, since the login connector may be u…

…sed for other login types.
dewarim · May 4, 2018 · b7b44eb · b7b44eb
1 parent 0cd1572
commit b7b44eb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/ldap-config.example.xml b/ldap-config.example.xml
@@ -7,7 +7,7 @@
     <searchAttribute>member</searchAttribute>
     <groupMappings>
         <groupMapping>
-            <ldapGroup>authors</ldapGroup>
+            <externalGroup>authors</externalGroup>
             <cinnamonGroup>group.authors</cinnamonGroup>
         </groupMapping>
     </groupMappings>

diff --git a/src/java/cinnamon/authentication/LdapConfig.java b/src/java/cinnamon/authentication/LdapConfig.java
@@ -31,7 +31,7 @@ public class LdapConfig {
      * Example:
      * cn=Users,dc=cinnamon,dc=dewarim,dc=coom
      * 
-     * The query will be pre-pended with cn=$ldapGroup from groupMappings.
+     * The query will be pre-pended with cn=$externalGroup from groupMappings.
      * Example:
      * cn=retrieval-users,cn=Users,dc=localhost
      */
@@ -111,15 +111,15 @@ public void setGroupMappings(List<GroupMapping> groupMappings) {
 
     public static class GroupMapping {
 
-        private String ldapGroup;
+        private String externalGroup;
         private String cinnamonGroup;
 
-        public String getLdapGroup() {
-            return ldapGroup;
+        public String getExternalGroup() {
+            return externalGroup;
         }
 
-        public void setLdapGroup(String ldapGroup) {
-            this.ldapGroup = ldapGroup;
+        public void setExternalGroup(String externalGroup) {
+            this.externalGroup = externalGroup;
         }
 
         public String getCinnamonGroup() {

diff --git a/src/java/cinnamon/authentication/UnboundIdLdapConnector.java b/src/java/cinnamon/authentication/UnboundIdLdapConnector.java
@@ -52,7 +52,7 @@ public LdapResult connect(String username, String password) {
             log.debug("connection: " + conn);
             final LDAPConnection connection = conn;
             List<LdapConfig.GroupMapping> groupMappings = ldapConfig.getGroupMappings().stream()
-                    .filter(groupMapping -> searchForGroup(connection, groupMapping.getLdapGroup(), username))
+                    .filter(groupMapping -> searchForGroup(connection, groupMapping.getExternalGroup(), username))
                     .collect(Collectors.toList());
 
             return new LdapResult(!groupMappings.isEmpty(), groupMappings);