Merge user custom fields on LDAP sync

Fix #15374 Merge current custom fields with new ones from LDAP.
RocketChat · Apr 21, 2020 · 6701426 · 6701426
1 parent 5a1ef96
commit 6701426
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/app/ldap/server/sync.js b/app/ldap/server/sync.js
@@ -356,6 +356,9 @@ export function syncUserData(user, ldapUser, ldap) {
 			_setRealName(user._id, userData.name);
 			delete userData.name;
 		}
+		userData.customFields = {
+			...user.customFields, ...userData.customFields,
+		};
 		Meteor.users.update(user._id, { $set: userData });
 		user = Meteor.users.findOne({ _id: user._id });
 	}