Fix registring IIdentityService with DbContext that has eight generic parameters.

Author: mo-esmp

src/DynamicAuthorization.Mvc.Core/Extensions/ServiceCollectionExtensions.cs

@@ -63,6 +63,11 @@ public static IDynamicAuthorizationBuilder AddDynamicAuthorization<TDbContext>(t
                     DynamicAuthorizationOptions.UserType = userType;
                     DynamicAuthorizationOptions.RoleType = roleType;
                     DynamicAuthorizationOptions.KeyType = keyType;
+                    DynamicAuthorizationOptions.UserClaimType = userClaimType;
+                    DynamicAuthorizationOptions.UserRoleType = userRoleType;
+                    DynamicAuthorizationOptions.UserLoginType = userLoginType;
+                    DynamicAuthorizationOptions.RoleClaimType = roleClaimType;
+                    DynamicAuthorizationOptions.UserTokenType = userTokenType;
                     services.Configure<MvcOptions>(mvcOptions =>
                     {
                         mvcOptions.Filters.Add(typeof(DynamicAuthorizationFilter<,,,,,,,,>)

src/DynamicAuthorization.Mvc.Core/Models/DynamicAuthorizationOptions.cs

@@ -17,5 +17,15 @@ public class DynamicAuthorizationOptions
         internal static Type RoleType { get; set; }
 
         internal static Type KeyType { get; set; }
+
+        internal static Type UserClaimType { get; set; }
+
+        internal static Type UserRoleType { get; set; }
+
+        internal static Type UserLoginType { get; set; }
+
+        internal static Type RoleClaimType { get; set; }
+
+        internal static Type UserTokenType { get; set; }
     }
 }

src/DynamicAuthorization.Mvc.Ui/Extensions/ServiceCollectionExtensions.cs

@@ -32,13 +32,29 @@ public static IDynamicAuthorizationBuilder AddUi(this IDynamicAuthorizationBuild
             }
 
             builder.Services.AddScoped<AddResourcesToViewFilter>();
-            builder.Services.AddScoped(
-                typeof(IIdentityService),
-                typeof(IdentityService<,,,>).MakeGenericType(
-                    DynamicAuthorizationOptions.DbContextType,
-                    DynamicAuthorizationOptions.UserType,
-                    DynamicAuthorizationOptions.RoleType,
-                    DynamicAuthorizationOptions.KeyType
+
+            if (DynamicAuthorizationOptions.UserClaimType == null)
+                builder.Services.AddScoped(
+                    typeof(IIdentityService),
+                    typeof(IdentityService<,,,>).MakeGenericType(
+                        DynamicAuthorizationOptions.DbContextType,
+                        DynamicAuthorizationOptions.UserType,
+                        DynamicAuthorizationOptions.RoleType,
+                        DynamicAuthorizationOptions.KeyType
+                        ));
+            else
+                builder.Services.AddScoped(
+                    typeof(IIdentityService),
+                    typeof(IdentityService<,,,,,,,,>).MakeGenericType(
+                        DynamicAuthorizationOptions.DbContextType,
+                        DynamicAuthorizationOptions.UserType,
+                        DynamicAuthorizationOptions.RoleType,
+                        DynamicAuthorizationOptions.KeyType,
+                        DynamicAuthorizationOptions.UserClaimType,
+                        DynamicAuthorizationOptions.UserRoleType,
+                        DynamicAuthorizationOptions.UserLoginType,
+                        DynamicAuthorizationOptions.RoleClaimType,
+                        DynamicAuthorizationOptions.UserTokenType
                     ));
 
             return builder;

src/DynamicAuthorization.Mvc.Ui/Services/IdentityService.cs

@@ -26,11 +26,29 @@ public IdentityService(TDbContext context) : base(context)
         }
     }
 
-    internal class IdentityService<TDbContext, TUser, TRole, TKey> : IIdentityService
+    internal class
+        IdentityService<TDbContext, TUser, TRole, TKey> : IdentityService<TDbContext, TUser, TRole, TKey, IdentityUserClaim<TKey>, IdentityUserRole<TKey>, IdentityUserLogin<TKey>, IdentityRoleClaim<TKey>, IdentityUserToken<TKey>>
         where TDbContext : IdentityDbContext<TUser, TRole, TKey>
         where TUser : IdentityUser<TKey>
         where TRole : IdentityRole<TKey>
         where TKey : IEquatable<TKey>
+
+    {
+        public IdentityService(TDbContext context) : base(context)
+        {
+        }
+    }
+
+    internal class IdentityService<TDbContext, TUser, TRole, TKey, TUserClaim, TUserRole, TUserLogin, TRoleClaim, TUserToken> : IIdentityService
+        where TDbContext : IdentityDbContext<TUser, TRole, TKey, TUserClaim, TUserRole, TUserLogin, TRoleClaim, TUserToken>
+        where TUser : IdentityUser<TKey>
+        where TRole : IdentityRole<TKey>
+        where TKey : IEquatable<TKey>
+        where TUserClaim : IdentityUserClaim<TKey>
+        where TUserRole : IdentityUserRole<TKey>
+        where TUserLogin : IdentityUserLogin<TKey>
+        where TRoleClaim : IdentityRoleClaim<TKey>
+        where TUserToken : IdentityUserToken<TKey>
     {
         private readonly TDbContext _context;
 

test/DynamicRoleBasedAuthorization.Tests/DynamicRoleBasedAuthorization.Tests.csproj

@@ -30,5 +30,6 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\DynamicAuthorization.Mvc.Core\DynamicAuthorization.Mvc.Core.csproj" />
     <ProjectReference Include="..\..\src\DynamicAuthorization.Mvc.JsonStore\DynamicAuthorization.Mvc.JsonStore.csproj" />
+    <ProjectReference Include="..\..\src\DynamicAuthorization.Mvc.Ui\DynamicAuthorization.Mvc.Ui.csproj" />
   </ItemGroup>
 </Project>

test/DynamicRoleBasedAuthorization.Tests/ServiceRegistrationTests.cs

@@ -1,5 +1,6 @@
 using DynamicAuthorization.Mvc.Core.Extensions;
 using DynamicAuthorization.Mvc.JsonStore.Extensions;
+using DynamicAuthorization.Mvc.Ui;
 using DynamicRoleBasedAuthorization.Tests.TestSetup;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
@@ -90,7 +91,7 @@ public CustomStartup(IConfiguration configuration)
         // This method gets called by the runtime. Use this method to add services to the container.
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddControllersWithViews();
+            var mvcBuilder = services.AddControllersWithViews();
 
             services.AddDbContext<CustomDbContext>(options => options.UseInMemoryDatabase("InMemoryDbForTesting"));
 
@@ -113,7 +114,8 @@ public void ConfigureServices(IServiceCollection services)
             });
 
             services.AddDynamicAuthorization<CustomDbContext>(options => options.DefaultAdminUser = InitialData.SuperUser.UserName)
-                .AddJsonStore();
+                .AddJsonStore()
+                .AddUi(mvcBuilder);
 
             services.AddScoped<DbInitializer>();
         }