Extract UI project for use in existing setups (v2)

.gitignore

@@ -275,9 +275,9 @@ __pycache__/
 /src/Skoruba.IdentityServer4.Admin/Data/Migrations/
 
 # Don't ignore these log folders
-!/src/Skoruba.IdentityServer4.Admin/Resources/Views/Log/
+!/src/Skoruba.IdentityServer4.Admin.UI/Resources/Views/Log/
 !/src/Skoruba.IdentityServer4.Admin.BusinessLogic/Dtos/Log/
-!/src/Skoruba.IdentityServer4.Admin/Views/Log/
+!**/Views/Log/
 !/src/Skoruba.IdentityServer4.Admin.BusinessLogic/Events/Log/
 /src/Skoruba.IdentityServer4.Admin.Api/appsettings.Production.json
 

Skoruba.IdentityServer4.Admin.sln

@@ -51,6 +51,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Skoruba.IdentityServer4.Adm
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Skoruba.IdentityServer4.Shared", "src\Skoruba.IdentityServer4.Shared\Skoruba.IdentityServer4.Shared.csproj", "{61B285F0-EE06-4AEE-AAF3-71492CBD11C5}"
 EndProject
+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}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -133,6 +135,10 @@ Global
 		{61B285F0-EE06-4AEE-AAF3-71492CBD11C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{61B285F0-EE06-4AEE-AAF3-71492CBD11C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{61B285F0-EE06-4AEE-AAF3-71492CBD11C5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6DD24C2C-0FB5-4C37-8B42-5DACA0FDE4EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6DD24C2C-0FB5-4C37-8B42-5DACA0FDE4EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6DD24C2C-0FB5-4C37-8B42-5DACA0FDE4EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6DD24C2C-0FB5-4C37-8B42-5DACA0FDE4EC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -156,6 +162,7 @@ Global
 		{0A8A0DB7-0509-4DFB-9201-74398511B481} = {2A514C8F-6A53-41CA-AB41-B644E7BC92A7}
 		{4D123ACB-ACBD-4E40-AE6B-1B0F79D703B0} = {0BC0CC4E-A0F1-45E8-B41A-AE0FA76BF3E5}
 		{61B285F0-EE06-4AEE-AAF3-71492CBD11C5} = {EE588CE5-51D0-4E98-A2B3-40EC8E655931}
+		{6DD24C2C-0FB5-4C37-8B42-5DACA0FDE4EC} = {588205D4-3A30-4DA4-849D-C7422C396DAA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B3166EDE-037B-4C68-BEBA-5DE9C5E3DB82}

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

@@ -145,24 +145,19 @@ public static IServiceCollection AddAdminApiCors(this IServiceCollection service
             where TDataProtectionDbContext : DbContext, IDataProtectionKeyContext
         {
             var databaseProvider = configuration.GetSection(nameof(DatabaseProviderConfiguration)).Get<DatabaseProviderConfiguration>();
-
-            var identityConnectionString = configuration.GetConnectionString(ConfigurationConsts.IdentityDbConnectionStringKey);
-            var configurationConnectionString = configuration.GetConnectionString(ConfigurationConsts.ConfigurationDbConnectionStringKey);
-            var persistedGrantsConnectionString = configuration.GetConnectionString(ConfigurationConsts.PersistedGrantDbConnectionStringKey);
-            var errorLoggingConnectionString = configuration.GetConnectionString(ConfigurationConsts.AdminLogDbConnectionStringKey);
-            var auditLoggingConnectionString = configuration.GetConnectionString(ConfigurationConsts.AdminAuditLogDbConnectionStringKey);
-            var dataProtectionConnectionString = configuration.GetConnectionString(ConfigurationConsts.DataProtectionDbConnectionStringKey);
+            var databaseMigrations = configuration.GetSection(nameof(DatabaseMigrationsConfiguration)).Get<DatabaseMigrationsConfiguration>() ?? new DatabaseMigrationsConfiguration();
+            var connectionStrings = configuration.GetSection("ConnectionStrings").Get<ConnectionStringsConfiguration>();
 
             switch (databaseProvider.ProviderType)
             {
                 case DatabaseProviderType.SqlServer:
-                    services.RegisterSqlServerDbContexts<TIdentityDbContext, TConfigurationDbContext, TPersistedGrantDbContext, TLogDbContext, TAuditLoggingDbContext, TDataProtectionDbContext>(identityConnectionString, configurationConnectionString, persistedGrantsConnectionString, errorLoggingConnectionString, auditLoggingConnectionString, dataProtectionConnectionString);
+                    services.RegisterSqlServerDbContexts<TIdentityDbContext, TConfigurationDbContext, TPersistedGrantDbContext, TLogDbContext, TAuditLoggingDbContext, TDataProtectionDbContext>(connectionStrings, databaseMigrations);
                     break;
                 case DatabaseProviderType.PostgreSQL:
-                    services.RegisterNpgSqlDbContexts<TIdentityDbContext, TConfigurationDbContext, TPersistedGrantDbContext, TLogDbContext, TAuditLoggingDbContext, TDataProtectionDbContext>(identityConnectionString, configurationConnectionString, persistedGrantsConnectionString, errorLoggingConnectionString, auditLoggingConnectionString, dataProtectionConnectionString);
+                    services.RegisterNpgSqlDbContexts<TIdentityDbContext, TConfigurationDbContext, TPersistedGrantDbContext, TLogDbContext, TAuditLoggingDbContext, TDataProtectionDbContext>(connectionStrings, databaseMigrations);
                     break;
                 case DatabaseProviderType.MySql:
-                    services.RegisterMySqlDbContexts<TIdentityDbContext, TConfigurationDbContext, TPersistedGrantDbContext, TLogDbContext, TAuditLoggingDbContext, TDataProtectionDbContext>(identityConnectionString, configurationConnectionString, persistedGrantsConnectionString, errorLoggingConnectionString, auditLoggingConnectionString, dataProtectionConnectionString);
+                    services.RegisterMySqlDbContexts<TIdentityDbContext, TConfigurationDbContext, TPersistedGrantDbContext, TLogDbContext, TAuditLoggingDbContext, TDataProtectionDbContext>(connectionStrings, databaseMigrations);
                     break;
                 default:
                     throw new ArgumentOutOfRangeException(nameof(databaseProvider.ProviderType), $@"The value needs to be one of {string.Join(", ", Enum.GetNames(typeof(DatabaseProviderType)))}.");

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

@@ -6,6 +6,7 @@
 using Skoruba.AuditLogging.EntityFramework.DbContexts;
 using Skoruba.AuditLogging.EntityFramework.Entities;
 using Skoruba.IdentityServer4.Admin.EntityFramework.Interfaces;
+using Skoruba.IdentityServer4.Admin.EntityFramework.Shared.Configuration;
 
 namespace Skoruba.IdentityServer4.Admin.EntityFramework.MySql.Extensions
 {
@@ -28,9 +29,8 @@ public static class DatabaseExtensions
         /// <param name="auditLoggingConnectionString"></param>
         public static void RegisterMySqlDbContexts<TIdentityDbContext, TConfigurationDbContext,
             TPersistedGrantDbContext, TLogDbContext, TAuditLoggingDbContext, TDataProtectionDbContext>(this IServiceCollection services,
-            string identityConnectionString, string configurationConnectionString,
-            string persistedGrantConnectionString, string errorLoggingConnectionString,
-            string auditLoggingConnectionString, string dataProtectionConnectionString = null)
+            ConnectionStringsConfiguration connectionStrings,
+            DatabaseMigrationsConfiguration databaseMigrations)
             where TIdentityDbContext : DbContext
             where TPersistedGrantDbContext : DbContext, IAdminPersistedGrantDbContext
             where TConfigurationDbContext : DbContext, IAdminConfigurationDbContext
@@ -42,29 +42,29 @@ public static class DatabaseExtensions
 
             // Config DB for identity
             services.AddDbContext<TIdentityDbContext>(options =>
-                options.UseMySql(identityConnectionString, sql => sql.MigrationsAssembly(migrationsAssembly)));
+                options.UseMySql(connectionStrings.IdentityDbConnection, sql => sql.MigrationsAssembly(databaseMigrations.IdentityDbMigrationsAssembly ?? migrationsAssembly)));
 
             // Config DB from existing connection
             services.AddConfigurationDbContext<TConfigurationDbContext>(options =>
                 options.ConfigureDbContext = b =>
-                    b.UseMySql(configurationConnectionString, sql => sql.MigrationsAssembly(migrationsAssembly)));
+                    b.UseMySql(connectionStrings.ConfigurationDbConnection, sql => sql.MigrationsAssembly(databaseMigrations.ConfigurationDbMigrationsAssembly ?? migrationsAssembly)));
 
             // Operational DB from existing connection
             services.AddOperationalDbContext<TPersistedGrantDbContext>(options => options.ConfigureDbContext = b =>
-                b.UseMySql(persistedGrantConnectionString, sql => sql.MigrationsAssembly(migrationsAssembly)));
+                b.UseMySql(connectionStrings.PersistedGrantDbConnection, sql => sql.MigrationsAssembly(databaseMigrations.PersistedGrantDbMigrationsAssembly ?? migrationsAssembly)));
 
             // Log DB from existing connection
-            services.AddDbContext<TLogDbContext>(options => options.UseMySql(errorLoggingConnectionString,
-                optionsSql => optionsSql.MigrationsAssembly(migrationsAssembly)));
+            services.AddDbContext<TLogDbContext>(options => options.UseMySql(connectionStrings.AdminLogDbConnection,
+                optionsSql => optionsSql.MigrationsAssembly(databaseMigrations.AdminLogDbMigrationsAssembly ?? migrationsAssembly)));
 
             // Audit logging connection
-            services.AddDbContext<TAuditLoggingDbContext>(options => options.UseMySql(auditLoggingConnectionString,
-                optionsSql => optionsSql.MigrationsAssembly(migrationsAssembly)));
+            services.AddDbContext<TAuditLoggingDbContext>(options => options.UseMySql(connectionStrings.AdminAuditLogDbConnection,
+                optionsSql => optionsSql.MigrationsAssembly(databaseMigrations.AdminAuditLogDbMigrationsAssembly ?? migrationsAssembly)));
 
             // DataProtectionKey DB from existing connection
-            if(!string.IsNullOrEmpty(dataProtectionConnectionString))
-                services.AddDbContext<TDataProtectionDbContext>(options => options.UseMySql(dataProtectionConnectionString,
-                    optionsSql => optionsSql.MigrationsAssembly(migrationsAssembly)));
+            if(!string.IsNullOrEmpty(connectionStrings.DataProtectionDbConnection))
+                services.AddDbContext<TDataProtectionDbContext>(options => options.UseMySql(connectionStrings.DataProtectionDbConnection,
+                    optionsSql => optionsSql.MigrationsAssembly(databaseMigrations.DataProtectionDbMigrationsAssembly ?? migrationsAssembly)));
         }
 
         /// <summary>

src/Skoruba.IdentityServer4.Admin.EntityFramework.PostgreSQL/Extensions/DatabaseExtensions.cs

@@ -7,6 +7,7 @@
 using Skoruba.AuditLogging.EntityFramework.DbContexts;
 using Skoruba.AuditLogging.EntityFramework.Entities;
 using Skoruba.IdentityServer4.Admin.EntityFramework.Interfaces;
+using Skoruba.IdentityServer4.Admin.EntityFramework.Shared.Configuration;
 
 namespace Skoruba.IdentityServer4.Admin.EntityFramework.PostgreSQL.Extensions
 {
@@ -29,9 +30,8 @@ public static class DatabaseExtensions
         /// <param name="auditLoggingConnectionString"></param>
         public static void RegisterNpgSqlDbContexts<TIdentityDbContext, TConfigurationDbContext,
             TPersistedGrantDbContext, TLogDbContext, TAuditLoggingDbContext, TDataProtectionDbContext>(this IServiceCollection services,
-            string identityConnectionString, string configurationConnectionString,
-            string persistedGrantConnectionString, string errorLoggingConnectionString,
-            string auditLoggingConnectionString, string dataProtectionConnectionString = null)
+            ConnectionStringsConfiguration connectionStrings,
+            DatabaseMigrationsConfiguration databaseMigrations)
             where TIdentityDbContext : DbContext
             where TPersistedGrantDbContext : DbContext, IAdminPersistedGrantDbContext
             where TConfigurationDbContext : DbContext, IAdminConfigurationDbContext
@@ -43,28 +43,28 @@ public static class DatabaseExtensions
 
             // Config DB for identity
             services.AddDbContext<TIdentityDbContext>(options =>
-                options.UseNpgsql(identityConnectionString, sql => sql.MigrationsAssembly(migrationsAssembly)));
+                options.UseNpgsql(connectionStrings.IdentityDbConnection, sql => sql.MigrationsAssembly(databaseMigrations.IdentityDbMigrationsAssembly ?? migrationsAssembly)));
 
             // Config DB from existing connection
             services.AddConfigurationDbContext<TConfigurationDbContext>(options =>
                 options.ConfigureDbContext = b =>
-                    b.UseNpgsql(configurationConnectionString, sql => sql.MigrationsAssembly(migrationsAssembly)));
+                    b.UseNpgsql(connectionStrings.ConfigurationDbConnection, sql => sql.MigrationsAssembly(databaseMigrations.ConfigurationDbMigrationsAssembly ?? migrationsAssembly)));
 
             // Operational DB from existing connection
             services.AddOperationalDbContext<TPersistedGrantDbContext>(options => options.ConfigureDbContext = b =>
-                b.UseNpgsql(persistedGrantConnectionString, sql => sql.MigrationsAssembly(migrationsAssembly)));
+                b.UseNpgsql(connectionStrings.PersistedGrantDbConnection, sql => sql.MigrationsAssembly(databaseMigrations.PersistedGrantDbMigrationsAssembly ?? migrationsAssembly)));
 
             // Log DB from existing connection
