jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

make email a constant

Browse Source
This commit is contained in:
Girish Ramakrishnan
2019-10-30 10:59:48 -07:00
parent 0a695190c4
commit d5d27d512c
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/externalldap.js
+10 -9
View File
@@ -178,9 +178,10 @@ function sync(progressCallback, callback) {
if (user.dn === externalLdapConfig.bindDn) return iteratorCallback();
const username = user[externalLdapConfig.usernameField];
const email = user.mail;
if (!username) {
debug(`[empty username] username=${username} email=${user.mail} cn=${user.cn} usernameField=${externalLdapConfig.usernameField}`);
if (!username || !email) {
debug(`[empty username or email] username=${username} email=${email} cn=${user.cn} usernameField=${externalLdapConfig.usernameField}`);
return iteratorCallback();
}
@@ -191,27 +192,27 @@ function sync(progressCallback, callback) {
}
if (error) {
debug(`[adding user] username=${username} email=${user.mail} cn=${user.cn}`);
debug(`[adding user] username=${username} email=${email} cn=${user.cn}`);
users.create(username, null /* password */, user.mail, user.cn, { source: 'ldap' }, auditsource.EXTERNAL_LDAP_TASK, function (error) {
users.create(username, null /* password */, email, user.cn, { source: 'ldap' }, auditsource.EXTERNAL_LDAP_TASK, function (error) {
if (error) console.error('Failed to create user', user, error);
iteratorCallback();
});
} else if (result.source !== 'ldap') {
debug(`[conflicting user] username=${username} email=${user.mail} cn=${user.cn}`);
debug(`[conflicting user] username=${username} email=${email} cn=${user.cn}`);
iteratorCallback();
} else if (result.email !== user.mail || result.displayName !== user.cn) {
debug(`[updating user] username=${username} email=${user.mail} cn=${user.cn}`);
} else if (result.email !== email || result.displayName !== user.cn) {
debug(`[updating user] username=${username} email=${email} cn=${user.cn}`);
users.update(result.id, { email: user.mail, fallbackEmail: user.mail, displayName: user.cn }, auditsource.EXTERNAL_LDAP_TASK, function (error) {
users.update(result.id, { email: email, fallbackEmail: email, displayName: user.cn }, auditsource.EXTERNAL_LDAP_TASK, function (error) {
if (error) debug('Failed to update user', user, error);
iteratorCallback();
});
} else {
// user known and up-to-date
debug(`[up-to-date user] username=${username} email=${user.mail} cn=${user.cn}`);
debug(`[up-to-date user] username=${username} email=${email} cn=${user.cn}`);
iteratorCallback();
}