From 0d01488fc43f8101f5759a242fa8f281158ece09 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Fri, 19 May 2017 11:05:58 -0400 Subject: [PATCH] skip non-deleted users with no email --- src/Core/Services/GSuiteDirectoryService.cs | 3 ++- src/Core/Services/LdapDirectoryService.cs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Core/Services/GSuiteDirectoryService.cs b/src/Core/Services/GSuiteDirectoryService.cs index baf57b24..2a29ee61 100644 --- a/src/Core/Services/GSuiteDirectoryService.cs +++ b/src/Core/Services/GSuiteDirectoryService.cs @@ -214,7 +214,8 @@ namespace Bit.Core.Services ExternalId = user.Id, Email = user.PrimaryEmail, Disabled = user.Suspended.GetValueOrDefault(false), - Deleted = deleted + Deleted = deleted, + CreationDate = user.CreationTime }; if(string.IsNullOrWhiteSpace(entry.Email) && !entry.Deleted) diff --git a/src/Core/Services/LdapDirectoryService.cs b/src/Core/Services/LdapDirectoryService.cs index d246589d..44fd664d 100644 --- a/src/Core/Services/LdapDirectoryService.cs +++ b/src/Core/Services/LdapDirectoryService.cs @@ -355,7 +355,7 @@ namespace Bit.Core.Services SettingsService.Instance.Sync.Ldap.UserEmailSuffix).ToLowerInvariant(); } - if(string.IsNullOrWhiteSpace(user.Email) && !user.Disabled && !user.Deleted) + if(string.IsNullOrWhiteSpace(user.Email) && !user.Deleted) { return null; }