From 1246a3e518df9b3ae793ff92abe49bfb3a693966 Mon Sep 17 00:00:00 2001
From: NachoEscrig <nacho.escrig@rocksolidknowledge.com>
Date: Thu, 13 Nov 2025 18:50:50 +0000
Subject: [PATCH] feat: Support custom schemas

---
 .../Data/ApplicationDbContext.cs              | 16 ++++++++++-
 .../Data/IdentityDbContext.cs                 |  6 +++--
 ...mples.OpenIddict.AdminUiIntegration.csproj |  2 +-
 Rsk.Samples.OpenIddict.AdminUI/Startup.cs     | 27 ++++++++++++++++---
 .../appsettings.json                          |  4 ++-
 5 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/Rsk.Samples.OpenIddict.AdminUI/Data/ApplicationDbContext.cs b/Rsk.Samples.OpenIddict.AdminUI/Data/ApplicationDbContext.cs
index 0fe9e24..b32ac01 100644
--- a/Rsk.Samples.OpenIddict.AdminUI/Data/ApplicationDbContext.cs
+++ b/Rsk.Samples.OpenIddict.AdminUI/Data/ApplicationDbContext.cs
@@ -1,5 +1,19 @@
+#nullable enable
 using Microsoft.EntityFrameworkCore;
 
 namespace Rsk.Samples.OpenIddict.AdminUiIntegration.Data;
 
-public class ApplicationDbContext(DbContextOptions<ApplicationDbContext> options) : DbContext(options);
+public class ApplicationDbContext(DbContextOptions<ApplicationDbContext> options, string? schema = null) : DbContext(options)
+{
+    private string Schema { get; } = schema ?? string.Empty;
+    
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+        if (!string.IsNullOrEmpty(Schema))
+        {
+            modelBuilder.HasDefaultSchema(Schema);
+        }
+
+        base.OnModelCreating(modelBuilder);
+    }
+}
diff --git a/Rsk.Samples.OpenIddict.AdminUI/Data/IdentityDbContext.cs b/Rsk.Samples.OpenIddict.AdminUI/Data/IdentityDbContext.cs
index 16b0e3c..64331ba 100644
--- a/Rsk.Samples.OpenIddict.AdminUI/Data/IdentityDbContext.cs
+++ b/Rsk.Samples.OpenIddict.AdminUI/Data/IdentityDbContext.cs
@@ -1,7 +1,9 @@
+#nullable enable
+using System;
 using IdentityExpress.Identity;
 using Microsoft.EntityFrameworkCore;
 
 namespace Rsk.Samples.OpenIddict.AdminUiIntegration.Data;
 
-public class IdentityDbContext(DbContextOptions<IdentityDbContext> options)
-    : IdentityExpressDbContext<ApplicationUser>(options);
\ No newline at end of file
+public class IdentityDbContext(DbContextOptions<IdentityDbContext> options, string? schema = null)
+    : IdentityExpressDbContext<ApplicationUser>(options, schema ?? String.Empty);
\ No newline at end of file
diff --git a/Rsk.Samples.OpenIddict.AdminUI/Rsk.Samples.OpenIddict.AdminUiIntegration.csproj b/Rsk.Samples.OpenIddict.AdminUI/Rsk.Samples.OpenIddict.AdminUiIntegration.csproj
index 529e062..cd3c68b 100644
--- a/Rsk.Samples.OpenIddict.AdminUI/Rsk.Samples.OpenIddict.AdminUiIntegration.csproj
+++ b/Rsk.Samples.OpenIddict.AdminUI/Rsk.Samples.OpenIddict.AdminUiIntegration.csproj
@@ -23,7 +23,7 @@
     <PackageReference Include="OpenIddict.Quartz" Version="6.1.1" />
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="9.0.0-preview.3.efcore.9.0.0" />
     <PackageReference Include="Quartz.Extensions.Hosting" Version="3.14.0" />
