From 9506718729ba2ca129278cdd31cb63a2e4befeda Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Fri, 19 Apr 2024 14:49:43 +0800
Subject: [PATCH] Get dynamic claims in `AbpAuthenticationHubFilter`.

---
 .../AbpAuthenticationHubFilter.cs             | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.SignalR/Volo/Abp/AspNetCore/SignalR/Authentication/AbpAuthenticationHubFilter.cs b/framework/src/Volo.Abp.AspNetCore.SignalR/Volo/Abp/AspNetCore/SignalR/Authentication/AbpAuthenticationHubFilter.cs
index ab79521159..baac1b538f 100644
--- a/framework/src/Volo.Abp.AspNetCore.SignalR/Volo/Abp/AspNetCore/SignalR/Authentication/AbpAuthenticationHubFilter.cs
+++ b/framework/src/Volo.Abp.AspNetCore.SignalR/Volo/Abp/AspNetCore/SignalR/Authentication/AbpAuthenticationHubFilter.cs
@@ -1,7 +1,9 @@
 using System;
+using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
 using Volo.Abp.Security.Claims;
 
 namespace Volo.Abp.AspNetCore.SignalR.Authentication;
@@ -11,7 +13,7 @@ public class AbpAuthenticationHubFilter : IHubFilter
     public virtual async ValueTask<object?> InvokeMethodAsync(HubInvocationContext invocationContext, Func<HubInvocationContext, ValueTask<object?>> next)
     {
         var currentPrincipalAccessor = invocationContext.ServiceProvider.GetRequiredService<ICurrentPrincipalAccessor>();
-        using (currentPrincipalAccessor.Change(invocationContext.Context.User!))
+        using (currentPrincipalAccessor.Change((await GetDynamicClaimsPrincipalAsync(invocationContext.Context.User, invocationContext.ServiceProvider))!))
         {
             return await next(invocationContext);
         }
@@ -20,7 +22,7 @@ public class AbpAuthenticationHubFilter : IHubFilter
     public virtual async Task OnConnectedAsync(HubLifetimeContext context, Func<HubLifetimeContext, Task> next)
     {
         var currentPrincipalAccessor = context.ServiceProvider.GetRequiredService<ICurrentPrincipalAccessor>();
-        using (currentPrincipalAccessor.Change(context.Context.User!))
+        using (currentPrincipalAccessor.Change((await GetDynamicClaimsPrincipalAsync(context.Context.User, context.ServiceProvider))!))
         {
             await next(context);
         }
@@ -29,9 +31,27 @@ public class AbpAuthenticationHubFilter : IHubFilter
     public virtual async Task OnDisconnectedAsync(HubLifetimeContext context, Exception? exception, Func<HubLifetimeContext, Exception?, Task> next)
     {
         var currentPrincipalAccessor = context.ServiceProvider.GetRequiredService<ICurrentPrincipalAccessor>();
-        using (currentPrincipalAccessor.Change(context.Context.User!))
+        using (currentPrincipalAccessor.Change((await GetDynamicClaimsPrincipalAsync(context.Context.User, context.ServiceProvider))!))
         {
             await next(context, exception);
         }
     }
+
+    protected virtual async Task<ClaimsPrincipal?> GetDynamicClaimsPrincipalAsync(ClaimsPrincipal? claimsPrincipal, IServiceProvider serviceProvider)
+    {
+        if (claimsPrincipal == null)
+        {
+            return claimsPrincipal;
+        }
+
+        if (claimsPrincipal.Identity != null &&
+            claimsPrincipal.Identity.IsAuthenticated &&
+            serviceProvider.GetRequiredService<IOptions<AbpClaimsPrincipalFactoryOptions>>().Value.IsDynamicClaimsEnabled)
+        {
+            var abpClaimsPrincipalFactory = serviceProvider.GetRequiredService<IAbpClaimsPrincipalFactory>();
+            claimsPrincipal = await abpClaimsPrincipalFactory.CreateDynamicAsync(claimsPrincipal);
+        }
+
+        return claimsPrincipal;
+    }
 }