-            services.AddDbContext<TLogDbContext>(options => options.UseNpgsql(errorLoggingConnectionString,
-                optionsSql => optionsSql.MigrationsAssembly(migrationsAssembly)));
+            services.AddDbContext<TLogDbContext>(options => options.UseNpgsql(connectionStrings.AdminLogDbConnection,
+                optionsSql => optionsSql.MigrationsAssembly(databaseMigrations.AdminLogDbMigrationsAssembly ?? migrationsAssembly)));
 
             // Audit logging connection
-            services.AddDbContext<TAuditLoggingDbContext>(options => options.UseNpgsql(auditLoggingConnectionString,
-                optionsSql => optionsSql.MigrationsAssembly(migrationsAssembly)));
+            services.AddDbContext<TAuditLoggingDbContext>(options => options.UseNpgsql(connectionStrings.AdminAuditLogDbConnection,
+                optionsSql => optionsSql.MigrationsAssembly(databaseMigrations.AdminAuditLogDbMigrationsAssembly ?? migrationsAssembly)));
 
             // DataProtectionKey DB from existing connection
-            if (!string.IsNullOrEmpty(dataProtectionConnectionString))
-                services.AddDbContext<TDataProtectionDbContext>(options => options.UseNpgsql(dataProtectionConnectionString, sql => sql.MigrationsAssembly(migrationsAssembly)));
+            if (!string.IsNullOrEmpty(connectionStrings.DataProtectionDbConnection))
+                services.AddDbContext<TDataProtectionDbContext>(options => options.UseNpgsql(connectionStrings.DataProtectionDbConnection, sql => sql.MigrationsAssembly(databaseMigrations.DataProtectionDbMigrationsAssembly ?? migrationsAssembly)));
         }
 
         /// <summary>

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

