From eca5abe4bb33c6748b4120550891df6992bbe71b Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Fri, 30 Aug 2024 14:27:30 +0200
Subject: [PATCH] Remove passwordSha1 param from AuthenticateUser function

---
 Emby.Server.Implementations/Session/SessionManager.cs  | 1 -
 Jellyfin.Api/Controllers/UserController.cs             | 1 -
 Jellyfin.Api/Models/UserDtos/UpdateUserEasyPassword.cs | 2 +-
 Jellyfin.Server.Implementations/Users/UserManager.cs   | 1 -
 MediaBrowser.Controller/Library/IUserManager.cs        | 3 +--
 5 files changed, 2 insertions(+), 6 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.Api/Models/UserDtos/UpdateUserEasyPassword.cs b/Jellyfin.Api/Models/UserDtos/UpdateUserEasyPassword.cs
index 80b6203bc..f19d0b57a 100644
--- a/Jellyfin.Api/Models/UserDtos/UpdateUserEasyPassword.cs
+++ b/Jellyfin.Api/Models/UserDtos/UpdateUserEasyPassword.cs
@@ -1,4 +1,4 @@
-namespace Jellyfin.Api.Models.UserDtos;
+namespace Jellyfin.Api.Models.UserDtos;
 
 /// <summary>
 /// The update user easy password request body.
diff --git a/Jellyfin.Server.Implementations/Users/UserManager.cs b/Jellyfin.Server.Implementations/Users/UserManager.cs
index 5753e75c9..a071e14a8 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.