dotnet9

KSemenenko · KSemenenko · commit b88391157264 · 2025-07-29T14:02:35.000+02:00
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 9.0.x
         
         # run build and test           
       - name: Restore dependencies
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,8 +2,8 @@
     
     <!--C# version-->
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <LangVersion>12</LangVersion>
+        <TargetFramework>net9.0</TargetFramework>
+        <LangVersion>13</LangVersion>
     </PropertyGroup>
     
     <!--NuGet-->
diff --git a/ManagedCode.Orleans.Identity.Client/Extensions/AuthenticationHandlerExtensions.cs b/ManagedCode.Orleans.Identity.Client/Extensions/AuthenticationHandlerExtensions.cs
@@ -27,23 +27,30 @@ public static void AddOrleansIdentity(this IServiceCollection services, Action<S
     /// </summary>
     /// <param name="services"></param>
     /// <param name="sessionOption">Options for working with session</param>
+    /// <param name="authenticationBuilder"></param>
     public static void AddOrleansIdentity(this IServiceCollection services, SessionOption? sessionOption = null, Action<AuthorizationPolicyBuilder>? authenticationBuilder = null)
 
     {
         sessionOption ??= new SessionOption();
         
-        //services.AddScoped<SessionAuthorizationHandler>();     
-        //services.AddScoped<SessionAuthenticationHandler>();      
-
-        services.AddAuthentication(options => options.DefaultScheme = OrleansIdentityConstants.AUTHENTICATION_TYPE)
-            .AddScheme<AuthenticationSchemeOptions, SessionAuthenticationHandler>(OrleansIdentityConstants.AUTHENTICATION_TYPE, op => { });
+        // Add custom authentication and authorization
+        services.AddScoped<OrleansSessionAuthorizationHandler>();
+        services.AddScoped<OrleansSessionAuthenticationHandler>();
 
+        services.AddAuthentication(options =>
+        {
+            options.DefaultScheme = OrleansIdentityConstants.AUTHENTICATION_TYPE;
+        })
+        .AddScheme<AuthenticationSchemeOptions, OrleansSessionAuthenticationHandler>(OrleansIdentityConstants.AUTHENTICATION_TYPE, op => 
+        {
+            
+        });
         services.AddAuthorization(options =>
         {
             var defaultAuthorizationPolicyBuilder = new AuthorizationPolicyBuilder(OrleansIdentityConstants.AUTHENTICATION_TYPE);
             defaultAuthorizationPolicyBuilder = defaultAuthorizationPolicyBuilder.RequireAuthenticatedUser();
-            authenticationBuilder?.Invoke(defaultAuthorizationPolicyBuilder);
             options.DefaultPolicy = defaultAuthorizationPolicyBuilder.Build();
         });
+        
     }
 }
diff --git a/ManagedCode.Orleans.Identity.Client/Extensions/OrleansContextMiddlewareExtensions.cs b/ManagedCode.Orleans.Identity.Client/Extensions/OrleansContextMiddlewareExtensions.cs
@@ -12,7 +12,8 @@ public static class OrleansContextMiddlewareExtensions
     /// <returns></returns>
     public static IApplicationBuilder UseOrleansIdentity(this IApplicationBuilder builder)
     {
-        return builder.UseMiddleware<OrleansContextMiddleware>();
+        return builder.UseMiddleware<OrleansContextMiddleware>()
+            .UseMiddleware<OrleansContextMiddleware>();
     }
 
     /// <summary>
diff --git a/ManagedCode.Orleans.Identity.Client/ManagedCode.Orleans.Identity.Client.csproj b/ManagedCode.Orleans.Identity.Client/ManagedCode.Orleans.Identity.Client.csproj
@@ -16,11 +16,11 @@
 
     <ItemGroup>
 
