diff options
Diffstat (limited to 'MediaBrowser.Api/UserService.cs')
| -rw-r--r-- | MediaBrowser.Api/UserService.cs | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/MediaBrowser.Api/UserService.cs b/MediaBrowser.Api/UserService.cs index 5c8d6a868..ee8b6ff32 100644 --- a/MediaBrowser.Api/UserService.cs +++ b/MediaBrowser.Api/UserService.cs @@ -20,7 +20,7 @@ namespace MediaBrowser.Api [Api(Description = "Gets a list of users")] public class GetUsers : IReturn<List<UserDto>> { - [ApiMember(Name = "IsHidden", Description="Optional filter by IsHidden=true or false", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")] + [ApiMember(Name = "IsHidden", Description = "Optional filter by IsHidden=true or false", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")] public bool? IsHidden { get; set; } [ApiMember(Name = "IsDisabled", Description = "Optional filter by IsDisabled=true or false", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")] @@ -32,7 +32,7 @@ namespace MediaBrowser.Api public class GetPublicUsers : IReturn<List<UserDto>> { } - + /// <summary> /// Class GetUser /// </summary> @@ -220,9 +220,12 @@ namespace MediaBrowser.Api users = users.Where(i => i.Configuration.IsHidden == request.IsHidden.Value); } - var tasks = users.OrderBy(u => u.Name).Select(_dtoService.GetUserDto).Select(i => i.Result); + var result = users + .OrderBy(u => u.Name) + .Select(_dtoService.GetUserDto) + .ToList(); - return ToOptimizedResult(tasks.ToList()); + return ToOptimizedResult(result); } /// <summary> @@ -239,7 +242,7 @@ namespace MediaBrowser.Api throw new ResourceNotFoundException("User not found"); } - var result = _dtoService.GetUserDto(user).Result; + var result = _dtoService.GetUserDto(user); return ToOptimizedResult(result); } @@ -305,7 +308,7 @@ namespace MediaBrowser.Api var result = new AuthenticationResult { - User = await _dtoService.GetUserDto(user).ConfigureAwait(false) + User = _dtoService.GetUserDto(user) }; return result; @@ -404,7 +407,7 @@ namespace MediaBrowser.Api newUser.UpdateConfiguration(dtoUser.Configuration, _xmlSerializer); - var result = _dtoService.GetUserDto(newUser).Result; + var result = _dtoService.GetUserDto(newUser); return ToOptimizedResult(result); } |