From f9d26ea1bcf14c148b2eceff56923f9316a85a12 Mon Sep 17 00:00:00 2001
From: David Ullmer <davidullmer@outlook.de>
Date: Mon, 4 Jul 2022 19:08:40 +0200
Subject: [PATCH] Use IsInRole

---
 Jellyfin.Api/Controllers/UserController.cs |  2 +-
 Jellyfin.Api/Helpers/RequestHelpers.cs     | 12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/Jellyfin.Api/Controllers/UserController.cs b/Jellyfin.Api/Controllers/UserController.cs
index 25dc6a785c..0c70517531 100644
--- a/Jellyfin.Api/Controllers/UserController.cs
+++ b/Jellyfin.Api/Controllers/UserController.cs
@@ -282,7 +282,7 @@ namespace Jellyfin.Api.Controllers
             }
             else
             {
-                if (await RequestHelpers.IsUserAdministrator(_authContext, HttpContext.Request).ConfigureAwait(false))
+                if (HttpContext.User.IsInRole(UserRoles.Administrator))
                 {
                     var success = await _userManager.AuthenticateUser(
                         user.Username,
diff --git a/Jellyfin.Api/Helpers/RequestHelpers.cs b/Jellyfin.Api/Helpers/RequestHelpers.cs
index f79a301341..20427d7fab 100644
--- a/Jellyfin.Api/Helpers/RequestHelpers.cs
+++ b/Jellyfin.Api/Helpers/RequestHelpers.cs
@@ -76,18 +76,6 @@ namespace Jellyfin.Api.Helpers
             return true;
         }
 
-        /// <summary>
-        /// Checks if the user is administrator.
-        /// </summary>
-        /// <param name="authContext">Instance of the <see cref="IAuthorizationContext"/> interface.</param>
-        /// <param name="requestContext">The <see cref="HttpRequest"/>.</param>
-        /// <returns>A <see cref="bool"/> whether the user can update the entry.</returns>
-        internal static async Task<bool> IsUserAdministrator(IAuthorizationContext authContext, HttpRequest requestContext)
-        {
-            var auth = await authContext.GetAuthorizationInfo(requestContext).ConfigureAwait(false);
-            return auth.User.HasPermission(PermissionKind.IsAdministrator);
-        }
-
         internal static async Task<SessionInfo> GetSession(ISessionManager sessionManager, IAuthorizationContext authContext, HttpRequest request)
         {
             var authorization = await authContext.GetAuthorizationInfo(request).ConfigureAwait(false);