Skip to content

Commit 7d8f493

Browse files
Brice-xCITskoruba
Brice-xCIT
and
skoruba
authored
Extract UI project for use in existing setups (v2) (#779)
* Update README * Moved UI folders and files to new Admin.UI project * Fixed application version page can no longer refer to Startup type for detecting assembly version * Fixed build of Admin project that now depends on UI project * Extracted UI-specific startup helpers and classes into UI project * Removed bogus project dependency * Removed now unused namespace imports in map app startup helpers * Moved styles and scripts and more helpers to UI project * Moved back root configuration to Admin app because database migration and seeding is probably out of scope of UI * Moved startup service configuration to UI project through dependency injection helpers * Moved back one constant unrelated to UI into main project * Refactored UI project namespaces for consistency * Fixed some build issues * Stub for app builder extensions for UI project * Fixed test project build * Moved security headers feature to UI project * Moved startup app building to UI project * Fixed authorization middleware setup * Fixed UI view build * Fixed views cannot be resolved * Fixed static assets not accessible from root URL (e.g. ~/) * Cleaned up startup * Added convenience DI extensions for setting up UI * Cleaned up startup test * Moved migration helpers to UI project * Support for custom migration assemblies * Moved migration helpers and config down to EntityFramework.Shared * Fixed build and tests * Fixed DI UI helper not using custom entity types completely * Moved UI config json files to UI project * Disabled unused code in startup * Minor code style * Fixed view localization of UI failing when used in custom web app project * Refactored middleware configuration to simplify usage of Use* methods in Startup * Added configuration of health checks middleware * Options to further configure the auth pipelines, and better separation of endpoint routing * Ported UI to area * Fixed test build * Fixed seeding not working due to missing configuration bind * Fixed missing new views after merge * Fixed missing areas in new views * Fixed test build Co-authored-by: janskoruba <[email protected]>
1 parent e2a5968 commit 7d8f493

File tree

1,104 files changed

+1262
-746
lines changed

Some content is hidden

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

1,104 files changed

+1262
-746
lines changed

‎.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,9 +275,9 @@ __pycache__/
275275
/src/Skoruba.IdentityServer4.Admin/Data/Migrations/
276276

277277
# Don't ignore these log folders
278-
!/src/Skoruba.IdentityServer4.Admin/Resources/Views/Log/
278+
!/src/Skoruba.IdentityServer4.Admin.UI/Resources/Views/Log/
279279
!/src/Skoruba.IdentityServer4.Admin.BusinessLogic/Dtos/Log/
280-
!/src/Skoruba.IdentityServer4.Admin/Views/Log/
280+
!**/Views/Log/
281281
!/src/Skoruba.IdentityServer4.Admin.BusinessLogic/Events/Log/
282282
/src/Skoruba.IdentityServer4.Admin.Api/appsettings.Production.json
283283

‎Skoruba.IdentityServer4.Admin.sln

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Skoruba.IdentityServer4.Adm
5151
EndProject
5252
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Skoruba.IdentityServer4.Shared", "src\Skoruba.IdentityServer4.Shared\Skoruba.IdentityServer4.Shared.csproj", "{61B285F0-EE06-4AEE-AAF3-71492CBD11C5}"
5353
EndProject
54+
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}"
55+
EndProject
5456
Global
5557
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5658
Debug|Any CPU = Debug|Any CPU
@@ -133,6 +135,10 @@ Global
133135
{61B285F0-EE06-4AEE-AAF3-71492CBD11C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
134136
{61B285F0-EE06-4AEE-AAF3-71492CBD11C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
135137
{61B285F0-EE06-4AEE-AAF3-71492CBD11C5}.Release|Any CPU.Build.0 = Release|Any CPU
138+
{6DD24C2C-0FB5-4C37-8B42-5DACA0FDE4EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
139+
{6DD24C2C-0FB5-4C37-8B42-5DACA0FDE4EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
140+
{6DD24C2C-0FB5-4C37-8B42-5DACA0FDE4EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
141+
{6DD24C2C-0FB5-4C37-8B42-5DACA0FDE4EC}.Release|Any CPU.Build.0 = Release|Any CPU
136142
EndGlobalSection
137143
GlobalSection(SolutionProperties) = preSolution
138144
HideSolutionNode = FALSE
@@ -156,6 +162,7 @@ Global
156162
{0A8A0DB7-0509-4DFB-9201-74398511B481} = {2A514C8F-6A53-41CA-AB41-B644E7BC92A7}
157163
{4D123ACB-ACBD-4E40-AE6B-1B0F79D703B0} = {0BC0CC4E-A0F1-45E8-B41A-AE0FA76BF3E5}
158164
{61B285F0-EE06-4AEE-AAF3-71492CBD11C5} = {EE588CE5-51D0-4E98-A2B3-40EC8E655931}
165+
{6DD24C2C-0FB5-4C37-8B42-5DACA0FDE4EC} = {588205D4-3A30-4DA4-849D-C7422C396DAA}
159166
EndGlobalSection
160167
GlobalSection(ExtensibilityGlobals) = postSolution
161168
SolutionGuid = {B3166EDE-037B-4C68-BEBA-5DE9C5E3DB82}

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

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -145,24 +145,19 @@ public static IServiceCollection AddAdminApiCors(this IServiceCollection service
145145
where TDataProtectionDbContext : DbContext, IDataProtectionKeyContext
146146
{
147147
var databaseProvider = configuration.GetSection(nameof(DatabaseProviderConfiguration)).Get<DatabaseProviderConfiguration>();
148-
149-
var identityConnectionString = configuration.GetConnectionString(ConfigurationConsts.IdentityDbConnectionStringKey);
150-
var configurationConnectionString = configuration.GetConnectionString(ConfigurationConsts.ConfigurationDbConnectionStringKey);
151-
var persistedGrantsConnectionString = configuration.GetConnectionString(ConfigurationConsts.PersistedGrantDbConnectionStringKey);
152-
var errorLoggingConnectionString = configuration.GetConnectionString(ConfigurationConsts.AdminLogDbConnectionStringKey);
153-
var auditLoggingConnectionString = configuration.GetConnectionString(ConfigurationConsts.AdminAuditLogDbConnectionStringKey);
154-
var dataProtectionConnectionString = configuration.GetConnectionString(ConfigurationConsts.DataProtectionDbConnectionStringKey);
148+
var databaseMigrations = configuration.GetSection(nameof(DatabaseMigrationsConfiguration)).Get<DatabaseMigrationsConfiguration>() ?? new DatabaseMigrationsConfiguration();
149+
var connectionStrings = configuration.GetSection("ConnectionStrings").Get<ConnectionStringsConfiguration>();
155150

156151
switch (databaseProvider.ProviderType)
157152
{
158153
case DatabaseProviderType.SqlServer:
159-
services.RegisterSqlServerDbContexts<TIdentityDbContext, TConfigurationDbContext, TPersistedGrantDbContext, TLogDbContext, TAuditLoggingDbContext, TDataProtectionDbContext>(identityConnectionString, configurationConnectionString, persistedGrantsConnectionString, errorLoggingConnectionString, auditLoggingConnectionString, dataProtectionConnectionString);
154+
services.RegisterSqlServerDbContexts<TIdentityDbContext, TConfigurationDbContext, TPersistedGrantDbContext, TLogDbContext, TAuditLoggingDbContext, TDataProtectionDbContext>(connectionStrings, databaseMigrations);
160155
break;
161156
case DatabaseProviderType.PostgreSQL:
162-
services.RegisterNpgSqlDbContexts<TIdentityDbContext, TConfigurationDbContext, TPersistedGrantDbContext, TLogDbContext, TAuditLoggingDbContext, TDataProtectionDbContext>(identityConnectionString, configurationConnectionString, persistedGrantsConnectionString, errorLoggingConnectionString, auditLoggingConnectionString, dataProtectionConnectionString);
157+
services.RegisterNpgSqlDbContexts<TIdentityDbContext, TConfigurationDbContext, TPersistedGrantDbContext, TLogDbContext, TAuditLoggingDbContext, TDataProtectionDbContext>(connectionStrings, databaseMigrations);
163158
break;
164159
case DatabaseProviderType.MySql:
165-
services.RegisterMySqlDbContexts<TIdentityDbContext, TConfigurationDbContext, TPersistedGrantDbContext, TLogDbContext, TAuditLoggingDbContext, TDataProtectionDbContext>(identityConnectionString, configurationConnectionString, persistedGrantsConnectionString, errorLoggingConnectionString, auditLoggingConnectionString, dataProtectionConnectionString);
160+
services.RegisterMySqlDbContexts<TIdentityDbContext, TConfigurationDbContext, TPersistedGrantDbContext, TLogDbContext, TAuditLoggingDbContext, TDataProtectionDbContext>(connectionStrings, databaseMigrations);
166161
break;
167162
default:
168163
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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using Skoruba.AuditLogging.EntityFramework.DbContexts;
77
using Skoruba.AuditLogging.EntityFramework.Entities;
88
using Skoruba.IdentityServer4.Admin.EntityFramework.Interfaces;
9+
using Skoruba.IdentityServer4.Admin.EntityFramework.Shared.Configuration;
910

1011
namespace Skoruba.IdentityServer4.Admin.EntityFramework.MySql.Extensions
1112
{
@@ -28,9 +29,8 @@ public static class DatabaseExtensions
2829
/// <param name="auditLoggingConnectionString"></param>
2930
public static void RegisterMySqlDbContexts<TIdentityDbContext, TConfigurationDbContext,
3031
TPersistedGrantDbContext, TLogDbContext, TAuditLoggingDbContext, TDataProtectionDbContext>(this IServiceCollection services,
31-
string identityConnectionString, string configurationConnectionString,
32-
string persistedGrantConnectionString, string errorLoggingConnectionString,
33-
string auditLoggingConnectionString, string dataProtectionConnectionString = null)
32+
ConnectionStringsConfiguration connectionStrings,
33+
DatabaseMigrationsConfiguration databaseMigrations)
3434
where TIdentityDbContext : DbContext
3535
where TPersistedGrantDbContext : DbContext, IAdminPersistedGrantDbContext
3636
where TConfigurationDbContext : DbContext, IAdminConfigurationDbContext
@@ -42,29 +42,29 @@ public static class DatabaseExtensions
4242

4343
// Config DB for identity
4444
services.AddDbContext<TIdentityDbContext>(options =>
45-
options.UseMySql(identityConnectionString, sql => sql.MigrationsAssembly(migrationsAssembly)));
45+
options.UseMySql(connectionStrings.IdentityDbConnection, sql => sql.MigrationsAssembly(databaseMigrations.IdentityDbMigrationsAssembly ?? migrationsAssembly)));
4646

4747
// Config DB from existing connection
4848
services.AddConfigurationDbContext<TConfigurationDbContext>(options =>
4949
options.ConfigureDbContext = b =>
50-
b.UseMySql(configurationConnectionString, sql => sql.MigrationsAssembly(migrationsAssembly)));
50+
b.UseMySql(connectionStrings.ConfigurationDbConnection, sql => sql.MigrationsAssembly(databaseMigrations.ConfigurationDbMigrationsAssembly ?? migrationsAssembly)));
5151

5252
// Operational DB from existing connection
5353
services.AddOperationalDbContext<TPersistedGrantDbContext>(options => options.ConfigureDbContext = b =>
54-
b.UseMySql(persistedGrantConnectionString, sql => sql.MigrationsAssembly(migrationsAssembly)));
54+
b.UseMySql(connectionStrings.PersistedGrantDbConnection, sql => sql.MigrationsAssembly(databaseMigrations.PersistedGrantDbMigrationsAssembly ?? migrationsAssembly)));
5555

5656
// Log DB from existing connection
57-
services.AddDbContext<TLogDbContext>(options => options.UseMySql(errorLoggingConnectionString,
58-
optionsSql => optionsSql.MigrationsAssembly(migrationsAssembly)));
57+
services.AddDbContext<TLogDbContext>(options => options.UseMySql(connectionStrings.AdminLogDbConnection,
58+
optionsSql => optionsSql.MigrationsAssembly(databaseMigrations.AdminLogDbMigrationsAssembly ?? migrationsAssembly)));
5959

6060
// Audit logging connection
61-
services.AddDbContext<TAuditLoggingDbContext>(options => options.UseMySql(auditLoggingConnectionString,
62-
optionsSql => optionsSql.MigrationsAssembly(migrationsAssembly)));
61+
services.AddDbContext<TAuditLoggingDbContext>(options => options.UseMySql(connectionStrings.AdminAuditLogDbConnection,
62+
optionsSql => optionsSql.MigrationsAssembly(databaseMigrations.AdminAuditLogDbMigrationsAssembly ?? migrationsAssembly)));
6363

6464
// DataProtectionKey DB from existing connection
65-
if(!string.IsNullOrEmpty(dataProtectionConnectionString))
66-
services.AddDbContext<TDataProtectionDbContext>(options => options.UseMySql(dataProtectionConnectionString,
67-
optionsSql => optionsSql.MigrationsAssembly(migrationsAssembly)));
65+
if(!string.IsNullOrEmpty(connectionStrings.DataProtectionDbConnection))
66+
services.AddDbContext<TDataProtectionDbContext>(options => options.UseMySql(connectionStrings.DataProtectionDbConnection,
67+
optionsSql => optionsSql.MigrationsAssembly(databaseMigrations.DataProtectionDbMigrationsAssembly ?? migrationsAssembly)));
6868
}
6969

7070
/// <summary>

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using Skoruba.AuditLogging.EntityFramework.DbContexts;
88
using Skoruba.AuditLogging.EntityFramework.Entities;
99
using Skoruba.IdentityServer4.Admin.EntityFramework.Interfaces;
10+
using Skoruba.IdentityServer4.Admin.EntityFramework.Shared.Configuration;
1011

1112
namespace Skoruba.IdentityServer4.Admin.EntityFramework.PostgreSQL.Extensions
1213
{
@@ -29,9 +30,8 @@ public static class DatabaseExtensions
2930
/// <param name="auditLoggingConnectionString"></param>
3031
public static void RegisterNpgSqlDbContexts<TIdentityDbContext, TConfigurationDbContext,
3132
TPersistedGrantDbContext, TLogDbContext, TAuditLoggingDbContext, TDataProtectionDbContext>(this IServiceCollection services,
32-
string identityConnectionString, string configurationConnectionString,
33-
string persistedGrantConnectionString, string errorLoggingConnectionString,
34-
string auditLoggingConnectionString, string dataProtectionConnectionString = null)
33+
ConnectionStringsConfiguration connectionStrings,
34+
DatabaseMigrationsConfiguration databaseMigrations)
3535
where TIdentityDbContext : DbContext
3636
where TPersistedGrantDbContext : DbContext, IAdminPersistedGrantDbContext
3737
where TConfigurationDbContext : DbContext, IAdminConfigurationDbContext
@@ -43,28 +43,28 @@ public static class DatabaseExtensions
4343

4444
// Config DB for identity
4545
services.AddDbContext<TIdentityDbContext>(options =>
46-
options.UseNpgsql(identityConnectionString, sql => sql.MigrationsAssembly(migrationsAssembly)));
46+
options.UseNpgsql(connectionStrings.IdentityDbConnection, sql => sql.MigrationsAssembly(databaseMigrations.IdentityDbMigrationsAssembly ?? migrationsAssembly)));
4747

4848
// Config DB from existing connection
4949
services.AddConfigurationDbContext<TConfigurationDbContext>(options =>
5050
options.ConfigureDbContext = b =>
51-
b.UseNpgsql(configurationConnectionString, sql => sql.MigrationsAssembly(migrationsAssembly)));
51+
b.UseNpgsql(connectionStrings.ConfigurationDbConnection, sql => sql.MigrationsAssembly(databaseMigrations.ConfigurationDbMigrationsAssembly ?? migrationsAssembly)));
5252

5353
// Operational DB from existing connection
5454
services.AddOperationalDbContext<TPersistedGrantDbContext>(options => options.ConfigureDbContext = b =>
55-
b.UseNpgsql(persistedGrantConnectionString, sql => sql.MigrationsAssembly(migrationsAssembly)));
55+
b.UseNpgsql(connectionStrings.PersistedGrantDbConnection, sql => sql.MigrationsAssembly(databaseMigrations.PersistedGrantDbMigrationsAssembly ?? migrationsAssembly)));
5656

5757
// Log DB from existing connection
58-
services.AddDbContext<TLogDbContext>(options => options.UseNpgsql(errorLoggingConnectionString,
59-
optionsSql => optionsSql.MigrationsAssembly(migrationsAssembly)));
58+
services.AddDbContext<TLogDbContext>(options => options.UseNpgsql(connectionStrings.AdminLogDbConnection,
59+
optionsSql => optionsSql.MigrationsAssembly(databaseMigrations.AdminLogDbMigrationsAssembly ?? migrationsAssembly)));
6060

6161
// Audit logging connection
62-
services.AddDbContext<TAuditLoggingDbContext>(options => options.UseNpgsql(auditLoggingConnectionString,
63-
optionsSql => optionsSql.MigrationsAssembly(migrationsAssembly)));
62+
services.AddDbContext<TAuditLoggingDbContext>(options => options.UseNpgsql(connectionStrings.AdminAuditLogDbConnection,
63+
optionsSql => optionsSql.MigrationsAssembly(databaseMigrations.AdminAuditLogDbMigrationsAssembly ?? migrationsAssembly)));
6464

6565
// DataProtectionKey DB from existing connection
66-
if (!string.IsNullOrEmpty(dataProtectionConnectionString))
67-
services.AddDbContext<TDataProtectionDbContext>(options => options.UseNpgsql(dataProtectionConnectionString, sql => sql.MigrationsAssembly(migrationsAssembly)));
66+
if (!string.IsNullOrEmpty(connectionStrings.DataProtectionDbConnection))
67+
services.AddDbContext<TDataProtectionDbContext>(options => options.UseNpgsql(connectionStrings.DataProtectionDbConnection, sql => sql.MigrationsAssembly(databaseMigrations.DataProtectionDbMigrationsAssembly ?? migrationsAssembly)));
6868
}
6969

