bitwarden/directory-connector
1
0
Fork 0
mirror of https://github.com/bitwarden/directory-connector synced 2025-12-05 23:53:21 +00:00
Code Issues Releases Wiki Activity

Apply user filter to deleted users as well

Browse Source
This commit is contained in:
Robyn MacCallum
2021-11-29 18:40:43 -05:00
parent 20aa6854c7
commit 1633ee265f
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/services/ldap-directory.service.ts
View File

@@ -79,7 +79,7 @@ export class LdapDirectoryService implements IDirectoryService {
}
try {
let deletedFilter = this.buildBaseFilter(this.syncConfig.userObjectClass, '(isDeleted=TRUE)');
let deletedFilter = this.buildBaseFilter(this.syncConfig.userObjectClass, '(isDeleted=TRUE)' + this.syncConfig.userFilter);
deletedFilter = this.buildRevisionFilter(deletedFilter, force, lastSync);
const deletedPath = this.makeSearchPath('CN=Deleted Objects');
@@ -107,10 +107,15 @@ export class LdapDirectoryService implements IDirectoryService {
user.externalId = this.getExternalId(searchEntry, user.referenceId);
user.disabled = this.entryDisabled(searchEntry);
user.email = this.getAttr(searchEntry, this.syncConfig.userEmailAttribute);
console.log(user.email);
if (user.email == null) {
console.log(this.syncConfig.useEmailPrefixSuffix, this.syncConfig.emailPrefixAttribute, this.syncConfig.emailSuffix)
}
if (user.email == null && this.syncConfig.useEmailPrefixSuffix &&
this.syncConfig.emailPrefixAttribute != null && this.syncConfig.emailSuffix != null) {
const prefixAttr = this.getAttr(searchEntry, this.syncConfig.emailPrefixAttribute);
if (prefixAttr != null) {
console.log('Building email', prefixAttr);
user.email = prefixAttr + this.syncConfig.emailSuffix;
}
}