some changes

Author: KSemenenko

.github/workflows/nuget.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 9.0.x
 
       - name: Restore dependencies
         run: dotnet restore

ManagedCode.Orleans.Identity.Client/Extensions/OrleansIdentityExtensions.cs

@@ -1,28 +1,30 @@
-using ManagedCode.Orleans.Identity.Client.Middlewares;
+using ManagedCode.Orleans.Identity.Client.Filters;
 using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.DependencyInjection;
+using Orleans;
+using Orleans.Hosting;
 
 namespace ManagedCode.Orleans.Identity.Client.Extensions;
 
 public static class OrleansIdentityExtensions
 {
     public static IServiceCollection AddOrleansIdentity(this IServiceCollection services)
     {
-        services.AddScoped<OrleansContextMiddleware>();
+        // Add the action filter globally for all controllers
+        services.Configure<MvcOptions>(options =>
+        {
+            options.Filters.Add<OrleansAuthorizationActionFilter>();
+        });
 
-        services.AddSignalR(options =>
+        // Configure SignalR with the authorization filter
+        services.Configure<HubOptions>(options =>
         {
             options.AddFilter<SignalRAuthorizationFilter>();
         });
+        
 
         return services;
     }
-
-    public static IApplicationBuilder UseOrleansIdentity(this IApplicationBuilder app)
-    {
-        app.UseMiddleware<OrleansContextMiddleware>();
-        
-        return app;
-    }
 } 

ManagedCode.Orleans.Identity.Client/Filters/OrleansAuthorizationActionFilter.cs

@@ -0,0 +1,15 @@
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Orleans.Runtime;
+using ManagedCode.Orleans.Identity.Core.Constants;
+
+namespace ManagedCode.Orleans.Identity.Client.Filters;
+
+public sealed class OrleansAuthorizationActionFilter : IAsyncActionFilter
+{
+    public Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
+    {
+        RequestContext.Set(OrleansIdentityConstants.USER_CLAIMS, context.HttpContext.User);
+        return next();
+    }
+}

…iddlewares/SignalRAuthorizationFilter.cs …nt/Filters/SignalRAuthorizationFilter.csManagedCode.Orleans.Identity.Client/Middlewares/SignalRAuthorizationFilter.cs renamed to ManagedCode.Orleans.Identity.Client/Filters/SignalRAuthorizationFilter.cs ManagedCode.Orleans.Identity.Client/Middlewares/SignalRAuthorizationFilter.cs renamed to ManagedCode.Orleans.Identity.Client/Filters/SignalRAuthorizationFilter.cs

@@ -1,32 +1,25 @@
 using System;
+using System.Security.Claims;
 using System.Threading.Tasks;
+using ManagedCode.Orleans.Identity.Core.Constants;
 using Microsoft.AspNetCore.SignalR;
 using Orleans.Runtime;
-using ManagedCode.Orleans.Identity.Core.Constants;
 
-namespace ManagedCode.Orleans.Identity.Client.Middlewares;
+namespace ManagedCode.Orleans.Identity.Client.Filters;
 
-public class SignalRAuthorizationFilter : IHubFilter
+public sealed class SignalRAuthorizationFilter : IHubFilter
 {
-    public async ValueTask<object?> InvokeMethodAsync(
+    public ValueTask<object?> InvokeMethodAsync(
         HubInvocationContext invocationContext,
         Func<HubInvocationContext, ValueTask<object?>> next)
     {
-        if (invocationContext.Context.User?.Identity?.IsAuthenticated == true)
-        {
-            RequestContext.Set(OrleansIdentityConstants.USER_CLAIMS, invocationContext.Context.User);
-        }
-
-        return await next(invocationContext);
+        RequestContext.Set(OrleansIdentityConstants.USER_CLAIMS, invocationContext.Context.User!); // can be null
+        return next(invocationContext);
     }
 
     public Task OnConnectedAsync(HubLifetimeContext context, Func<HubLifetimeContext, Task> next)
     {
-        if (context.Context.User?.Identity?.IsAuthenticated == true)
-        {
-            RequestContext.Set(OrleansIdentityConstants.USER_CLAIMS, context.Context.User);
-        }
-
+        // Don't set RequestContext here as it won't persist to method calls
         return next(context);
     }
 

ManagedCode.Orleans.Identity.Client/Middlewares/OrleansContextMiddleware.cs

@@ -2,9 +2,9 @@
 
 public static class OrleansIdentityConstants
 {
-    public const string SESSION_STORAGE = "sessionStore";
-    public static string AUTH_TOKEN = "AUTH-TOKEN";
-    public static string AUTHENTICATION_TYPE = "MC-OrleansIdentity";
-    public const string SESSION_ID_CLAIM_NAME = "SessionId";
-    public const string USER_CLAIMS = "UserClaims";
+    /// <summary>
+    /// Key used to store user claims in Orleans RequestContext.
+    /// Works with any ASP.NET Core authentication method (JWT, Cookie, etc.)
+    /// </summary>
+    public const string USER_CLAIMS = "MC-UserClaims";
 }

ManagedCode.Orleans.Identity.Core/Constants/OrleansIdentityConstants.cs

@@ -25,12 +25,7 @@ public static string GetPhone(this ClaimsPrincipal user)
     {
         return user.FindFirst(ClaimTypes.HomePhone)?.Value ?? string.Empty;
     }
-
-    public static string GetSessionId(this ClaimsPrincipal user)
-    {
-        return user.FindFirst(OrleansIdentityConstants.SESSION_ID_CLAIM_NAME)?.Value ?? string.Empty;
-    }
-
+    
     public static string GetGrainId(this ClaimsPrincipal user)
     {
         return user.FindFirst(ClaimTypes.Actor)?.Value ?? string.Empty;
@@ -40,10 +35,4 @@ public static string[] GetRoles(this ClaimsPrincipal user)
     {
         return user.FindAll(ClaimTypes.Role).Select(s => s.Value).ToArray();
     }
-
-    public static bool IsUnauthorizedClient(this ClaimsPrincipal user)
-    {
-        //TODO: this is strange 
-        return user.GetGrainId() == OrleansIdentityConstants.AUTH_TOKEN;
-    }
 }