Merge pull request #8500 from cvium/fix_authcontext_usage

1 files changed, 4 insertions, 3 deletions

diff --git a/Jellyfin.Api/Controllers/QuickConnectController.cs b/Jellyfin.Api/Controllers/QuickConnectController.cs
index 1df26355f..77d88475f 100644
--- a/Jellyfin.Api/Controllers/QuickConnectController.cs
+++ b/Jellyfin.Api/Controllers/QuickConnectController.cs
@@ -1,6 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
 using Jellyfin.Api.Constants;
+using Jellyfin.Api.Extensions;
 using Jellyfin.Api.Helpers;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Authentication;
@@ -104,15 +105,15 @@ namespace Jellyfin.Api.Controllers
         [ProducesResponseType(StatusCodes.Status403Forbidden)]
         public async Task<ActionResult<bool>> AuthorizeQuickConnect([FromQuery, Required] string code)
         {
-            var userId = ClaimHelpers.GetUserId(Request.HttpContext.User);
-            if (!userId.HasValue)
+            var userId = User.GetUserId();
+            if (userId.Equals(default))
             {
                 return StatusCode(StatusCodes.Status403Forbidden, "Unknown user id");
             }
 
             try
             {
-                return await _quickConnect.AuthorizeRequest(userId.Value, code).ConfigureAwait(false);
+                return await _quickConnect.AuthorizeRequest(userId, code).ConfigureAwait(false);
             }
             catch (AuthenticationException)
             {