diff options
| author | Niels van Velzen <nielsvanvelzen@users.noreply.github.com> | 2024-09-06 21:56:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-06 21:56:59 +0200 |
| commit | 2b492ed8cd82651453f7d58321dc50753f2cf961 (patch) | |
| tree | cbfdd78f5d9ba5a51424b1e2a1010caa938eb802 | |
| parent | cc2f91b331cd51ecf238db4370b98ecdaf1ad897 (diff) | |
| parent | eca5abe4bb33c6748b4120550891df6992bbe71b (diff) | |
Merge pull request #12545 from Bond-009/sha1
Remove passwordSha1 param from AuthenticateUser function
4 files changed, 1 insertions, 5 deletions
diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs index 681c252b6..72e164b52 100644 --- a/Emby.Server.Implementations/Session/SessionManager.cs +++ b/Emby.Server.Implementations/Session/SessionManager.cs @@ -1468,7 +1468,6 @@ namespace Emby.Server.Implementations.Session user = await _userManager.AuthenticateUser( request.Username, request.Password, - null, request.RemoteEndPoint, true).ConfigureAwait(false); } diff --git a/Jellyfin.Api/Controllers/UserController.cs b/Jellyfin.Api/Controllers/UserController.cs index 2df79c80c..d7886d247 100644 --- a/Jellyfin.Api/Controllers/UserController.cs +++ b/Jellyfin.Api/Controllers/UserController.cs @@ -296,7 +296,6 @@ public class UserController : BaseJellyfinApiController var success = await _userManager.AuthenticateUser( user.Username, request.CurrentPw ?? string.Empty, - request.CurrentPw ?? string.Empty, HttpContext.GetNormalizedRemoteIP().ToString(), false).ConfigureAwait(false); diff --git a/Jellyfin.Server.Implementations/Users/UserManager.cs b/Jellyfin.Server.Implementations/Users/UserManager.cs index 65c0ab83d..eb4bc2aff 100644 --- a/Jellyfin.Server.Implementations/Users/UserManager.cs +++ b/Jellyfin.Server.Implementations/Users/UserManager.cs @@ -384,7 +384,6 @@ namespace Jellyfin.Server.Implementations.Users public async Task<User?> AuthenticateUser( string username, string password, - string passwordSha1, string remoteEndPoint, bool isUserSession) { diff --git a/MediaBrowser.Controller/Library/IUserManager.cs b/MediaBrowser.Controller/Library/IUserManager.cs index 6d6a532db..1c115be85 100644 --- a/MediaBrowser.Controller/Library/IUserManager.cs +++ b/MediaBrowser.Controller/Library/IUserManager.cs @@ -117,11 +117,10 @@ namespace MediaBrowser.Controller.Library /// </summary> /// <param name="username">The user.</param> /// <param name="password">The password to use.</param> - /// <param name="passwordSha1">Hash of password.</param> /// <param name="remoteEndPoint">Remove endpoint to use.</param> /// <param name="isUserSession">Specifies if a user session.</param> /// <returns>User wrapped in awaitable task.</returns> - Task<User?> AuthenticateUser(string username, string password, string passwordSha1, string remoteEndPoint, bool isUserSession); + Task<User?> AuthenticateUser(string username, string password, string remoteEndPoint, bool isUserSession); /// <summary> /// Starts the forgot password process. |