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

if email field is not valid, try username

Browse Source
This commit is contained in:
Kyle Spearrin
2020-06-22 10:43:55 -04:00
parent 04e278249e
commit 13ad64e6f3
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,8 +88,7 @@ export class OneLoginDirectoryService extends BaseDirectoryService implements Di
entry.deleted = false;
entry.disabled = user.status === 2;
entry.email = user.email;
const emailInvalid = (ue: UserEntry) => ue.email == null || ue.email === '';
if (emailInvalid(entry) && user.username != null && user.username !== '') {
if (!this.validEmailAddress(entry.email) && user.username != null && user.username !== '') {
if (this.validEmailAddress(user.username)) {
entry.email = user.username;
} else if (this.syncConfig.useEmailPrefixSuffix && this.syncConfig.emailSuffix != null) {
@@ -99,7 +98,7 @@ export class OneLoginDirectoryService extends BaseDirectoryService implements Di
if (entry.email != null) {
entry.email = entry.email.trim().toLowerCase();
}
if (emailInvalid(entry) || !this.validEmailAddress(entry.email)) {
if (!this.validEmailAddress(entry.email)) {
return null;
}
return entry;
@@ -192,6 +191,6 @@ export class OneLoginDirectoryService extends BaseDirectoryService implements Di
}
private validEmailAddress(email: string) {
return ValidEmailRegex.test(email);
return email != null && email !== '' && ValidEmailRegex.test(email);
}
}