-        <PackageReference Include="ManagedCode.Communication" Version="8.0.7" />
-        <PackageReference Include="ManagedCode.Communication.Orleans" Version="8.0.7" />
+        <PackageReference Include="ManagedCode.Communication" Version="9.0.0" />
+        <PackageReference Include="ManagedCode.Communication.Orleans" Version="9.0.0" />
         
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
-        <PackageReference Include="Microsoft.Orleans.Client" Version="8.2.0" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.7" />
+        <PackageReference Include="Microsoft.Orleans.Client" Version="9.2.1" />
 
     </ItemGroup>
 
diff --git a/ManagedCode.Orleans.Identity.Core/ManagedCode.Orleans.Identity.Core.csproj b/ManagedCode.Orleans.Identity.Core/ManagedCode.Orleans.Identity.Core.csproj
@@ -17,11 +17,11 @@
 
     <ItemGroup>
 
-        <PackageReference Include="ManagedCode.Communication" Version="8.0.7" />
-        <PackageReference Include="ManagedCode.Communication.Orleans" Version="8.0.7" />
+        <PackageReference Include="ManagedCode.Communication" Version="9.0.0" />
+        <PackageReference Include="ManagedCode.Communication.Orleans" Version="9.0.0" />
 
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
-        <PackageReference Include="Microsoft.Orleans.Sdk" Version="8.2.0" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.7" />
+        <PackageReference Include="Microsoft.Orleans.Sdk" Version="9.2.1" />
     </ItemGroup>
 
 </Project>
diff --git a/ManagedCode.Orleans.Identity.Server/GrainCallFilter/GrainAuthorizationIncomingFilter.cs b/ManagedCode.Orleans.Identity.Server/GrainCallFilter/GrainAuthorizationIncomingFilter.cs
@@ -10,16 +10,9 @@
 
 namespace ManagedCode.Orleans.Identity.Server.GrainCallFilter;
 
