diff --git a/jslib b/jslib index eb48abbc..773c5190 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit eb48abbcf659ae20b2d0627467bccb56c272132e +Subproject commit 773c51901fe77165c40cfb018bf5b99a740b5e4a diff --git a/src/services/azure-directory.service.ts b/src/services/azure-directory.service.ts index 8a8d6b34..f43b6b2f 100644 --- a/src/services/azure-directory.service.ts +++ b/src/services/azure-directory.service.ts @@ -135,7 +135,7 @@ export class AzureDirectoryService extends BaseDirectoryService implements Direc } if (entry.email != null) { - entry.email = entry.email.toLowerCase(); + entry.email = entry.email.trim().toLowerCase(); } entry.disabled = user.accountEnabled == null ? false : !user.accountEnabled; diff --git a/src/services/gsuite-directory.service.ts b/src/services/gsuite-directory.service.ts index b8892ee8..60def915 100644 --- a/src/services/gsuite-directory.service.ts +++ b/src/services/gsuite-directory.service.ts @@ -125,7 +125,7 @@ export class GSuiteDirectoryService extends BaseDirectoryService implements Dire const entry = new UserEntry(); entry.referenceId = user.id; entry.externalId = user.id; - entry.email = user.primaryEmail != null ? user.primaryEmail.toLowerCase() : null; + entry.email = user.primaryEmail != null ? user.primaryEmail.trim().toLowerCase() : null; entry.disabled = user.suspended || false; entry.deleted = deleted; return entry; diff --git a/src/services/ldap-directory.service.ts b/src/services/ldap-directory.service.ts index 084eec2e..50fe88e5 100644 --- a/src/services/ldap-directory.service.ts +++ b/src/services/ldap-directory.service.ts @@ -113,7 +113,7 @@ export class LdapDirectoryService implements DirectoryService { } if (user.email != null) { - user.email = user.email.toLowerCase(); + user.email = user.email.trim().toLowerCase(); } if (!user.deleted && (user.email == null || user.email.trim() === '')) { @@ -328,7 +328,7 @@ export class LdapDirectoryService implements DirectoryService { ':' + this.dirConfig.port; this.client = ldap.createClient({ - url: url.toLowerCase(), + url: url.trim().toLowerCase(), }); const user = this.dirConfig.username == null || this.dirConfig.username.trim() === '' ? null : diff --git a/src/services/okta-directory.service.ts b/src/services/okta-directory.service.ts index 837ac52c..ee35c7a9 100644 --- a/src/services/okta-directory.service.ts +++ b/src/services/okta-directory.service.ts @@ -104,7 +104,7 @@ export class OktaDirectoryService extends BaseDirectoryService implements Direct const entry = new UserEntry(); entry.externalId = user.id; entry.referenceId = user.id; - entry.email = user.profile.email != null ? user.profile.email.toLowerCase() : null; + entry.email = user.profile.email != null ? user.profile.email.trim().toLowerCase() : null; entry.deleted = user.status === 'DEPROVISIONED'; entry.disabled = user.status === 'SUSPENDED'; return entry; diff --git a/src/services/sync.service.ts b/src/services/sync.service.ts index 20de4be3..a90a89c5 100644 --- a/src/services/sync.service.ts +++ b/src/services/sync.service.ts @@ -146,7 +146,7 @@ export class SyncService { const iu = new ImportDirectoryRequestUser(); iu.email = u.email; if (iu.email != null) { - iu.email = iu.email.toLowerCase(); + iu.email = iu.email.trim().toLowerCase(); } iu.externalId = u.externalId; iu.deleted = u.deleted || (removeDisabled && u.disabled);