Merge pull request jellyfin#12545 from Bond-009/sha1

Remove passwordSha1 param from AuthenticateUser function
sjww233 · Sep 6, 2024 · 2b492ed · 2b492ed
2 parents cc2f91b + eca5abe
commit 2b492ed
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 5 deletions.
diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs
@@ -1468,7 +1468,6 @@ internal async Task<AuthenticationResult> AuthenticateNewSessionInternal(Authent
                 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
@@ -296,7 +296,6 @@ public async Task<ActionResult> UpdateUserPassword(
                 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
@@ -384,7 +384,6 @@ public UserDto GetUserDto(User user, string? remoteEndPoint = null)
         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
@@ -117,11 +117,10 @@ public interface IUserManager
         /// </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.