Fetch HubIdentity in HubController, not UserIdentity

Author: hhvrc

Common/Extensions/ClaimsPrincipalExtensions.cs

@@ -6,12 +6,15 @@ namespace OpenShock.Common.Extensions;
 
 public static class ClaimsPrincipalExtensions
 {
-    private static readonly Func<ClaimsIdentity, bool> UserClaimPredicate = x => x is
+    private static readonly Func<ClaimsIdentity, bool> HubIdentityPredicate = x => x is
+        { IsAuthenticated: true, AuthenticationType: OpenShockAuthSchemes.HubToken };
+    private static readonly Func<ClaimsIdentity, bool> UserIdentityPredicate = x => x is
         { IsAuthenticated: true, AuthenticationType: OpenShockAuthSchemes.UserSessionCookie };
 
-    public static bool HasOpenShockUserIdentity(this ClaimsPrincipal principal) => principal.Identities.Any(UserClaimPredicate);
-    public static ClaimsIdentity GetOpenShockUserIdentity(this ClaimsPrincipal principal) => principal.Identities.Single(UserClaimPredicate);
-    public static ClaimsIdentity? TryGetOpenShockUserIdentity(this ClaimsPrincipal principal) => principal.Identities.SingleOrDefault(UserClaimPredicate);
+    public static bool HasOpenShockUserIdentity(this ClaimsPrincipal principal) => principal.Identities.Any(UserIdentityPredicate);
+    public static ClaimsIdentity GetOpenShockHubIdentity(this ClaimsPrincipal principal) => principal.Identities.Single(HubIdentityPredicate);
+    public static ClaimsIdentity GetOpenShockUserIdentity(this ClaimsPrincipal principal) => principal.Identities.Single(UserIdentityPredicate);
+    public static ClaimsIdentity? TryGetOpenShockUserIdentity(this ClaimsPrincipal principal) => principal.Identities.SingleOrDefault(UserIdentityPredicate);
     public static string GetClaimValue(this ClaimsIdentity identity, string claimType) => identity.Claims.Single(x => x.Type == claimType).Value;
     public static Guid GetClaimValueAsGuid(this ClaimsIdentity identity, string claimType) => Guid.Parse(GetClaimValue(identity, claimType));
 }

LiveControlGateway/Controllers/HubControllerBase.cs

@@ -68,7 +68,7 @@ protected HubLifetime HubLifetime
     [NonAction]
     public void OnActionExecuting(ActionExecutingContext context)
     {
-        var identity = User.GetOpenShockUserIdentity();
+        var identity = User.GetOpenShockHubIdentity();
         CurrentHubId = identity.GetClaimValueAsGuid(OpenShockAuthClaims.HubId);
         CurrentHubOwnerId = identity.GetClaimValueAsGuid(ClaimTypes.NameIdentifier);
     }