Feature #42: Active Directory Interop Upgrade

AD Interop moved to Disco.Services; Supports multi-domain environments,
sites, and searching restricted with OUs.

Disco.Services/Users/UserService.cs

@@ -3,6 +3,7 @@ using Disco.Models.Interop.ActiveDirectory;
 using Disco.Models.Repository;
 using Disco.Services.Authorization;
 using Disco.Services.Authorization.Roles;
+using Disco.Services.Interop.ActiveDirectory;
 using Disco.Services.Logging;
 using Newtonsoft.Json;
 using System;
@@ -20,19 +21,9 @@ namespace Disco.Services.Users
     public static class UserService
     {
         private const string _cacheHttpRequestKey = "Disco_CurrentUserToken";
-        private static Func<string, string[], ActiveDirectoryUserAccount> _GetActiveDirectoryUserAccount;
-        private static Func<string, string[], ActiveDirectoryMachineAccount> _GetActiveDirectoryMachineAccount;
-        private static Func<string, List<ActiveDirectoryUserAccount>> _SearchActiveDirectoryUsers;
 
-        public static void Initialize(DiscoDataContext Database,
-            Func<string, string[], ActiveDirectoryUserAccount> GetActiveDirectoryUserAccount,
-            Func<string, string[], ActiveDirectoryMachineAccount> GetActiveDirectoryMachineAccount,
-            Func<string, List<ActiveDirectoryUserAccount>> SearchActiveDirectoryUsers)
+        public static void Initialize(DiscoDataContext Database)
         {
-            _GetActiveDirectoryUserAccount = GetActiveDirectoryUserAccount;
-            _GetActiveDirectoryMachineAccount = GetActiveDirectoryMachineAccount;
-            _SearchActiveDirectoryUsers = SearchActiveDirectoryUsers;
-
             Authorization.Roles.RoleCache.Initialize(Database);
         }
 
@@ -56,10 +47,7 @@ namespace Disco.Services.Users
                     userId = System.Security.Principal.WindowsIdentity.GetCurrent().Name;
                 }
 
-                if (userId.Contains("\\"))
-                    return userId.Substring(checked(userId.IndexOf("\\") + 1));
-                else
-                    return userId;
+                return userId;
             }
         }
 
@@ -204,38 +192,31 @@ namespace Disco.Services.Users
             Cache.FlushCache();
         }
 
-        internal static List<ActiveDirectoryUserAccount> SearchUsers(string Term)
+        internal static IEnumerable<ActiveDirectoryUserAccount> SearchUsers(DiscoDataContext Database, string Term)
         {
-            return _SearchActiveDirectoryUsers(Term);
-        }
-
-        internal static List<ActiveDirectoryUserAccount> SearchUsers(DiscoDataContext Database, string Term)
-        {
-            var adImportedUsers = SearchUsers(Term);
+            var adImportedUsers = ActiveDirectory.SearchUserAccounts(Term);
             foreach (var adU in adImportedUsers.Select(adU => adU.ToRepositoryUser()))
             {
-                var existingUser = Database.Users.Find(adU.Id);
+                var existingUser = Database.Users.Find(adU.UserId);
                 if (existingUser != null)
                     existingUser.UpdateSelf(adU);
                 else
                     Database.Users.Add(adU);
                 Database.SaveChanges();
-                UserService.InvalidateCachedUser(adU.Id);
+                UserService.InvalidateCachedUser(adU.UserId);
             }
             return adImportedUsers;
         }
 
         internal static Tuple<User, AuthorizationToken> ImportUser(DiscoDataContext Database, string UserId)
         {
-            if (_GetActiveDirectoryUserAccount == null)
-                throw new InvalidOperationException("UserServer has not been Initialized");
             if (string.IsNullOrEmpty(UserId))
                 throw new ArgumentNullException("UserId is required", "UserId");
 
             if (UserId.EndsWith("$"))
             {
                 // Machine Account
-                var adAccount = _GetActiveDirectoryMachineAccount(UserId, null);
+                var adAccount = ActiveDirectory.RetrieveMachineAccount(UserId);
 
                 if (adAccount == null)
                     return null;
@@ -252,7 +233,7 @@ namespace Disco.Services.Users
                 ActiveDirectoryUserAccount adAccount;
                 try
                 {
-                    adAccount = _GetActiveDirectoryUserAccount(UserId, null);
+                    adAccount = ActiveDirectory.RetrieveUserAccount(UserId);
 
                     if (adAccount == null)
                         throw new ArgumentException(string.Format("Invalid Username: '{0}'; User not found in Active Directory", UserId), "Username");
@@ -275,7 +256,7 @@ namespace Disco.Services.Users
                 var user = adAccount.ToRepositoryUser();
 
                 // Update Repository
-                User existingUser = Database.Users.Find(user.Id);
+                User existingUser = Database.Users.Find(user.UserId);
                 if (existingUser == null)
                     Database.Users.Add(user);
                 else