diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-04-06 16:08:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-06 16:08:05 -0400 |
| commit | 6f7d8bb742f3594bdca16fa5c20c55707edad158 (patch) | |
| tree | b045a71d84deeb89a85975d34a7a2ded2642c0d5 /Emby.Server.Implementations/Library/UserManager.cs | |
| parent | 481b700b05598bedd66fcc1d5ad755fb1bf6b281 (diff) | |
| parent | ccb694a89ad5ba63fcae1c9634a55c1f0378d98c (diff) | |
Merge pull request #2566 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Server.Implementations/Library/UserManager.cs')
| -rw-r--r-- | Emby.Server.Implementations/Library/UserManager.cs | 6 |
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) |