From 05fd55cef312b8851b1e20a0d70124cd83694d12 Mon Sep 17 00:00:00 2001
From: Tobias Genannt <tobias.genannt@gmail.com>
Date: Thu, 16 Apr 2020 21:30:02 +0200
Subject: [PATCH] Merge user custom fields on LDAP sync

Fix #15374
Merge current custom fields with new ones from LDAP.
---
 app/ldap/server/sync.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/ldap/server/sync.js b/app/ldap/server/sync.js
index 9c3249b9172c4..bddd8e332b92a 100644
--- a/app/ldap/server/sync.js
+++ b/app/ldap/server/sync.js
@@ -358,6 +358,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 });
 	}