fix: use HttpContext and ClaimsPrincipal instead of IAuthorizationContext

2 files changed, 85 insertions, 4 deletions

diff --git a/Jellyfin.Api/Extensions/ClaimsPrincipalExtensions.cs b/Jellyfin.Api/Extensions/ClaimsPrincipalExtensions.cs
new file mode 100644
index 000000000..6b3e78d4d
--- /dev/null
+++ b/Jellyfin.Api/Extensions/ClaimsPrincipalExtensions.cs
@@ -0,0 +1,81 @@
+using System;
+using System.Linq;
+using System.Security.Claims;
+using Jellyfin.Api.Constants;
+
+namespace Jellyfin.Api.Extensions;
+
+/// <summary>
+/// Extensions for <see cref="ClaimsPrincipal"/>.
+/// </summary>
+public static class ClaimsPrincipalExtensions
+{
+    /// <summary>
+    /// Get user id from claims.
+    /// </summary>
+    /// <param name="user">Current claims principal.</param>
+    /// <returns>User id.</returns>
+    public static Guid GetUserId(this ClaimsPrincipal user)
+    {
+        var value = GetClaimValue(user, InternalClaimTypes.UserId);
+        return string.IsNullOrEmpty(value)
+            ? default
+            : Guid.Parse(value);
+    }
+
+    /// <summary>
+    /// Get device id from claims.
+    /// </summary>
+    /// <param name="user">Current claims principal.</param>
+    /// <returns>Device id.</returns>
+    public static string? GetDeviceId(this ClaimsPrincipal user)
+        => GetClaimValue(user, InternalClaimTypes.DeviceId);
+
+    /// <summary>
+    /// Get device from claims.
+    /// </summary>
+    /// <param name="user">Current claims principal.</param>
+    /// <returns>Device.</returns>
+    public static string? GetDevice(this ClaimsPrincipal user)
+        => GetClaimValue(user, InternalClaimTypes.Device);
+
+    /// <summary>
+    /// Get client from claims.
+    /// </summary>
+    /// <param name="user">Current claims principal.</param>
+    /// <returns>Client.</returns>
+    public static string? GetClient(this ClaimsPrincipal user)
+        => GetClaimValue(user, InternalClaimTypes.Client);
+
+    /// <summary>
+    /// Get version from claims.
+    /// </summary>
+    /// <param name="user">Current claims principal.</param>
+    /// <returns>Version.</returns>
+    public static string? GetVersion(this ClaimsPrincipal user)
+        => GetClaimValue(user, InternalClaimTypes.Version);
+
+    /// <summary>
+    /// Get token from claims.
+    /// </summary>
+    /// <param name="user">Current claims principal.</param>
+    /// <returns>Token.</returns>
+    public static string? GetToken(this ClaimsPrincipal user)
+        => GetClaimValue(user, InternalClaimTypes.Token);
+
+    /// <summary>
+    /// Gets a flag specifying whether the request is using an api key.
+    /// </summary>
+    /// <param name="user">Current claims principal.</param>
+    /// <returns>The flag specifying whether the request is using an api key.</returns>
+    public static bool GetIsApiKey(this ClaimsPrincipal user)
+    {
+        var claimValue = GetClaimValue(user, InternalClaimTypes.IsApiKey);
+        return !string.IsNullOrEmpty(claimValue)
+               && bool.TryParse(claimValue, out var parsedClaimValue)
+               && parsedClaimValue;
+    }
+
+    private static string? GetClaimValue(in ClaimsPrincipal user, string name)
+        => user.Claims.FirstOrDefault(claim => claim.Type.Equals(name, StringComparison.OrdinalIgnoreCase))?.Value;
+}
diff --git a/Jellyfin.Api/Extensions/DtoExtensions.cs b/Jellyfin.Api/Extensions/DtoExtensions.cs
index 5e338b67d..9e784f7c4 100644
--- a/Jellyfin.Api/Extensions/DtoExtensions.cs
+++ b/Jellyfin.Api/Extensions/DtoExtensions.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using Jellyfin.Api.Helpers;
+using System.Security.Claims;
 using Jellyfin.Extensions;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Model.Entities;
@@ -22,14 +22,14 @@ namespace Jellyfin.Api.Extensions
         /// Legacy order: 2.
         /// </remarks>
         /// <param name="dtoOptions">DtoOptions object.</param>
-        /// <param name="request">Current request.</param>
+        /// <param name="user">Current claims principal.</param>
         /// <returns>Modified DtoOptions object.</returns>
         internal static DtoOptions AddClientFields(
-            this DtoOptions dtoOptions, HttpRequest request)
+            this DtoOptions dtoOptions, ClaimsPrincipal user)
         {
             dtoOptions.Fields ??= Array.Empty<ItemFields>();
 
-            string? client = ClaimHelpers.GetClient(request.HttpContext.User);
+            string? client = user.GetClient();
 
             // No client in claim
             if (string.IsNullOrEmpty(client))