Merge pull request #2847 from MediaBrowser/beta

Beta

1 files changed, 24 insertions, 39 deletions

diff --git a/MediaBrowser.Api/UserService.cs b/MediaBrowser.Api/UserService.cs
index 49b7f6c15..512356b43 100644
--- a/MediaBrowser.Api/UserService.cs
+++ b/MediaBrowser.Api/UserService.cs
@@ -22,7 +22,7 @@ namespace MediaBrowser.Api
     /// </summary>
     [Route("/Users", "GET", Summary = "Gets a list of users")]
     [Authenticated]
-    public class GetUsers : IReturn<List<UserDto>>
+    public class GetUsers : IReturn<UserDto[]>
     {
         [ApiMember(Name = "IsHidden", Description = "Optional filter by IsHidden=true or false", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")]
         public bool? IsHidden { get; set; }
@@ -35,7 +35,7 @@ namespace MediaBrowser.Api
     }
 
     [Route("/Users/Public", "GET", Summary = "Gets a list of publicly visible users for display on a login screen.")]
-    public class GetPublicUsers : IReturn<List<UserDto>>
+    public class GetPublicUsers : IReturn<UserDto[]>
     {
     }
 
@@ -329,7 +329,7 @@ namespace MediaBrowser.Api
             var result = users
                 .OrderBy(u => u.Name)
                 .Select(i => _userManager.GetUserDto(i, Request.RemoteIp))
-                .ToList();
+                .ToArray();
 
             return ToOptimizedResult(result);
         }
@@ -387,7 +387,7 @@ namespace MediaBrowser.Api
                 throw new ResourceNotFoundException("User not found");
             }
 
-            await _sessionMananger.RevokeUserTokens(user.Id.ToString("N"), null).ConfigureAwait(false);
+            _sessionMananger.RevokeUserTokens(user.Id.ToString("N"), null);
 
             await _userManager.DeleteUser(user).ConfigureAwait(false);
         }
@@ -455,7 +455,7 @@ namespace MediaBrowser.Api
 
             if (request.ResetPassword)
             {
-                await _userManager.ResetPassword(user).ConfigureAwait(false);
+                _userManager.ResetPassword(user);
             }
             else
             {
@@ -466,24 +466,18 @@ namespace MediaBrowser.Api
                     throw new ArgumentException("Invalid user or password entered.");
                 }
 
-                await _userManager.ChangePassword(user, request.NewPassword).ConfigureAwait(false);
+                _userManager.ChangePassword(user, request.NewPassword);
 
                 var currentToken = _authContext.GetAuthorizationInfo(Request).Token;
 
-                await _sessionMananger.RevokeUserTokens(user.Id.ToString("N"), currentToken).ConfigureAwait(false);
+                _sessionMananger.RevokeUserTokens(user.Id.ToString("N"), currentToken);
             }
         }
 
         public void Post(UpdateUserEasyPassword request)
         {
-            var task = PostAsync(request);
-            Task.WaitAll(task);
-        }
-        
-        public async Task PostAsync(UpdateUserEasyPassword request)
-        {
             AssertCanUpdateUser(_authContext, _userManager, request.Id, true);
-            
+
             var user = _userManager.GetUserById(request.Id);
 
             if (user == null)
@@ -493,11 +487,11 @@ namespace MediaBrowser.Api
 
             if (request.ResetPassword)
             {
-                await _userManager.ResetEasyPassword(user).ConfigureAwait(false);
+                _userManager.ResetEasyPassword(user);
             }
             else
             {
-                await _userManager.ChangeEasyPassword(user, request.NewPassword).ConfigureAwait(false);
+                _userManager.ChangeEasyPassword(user, request.NewPassword);
             }
         }
 
@@ -507,13 +501,6 @@ namespace MediaBrowser.Api
         /// <param name="request">The request.</param>
         public void Post(UpdateUser request)
         {
-            var task = PostAsync(request);
-
-            Task.WaitAll(task);
-        }
-
-        public async Task PostAsync(UpdateUser request)
-        {
             // We need to parse this manually because we told service stack not to with IRequiresRequestStream
             // https://code.google.com/p/servicestack/source/browse/trunk/Common/ServiceStack.Text/ServiceStack.Text/Controller/PathInfo.cs
             var id = GetPathValue(1);
@@ -524,13 +511,18 @@ namespace MediaBrowser.Api
 
             var user = _userManager.GetUserById(id);
 
-            var task = string.Equals(user.Name, dtoUser.Name, StringComparison.Ordinal) ?
-                _userManager.UpdateUser(user) :
-                _userManager.RenameUser(user, dtoUser.Name);
+            if (string.Equals(user.Name, dtoUser.Name, StringComparison.Ordinal))
+            {
+                _userManager.UpdateUser(user);
+            }
+            else
+            {
+                var task = _userManager.RenameUser(user, dtoUser.Name);
 
-            await task.ConfigureAwait(false);
+                Task.WaitAll(task);
+            }
 
-            await _userManager.UpdateConfiguration(dtoUser.Id, dtoUser.Configuration);
+            _userManager.UpdateConfiguration(dtoUser.Id, dtoUser.Configuration);
         }
 
         /// <summary>
@@ -570,21 +562,14 @@ namespace MediaBrowser.Api
         {
             AssertCanUpdateUser(_authContext, _userManager, request.Id, false);
 
-            var task = _userManager.UpdateConfiguration(request.Id, request);
+            _userManager.UpdateConfiguration(request.Id, request);
 
-            Task.WaitAll(task);
         }
 
         public void Post(UpdateUserPolicy request)
         {
-            var task = UpdateUserPolicy(request);
-            Task.WaitAll(task);
-        }
-
-        private async Task UpdateUserPolicy(UpdateUserPolicy request)
-        {
             var user = _userManager.GetUserById(request.Id);
-            
+
             // If removing admin access
             if (!request.IsAdministrator && user.Policy.IsAdministrator)
             {
@@ -609,10 +594,10 @@ namespace MediaBrowser.Api
                 }
 
                 var currentToken = _authContext.GetAuthorizationInfo(Request).Token;
-                await _sessionMananger.RevokeUserTokens(user.Id.ToString("N"), currentToken).ConfigureAwait(false);
+                _sessionMananger.RevokeUserTokens(user.Id.ToString("N"), currentToken);
             }
 
-            await _userManager.UpdateUserPolicy(request.Id, request).ConfigureAwait(false);
+            _userManager.UpdateUserPolicy(request.Id, request);
         }
     }
 }