fixes retrieval of firstname

vaulttec · Mar 30, 2024 · b6d4fe7 · b6d4fe7
1 parent 069aa44
commit b6d4fe7
Showing 1 changed file with 28 additions and 10 deletions.
diff --git a/.../java/org/vaulttec/keycloak/ldap/mappers/confluence/ConfluenceGroupLDAPStorageMapper.java b/.../java/org/vaulttec/keycloak/ldap/mappers/confluence/ConfluenceGroupLDAPStorageMapper.java
@@ -125,23 +125,41 @@ public void leaveGroup(GroupModel group) {
 
     @Override
     public void onImportUserFromLDAP(LDAPObject ldapUser, UserModel user, RealmModel realm, boolean isCreate) {
-        String firstName = ldapUser.getAttributeAsString("givenName");
         String lastName = ldapUser.getAttributeAsString("sn");
-        if (firstName != null && lastName != null) {
-            List<ConfluencePage> mappedPages = getMappedPages(firstName, lastName);
-            if (!mappedPages.isEmpty()) {
-                GroupModel parent = getKcGroupsPathGroup(realm);
-                for (ConfluencePage mappedPage : mappedPages) {
-                    GroupModel mappedGroup = findKcGroupOrSyncFromConfluence(realm, mappedPage, parent);
-                    if (mappedGroup != null && !user.isMemberOf(mappedGroup)) {
-                        LOG.debugf("User '%s' joins Confluence group '%s' during import from LDAP", user.getUsername(), mappedGroup.getName());
-                        user.joinGroup(mappedGroup);
+        if (lastName != null) {
+            String firstName = getFirstName(ldapUser, lastName);
+            if (firstName != null) {
+                List<ConfluencePage> mappedPages = getMappedPages(firstName, lastName);
+                if (!mappedPages.isEmpty()) {
+                    GroupModel parent = getKcGroupsPathGroup(realm);
+                    for (ConfluencePage mappedPage : mappedPages) {
+                        GroupModel mappedGroup = findKcGroupOrSyncFromConfluence(realm, mappedPage, parent);
+                        if (mappedGroup != null && !user.isMemberOf(mappedGroup)) {
+                            LOG.debugf("User '%s' joins Confluence group '%s' during import from LDAP", user.getUsername(), mappedGroup.getName());
+                            user.joinGroup(mappedGroup);
+                        }
                     }
                 }
             }
         }
     }
 
+    private static String getFirstName(LDAPObject ldapUser, String lastName) {
+        String firstName = ldapUser.getAttributeAsString("givenName");
+        if (firstName == null) {
+            // Retrieve first name from common name
+            String commonName = ldapUser.getAttributeAsString("cn");
+            if (commonName != null) {
+                if (commonName.startsWith(lastName + ",")) {
+                    firstName = commonName.substring(lastName.length() + 1).trim();
+                } else if (commonName.endsWith(lastName)) {
+                    firstName = commonName.substring(0, commonName.length() - lastName.length()).trim();
+                }
+            }
+        }
+        return firstName;
+    }
+
     private GroupModel findKcGroupOrSyncFromConfluence(RealmModel realm, ConfluencePage page, GroupModel parent) {
         GroupModel group = getGroupByConfluencePage(realm, page, parent);
         if (group == null && !syncFromConfluencePerformedInThisTransaction) {