Skip to content

Commit f915c4b

Browse files
skorubaskoruba
committed
Restructured project because of new UI package which has to used nuget packages not shared projects
1 parent 6b17456 commit f915c4b

File tree

143 files changed

+551
-467
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+551
-467
lines changed

‎Skoruba.IdentityServer4.Admin.sln

+14
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Skoruba.IdentityServer4.Sha
5353
EndProject
5454
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Skoruba.IdentityServer4.Admin.UI", "src\Skoruba.IdentityServer4.Admin.UI\Skoruba.IdentityServer4.Admin.UI.csproj", "{6DD24C2C-0FB5-4C37-8B42-5DACA0FDE4EC}"
5555
EndProject
56+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Skoruba.IdentityServer4.Admin.EntityFramework.Configuration", "src\Skoruba.IdentityServer4.Admin.EntityFramework.Configuration\Skoruba.IdentityServer4.Admin.EntityFramework.Configuration.csproj", "{45FB23BE-A7F9-4172-8868-B5E387007644}"
57+
EndProject
58+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Skoruba.IdentityServer4.Shared.Configuration", "src\Skoruba.IdentityServer4.Shared.Configuration\Skoruba.IdentityServer4.Shared.Configuration.csproj", "{D49A2D61-AEEB-457C-B3BA-D1322EB2F4EC}"
59+
EndProject
5660
Global
5761
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5862
Debug|Any CPU = Debug|Any CPU
@@ -139,6 +143,14 @@ Global
139143
{6DD24C2C-0FB5-4C37-8B42-5DACA0FDE4EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
140144
{6DD24C2C-0FB5-4C37-8B42-5DACA0FDE4EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
141145
{6DD24C2C-0FB5-4C37-8B42-5DACA0FDE4EC}.Release|Any CPU.Build.0 = Release|Any CPU
146+
{45FB23BE-A7F9-4172-8868-B5E387007644}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
147+
{45FB23BE-A7F9-4172-8868-B5E387007644}.Debug|Any CPU.Build.0 = Debug|Any CPU
148+
{45FB23BE-A7F9-4172-8868-B5E387007644}.Release|Any CPU.ActiveCfg = Release|Any CPU
149+
{45FB23BE-A7F9-4172-8868-B5E387007644}.Release|Any CPU.Build.0 = Release|Any CPU
150+
{D49A2D61-AEEB-457C-B3BA-D1322EB2F4EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
151+
{D49A2D61-AEEB-457C-B3BA-D1322EB2F4EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
152+
{D49A2D61-AEEB-457C-B3BA-D1322EB2F4EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
153+
{D49A2D61-AEEB-457C-B3BA-D1322EB2F4EC}.Release|Any CPU.Build.0 = Release|Any CPU
142154
EndGlobalSection
143155
GlobalSection(SolutionProperties) = preSolution
144156
HideSolutionNode = FALSE
@@ -163,6 +175,8 @@ Global
163175
{4D123ACB-ACBD-4E40-AE6B-1B0F79D703B0} = {0BC0CC4E-A0F1-45E8-B41A-AE0FA76BF3E5}
164176
{61B285F0-EE06-4AEE-AAF3-71492CBD11C5} = {EE588CE5-51D0-4E98-A2B3-40EC8E655931}
165177
{6DD24C2C-0FB5-4C37-8B42-5DACA0FDE4EC} = {588205D4-3A30-4DA4-849D-C7422C396DAA}
178+
{45FB23BE-A7F9-4172-8868-B5E387007644} = {2A514C8F-6A53-41CA-AB41-B644E7BC92A7}
179+
{D49A2D61-AEEB-457C-B3BA-D1322EB2F4EC} = {EE588CE5-51D0-4E98-A2B3-40EC8E655931}
166180
EndGlobalSection
167181
GlobalSection(ExtensibilityGlobals) = postSolution
168182
SolutionGuid = {B3166EDE-037B-4C68-BEBA-5DE9C5E3DB82}

‎src/Skoruba.IdentityServer4.Admin.Api/Configuration/Test/StartupTest.cs

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
using Skoruba.IdentityServer4.Admin.Api.Middlewares;
99
using Skoruba.IdentityServer4.Admin.EntityFramework.Shared.DbContexts;
1010
using Skoruba.IdentityServer4.Admin.EntityFramework.Shared.Entities.Identity;
11-
using Skoruba.IdentityServer4.Shared.Configuration.Identity;
1211

1312
namespace Skoruba.IdentityServer4.Admin.Api.Configuration.Test
1413
{

‎src/Skoruba.IdentityServer4.Admin.Api/Helpers/StartupHelpers.cs

+7-7
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,12 @@
2121
using Skoruba.IdentityServer4.Admin.Api.Configuration.Constants;
2222
using Skoruba.IdentityServer4.Admin.Api.Helpers.Localization;
2323
using Skoruba.IdentityServer4.Admin.BusinessLogic.Identity.Dtos.Identity;
24+
using Skoruba.IdentityServer4.Admin.EntityFramework.Configuration.Configuration;
2425
using Skoruba.IdentityServer4.Admin.EntityFramework.Helpers;
2526
using Skoruba.IdentityServer4.Admin.EntityFramework.Interfaces;
2627
using Skoruba.IdentityServer4.Admin.EntityFramework.MySql.Extensions;
2728
using Skoruba.IdentityServer4.Admin.EntityFramework.PostgreSQL.Extensions;
28-
using Skoruba.IdentityServer4.Admin.EntityFramework.Shared.Configuration;
2929
using Skoruba.IdentityServer4.Admin.EntityFramework.SqlServer.Extensions;
30-
using Skoruba.IdentityServer4.Shared.Configuration.Identity;
3130

3231
namespace Skoruba.IdentityServer4.Admin.Api.Helpers
3332
{
@@ -136,13 +135,14 @@ public static IServiceCollection AddAdminApiCors(this IServiceCollection service
136135
/// <param name="services"></param>
137136
/// <param name="configuration"></param>
138137
public static void AddDbContexts<TIdentityDbContext, TConfigurationDbContext, TPersistedGrantDbContext,
139-
TLogDbContext, TAuditLoggingDbContext, TDataProtectionDbContext>(this IServiceCollection services, IConfiguration configuration)
138+
TLogDbContext, TAuditLoggingDbContext, TDataProtectionDbContext, TAuditLog>(this IServiceCollection services, IConfiguration configuration)
140139
where TIdentityDbContext : DbContext
141140
where TPersistedGrantDbContext : DbContext, IAdminPersistedGrantDbContext
142141
where TConfigurationDbContext : DbContext, IAdminConfigurationDbContext
143142
where TLogDbContext : DbContext, IAdminLogDbContext
144-
where TAuditLoggingDbContext : DbContext, IAuditLoggingDbContext<AuditLog>
143+
where TAuditLoggingDbContext : DbContext, IAuditLoggingDbContext<TAuditLog>
145144
where TDataProtectionDbContext : DbContext, IDataProtectionKeyContext
145+
where TAuditLog : AuditLog
146146
{
147147
var databaseProvider = configuration.GetSection(nameof(DatabaseProviderConfiguration)).Get<DatabaseProviderConfiguration>();
148148
var databaseMigrations = configuration.GetSection(nameof(DatabaseMigrationsConfiguration)).Get<DatabaseMigrationsConfiguration>() ?? new DatabaseMigrationsConfiguration();
@@ -151,13 +151,13 @@ public static IServiceCollection AddAdminApiCors(this IServiceCollection service
151151
switch (databaseProvider.ProviderType)
152152
{
153153
case DatabaseProviderType.SqlServer:
154-
services.RegisterSqlServerDbContexts<TIdentityDbContext, TConfigurationDbContext, TPersistedGrantDbContext, TLogDbContext, TAuditLoggingDbContext, TDataProtectionDbContext>(connectionStrings, databaseMigrations);
154+
services.RegisterSqlServerDbContexts<TIdentityDbContext, TConfigurationDbContext, TPersistedGrantDbContext, TLogDbContext, TAuditLoggingDbContext, TDataProtectionDbContext, TAuditLog>(connectionStrings, databaseMigrations);
155155
break;
156156
case DatabaseProviderType.PostgreSQL:
157-
services.RegisterNpgSqlDbContexts<TIdentityDbContext, TConfigurationDbContext, TPersistedGrantDbContext, TLogDbContext, TAuditLoggingDbContext, TDataProtectionDbContext>(connectionStrings, databaseMigrations);
157+
services.RegisterNpgSqlDbContexts<TIdentityDbContext, TConfigurationDbContext, TPersistedGrantDbContext, TLogDbContext, TAuditLoggingDbContext, TDataProtectionDbContext, TAuditLog>(connectionStrings, databaseMigrations);
158158
break;
159159
case DatabaseProviderType.MySql:
160-
services.RegisterMySqlDbContexts<TIdentityDbContext, TConfigurationDbContext, TPersistedGrantDbContext, TLogDbContext, TAuditLoggingDbContext, TDataProtectionDbContext>(connectionStrings, databaseMigrations);
160+
services.RegisterMySqlDbContexts<TIdentityDbContext, TConfigurationDbContext, TPersistedGrantDbContext, TLogDbContext, TAuditLoggingDbContext, TDataProtectionDbContext, TAuditLog>(connectionStrings, databaseMigrations);
161161
break;
162162
default:
163163
throw new ArgumentOutOfRangeException(nameof(databaseProvider.ProviderType), $@"The value needs to be one of {string.Join(", ", Enum.GetNames(typeof(DatabaseProviderType)))}.");

‎src/Skoruba.IdentityServer4.Admin.Api/Program.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using Microsoft.Extensions.Configuration;
55
using Microsoft.Extensions.Hosting;
66
using Serilog;
7-
using Skoruba.IdentityServer4.Shared.Helpers;
7+
using Skoruba.IdentityServer4.Shared.Configuration.Helpers;
88

99
namespace Skoruba.IdentityServer4.Admin.Api
1010
{

‎src/Skoruba.IdentityServer4.Admin.Api/Skoruba.IdentityServer4.Admin.Api.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
<ProjectReference Include="..\Skoruba.IdentityServer4.Admin.EntityFramework.PostgreSQL\Skoruba.IdentityServer4.Admin.EntityFramework.PostgreSQL.csproj" />
5555
<ProjectReference Include="..\Skoruba.IdentityServer4.Admin.EntityFramework.Shared\Skoruba.IdentityServer4.Admin.EntityFramework.Shared.csproj" />
5656
<ProjectReference Include="..\Skoruba.IdentityServer4.Admin.EntityFramework.SqlServer\Skoruba.IdentityServer4.Admin.EntityFramework.SqlServer.csproj" />
57+
<ProjectReference Include="..\Skoruba.IdentityServer4.Shared.Configuration\Skoruba.IdentityServer4.Shared.Configuration.csproj" />
5758
<ProjectReference Include="..\Skoruba.IdentityServer4.Shared\Skoruba.IdentityServer4.Shared.csproj" />
5859
</ItemGroup>
5960

‎src/Skoruba.IdentityServer4.Admin.Api/Startup.cs

+2-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22
using System.Collections.Generic;
33
using HealthChecks.UI.Client;
44
using Microsoft.AspNetCore.Builder;
5-
using Microsoft.AspNetCore.DataProtection;
65
using Microsoft.AspNetCore.Diagnostics.HealthChecks;
76
using Microsoft.AspNetCore.Hosting;
8-
using Microsoft.AspNetCore.HttpOverrides;
97
using Microsoft.Extensions.Configuration;
108
using Microsoft.Extensions.DependencyInjection;
119
using Microsoft.Extensions.Hosting;
@@ -19,9 +17,9 @@
1917
using Skoruba.IdentityServer4.Admin.Api.Resources;
2018
using Skoruba.IdentityServer4.Admin.EntityFramework.Shared.DbContexts;
2119
using Skoruba.IdentityServer4.Admin.EntityFramework.Shared.Entities.Identity;
20+
using Skoruba.IdentityServer4.Shared.Configuration.Helpers;
2221
using Skoruba.IdentityServer4.Shared.Dtos;
2322
using Skoruba.IdentityServer4.Shared.Dtos.Identity;
24-
using Skoruba.IdentityServer4.Shared.Helpers;
2523

2624
namespace Skoruba.IdentityServer4.Admin.Api
2725
{
@@ -144,7 +142,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, AdminApi
144142

145143
public virtual void RegisterDbContexts(IServiceCollection services)
146144
{
147-
services.AddDbContexts<AdminIdentityDbContext, IdentityServerConfigurationDbContext, IdentityServerPersistedGrantDbContext, AdminLogDbContext, AdminAuditLogDbContext, IdentityServerDataProtectionDbContext>(Configuration);
145+
services.AddDbContexts<AdminIdentityDbContext, IdentityServerConfigurationDbContext, IdentityServerPersistedGrantDbContext, AdminLogDbContext, AdminAuditLogDbContext, IdentityServerDataProtectionDbContext, AuditLog>(Configuration);
148146
}
149147

150148
public virtual void RegisterAuthentication(IServiceCollection services)

‎src/Skoruba.IdentityServer4.Admin.EntityFramework.Shared/Configuration/ConnectionStringsConfiguration.cs ‎src/Skoruba.IdentityServer4.Admin.EntityFramework.Configuration/Configuration/ConnectionStringsConfiguration.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace Skoruba.IdentityServer4.Admin.EntityFramework.Shared.Configuration
1+
namespace Skoruba.IdentityServer4.Admin.EntityFramework.Configuration.Configuration
22
{
33
public class ConnectionStringsConfiguration
44
{

‎src/Skoruba.IdentityServer4.Admin.EntityFramework.Shared/Configuration/DatabaseMigrationsConfiguration.cs ‎src/Skoruba.IdentityServer4.Admin.EntityFramework.Configuration/Configuration/DatabaseMigrationsConfiguration.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace Skoruba.IdentityServer4.Admin.EntityFramework.Shared.Configuration
1+
namespace Skoruba.IdentityServer4.Admin.EntityFramework.Configuration.Configuration
22
{
33
public class DatabaseMigrationsConfiguration
44
{

‎src/Skoruba.IdentityServer4.Admin.EntityFramework.Shared/Configuration/DatabaseProviderConfiguration.cs ‎src/Skoruba.IdentityServer4.Admin.EntityFramework.Configuration/Configuration/DatabaseProviderConfiguration.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace Skoruba.IdentityServer4.Admin.EntityFramework.Shared.Configuration
1+
namespace Skoruba.IdentityServer4.Admin.EntityFramework.Configuration.Configuration
22
{
33
public class DatabaseProviderConfiguration
44
{

‎src/Skoruba.IdentityServer4.Admin.EntityFramework.Shared/Configuration/DatabaseProviderType.cs ‎src/Skoruba.IdentityServer4.Admin.EntityFramework.Configuration/Configuration/DatabaseProviderType.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace Skoruba.IdentityServer4.Admin.EntityFramework.Shared.Configuration
1+
namespace Skoruba.IdentityServer4.Admin.EntityFramework.Configuration.Configuration
22
{
33
public enum DatabaseProviderType
44
{

‎src/Skoruba.IdentityServer4.Admin.EntityFramework.Shared/Configuration/Identity/Claim.cs ‎src/Skoruba.IdentityServer4.Admin.EntityFramework.Configuration/Configuration/Identity/Claim.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace Skoruba.IdentityServer4.Admin.EntityFramework.Shared.Configuration.Identity
1+
namespace Skoruba.IdentityServer4.Admin.EntityFramework.Configuration.Configuration.Identity
22
{
33
public class Claim
44
{

‎src/Skoruba.IdentityServer4.Admin.EntityFramework.Shared/Configuration/Identity/Role.cs ‎src/Skoruba.IdentityServer4.Admin.EntityFramework.Configuration/Configuration/Identity/Role.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Collections.Generic;
22

3-
namespace Skoruba.IdentityServer4.Admin.EntityFramework.Shared.Configuration.Identity
3+
namespace Skoruba.IdentityServer4.Admin.EntityFramework.Configuration.Configuration.Identity
44
{
55
public class Role
66
{

‎src/Skoruba.IdentityServer4.Admin.EntityFramework.Shared/Configuration/Identity/User.cs ‎src/Skoruba.IdentityServer4.Admin.EntityFramework.Configuration/Configuration/Identity/User.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Collections.Generic;
22

3-
namespace Skoruba.IdentityServer4.Admin.EntityFramework.Shared.Configuration.Identity
3+
namespace Skoruba.IdentityServer4.Admin.EntityFramework.Configuration.Configuration.Identity
44
{
55
public class User
66
{

‎src/Skoruba.IdentityServer4.Admin.EntityFramework.Configuration/Configuration/IdentityData.cs

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
using System.Collections.Generic;
2+
using Skoruba.IdentityServer4.Admin.EntityFramework.Configuration.Configuration.Identity;
3+
4+
namespace Skoruba.IdentityServer4.Admin.EntityFramework.Configuration.Configuration
5+
{
6+
public class IdentityData
7+
{
8+
public List<Role> Roles { get; set; }
9+
public List<User> Users { get; set; }
10+
}
11+
}

‎src/Skoruba.IdentityServer4.Admin.EntityFramework.Shared/Configuration/IdentityServer/Client.cs ‎src/Skoruba.IdentityServer4.Admin.EntityFramework.Configuration/Configuration/IdentityServer/Client.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System.Collections.Generic;
2-
using Skoruba.IdentityServer4.Admin.EntityFramework.Shared.Configuration.Identity;
2+
using Skoruba.IdentityServer4.Admin.EntityFramework.Configuration.Configuration.Identity;
33

4-
namespace Skoruba.IdentityServer4.Admin.EntityFramework.Shared.Configuration.IdentityServer
4+
namespace Skoruba.IdentityServer4.Admin.EntityFramework.Configuration.Configuration.IdentityServer
55
{
66
public class Client : global::IdentityServer4.Models.Client
77
{

‎src/Skoruba.IdentityServer4.Admin.EntityFramework.Shared/Configuration/IdentityServerData.cs ‎src/Skoruba.IdentityServer4.Admin.EntityFramework.Configuration/Configuration/IdentityServerData.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
using IdentityServer4.Models;
2-
using System.Collections.Generic;
3-
using Client = Skoruba.IdentityServer4.Admin.EntityFramework.Shared.Configuration.IdentityServer.Client;
1+
using System.Collections.Generic;
2+
using IdentityServer4.Models;
3+
using Client = Skoruba.IdentityServer4.Admin.EntityFramework.Configuration.Configuration.IdentityServer.Client;
44

5-
namespace Skoruba.IdentityServer4.Admin.EntityFramework.Shared.Configuration
5+
namespace Skoruba.IdentityServer4.Admin.EntityFramework.Configuration.Configuration
66
{
77
public class IdentityServerData
88
{

‎src/Skoruba.IdentityServer4.Admin.EntityFramework.Shared/Configuration/SeedConfiguration.cs ‎src/Skoruba.IdentityServer4.Admin.EntityFramework.Configuration/Configuration/SeedConfiguration.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace Skoruba.IdentityServer4.Admin.EntityFramework.Shared.Configuration
1+
namespace Skoruba.IdentityServer4.Admin.EntityFramework.Configuration.Configuration
22
{
33
public class SeedConfiguration
44
{

‎src/Skoruba.IdentityServer4.Admin.EntityFramework.Configuration/Skoruba.IdentityServer4.Admin.EntityFramework.Configuration.csproj

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<Version>2.0.0-rc1</Version>
6+
<Authors>Jan Škoruba</Authors>
7+
<PackageTags>IdentityServer4 Admin OpenIDConnect OAuth2 Identity</PackageTags>
8+
<Description>Entity Framework configuration for the administration of the IdentityServer4 and Asp.Net Core Identity</Description>
9+
<PackageLicenseUrl>https://github.com/skoruba/IdentityServer4.Admin/blob/master/LICENSE.md</PackageLicenseUrl>
10+
<PackageProjectUrl>https://github.com/skoruba/IdentityServer4.Admin</PackageProjectUrl>
11+
<PackageIconUrl>https://raw.githubusercontent.com/skoruba/IdentityServer4.Admin/master/docs/Images/Skoruba.IdentityServer4.Admin-Logo-Nuget.png</PackageIconUrl>
12+
</PropertyGroup>
13+
14+
<ItemGroup>
15+
<PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="3.1.9" />
16+
<PackageReference Include="Skoruba.AuditLogging.EntityFramework" Version="1.0.0" />
17+
</ItemGroup>
18+
19+
<ItemGroup>
20+
<ProjectReference Include="..\Skoruba.IdentityServer4.Admin.EntityFramework.Identity\Skoruba.IdentityServer4.Admin.EntityFramework.Identity.csproj" />
21+
<ProjectReference Include="..\Skoruba.IdentityServer4.Admin.EntityFramework\Skoruba.IdentityServer4.Admin.EntityFramework.csproj" />
22+
</ItemGroup>
23+
24+
</Project>

‎src/Skoruba.IdentityServer4.Admin.EntityFramework.MySql/Extensions/DatabaseExtensions.cs

+10-8
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
using Microsoft.Extensions.DependencyInjection;
66
using Skoruba.AuditLogging.EntityFramework.DbContexts;
77
using Skoruba.AuditLogging.EntityFramework.Entities;
8+
using Skoruba.IdentityServer4.Admin.EntityFramework.Configuration.Configuration;
89
using Skoruba.IdentityServer4.Admin.EntityFramework.Interfaces;
9-
using Skoruba.IdentityServer4.Admin.EntityFramework.Shared.Configuration;
1010

1111
namespace Skoruba.IdentityServer4.Admin.EntityFramework.MySql.Extensions
1212
{
@@ -21,22 +21,22 @@ public static class DatabaseExtensions
2121
/// <typeparam name="TLogDbContext"></typeparam>
2222
/// <typeparam name="TIdentityDbContext"></typeparam>
2323
/// <typeparam name="TAuditLoggingDbContext"></typeparam>
24+
/// <typeparam name="TDataProtectionDbContext"></typeparam>
25+
/// <typeparam name="TAuditLog"></typeparam>
2426
/// <param name="services"></param>
25-
/// <param name="identityConnectionString"></param>
26-
/// <param name="configurationConnectionString"></param>
27-
/// <param name="persistedGrantConnectionString"></param>
28-
/// <param name="errorLoggingConnectionString"></param>
29-
/// <param name="auditLoggingConnectionString"></param>
27+
/// <param name="connectionStrings"></param>
28+
/// <param name="databaseMigrations"></param>
3029
public static void RegisterMySqlDbContexts<TIdentityDbContext, TConfigurationDbContext,
31-
TPersistedGrantDbContext, TLogDbContext, TAuditLoggingDbContext, TDataProtectionDbContext>(this IServiceCollection services,
30+
TPersistedGrantDbContext, TLogDbContext, TAuditLoggingDbContext, TDataProtectionDbContext, TAuditLog>(this IServiceCollection services,
3231
ConnectionStringsConfiguration connectionStrings,
3332
DatabaseMigrationsConfiguration databaseMigrations)
3433
where TIdentityDbContext : DbContext
3534
where TPersistedGrantDbContext : DbContext, IAdminPersistedGrantDbContext
3635
where TConfigurationDbContext : DbContext, IAdminConfigurationDbContext
3736
where TLogDbContext : DbContext, IAdminLogDbContext
38-
where TAuditLoggingDbContext : DbContext, IAuditLoggingDbContext<AuditLog>
37+
where TAuditLoggingDbContext : DbContext, IAuditLoggingDbContext<TAuditLog>
3938
where TDataProtectionDbContext : DbContext, IDataProtectionKeyContext
39+
where TAuditLog : AuditLog
4040
{
4141
var migrationsAssembly = typeof(DatabaseExtensions).GetTypeInfo().Assembly.GetName().Name;
4242

@@ -74,10 +74,12 @@ public static class DatabaseExtensions
7474
/// <typeparam name="TConfigurationDbContext"></typeparam>
7575
/// <typeparam name="TPersistedGrantDbContext"></typeparam>
7676
/// <typeparam name="TIdentityDbContext"></typeparam>
77+
/// <typeparam name="TDataProtectionDbContext"></typeparam>
7778
/// <param name="services"></param>
7879
/// <param name="identityConnectionString"></param>
7980
/// <param name="configurationConnectionString"></param>
8081
/// <param name="persistedGrantConnectionString"></param>
82+
/// <param name="dataProtectionConnectionString"></param>
8183
public static void RegisterMySqlDbContexts<TIdentityDbContext, TConfigurationDbContext,
8284
TPersistedGrantDbContext, TDataProtectionDbContext>(this IServiceCollection services,
8385
string identityConnectionString, string configurationConnectionString,

‎src/Skoruba.IdentityServer4.Admin.EntityFramework.MySql/Skoruba.IdentityServer4.Admin.EntityFramework.MySql.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21+
<ProjectReference Include="..\Skoruba.IdentityServer4.Admin.EntityFramework.Configuration\Skoruba.IdentityServer4.Admin.EntityFramework.Configuration.csproj" />
2122
<ProjectReference Include="..\Skoruba.IdentityServer4.Admin.EntityFramework.Identity\Skoruba.IdentityServer4.Admin.EntityFramework.Identity.csproj" />
22-
<ProjectReference Include="..\Skoruba.IdentityServer4.Admin.EntityFramework.Shared\Skoruba.IdentityServer4.Admin.EntityFramework.Shared.csproj" />
2323
<ProjectReference Include="..\Skoruba.IdentityServer4.Admin.EntityFramework\Skoruba.IdentityServer4.Admin.EntityFramework.csproj" />
2424
</ItemGroup>
2525

0 commit comments

Comments
 (0)