From e502a8d9c6e635bbb4f2dd507c8cbfd9296427de Mon Sep 17 00:00:00 2001 From: magicbelette Date: Fri, 14 Jun 2019 15:12:40 +0200 Subject: [PATCH 1/2] [FIX] LDAP login with customField sync (#14661) Closes #14661 --- app/ldap/server/sync.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/ldap/server/sync.js b/app/ldap/server/sync.js index 550c079a697f..e90b021703eb 100644 --- a/app/ldap/server/sync.js +++ b/app/ldap/server/sync.js @@ -144,7 +144,7 @@ export function getDataToSyncUserData(ldapUser, user) { if (currKey === lastKey) { obj[currKey] = tmpLdapField; } else { - obj[currKey] = obj[currKey]; + obj[currKey] = obj[currKey] || {}; } return obj[currKey]; }, userData); From 711ed8c727c03a57f146fab924e0521ef3533bed Mon Sep 17 00:00:00 2001 From: Diego Sampaio Date: Fri, 28 Jun 2019 16:30:48 -0300 Subject: [PATCH 2/2] Change to regular space --- app/ldap/server/sync.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/ldap/server/sync.js b/app/ldap/server/sync.js index e90b021703eb..ac9d6fe33f0b 100644 --- a/app/ldap/server/sync.js +++ b/app/ldap/server/sync.js @@ -144,7 +144,7 @@ export function getDataToSyncUserData(ldapUser, user) { if (currKey === lastKey) { obj[currKey] = tmpLdapField; } else { - obj[currKey] = obj[currKey] || {}; + obj[currKey] = obj[currKey] || {}; } return obj[currKey]; }, userData);