Merge pull request #1624 from stefannikolei/sn/fix/1616

ClientConfigurationStore now uses IConfigurationDbContext
DuendeSoftware · Dec 1, 2024 · df77918 · df77918
2 parents d1e1717 + fb9c8c0
commit df77918
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/src/Configuration.EntityFramework/ClientConfigurationStore.cs b/src/Configuration.EntityFramework/ClientConfigurationStore.cs
@@ -3,6 +3,7 @@
 
 
 using Duende.IdentityServer.EntityFramework.DbContexts;
+using Duende.IdentityServer.EntityFramework.Interfaces;
 using Duende.IdentityServer.EntityFramework.Mappers;
 using Duende.IdentityServer.Models;
 using Duende.IdentityServer.Services;
@@ -19,7 +20,7 @@ public class ClientConfigurationStore : IClientConfigurationStore
     /// <summary>
     /// The DbContext.
     /// </summary>
-    protected readonly ConfigurationDbContext DbContext;
+    protected readonly IConfigurationDbContext DbContext;
 
     /// <summary>
     /// The CancellationToken provider.
@@ -36,7 +37,7 @@ public class ClientConfigurationStore : IClientConfigurationStore
     /// class.
     /// </summary>
     public ClientConfigurationStore(
-        ConfigurationDbContext dbContext,
+        IConfigurationDbContext dbContext,
         ICancellationTokenProvider cancellationTokenProvider,
         ILogger<ClientConfigurationStore> logger)
     {
@@ -48,8 +49,8 @@ public ClientConfigurationStore(
     /// <inheritdoc />
     public async Task AddAsync(Client client)
     {
-        Logger.LogDebug("Adding client {clientId} to configuration store", client.ClientId);
-        DbContext.Clients.Add(ClientMappers.ToEntity(client));
+        Logger.LogDebug("Adding client {ClientId} to configuration store", client.ClientId);
+        DbContext.Clients.Add(client.ToEntity());
         await DbContext.SaveChangesAsync(CancellationTokenProvider.CancellationToken);
     }
 }
diff --git a/src/EntityFramework.Storage/Interfaces/IConfigurationDbContext.cs b/src/EntityFramework.Storage/Interfaces/IConfigurationDbContext.cs
@@ -5,6 +5,8 @@
 #nullable enable
 
 using System;
+using System.Threading;
+using System.Threading.Tasks;
 using Duende.IdentityServer.EntityFramework.Entities;
 using Microsoft.EntityFrameworkCore;
 
@@ -63,4 +65,19 @@ public interface IConfigurationDbContext : IDisposable
     /// The identity providers.
     /// </value>
     DbSet<IdentityProvider> IdentityProviders { get; set; }
+
+    /// <summary>
+    /// Saves the changes.
+    /// </summary>
+    /// <returns></returns>
+    Task<int> SaveChangesAsync(CancellationToken cancellationToken);
+
+    // this is here only because of this: https://github.com/DuendeSoftware/IdentityServer/issues/472
+    // and because Microsoft implements the old API explicitly: https://github.com/dotnet/aspnetcore/blob/v6.0.0-rc.2.21480.10/src/Identity/ApiAuthorization.IdentityServer/src/Data/ApiAuthorizationDbContext.cs
+
+    /// <summary>
+    /// Saves the changes.
+    /// </summary>
+    /// <returns></returns>
+    Task<int> SaveChangesAsync() => SaveChangesAsync(CancellationToken.None);
 }
diff --git a/test/Configuration.IntegrationTests/TestHosts/ConfigurationHost.cs b/test/Configuration.IntegrationTests/TestHosts/ConfigurationHost.cs
@@ -12,6 +12,7 @@
 using Microsoft.EntityFrameworkCore.Storage;
 using Duende.IdentityServer.Services;
 using Duende.IdentityServer.EntityFramework.Options;
+using Duende.IdentityServer.EntityFramework.Storage;
 
 namespace IntegrationTests.TestHosts;
 
@@ -39,8 +40,10 @@ private void ConfigureServices(IServiceCollection services, InMemoryDatabaseRoot
             })
             .AddClientConfigurationStore();
         services.AddSingleton(new ConfigurationStoreOptions());
-        services.AddDbContext<ConfigurationDbContext>(opt =>
-            opt.UseInMemoryDatabase("configurationDb", databaseRoot));
+        services.AddConfigurationDbContext(options => {
+            options.ConfigureDbContext = b =>
+                b.UseInMemoryDatabase("configurationDb", databaseRoot);
+        });
     }
 
     private void Configure(WebApplication app)