Skip to content

feat: Add custom db schema configuration #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nachoRSK wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: Add custom db schema configuration #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Rsk.Samples.IdentityServer.AdminUiIntegration/Extensions/EventSinkExtExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ namespace Rsk.Samples.IdentityServer.AdminUiIntegration.Extensions;

public static class EventSinkExtExtensions
{
public static IServiceCollection AddAuditProviderFactory(this IServiceCollection services, DbContextOptionsBuilder<AuditDatabaseContext> auditDbBuilder)
public static IServiceCollection AddAuditProviderFactory(this IServiceCollection services, DbContextOptionsBuilder<AuditDatabaseContext> auditDbBuilder, string schemName = null)
{
RSK.Audit.AuditProviderFactory auditFactory = new AuditProviderFactory(auditDbBuilder.Options);
RSK.Audit.AuditProviderFactory auditFactory = new AuditProviderFactory(auditDbBuilder.Options, schemName);
services.AddSingleton(auditFactory.CreateAuditSource("IdentityServer"));
services.AddSingleton<IEventSink, AuditSink>();
return services;
Expand Down
6 changes: 3 additions & 3 deletions ...es.IdentityServer.AdminUiIntegration/Rsk.Samples.IdentityServer.AdminUiIntegration.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<PackageReference Include="Duende.IdentityServer" Version="7.1.0" />
<PackageReference Include="Duende.IdentityServer.AspNetIdentity" Version="7.1.0" />
<PackageReference Include="Duende.IdentityServer.EntityFramework" Version="7.1.0" />
<PackageReference Include="IdentityExpress.Identity" Version="6.0.1" />
<PackageReference Include="IdentityExpress.Identity" Version="7.0.0" />
<PackageReference Include="IdentityModel.AspNetCore.OAuth2Introspection" Version="6.2.0" />
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.1" />
Expand All @@ -43,8 +43,8 @@
<PackageReference Include="Microsoft.IdentityModel.Protocols" Version="8.3.1" />
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.3.1" />
<PackageReference Include="Microsoft.IdentityModel.Tokens.Saml" Version="8.3.1" />
<PackageReference Include="Rsk.DuendeIdentityServer.AuditEventSink" Version="3.0.0" />
<PackageReference Include="Rsk.Audit.EF" Version="2.0.0" />
<PackageReference Include="Rsk.DuendeIdentityServer.AuditEventSink" Version="4.0.0" />
<PackageReference Include="Rsk.Audit.EF" Version="3.0.0" />
<PackageReference Include="Rsk.DynamicAuthenticationProviders" Version="2.0.0" />
<PackageReference Include="Rsk.DynamicAuthenticationProviders.EntityFramework" Version="2.0.0" />
<PackageReference Include="Rsk.DynamicAuthenticationProviders.Saml" Version="2.0.0" />
Expand Down
7 changes: 5 additions & 2 deletions Rsk.Samples.IdentityServer.AdminUiIntegration/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ public void ConfigureServices(IServiceCollection services)
}

// Add Auditing
services.AddAuditProviderFactory(auditDbBuilder);
var auditSchema = Configuration.GetValue<string>("AuditStoreSchemaName");
services.AddAuditProviderFactory(auditDbBuilder, auditSchema);

// configure test-suitable X-Forwarded headers and CORS policy
services.AddSingleton<XForwardedPrefixMiddleware>();
Expand All @@ -104,9 +105,11 @@ public void ConfigureServices(IServiceCollection services)
options.AddDefaultPolicy(builder => builder.AllowAnyOrigin().AllowAnyHeader().AllowAnyMethod());
});

var identitySchema = Configuration.GetValue<string>("IdentityStoreSchemaName");

// configure ASP.NET Identity
services
.AddIdentityExpressAdminUiConfiguration(identityBuilder) // ASP.NET Core Identity Registrations for AdminUI
.AddIdentityExpressAdminUiConfiguration(identityBuilder, identitySchema) // ASP.NET Core Identity Registrations for AdminUI
.AddDefaultTokenProviders()
.AddIdentityExpressUserClaimsPrincipalFactory(); // Claims Principal Factory for loading AdminUI users as .NET Identities

Expand Down
2 changes: 2 additions & 0 deletions Rsk.Samples.IdentityServer.AdminUiIntegration/appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
"IdentityServerConnectionString": "Server=localhost,3306;Uid=docker;Pwd=Welkom1234!;Database=IdentityExpressDb;",
"Google_ClientId": "",
"Google_ClientSecret": "",
"IdentityStoreSchemaName": "",
"OperationalStoreSchemaName": "",
"ConfigurationStoreSchemaName": "",
"AuditStoreSchemaName": "",
"DynamicAuth": {
"Mode": "Duende",
"RskComponentLicensee": "DEMO",
Expand Down