@@ -0,0 +1,27 @@
+namespace Skoruba.IdentityServer4.Admin.EntityFramework.Shared.Configuration
+{
+	public class ConnectionStringsConfiguration
+	{
+		public string ConfigurationDbConnection { get; set; }
+
+		public string PersistedGrantDbConnection { get; set; }
+
+		public string AdminLogDbConnection { get; set; }
+
+		public string IdentityDbConnection { get; set; }
+
+		public string AdminAuditLogDbConnection { get; set; }
+
+		public string DataProtectionDbConnection { get; set; }
+
+		public void SetConnections(string commonConnectionString)
+		{
+			AdminAuditLogDbConnection = commonConnectionString;
+			AdminLogDbConnection = commonConnectionString;
+			ConfigurationDbConnection = commonConnectionString;
+			DataProtectionDbConnection = commonConnectionString;
+			IdentityDbConnection = commonConnectionString;
+			PersistedGrantDbConnection = commonConnectionString;
+		}
+	}
+}

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

@@ -0,0 +1,29 @@
+namespace Skoruba.IdentityServer4.Admin.EntityFramework.Shared.Configuration
+{
+    public class DatabaseMigrationsConfiguration
+    {
+        public bool ApplyDatabaseMigrations { get; set; } = false;
+
+		public string ConfigurationDbMigrationsAssembly { get; set; }
+
+		public string PersistedGrantDbMigrationsAssembly { get; set; }
+
+		public string AdminLogDbMigrationsAssembly { get; set; }
+
+		public string IdentityDbMigrationsAssembly { get; set; }
+
+		public string AdminAuditLogDbMigrationsAssembly { get; set; }
+
+		public string DataProtectionDbMigrationsAssembly { get; set; }
+
+		public void SetMigrationsAssemblies(string commonMigrationsAssembly)
+		{
+			AdminAuditLogDbMigrationsAssembly = commonMigrationsAssembly;
+			AdminLogDbMigrationsAssembly = commonMigrationsAssembly;
+			ConfigurationDbMigrationsAssembly = commonMigrationsAssembly;
+			DataProtectionDbMigrationsAssembly = commonMigrationsAssembly;
+			IdentityDbMigrationsAssembly = commonMigrationsAssembly;
+			PersistedGrantDbMigrationsAssembly = commonMigrationsAssembly;
+		}
+	}
+}

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

