Merge pull request #7472 from RocketChat/always-set-ldap-property

[FIX] Always set LDAP properties on login
RocketChat · Jul 14, 2017 · 9aba96e · 9aba96e
1 parent 4974ca3
commit 9aba96e
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/packages/rocketchat-ldap/server/sync.js b/packages/rocketchat-ldap/server/sync.js
@@ -62,9 +62,10 @@ getDataToSyncUserData = function getDataToSyncUserData(ldapUser, user) {
 	const syncUserData = RocketChat.settings.get('LDAP_Sync_User_Data');
 	const syncUserDataFieldMap = RocketChat.settings.get('LDAP_Sync_User_Data_FieldMap').trim();
 
+	const userData = {};
+
 	if (syncUserData && syncUserDataFieldMap) {
 		const fieldMap = JSON.parse(syncUserDataFieldMap);
-		const userData = {};
 		const emailList = [];
 		_.map(fieldMap, function(userField, ldapField) {
 			switch (userField) {
@@ -125,21 +126,21 @@ getDataToSyncUserData = function getDataToSyncUserData(ldapUser, user) {
 				userData.emails = emailList;
 			}
 		}
+	}
 
-		const uniqueId = getLdapUserUniqueID(ldapUser);
+	const uniqueId = getLdapUserUniqueID(ldapUser);
 
-		if (uniqueId && (!user.services || !user.services.ldap || user.services.ldap.id !== uniqueId.value || user.services.ldap.idAttribute !== uniqueId.attribute)) {
-			userData['services.ldap.id'] = uniqueId.value;
-			userData['services.ldap.idAttribute'] = uniqueId.attribute;
-		}
+	if (uniqueId && (!user.services || !user.services.ldap || user.services.ldap.id !== uniqueId.value || user.services.ldap.idAttribute !== uniqueId.attribute)) {
+		userData['services.ldap.id'] = uniqueId.value;
+		userData['services.ldap.idAttribute'] = uniqueId.attribute;
+	}
 
-		if (user.ldap !== true) {
-			userData.ldap = true;
-		}
+	if (user.ldap !== true) {
+		userData.ldap = true;
+	}
 
-		if (_.size(userData)) {
-			return userData;
-		}
+	if (_.size(userData)) {
+		return userData;
 	}
 };