Deleted users for ldap

src/Core/Models/Entry.cs

@@ -25,5 +25,6 @@ namespace Bit.Core.Models
     {
         public string Email { get; set; }
         public bool Disabled { get; set; }
+        public bool Deleted { get; set; }
     }
 }

src/Core/Models/ImportRequest.cs

@@ -33,13 +33,13 @@ namespace Bit.Core.Models
             public User(UserEntry entry)
             {
                 Email = entry.Email;
-                Disabled = entry.Disabled;
+                Deleted = entry.Disabled || entry.Deleted;
                 ExternalId = entry.ExternalId;
             }
 
             public string ExternalId { get; set; }
             public string Email { get; set; }
-            public bool Disabled { get; set; }
+            public bool Deleted { get; set; }
         }
     }
 

src/Core/Services/AzureDirectoryService.cs

@@ -214,7 +214,7 @@ namespace Bit.Core.Services
                     object deleted;
                     if(user.AdditionalData.TryGetValue("@removed", out deleted) && deleted.ToString().Contains("changed"))
                     {
-                        entry.Disabled = true;
+                        entry.Deleted = true;
                     }
                     else if(!entry.Disabled && (entry?.Email?.Contains("#") ?? true))
                     {

src/Core/Services/LdapDirectoryService.cs

@@ -200,15 +200,51 @@ namespace Bit.Core.Services
 
             var users = new List<UserEntry>();
             foreach(SearchResult item in result)
+            {
+                var user = BuildUser(item, false);
+                if(user == null)
+                {
+                    continue;
+                }
+
+                users.Add(user);
+            }
+
+            // Deleted users
+            if(SettingsService.Instance.Server.Type == DirectoryType.ActiveDirectory)
+            {
+                filter = string.Format("(&{0}(isDeleted=TRUE))",
+                    filter != null ? string.Format("({0})", filter) : string.Empty);
+
+                searcher = new DirectorySearcher(entry, filter);
+                searcher.Tombstone = true;
+                result = searcher.FindAll();
+                foreach(SearchResult item in result)
+                {
+                    var user = BuildUser(item, true);
+                    if(user == null)
+                    {
+                        continue;
+                    }
+
+                    users.Add(user);
+                }
+            }
+
+            return Task.FromResult(users);
+        }
+
+        private static UserEntry BuildUser(SearchResult item, bool deleted)
         {
             var user = new UserEntry
             {
-                    ReferenceId = new Uri(item.Path).Segments?.LastOrDefault()
+                ReferenceId = new Uri(item.Path).Segments?.LastOrDefault(),
+                Deleted = deleted
             };
 
             if(user.ReferenceId == null)
             {
-                    continue;
+                return null;
             }
 
             // External Id
@@ -240,17 +276,16 @@ namespace Bit.Core.Services
                     .ToString()
                     .ToLowerInvariant();
             }
-                else if(!user.Disabled)
+            else if(!user.Disabled && !user.Deleted)
             {
-                    continue;
+                return null;
             }
 
             // Dates
             user.CreationDate = item.Properties.ParseDateTime(SettingsService.Instance.Sync.CreationDateAttribute);
             user.RevisionDate = item.Properties.ParseDateTime(SettingsService.Instance.Sync.RevisionDateAttribute);
-            }
 
-            return Task.FromResult(users);
+            return user;
         }
 
         private static bool EntryDisabled(SearchResult item)