Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix password change during parental control schedule #8013

Merged
merged 4 commits into from Jul 7, 2022

Conversation

daullmer
Copy link
Member

Changes
Allow admin to change password of user even if user is currently blocked to sign in because of parental control schedule

Issues
Fix #7930

@Shadowghost
Copy link
Contributor

Since it's a bugfix you should target the 10.8 release branch so it'll be in the current stable release too

@daullmer daullmer changed the base branch from master to release-10.8.z June 26, 2022 12:04
@daullmer daullmer removed the request for review from joshuaboniface June 26, 2022 12:08
@Shadowghost Shadowghost added the stable backport Backport into the next stable release label Jun 26, 2022
@daullmer daullmer requested a review from cvium July 4, 2022 16:18
false).ConfigureAwait(false);

if (success == null)
if (await RequestHelpers.IsUserAdministrator(_authContext, HttpContext.Request).ConfigureAwait(false))
Copy link
Member

@cvium cvium Jul 4, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should be able to simply do HttpContext.User.IsInRole(UserRoles.Administrator), but I believe you are missing a negation

@Bond-009 Bond-009 merged commit 84a1674 into jellyfin:release-10.8.z Jul 7, 2022
@daullmer daullmer deleted the parental_password_fix branch July 7, 2022 15:16
@jellyfin-bot jellyfin-bot removed the stable backport Backport into the next stable release label Jul 20, 2022
jellyfin-bot pushed a commit that referenced this pull request Jul 20, 2022
Fix password change during parental control schedule

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

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

Original-merge: 84a1674
Kakadus pushed a commit to Kakadus/jellyfin that referenced this pull request Oct 2, 2022
Fix password change during parental control schedule

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

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

Original-merge: 84a1674
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Issue]: admin cant change password for user with parental control
6 participants