LDAP: Support user name sync by default

yona-projects · Jul 3, 2017 · 0dbb5ce · 0dbb5ce
1 parent 15eb28e
commit 0dbb5ce
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/app/controllers/UserApp.java b/app/controllers/UserApp.java
@@ -1147,6 +1147,13 @@ public static User authenticateWithLdap(String loginIdOrEmail, String password)
                 if(!localUserFoundByLdapLogin.isSamePassword(password)) {
                     User.resetPassword(localUserFoundByLdapLogin.loginId, password);
                 }
+
+                if (StringUtils.isNotEmpty(ldapUser.getDepartment())) {
+                    localUserFoundByLdapLogin.name = ldapUser.getDisplayName() + " [" + ldapUser.getDepartment() + "]";
+                } else {
+                    localUserFoundByLdapLogin.name = ldapUser.getDisplayName();
+                }
+                localUserFoundByLdapLogin.update();
                 return localUserFoundByLdapLogin;
             }
         } catch (CommunicationException e) {

diff --git a/app/utils/LdapService.java b/app/utils/LdapService.java
@@ -6,6 +6,7 @@
  **/
 package utils;
 
+import models.User;
 import models.support.LdapUser;
 import play.Play;
 
@@ -67,6 +68,10 @@ private String getProperUsernameGuessing(@Nonnull String username){
         if(username.contains("@")){
             return username;
         } else {
+            User user = User.findByLoginId(username);
+            if(!user.isAnonymous()) {
+                return user.email;
+            }
             return USER_NAME_PROPERTY + "=" + username + "," +  DN_POSTFIX;
         }
     }