7070
/// <summary>

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
namespace Skoruba.IdentityServer4.Admin.EntityFramework.Shared.Configuration
2+
{
3+
public class ConnectionStringsConfiguration
4+
{
5+
public string ConfigurationDbConnection { get; set; }
6+
7+
public string PersistedGrantDbConnection { get; set; }
8+
9+
public string AdminLogDbConnection { get; set; }
10+
11+
public string IdentityDbConnection { get; set; }
12+
13+
public string AdminAuditLogDbConnection { get; set; }
14+
15+
public string DataProtectionDbConnection { get; set; }
16+
17+
public void SetConnections(string commonConnectionString)
18+
{
19+
AdminAuditLogDbConnection = commonConnectionString;
20+
AdminLogDbConnection = commonConnectionString;
21+
ConfigurationDbConnection = commonConnectionString;
22+
DataProtectionDbConnection = commonConnectionString;
23+
IdentityDbConnection = commonConnectionString;
24+
PersistedGrantDbConnection = commonConnectionString;
25+
}
26+
}
27+
}

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
namespace Skoruba.IdentityServer4.Admin.EntityFramework.Shared.Configuration
2+
{
3+
public class DatabaseMigrationsConfiguration
4+
{
5+
public bool ApplyDatabaseMigrations { get; set; } = false;
6+
7+
public string ConfigurationDbMigrationsAssembly { get; set; }
8+
9+
public string PersistedGrantDbMigrationsAssembly { get; set; }
10+
11+
public string AdminLogDbMigrationsAssembly { get; set; }
12+
13+
public string IdentityDbMigrationsAssembly { get; set; }
14+
15+
public string AdminAuditLogDbMigrationsAssembly { get; set; }
16+
17+
public string DataProtectionDbMigrationsAssembly { get; set; }
18+
19+
public void SetMigrationsAssemblies(string commonMigrationsAssembly)
20+
{
21+
AdminAuditLogDbMigrationsAssembly = commonMigrationsAssembly;
22+
AdminLogDbMigrationsAssembly = commonMigrationsAssembly;
23+
ConfigurationDbMigrationsAssembly = commonMigrationsAssembly;
24+
DataProtectionDbMigrationsAssembly = commonMigrationsAssembly;
25+
IdentityDbMigrationsAssembly = commonMigrationsAssembly;
26+
PersistedGrantDbMigrationsAssembly = commonMigrationsAssembly;
27+
}
28+
}
29+
}

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

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Collections.Generic;
22

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Collections.Generic;
22

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

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
using Skoruba.IdentityServer4.Admin.EntityFramework.Shared.Configuration.Identity;
2+
using System.Collections.Generic;
3+
4+
namespace Skoruba.IdentityServer4.Admin.EntityFramework.Shared.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/Configuration/IdentityServer/Client.cs renamed to ‎src/Skoruba.IdentityServer4.Admin.EntityFramework.Shared/Configuration/IdentityServer/Client.cs

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

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

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
using IdentityServer4.Models;
22
using System.Collections.Generic;
3-
using Client = Skoruba.IdentityServer4.Admin.Configuration.IdentityServer.Client;
3+
using Client = Skoruba.IdentityServer4.Admin.EntityFramework.Shared.Configuration.IdentityServer.Client;
44

5-
namespace Skoruba.IdentityServer4.Admin.Configuration
5+
namespace Skoruba.IdentityServer4.Admin.EntityFramework.Shared.Configuration
66
{
7-
public class IdentityServerDataConfiguration
7+
public class IdentityServerData
88
{
99
public List<Client> Clients { get; set; } = new List<Client>();
1010
public List<IdentityResource> IdentityResources { get; set; } = new List<IdentityResource>();

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

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

0 commit comments

Comments
 (0)