@@ -1,4 +1,4 @@
-namespace Skoruba.IdentityServer4.Admin.Configuration.Identity
+namespace Skoruba.IdentityServer4.Admin.EntityFramework.Shared.Configuration.Identity
 {
     public class Claim
     {

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

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Skoruba.IdentityServer4.Admin.Configuration.Identity
+namespace Skoruba.IdentityServer4.Admin.EntityFramework.Shared.Configuration.Identity
 {
     public class Role
     {

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

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Skoruba.IdentityServer4.Admin.Configuration.Identity
+namespace Skoruba.IdentityServer4.Admin.EntityFramework.Shared.Configuration.Identity
 {
     public class User
     {

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

@@ -0,0 +1,11 @@
+using Skoruba.IdentityServer4.Admin.EntityFramework.Shared.Configuration.Identity;
+using System.Collections.Generic;
+
+namespace Skoruba.IdentityServer4.Admin.EntityFramework.Shared.Configuration
+{
+	public class IdentityData
+    {
+       public List<Role> Roles { get; set; }
+       public List<User> Users { get; set; }
+    }
+}

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

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
-using Skoruba.IdentityServer4.Admin.Configuration.Identity;
+using Skoruba.IdentityServer4.Admin.EntityFramework.Shared.Configuration.Identity;
 
-namespace Skoruba.IdentityServer4.Admin.Configuration.IdentityServer
+namespace Skoruba.IdentityServer4.Admin.EntityFramework.Shared.Configuration.IdentityServer
 {
     public class Client : global::IdentityServer4.Models.Client
     {

src/Skoruba.IdentityServer4.Admin/Configuration/IdentityServerDataConfiguration.cs → src/Skoruba.IdentityServer4.Admin.EntityFramework.Shared/Configuration/IdentityServerData.cs

@@ -1,10 +1,10 @@
 using IdentityServer4.Models;
 using System.Collections.Generic;
-using Client = Skoruba.IdentityServer4.Admin.Configuration.IdentityServer.Client;
+using Client = Skoruba.IdentityServer4.Admin.EntityFramework.Shared.Configuration.IdentityServer.Client;
 
-namespace Skoruba.IdentityServer4.Admin.Configuration
+namespace Skoruba.IdentityServer4.Admin.EntityFramework.Shared.Configuration
 {
-    public class IdentityServerDataConfiguration
+    public class IdentityServerData
     {
         public List<Client> Clients { get; set; } = new List<Client>();
         public List<IdentityResource> IdentityResources { get; set; } = new List<IdentityResource>();

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

@@ -1,4 +1,4 @@
-namespace Skoruba.IdentityServer4.Admin.Configuration
+namespace Skoruba.IdentityServer4.Admin.EntityFramework.Shared.Configuration
 {
     public class SeedConfiguration
     {