Merge pull request #2567 from MediaBrowser/beta

Beta

1 files changed, 3 insertions, 3 deletions

diff --git a/Emby.Server.Implementations/Library/UserManager.cs b/Emby.Server.Implementations/Library/UserManager.cs
index 3b11a4767..89b7198ca 100644
--- a/Emby.Server.Implementations/Library/UserManager.cs
+++ b/Emby.Server.Implementations/Library/UserManager.cs
@@ -182,7 +182,7 @@ namespace Emby.Server.Implementations.Library
             }
         }
 
-        public Task<bool> AuthenticateUser(string username, string passwordSha1, string remoteEndPoint)
+        public Task<User> AuthenticateUser(string username, string passwordSha1, string remoteEndPoint)
         {
             return AuthenticateUser(username, passwordSha1, null, remoteEndPoint);
         }
@@ -226,7 +226,7 @@ namespace Emby.Server.Implementations.Library
             return builder.ToString();
         }
 
-        public async Task<bool> AuthenticateUser(string username, string passwordSha1, string passwordMd5, string remoteEndPoint)
+        public async Task<User> AuthenticateUser(string username, string passwordSha1, string passwordMd5, string remoteEndPoint)
         {
             if (string.IsNullOrWhiteSpace(username))
             {
@@ -307,7 +307,7 @@ namespace Emby.Server.Implementations.Library
 
             _logger.Info("Authentication request for {0} {1}.", user.Name, success ? "has succeeded" : "has been denied");
 
-            return success;
+            return success ? user : null;
         }
 
         private async Task UpdateInvalidLoginAttemptCount(User user, int newValue)