Merging in latest dev

1 files changed, 3 insertions, 23 deletions

diff --git a/MediaBrowser.Server.Implementations/Library/UserManager.cs b/MediaBrowser.Server.Implementations/Library/UserManager.cs
index b101f6ae1..03471a8e9 100644
--- a/MediaBrowser.Server.Implementations/Library/UserManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserManager.cs
@@ -166,11 +166,6 @@ namespace MediaBrowser.Server.Implementations.Library
 
             var users = Users.ToList();
 
-            foreach (var user in users)
-            {
-                await DoPolicyMigration(user).ConfigureAwait(false);
-            }
-
             // If there are no local users with admin rights, make them all admins
             if (!users.Any(i => i.Policy.IsAdministrator))
             {
@@ -286,10 +281,10 @@ namespace MediaBrowser.Server.Implementations.Library
 
                 if (newValue >= maxCount)
                 {
-                    //_logger.Debug("Disabling user {0} due to {1} unsuccessful login attempts.", user.Name, newValue.ToString(CultureInfo.InvariantCulture));
-                    //user.Policy.IsDisabled = true;
+                    _logger.Debug("Disabling user {0} due to {1} unsuccessful login attempts.", user.Name, newValue.ToString(CultureInfo.InvariantCulture));
+                    user.Policy.IsDisabled = true;
 
-                    //fireLockout = true;
+                    fireLockout = true;
                 }
 
                 await UpdateUserPolicy(user, user.Policy, false).ConfigureAwait(false);
@@ -366,19 +361,6 @@ namespace MediaBrowser.Server.Implementations.Library
             return users;
         }
 
-        private async Task DoPolicyMigration(User user)
-        {
-            if (!user.Configuration.HasMigratedToPolicy)
-            {
-                user.Policy.IsAdministrator = user.Configuration.IsAdministrator;
-
-                await UpdateUserPolicy(user, user.Policy, false);
-
-                user.Configuration.HasMigratedToPolicy = true;
-                await UpdateConfiguration(user, user.Configuration, true).ConfigureAwait(false);
-            }
-        }
-
         public UserDto GetUserDto(User user, string remoteEndPoint = null)
         {
             if (user == null)
@@ -953,8 +935,6 @@ namespace MediaBrowser.Server.Implementations.Library
                 user.Policy = userPolicy;
             }
 
-            user.Configuration.IsAdministrator = user.Policy.IsAdministrator;
-
             await UpdateConfiguration(user, user.Configuration, true).ConfigureAwait(false);
         }