Add extensions methods (#4)

* add test grain

* import missing namespace

* move orleans extension methods to shared project from server project

* add tests for grain authorized with role

* add test when grain with role and method without

* add more role tests

* extensions

* add method description for session grain

* add description for extension methods

Co-authored-by: ksemenenko <mail@ksemenenko.com>

Author: TRybina132

Directory.Build.props

@@ -17,8 +17,8 @@
         <RepositoryUrl>https://github.com/managedcode/Orleans.Identity</RepositoryUrl>
         <PackageProjectUrl>https://github.com/managedcode/Orleans.Identity</PackageProjectUrl>
         <Product>Managed Code - Orleans Identity</Product>
-        <Version>1.0.0.0</Version>
-        <PackageVersion>1.0.0.0</PackageVersion>
+        <Version>7.0.0</Version>
+        <PackageVersion>7.0.0</PackageVersion>
 
     </PropertyGroup>
     <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">

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

@@ -10,14 +10,24 @@ namespace ManagedCode.Orleans.Identity.Client.Extensions;
 
 public static class AuthenticationHandlerExtensions
 {
+    /// <summary>
+    /// Use Orleans.Identity authentication as default authentication scheme
+    /// </summary>
+    /// <param name="services"></param>
+    /// <param name="sessionOption">Options for working with session</param>
     public static void AddOrleansIdentity(this IServiceCollection services, Action<SessionOption> sessionOption)
     {
         var option = new SessionOption();
         sessionOption?.Invoke(option);
         AddOrleansIdentity(services, option);
     }
 
-    public static void AddOrleansIdentity(this IServiceCollection services, SessionOption sessionOption = null)
+    /// <summary>
+    /// Use Orleans.Identity authentication as default authentication scheme
+    /// </summary>
+    /// <param name="services"></param>
+    /// <param name="sessionOption">Options for working with session</param>
+    public static void AddOrleansIdentity(this IServiceCollection services, SessionOption? sessionOption = null)
     {
         sessionOption ??= new SessionOption();
 

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

@@ -5,11 +5,21 @@ namespace ManagedCode.Orleans.Identity.Client.Extensions;
 
 public static class OrleansContextMiddlewareExtensions
 {
+    /// <summary>
+    /// Use middleware to set claims and session id for request to cluster
+    /// </summary>
+    /// <param name="builder"></param>
+    /// <returns></returns>
     public static IApplicationBuilder UseOrleansIdentity(this IApplicationBuilder builder)
     {
         return builder.UseMiddleware<OrleansContextMiddleware>();
     }
 
+    /// <summary>
+    /// Use middleware to set claims and session id for request to cluster, this method includes <c>UseAuthentication</c> and <c>UseAuthorization</c> middlewares
+    /// </summary>
+    /// <param name="builder"></param>
+    /// <returns></returns>
     public static IApplicationBuilder UseAuthenticationAndOrleansIdentity(this IApplicationBuilder builder)
     {
         builder.UseAuthentication();

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

@@ -1,4 +1,5 @@
 using System.Threading.Tasks;
+using ManagedCode.Orleans.Identity.Extensions;
 using Microsoft.AspNetCore.Http;
 
 namespace ManagedCode.Orleans.Identity.Client.Middlewares;

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

@@ -3,6 +3,7 @@
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
 using ManagedCode.Orleans.Identity.Constants;
+using ManagedCode.Orleans.Identity.Extensions;
 using ManagedCode.Orleans.Identity.Interfaces;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.Extensions.Logging;

ManagedCode.Orleans.Identity.Server/Extensions/SiloBuilderExtensions.cs

@@ -0,0 +1,18 @@
+using ManagedCode.Orleans.Identity.Server.GrainCallFilter;
+using Orleans.Hosting;
+
+namespace ManagedCode.Orleans.Identity.Server.Extensions;
+
+public static class SiloBuilderExtensions
+{
+    /// <summary>
+    /// Add incoming grain filter for authorization
+    /// </summary>
+    /// <param name="siloBuilder"></param>
+    /// <returns></returns>
+    public static ISiloBuilder AddOrleansIdentity(this ISiloBuilder siloBuilder)
+    {
+        siloBuilder.AddIncomingGrainCallFilter<GrainAuthorizationIncomingFilter>();
+        return siloBuilder;
+    }
+}

ManagedCode.Orleans.Identity.Server/GrainCallFilter/GrainAuthorizationIncomingFilter.cs

@@ -3,8 +3,8 @@
 using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
+using ManagedCode.Orleans.Identity.Extensions;
 using ManagedCode.Orleans.Identity.Interfaces;
-using ManagedCode.Orleans.Identity.Server.Extensions;
 using Microsoft.AspNetCore.Authorization;
 using Orleans;
 

ManagedCode.Orleans.Identity.Server/Grains/SessionGrain.cs

@@ -45,9 +45,8 @@ public async Task<Result<SessionModel>> CreateAsync(CreateSessionModel model)
     {
         var date = DateTime.UtcNow;
 
-        _sessionState.State = new SessionModel
+        _sessionState.State = new SessionModel(this.GetPrimaryKeyString())
         {
-            Id = this.GetPrimaryKeyString(),
             IsActive = true,
             UserGrainId = model.UserGrainId,
             UserData = model.UserData ?? new Dictionary<string, HashSet<string>>(),
@@ -275,9 +274,8 @@ public override async Task OnDeactivateAsync(DeactivationReason reason, Cancella
 
     private SessionModel GetSessionModel()
     {
-        return new SessionModel
+        return new SessionModel(_sessionState.State.Id)
         {
-            Id = _sessionState.State.Id,
             IsActive = _sessionState.State.IsActive,
             ClosedDate = _sessionState.State.ClosedDate,
             CreatedDate = _sessionState.State.CreatedDate,

ManagedCode.Orleans.Identity.Tests/Cluster/Grains/Interfaces/IModeratorGrain.cs

@@ -0,0 +1,9 @@
+namespace ManagedCode.Orleans.Identity.Tests.Cluster.Grains.Interfaces
+{
+    public interface IModeratorGrain : IGrainWithStringKey
+    {
+        Task<string> GetInfo();
+        Task<string> GetModerators();
+        Task<string> GetPublicInformation();
+    }
+}

ManagedCode.Orleans.Identity.Tests/Cluster/Grains/ModeratorGrain.cs

@@ -0,0 +1,27 @@
+using ManagedCode.Orleans.Identity.Tests.Cluster.Grains.Interfaces;
+using ManagedCode.Orleans.Identity.Tests.Constants;
+using Microsoft.AspNetCore.Authorization;
+
+namespace ManagedCode.Orleans.Identity.Tests.Cluster.Grains
+{
+    [Authorize(Roles = TestRoles.MODERATOR)]
+    public class ModeratorGrain : Grain, IModeratorGrain
+    {
+        public Task<string> GetInfo()
+        {
+            return Task.FromResult("info");
+        }
+
+        [Authorize]
+        public Task<string> GetModerators()
+        {
+            return Task.FromResult("moderators");
+        }
+
+        [AllowAnonymous]
+        public Task<string> GetPublicInformation()
+        {
+            return Task.FromResult("public info");
+        }
+    }
+}