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

Stop ldap syncing if we hit some internal error

Browse Source
This commit is contained in:
Johannes Zellner
2020-06-05 09:03:26 +02:00
parent 865a549885
commit cba3674ac0
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/externalldap.js
+7 -10
View File
@@ -330,12 +330,9 @@ function sync(progressCallback, callback) {
progressCallback({ percent, message: `Syncing... ${user.username}` });
users.getByUsername(user.username, function (error, result) {
if (error && error.reason !== BoxError.NOT_FOUND) {
debug(`Could not find user with username ${user.username}: ${error.message}`);
return iteratorCallback();
}
if (error && error.reason !== BoxError.NOT_FOUND) return iteratorCallback(error);
if (error) {
if (!result) {
debug(`[adding user] username=${user.username} email=${user.email} displayName=${user.displayName}`);
users.create(user.username, null /* password */, user.email, user.displayName, { source: 'ldap' }, auditSource.EXTERNAL_LDAP_TASK, function (error) {
@@ -379,17 +376,17 @@ function sync(progressCallback, callback) {
groups.getByName(groupName, function (error, result) {
if (error && error.reason !== BoxError.NOT_FOUND) return iteratorCallback(error);
if (result) {
debug(`[up-to-date group] groupname=${groupName}`);
iteratorCallback();
} else {
if (!result) {
debug(`[adding group] groupname=${groupName}`);
groups.create(groupName, 'ldap', function (error) {
if (error) console.error('Failed to create group', groupName, error);
iteratorCallback();
});
} else {
debug(`[up-to-date group] groupname=${groupName}`);
iteratorCallback();
}
});
}, function (error) {