-    <PackageReference Include="IdentityExpress.Identity" Version="6.0.1" />
+    <PackageReference Include="IdentityExpress.Identity" Version="7.0.0" />
     <PackageReference Include="Rsk.OpenIddict.Utils" Version="2.0.0" />
     <PackageReference Include="Rsk.Saml.OpenIddict" Version="9.2.0" />
     <PackageReference Include="Rsk.Saml.OpenIddict.AspNetCore.Identity" Version="9.2.0" />
diff --git a/Rsk.Samples.OpenIddict.AdminUI/Startup.cs b/Rsk.Samples.OpenIddict.AdminUI/Startup.cs
index 3937765..e0a36f2 100644
--- a/Rsk.Samples.OpenIddict.AdminUI/Startup.cs
+++ b/Rsk.Samples.OpenIddict.AdminUI/Startup.cs
@@ -31,7 +31,17 @@ public void ConfigureServices(IServiceCollection services)
         services.AddControllersWithViews();
         services.AddRazorPages();
 
+        var identitySchema = Configuration.GetValue<string>("IdentityStoreSchemaName");
         services.AddDbContext<IdentityDbContext>(GetDbConnection);
+        services.AddScoped<IdentityDbContext>(serviceProvider =>
+        {
+            var options = serviceProvider
+                .GetRequiredService<DbContextOptions<IdentityDbContext>>();
+
+            return new IdentityDbContext(options, identitySchema);
+        });
+        
+        var openIddictSchema = Configuration.GetValue<string>("OpenIddictStoreSchemaName");
         services.AddDbContext<ApplicationDbContext>(options =>
         {
             GetDbConnection(options);
@@ -41,11 +51,20 @@ public void ConfigureServices(IServiceCollection services)
             // to replace the default OpenIddict entities.
             options.UseOpenIddict();
         });
+        services.AddScoped<ApplicationDbContext>(serviceProvider =>
+        {
+            var options = serviceProvider
+                .GetRequiredService<DbContextOptions<ApplicationDbContext>>();
+
+            return new ApplicationDbContext(options, openIddictSchema);
+        });
 
         services.AddDatabaseDeveloperPageExceptionFilter();
+        
 
         // Register the Identity services.
-        services.AddIdentity<ApplicationUser, IdentityExpressRole>()
+        services
+            .AddIdentity<ApplicationUser, IdentityExpressRole>()
             .AddEntityFrameworkStores<IdentityDbContext>()
             .AddDefaultTokenProviders();
 
@@ -117,9 +136,9 @@ public void ConfigureServices(IServiceCollection services)
                 options.AddSamlPlugin(builder =>
                 {
                     builder.UseSamlEntityFrameworkCore()
-                        .AddSamlArtifactDbContext(GetDbConnection)
-                        .AddSamlConfigurationDbContext(GetDbConnection)
-                        .AddSamlMessageDbContext(GetDbConnection);
+                        .AddSamlArtifactDbContext(GetDbConnection, openIddictSchema)
+                        .AddSamlConfigurationDbContext(GetDbConnection, openIddictSchema)
+                        .AddSamlMessageDbContext(GetDbConnection, openIddictSchema);
                 
                     builder.ConfigureSamlOpenIddictServerOptions(serverOptions =>
                     {
diff --git a/Rsk.Samples.OpenIddict.AdminUI/appsettings.json b/Rsk.Samples.OpenIddict.AdminUI/appsettings.json
index 87c98e2..dc1b3a2 100644
--- a/Rsk.Samples.OpenIddict.AdminUI/appsettings.json
+++ b/Rsk.Samples.OpenIddict.AdminUI/appsettings.json
@@ -9,6 +9,8 @@
   "AllowedHosts": "*",
   "DbProvider": "SqlServer",
   "OpenIddictConnectionString": "Server=localhost;User Id=IISConnect;Password=Password123!;Database=OpenIddictDb;Encrypt=False",
+  "IdentityStoreSchemaName": "",
+  "OpenIddictStoreSchemaName": "",
   "SAML2PLicensee": "DEMO",
-  "SAML2PLicense": "***YOUR LICENSE KEY***"
+  "SAML2PLicense": ""
 }
\ No newline at end of file