Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-06-02 05:04:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Joshua Boniface 2022-07-20 19:29:06 -04:00
parent 81e164ebc8
commit b7206b4816
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Jellyfin.Api/Controllers/UserController.cs
View File

@ -281,6 +281,8 @@ namespace Jellyfin.Api.Controllers
await _userManager.ResetPassword(user).ConfigureAwait(false); await _userManager.ResetPassword(user).ConfigureAwait(false);
} }
else else
{
if (!HttpContext.User.IsInRole(UserRoles.Administrator))
{ {
var success = await _userManager.AuthenticateUser( var success = await _userManager.AuthenticateUser(
user.Username, user.Username,
@ -293,6 +295,7 @@ namespace Jellyfin.Api.Controllers
{ {
return StatusCode(StatusCodes.Status403Forbidden, "Invalid user or password entered."); 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);