add setting for usernames unique across tenants

brockallen · Jan 10, 2013 · 5e1caed · 5e1caed
1 parent 8ef4c11
commit 5e1caed
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/BrockAllen.MembershipReboot/Services/Accounts/SecuritySettings.cs b/BrockAllen.MembershipReboot/Services/Accounts/SecuritySettings.cs
@@ -14,6 +14,7 @@ public class SecuritySettings
         public bool MultiTenant { get; set; }
         public string DefaultTenant { get; set; }
         public bool EmailIsUsername { get; set; }
+        public bool UsernamesUniqueAcrossTenants { get; set; }
         public bool RequireAccountVerification { get; set; }
         public bool AllowLoginAfterAccountCreation { get; set; }
         public int AccountLockoutFailedLoginAttempts { get; set; }
@@ -30,6 +31,7 @@ public SecuritySettings()
             MultiTenant = GetAppSettings("MultiTenant", false);
             DefaultTenant = GetAppSettings("DefaultTenant", "default");
             EmailIsUsername = GetAppSettings("EmailIsUsername", false);
+            UsernamesUniqueAcrossTenants = GetAppSettings("UsernamesUniqueAcrossTenants", false);
             RequireAccountVerification = GetAppSettings("RequireAccountVerification", true);
             AllowLoginAfterAccountCreation = GetAppSettings("AllowLoginAfterAccountCreation", true);
             AccountLockoutFailedLoginAttempts = GetAppSettings("AccountLockoutFailedLoginAttempts", 10);
@@ -45,6 +47,5 @@ private T GetAppSettings<T>(string name, T defaultValue)
             if (val != null) return (T)Convert.ChangeType(val, typeof(T));
             return defaultValue;
         }
-
     }
 }
diff --git a/BrockAllen.MembershipReboot/Services/Accounts/UserAccountService.cs b/BrockAllen.MembershipReboot/Services/Accounts/UserAccountService.cs
@@ -114,7 +114,14 @@ public virtual bool UsernameExists(string tenant, string username)
             if (String.IsNullOrWhiteSpace(tenant)) return false;
             if (String.IsNullOrWhiteSpace(username)) return false;
 
-            return this.userRepository.GetAll().Where(x => x.Tenant == tenant && x.Username == username).Any();
+            if (SecuritySettings.Instance.UsernamesUniqueAcrossTenants)
+            {
+                return this.userRepository.GetAll().Where(x => x.Username == username).Any();
+            }
+            else
+            {
+                return this.userRepository.GetAll().Where(x => x.Tenant == tenant && x.Username == username).Any();
+            }
         }
 
         public virtual bool EmailExists(string email)
@@ -165,16 +172,22 @@ public virtual UserAccount CreateAccount(string tenant, string username, string
                 throw new ValidationException("Email is invalid.");
             }
 
-            if ((!SecuritySettings.Instance.EmailIsUsername && UsernameExists(tenant, username))
-                || EmailExists(tenant, email))
+            if (UsernameExists(tenant, username))
             {
-                throw new ValidationException("Username/Email already in use.");
+                var msg = SecuritySettings.Instance.EmailIsUsername ? "Email" : "Username";
+                throw new ValidationException(msg + " already in use.");
             }
+
+            if (EmailExists(tenant, username))
+            {
+                throw new ValidationException("Email already in use.");
+            } 
 
             using (var tx = new TransactionScope())
             {
                 var account = UserAccount.Create(tenant, username, password, email);
                 this.userRepository.Add(account);
+
                 if (this.notificationService != null)
                 {
                     if (SecuritySettings.Instance.RequireAccountVerification)
@@ -186,6 +199,7 @@ public virtual UserAccount CreateAccount(string tenant, string username, string
                         this.notificationService.SendAccountVerified(account);
                     }
                 }
+
                 this.userRepository.SaveChanges();
                 tx.Complete();