Selaa lähdekoodia

Backport pull request #8013 from jellyfin/release-10.8.z

Fix password change during parental control schedule

Authored-by: David Ullmer <davidullmer@outlook.de>

Merged-by: Bond-009 <bond.009@outlook.com>

Original-merge: 84a1674f391d344c251c2c949cb227a9318536eb
Joshua Boniface 2 vuotta sitten
vanhempi
sitoutus
b7206b4816
1 muutettua tiedostoa jossa 12 lisäystä ja 9 poistoa
  1. 12 9
      Jellyfin.Api/Controllers/UserController.cs

+ 12 - 9
Jellyfin.Api/Controllers/UserController.cs

@@ -282,16 +282,19 @@ namespace Jellyfin.Api.Controllers
             }
             }
             else
             else
             {
             {
-                var success = await _userManager.AuthenticateUser(
-                    user.Username,
-                    request.CurrentPw,
-                    request.CurrentPw,
-                    HttpContext.GetNormalizedRemoteIp().ToString(),
-                    false).ConfigureAwait(false);
-
-                if (success == null)
+                if (!HttpContext.User.IsInRole(UserRoles.Administrator))
                 {
                 {
-                    return StatusCode(StatusCodes.Status403Forbidden, "Invalid user or password entered.");
+                    var success = await _userManager.AuthenticateUser(
+                        user.Username,
+                        request.CurrentPw,
+                        request.CurrentPw,
+                        HttpContext.GetNormalizedRemoteIp().ToString(),
+                        false).ConfigureAwait(false);
+
+                    if (success == null)
+                    {
+                        return StatusCode(StatusCodes.Status403Forbidden, "Invalid user or password entered.");
+                    }
                 }
                 }
 
 
                 await _userManager.ChangePassword(user, request.NewPw).ConfigureAwait(false);
                 await _userManager.ChangePassword(user, request.NewPw).ConfigureAwait(false);