-public class GrainAuthorizationIncomingFilter : IIncomingGrainCallFilter
+public class GrainAuthorizationIncomingFilter(IClusterClient client, IGrainFactory grainFactory) : IIncomingGrainCallFilter
 {
-    private readonly IClusterClient _client;
-    private readonly IGrainFactory _grainFactory;
-
-    public GrainAuthorizationIncomingFilter(IClusterClient client, IGrainFactory grainFactory)
-    {
-        _client = client;
-        _grainFactory = grainFactory;
-    }
+    private readonly IClusterClient _client = client;
 
     public async Task Invoke(IIncomingGrainCallContext context)
     {
@@ -28,11 +21,12 @@ public async Task Invoke(IIncomingGrainCallContext context)
             var isSessionExists = await IsAuthorized();
             if (isSessionExists)
             {
-                if (attributes.All(attributes => string.IsNullOrWhiteSpace(attributes.Roles)))
+                if (attributes.All(attribute => string.IsNullOrWhiteSpace(attribute.Roles)))
                 {
                     await context.Invoke();
                     return;
                 }
+                
                 var roles = this.GetRoles().ToHashSet();
                 foreach (var attribute in attributes)
                 {
@@ -46,18 +40,17 @@ public async Task Invoke(IIncomingGrainCallContext context)
             }
             throw new UnauthorizedAccessException();
         }
-        else
-        {
-            await context.Invoke();
-        }
+
+        await context.Invoke();
+        
     }
 
     private async Task<bool> IsAuthorized()
     {
         var sessionId = this.GetSessionId();
         if (string.IsNullOrWhiteSpace(sessionId) is false)
         {
-            var sessionGrain = _grainFactory.GetGrain<ISessionGrain>(sessionId);
+            var sessionGrain = grainFactory.GetGrain<ISessionGrain>(sessionId);
             var result = await sessionGrain.ValidateAndGetClaimsAsync();
             return result.IsSuccess;
         }
diff --git a/ManagedCode.Orleans.Identity.Server/ManagedCode.Orleans.Identity.Server.csproj b/ManagedCode.Orleans.Identity.Server/ManagedCode.Orleans.Identity.Server.csproj
@@ -16,13 +16,13 @@
 
     <ItemGroup>
 
-        <PackageReference Include="ManagedCode.Communication" Version="8.0.7" />
-        <PackageReference Include="ManagedCode.Communication.Orleans" Version="8.0.7" />
+        <PackageReference Include="ManagedCode.Communication" Version="9.0.0" />
+        <PackageReference Include="ManagedCode.Communication.Orleans" Version="9.0.0" />
         
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.7" />
         
-        <PackageReference Include="Microsoft.Orleans.Reminders" Version="8.2.0" />
-        <PackageReference Include="Microsoft.Orleans.Server" Version="8.2.0" />
+        <PackageReference Include="Microsoft.Orleans.Reminders" Version="9.2.1" />
+        <PackageReference Include="Microsoft.Orleans.Server" Version="9.2.1" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/ManagedCode.Orleans.Identity.Tests/ManagedCode.Orleans.Identity.Tests.csproj b/ManagedCode.Orleans.Identity.Tests/ManagedCode.Orleans.Identity.Tests.csproj
@@ -9,43 +9,43 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="FluentAssertions" Version="6.12.1" />
-        <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.10" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.10" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-        <PackageReference Include="Microsoft.Orleans.Analyzers" Version="8.2.0">
+        <PackageReference Include="FluentAssertions" Version="8.5.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.7" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.7" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+        <PackageReference Include="Microsoft.Orleans.Analyzers" Version="9.2.1">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.Orleans.Serialization" Version="8.2.0" />
-        <PackageReference Include="Microsoft.Orleans.TestingHost" Version="8.2.0" />
-        <PackageReference Include="System.Linq.Async" Version="6.0.1" />
-        <PackageReference Include="xunit" Version="2.9.2" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+        <PackageReference Include="Microsoft.Orleans.Serialization" Version="9.2.1" />
+        <PackageReference Include="Microsoft.Orleans.TestingHost" Version="9.2.1" />
+        <PackageReference Include="System.Linq.Async" Version="6.0.3" />
+        <PackageReference Include="xunit" Version="2.9.3" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.1.3">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="xunit.runner.console" Version="2.9.2">
+        <PackageReference Include="xunit.runner.console" Version="2.9.3">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="coverlet.collector" Version="6.0.2">
+        <PackageReference Include="coverlet.collector" Version="6.0.4">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="coverlet.msbuild" Version="6.0.2">
+        <PackageReference Include="coverlet.msbuild" Version="6.0.4">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.10" />
-        <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.10" />
-        <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.10" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
-        <PackageReference Include="Microsoft.Orleans.Sdk" Version="8.2.0" />
-        <PackageReference Include="Microsoft.Orleans.Serialization.TestKit" Version="8.2.0" />
-        <PackageReference Include="ManagedCode.Communication" Version="8.0.7" />
-        <PackageReference Include="ManagedCode.Communication.Orleans" Version="8.0.7" />
+        <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.7" />
+        <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.7" />
+        <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="9.0.7" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.7" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />
+        <PackageReference Include="Microsoft.Orleans.Sdk" Version="9.2.1" />
+        <PackageReference Include="Microsoft.Orleans.Serialization.TestKit" Version="9.2.1" />
+        <PackageReference Include="ManagedCode.Communication" Version="9.0.0" />
+        <PackageReference Include="ManagedCode.Communication.Orleans" Version="9.0.0" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/ManagedCode.Orleans.Identity.Tests/TestApp/HttpHostProgram.cs b/ManagedCode.Orleans.Identity.Tests/TestApp/HttpHostProgram.cs
@@ -33,30 +33,14 @@ public static void Main(string[] args)
         // AddProperty it for using Orleans Identity
         builder.Services.AddOrleansIdentity();
         
-
         
-        builder.Services.AddAuthorization(options =>
-        {
-            options.AddPolicy(OrleansIdentityConstants.AUTHENTICATION_TYPE, policy =>
-            {
-                policy.AuthenticationSchemes.Add(OrleansIdentityConstants.AUTH_TOKEN);
-                policy.Requirements.Add(new SessionRequirement());
-            });
-        });
-        builder.Services.AddAuthentication(options =>
-        {
-            options.DefaultScheme = OrleansIdentityConstants.AUTHENTICATION_TYPE;
-        });
-
 
         var app = builder.Build();
 
         // AddProperty it for using Orleans Identity
         // Authentication and Authorization already use
-        //app.UseAuthenticationAndOrleansIdentity();
-
-        app.UseAuthentication();
-        app.UseAuthorization();
+        app.UseAuthenticationAndOrleansIdentity();
+        
         
         app.MapControllers();
         app.MapHub<TestAnonymousHub>(nameof(TestAnonymousHub));

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,8 @@ public static class OrleansContextMiddlewareExtensions`
`12`	`12`	`/// <returns></returns>`
`13`	`13`	`public static IApplicationBuilder UseOrleansIdentity(this IApplicationBuilder builder)`
`14`	`14`	`{`
`15`		`- return builder.UseMiddleware<OrleansContextMiddleware>();`
	`15`	`+ return builder.UseMiddleware<OrleansContextMiddleware>()`
	`16`	`+ .UseMiddleware<OrleansContextMiddleware>();`
`16`	`17`	`}`
`17`	`18`
`18`	`19`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -10,16 +10,9 @@`
`10`	`10`
`11`	`11`	`namespace ManagedCode.Orleans.Identity.Server.GrainCallFilter;`
`12`	`12`
`13`		`-public class GrainAuthorizationIncomingFilter : IIncomingGrainCallFilter`
	`13`	`+public class GrainAuthorizationIncomingFilter(IClusterClient client, IGrainFactory grainFactory) : IIncomingGrainCallFilter`
`14`	`14`	`{`
`15`		`- private readonly IClusterClient _client;`
`16`		`- private readonly IGrainFactory _grainFactory;`
`17`		`-`
`18`		`- public GrainAuthorizationIncomingFilter(IClusterClient client, IGrainFactory grainFactory)`
`19`		`- {`
`20`		`- _client = client;`
`21`		`- _grainFactory = grainFactory;`
`22`		`- }`
	`15`	`+ private readonly IClusterClient _client = client;`
`23`	`16`
`24`	`17`	`public async Task Invoke(IIncomingGrainCallContext context)`
`25`	`18`	`{`
`@@ -28,11 +21,12 @@ public async Task Invoke(IIncomingGrainCallContext context)`
`28`	`21`	`var isSessionExists = await IsAuthorized();`
`29`	`22`	`if (isSessionExists)`
`30`	`23`	`{`
`31`		`- if (attributes.All(attributes => string.IsNullOrWhiteSpace(attributes.Roles)))`
	`24`	`+ if (attributes.All(attribute => string.IsNullOrWhiteSpace(attribute.Roles)))`
`32`	`25`	`{`
`33`	`26`	`await context.Invoke();`
`34`	`27`	`return;`
`35`	`28`	`}`
	`29`	`+`
`36`	`30`	`var roles = this.GetRoles().ToHashSet();`
`37`	`31`	`foreach (var attribute in attributes)`
`38`	`32`	`{`
`@@ -46,18 +40,17 @@ public async Task Invoke(IIncomingGrainCallContext context)`
`46`	`40`	`}`
`47`	`41`	`throw new UnauthorizedAccessException();`
`48`	`42`	`}`
`49`		`- else`
`50`		`- {`
`51`		`- await context.Invoke();`
`52`		`- }`
	`43`	`+`
	`44`	`+ await context.Invoke();`
	`45`	`+`
`53`	`46`	`}`
`54`	`47`
`55`	`48`	`private async Task<bool> IsAuthorized()`
`56`	`49`	`{`
`57`	`50`	`var sessionId = this.GetSessionId();`
`58`	`51`	`if (string.IsNullOrWhiteSpace(sessionId) is false)`
`59`	`52`	`{`
`60`		`- var sessionGrain = _grainFactory.GetGrain<ISessionGrain>(sessionId);`
	`53`	`+ var sessionGrain = grainFactory.GetGrain<ISessionGrain>(sessionId);`
`61`	`54`	`var result = await sessionGrain.ValidateAndGetClaimsAsync();`
`62`	`55`	`return result.IsSuccess;`
`63`	`56`	`}`