Sync 7.4 prelease branch to main

Directory.Packages.props

@@ -34,9 +34,9 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="AngleSharp" Version="1.1.2" />
-    <PackageVersion Include="Aspire.Hosting.AppHost" Version="9.5.0" />
-    <PackageVersion Include="Aspire.Hosting.Testing" Version="9.5.0" />
-    <PackageVersion Include="Aspire.Hosting.SqlServer" Version="9.5.0" />
+    <PackageVersion Include="Aspire.Hosting.AppHost" Version="9.5.2" />
+    <PackageVersion Include="Aspire.Hosting.Testing" Version="9.5.2" />
+    <PackageVersion Include="Aspire.Hosting.SqlServer" Version="9.5.2" />
     <PackageVersion Include="BenchmarkDotNet" Version="0.15.0" />
     <PackageVersion Include="BullsEye" Version="5.0.0" />
     <PackageVersion Include="coverlet.collector" Version="6.0.2" />

bff/hosts/Hosts.AppHost/Hosts.AppHost.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Sdk Name="Aspire.AppHost.Sdk" Version="9.5.0" />
+  <Sdk Name="Aspire.AppHost.Sdk" Version="9.5.2" />
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>

identity-server/aspire/AppHosts/All/All.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Sdk Name="Aspire.AppHost.Sdk" Version="9.5.0" />
+  <Sdk Name="Aspire.AppHost.Sdk" Version="9.5.2" />
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -58,6 +58,9 @@
     <ProjectReference Include="..\..\..\hosts\net9\AspNetIdentity9\Host.AspNetIdentity9.csproj" />
     <ProjectReference Include="..\..\..\hosts\net9\EntityFramework9\Host.EntityFramework9.csproj" />
     <ProjectReference Include="..\..\..\hosts\net9\Main9\Host.Main9.csproj" />
+    <ProjectReference Include="..\..\..\hosts\net10\AspNetIdentity10\Host.AspNetIdentity10.csproj" />
+    <ProjectReference Include="..\..\..\hosts\net10\EntityFramework10\Host.EntityFramework10.csproj" />
+    <ProjectReference Include="..\..\..\hosts\net10\Main10\Host.Main10.csproj" />
     <ProjectReference Include="..\..\..\migrations\AspNetIdentityDb\AspNetIdentityDb.csproj" />
     <ProjectReference Include="..\..\..\migrations\IdentityServerDb\IdentityServerDb.csproj" />
     <ProjectReference Include="..\..\..\templates\src\IdentityServerAspNetIdentity\IdentityServerAspNetIdentity.csproj" />

identity-server/aspire/AppHosts/All/Program.cs

@@ -46,13 +46,25 @@ void ConfigureIdentityServerHosts()
         projectRegistry.Add("is-host", hostMain);
     }
 
+    if (HostIsEnabled(nameof(Projects.Host_Main10)))
+    {
+        var hostMain = builder
+            .AddProject<Projects.Host_Main10>("is-host")
+            .WithHttpHealthCheck(path: "/.well-known/openid-configuration");
+
+        projectRegistry.Add("is-host", hostMain);
+    }
+
+
     // These hosts require a database
     var dbHosts = new List<string>
     {
         nameof(Projects.Host_AspNetIdentity8),
         nameof(Projects.Host_AspNetIdentity9),
+        nameof(Projects.Host_AspNetIdentity10),
         nameof(Projects.Host_EntityFramework8),
-        nameof(Projects.Host_EntityFramework9)
+        nameof(Projects.Host_EntityFramework9),
+        nameof(Projects.Host_EntityFramework10)
     };
 
     if (dbHosts.Any(HostIsEnabled))
@@ -100,6 +112,23 @@ void ConfigureIdentityServerHosts()
             projectRegistry.Add("is-host", hostAspNetIdentity);
         }
 
+        if (HostIsEnabled(nameof(Projects.Host_AspNetIdentity10)))
+        {
+            var hostAspNetIdentity = builder.AddProject<Projects.Host_AspNetIdentity10>(name: "is-host")
+                .WithHttpHealthCheck(path: "/.well-known/openid-configuration")
+                .WithReference(identityServerDb, connectionName: "DefaultConnection");
+
+            if (appConfig.RunDatabaseMigrations)
+            {
+                var aspnetMigration = builder.AddProject<Projects.AspNetIdentityDb>(name: "aspnetidentitydb-migrations")
+                    .WithReference(identityServerDb, connectionName: "DefaultConnection")
+                    .WaitFor(identityServerDb);
+                hostAspNetIdentity.WaitForCompletion(aspnetMigration);
+            }
+
+            projectRegistry.Add("is-host", hostAspNetIdentity);
+        }
+
         if (HostIsEnabled(nameof(Projects.Host_EntityFramework8)))
         {
             var hostEntityFramework = builder.AddProject<Projects.Host_EntityFramework8>(name: "is-host")
@@ -133,6 +162,23 @@ void ConfigureIdentityServerHosts()
 
             projectRegistry.Add("is-host", hostEntityFramework);
         }
+
+        if (HostIsEnabled(nameof(Projects.Host_EntityFramework10)))
+        {
+            var hostEntityFramework = builder.AddProject<Projects.Host_EntityFramework10>(name: "is-host")
+                .WithHttpHealthCheck(path: "/.well-known/openid-configuration")
+                .WithReference(identityServerDb, connectionName: "DefaultConnection");
+
+            if (appConfig.RunDatabaseMigrations)
+            {
+                var idSrvMigration = builder.AddProject<Projects.IdentityServerDb>(name: "identityserverdb-migrations")
+                    .WithReference(identityServerDb, connectionName: "DefaultConnection")
+                    .WaitFor(identityServerDb);
+                hostEntityFramework.WaitForCompletion(idSrvMigration);
+            }
+
+            projectRegistry.Add("is-host", hostEntityFramework);
+        }
     }
 
     bool HostIsEnabled(string name) =>

identity-server/aspire/AppHosts/All/appsettings.json

@@ -7,7 +7,7 @@
     }
   },
   "AspireProjectConfiguration": {
-    "IdentityHost": "Host_Main9",
+    "IdentityHost": "Host_Main10",
     "UseClients": {
       "ConsoleCibaClient": false,
       "ConsoleClientCredentialsFlow": false,

identity-server/aspire/AppHosts/Dev/Dev.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Sdk Name="Aspire.AppHost.Sdk" Version="9.5.0" />
+  <Sdk Name="Aspire.AppHost.Sdk" Version="9.5.2" />
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>

identity-server/clients/src/ConsoleResourceOwnerFlowRefreshToken/Program.cs

@@ -34,12 +34,12 @@
 
 var refresh_token = response.RefreshToken;
 
-while (true)
+for (var i = 0; i < 10; i++)
 {
     response = await RefreshTokenAsync(refresh_token);
     response.Show();
 
-    Thread.Sleep(5000);
+    Thread.Sleep(50);
 
     await CallServiceAsync(response.AccessToken);
 

identity-server/clients/src/ConsoleScopesResources/Program.cs

@@ -36,8 +36,8 @@
     new() { Enabled = true, Id = "J", Name = "No scope (resource: resource1)", Scope = "", Resource = "urn:resource1" },
     new() { Enabled = true, Id = "K", Name = "No scope (resource: resource3)", Scope = "", Resource = "urn:resource3" },
     new() { Enabled = true, Id = "L", Name = "Isolated scope without resource parameter", Scope = "resource3.scope1" },
-    new() { Enabled = true, Id = "M", Name = "Isolated scope without resource parameter", Scope = "resource3.scope1", Resource = "urn:resource3" },
-    new() { Enabled = true, Id = "N", Name = "Isolated scope without resource parameter", Scope = "resource3.scope1", Resource = "urn:resource2" }
+    new() { Enabled = true, Id = "M", Name = "Isolated scope with resource parameter", Scope = "resource3.scope1", Resource = "urn:resource3" },
+    new() { Enabled = true, Id = "N", Name = "Shared scope with resource parameter", Scope = "shared.scope", Resource = "urn:resource2" }
 };
 
 // Execute the planned runs

identity-server/hosts/Shared/Configuration/TestClients.cs

@@ -7,7 +7,7 @@ namespace Duende.IdentityServer.Hosts.Shared.Configuration;
 
 public static class TestClients
 {
-    public static IEnumerable<Client> Get()
+    public static List<Client> Get()
     {
         var clients = new List<Client>();
 

identity-server/hosts/Shared/Customization/CustomClientRegistrationProcessor.cs

@@ -25,7 +25,7 @@ protected override async Task<IStepResult> AddClientId(DynamicClientRegistration
             var clientId = clientIdParameter.ToString();
             if (clientId != null)
             {
-                var existingClient = clientStore.FindClientByIdAsync(clientId);
+                var existingClient = await clientStore.FindClientByIdAsync(clientId);
                 if (existingClient is not null)
                 {
                     return new DynamicClientRegistrationError(

identity-server/hosts/net10/AspNetIdentity10/HostingExtensions.cs

@@ -2,6 +2,7 @@
 // See LICENSE in the project root for license information.
 
 using Duende.IdentityServer;
+using Duende.IdentityServer.Configuration;
 using Duende.IdentityServer.UI;
 using Duende.IdentityServer.UI.AspNetIdentity.Models;
 using IdentityServerHost.Data;
@@ -122,6 +123,9 @@ internal static WebApplication ConfigurePipeline(this WebApplication app)
         app.MapRazorPages()
             .RequireAuthorization();
 
+        app.MapDynamicClientRegistration()
+            .AllowAnonymous();
+
         return app;
     }
 }

identity-server/hosts/net10/AspNetIdentity10/IdentityServerExtensions.cs

@@ -1,7 +1,10 @@
 // Copyright (c) Duende Software. All rights reserved.
 // See LICENSE in the project root for license information.
 
+using Duende.IdentityServer.Configuration;
+using Duende.IdentityServer.Configuration.RequestProcessing;
 using Duende.IdentityServer.Hosts.Shared.Configuration;
+using Duende.IdentityServer.Hosts.Shared.Customization;
 using Duende.IdentityServer.UI.AspNetIdentity.Models;
 
 namespace IdentityServerHost;
@@ -26,6 +29,10 @@ internal static WebApplicationBuilder ConfigureIdentityServer(this WebApplicatio
             .AddInMemoryClients(TestClients.Get())
             .AddAspNetIdentity<ApplicationUser>();
 
+        builder.Services.AddIdentityServerConfiguration(opt => { })
+            .AddInMemoryClientConfigurationStore();
+        builder.Services.AddTransient<IDynamicClientRegistrationRequestProcessor, CustomClientRegistrationProcessor>();
+
         return builder;
     }
 }

identity-server/hosts/net10/Main10/HostingExtensions.cs

@@ -4,6 +4,7 @@
 using System.Globalization;
 using System.Security.Claims;
 using Duende.IdentityServer;
+using Duende.IdentityServer.Configuration;
 using Duende.IdentityServer.Hosts.Shared.Customization;
 using Duende.IdentityServer.UI;
 using Microsoft.AspNetCore.Mvc.Razor;
@@ -171,6 +172,9 @@ internal static WebApplication ConfigurePipeline(this WebApplication app)
         app.MapRazorPages()
             .RequireAuthorization();
 
+        app.MapDynamicClientRegistration()
+            .AllowAnonymous();
+
         return app;
     }
 }

identity-server/hosts/net10/Main10/IdentityServerExtensions.cs

@@ -5,6 +5,7 @@
 using Duende.IdentityModel;
 using Duende.IdentityServer;
 using Duende.IdentityServer.Configuration;
+using Duende.IdentityServer.Configuration.RequestProcessing;
 using Duende.IdentityServer.Hosts.Shared.Configuration;
 using Duende.IdentityServer.Hosts.Shared.Customization;
 using Microsoft.AspNetCore.Authentication.Certificate;
@@ -51,7 +52,7 @@ internal static WebApplicationBuilder ConfigureIdentityServer(this WebApplicatio
                 options.Diagnostics.ChunkSize = 1024 * 1000 - 32; // 1 MB minus some formatting space;
             })
             .AddServerSideSessions()
-            .AddInMemoryClients([.. TestClients.Get()])
+            .AddInMemoryClients(TestClients.Get())
             .AddInMemoryIdentityResources(TestResources.IdentityResources)
             .AddInMemoryApiResources(TestResources.ApiResources)
             .AddInMemoryApiScopes(TestResources.ApiScopes)
@@ -81,6 +82,7 @@ internal static WebApplicationBuilder ConfigureIdentityServer(this WebApplicatio
 
         builder.Services.AddIdentityServerConfiguration(opt => { })
             .AddInMemoryClientConfigurationStore();
+        builder.Services.AddTransient<IDynamicClientRegistrationRequestProcessor, CustomClientRegistrationProcessor>();
 
         builder.Services.AddDistributedMemoryCache();
 

identity-server/hosts/net8/AspNetIdentity8/HostingExtensions.cs

@@ -2,6 +2,7 @@
 // See LICENSE in the project root for license information.
 
 using Duende.IdentityServer;
+using Duende.IdentityServer.Configuration;
 using Duende.IdentityServer.UI;
 using Duende.IdentityServer.UI.AspNetIdentity.Models;
 using IdentityServerHost.Data;
@@ -120,6 +121,9 @@ internal static WebApplication ConfigurePipeline(this WebApplication app)
         app.MapRazorPages()
             .RequireAuthorization();
 
+        app.MapDynamicClientRegistration()
+            .AllowAnonymous();
+
         return app;
     }
 }

identity-server/hosts/net8/AspNetIdentity8/IdentityServerExtensions.cs

@@ -1,7 +1,10 @@
 // Copyright (c) Duende Software. All rights reserved.
 // See LICENSE in the project root for license information.
 
+using Duende.IdentityServer.Configuration;
+using Duende.IdentityServer.Configuration.RequestProcessing;
 using Duende.IdentityServer.Hosts.Shared.Configuration;
+using Duende.IdentityServer.Hosts.Shared.Customization;
 using Duende.IdentityServer.UI.AspNetIdentity.Models;
 
 namespace IdentityServerHost;
@@ -26,6 +29,10 @@ internal static WebApplicationBuilder ConfigureIdentityServer(this WebApplicatio
             .AddInMemoryClients(TestClients.Get())
             .AddAspNetIdentity<ApplicationUser>();
 
+        builder.Services.AddIdentityServerConfiguration(opt => { })
+            .AddInMemoryClientConfigurationStore();
+        builder.Services.AddTransient<IDynamicClientRegistrationRequestProcessor, CustomClientRegistrationProcessor>();
+
         return builder;
     }
 }

identity-server/hosts/net8/Main8/HostingExtensions.cs

@@ -4,6 +4,7 @@
 using System.Globalization;
 using System.Security.Claims;
 using Duende.IdentityServer;
+using Duende.IdentityServer.Configuration;
 using Duende.IdentityServer.Hosts.Shared.Customization;
 using Duende.IdentityServer.UI;
 using Microsoft.AspNetCore.Mvc.Razor;
@@ -171,6 +172,9 @@ internal static WebApplication ConfigurePipeline(this WebApplication app)
         app.MapRazorPages()
             .RequireAuthorization();
 
+        app.MapDynamicClientRegistration()
+            .AllowAnonymous();
+
         return app;
     }
 }

identity-server/hosts/net8/Main8/IdentityServerExtensions.cs

@@ -5,6 +5,7 @@
 using Duende.IdentityModel;
 using Duende.IdentityServer;
 using Duende.IdentityServer.Configuration;
+using Duende.IdentityServer.Configuration.RequestProcessing;
 using Duende.IdentityServer.Hosts.Shared.Configuration;
 using Duende.IdentityServer.Hosts.Shared.Customization;
 using Microsoft.AspNetCore.Authentication.Certificate;
@@ -51,7 +52,7 @@ internal static WebApplicationBuilder ConfigureIdentityServer(this WebApplicatio
                 options.Diagnostics.ChunkSize = 1024 * 1000 - 32; // 1 MB minus some formatting space;
             })
             .AddServerSideSessions()
-            .AddInMemoryClients([.. TestClients.Get()])
+            .AddInMemoryClients(TestClients.Get())
             .AddInMemoryIdentityResources(TestResources.IdentityResources)
             .AddInMemoryApiResources(TestResources.ApiResources)
             .AddInMemoryApiScopes(TestResources.ApiScopes)
@@ -81,6 +82,7 @@ internal static WebApplicationBuilder ConfigureIdentityServer(this WebApplicatio
 
         builder.Services.AddIdentityServerConfiguration(opt => { })
             .AddInMemoryClientConfigurationStore();
+        builder.Services.AddTransient<IDynamicClientRegistrationRequestProcessor, CustomClientRegistrationProcessor>();
 
         builder.Services.AddDistributedMemoryCache();
 

identity-server/hosts/net9/AspNetIdentity9/HostingExtensions.cs

@@ -2,6 +2,7 @@
 // See LICENSE in the project root for license information.
 
 using Duende.IdentityServer;
+using Duende.IdentityServer.Configuration;
 using Duende.IdentityServer.UI;
 using Duende.IdentityServer.UI.AspNetIdentity.Models;
 using IdentityServerHost.Data;
@@ -122,6 +123,9 @@ internal static WebApplication ConfigurePipeline(this WebApplication app)
         app.MapRazorPages()
             .RequireAuthorization();
 
+        app.MapDynamicClientRegistration()
+            .AllowAnonymous();
+
         return app;
     }
 }

identity-server/hosts/net9/AspNetIdentity9/IdentityServerExtensions.cs

@@ -1,7 +1,10 @@
 // Copyright (c) Duende Software. All rights reserved.
 // See LICENSE in the project root for license information.
 
+using Duende.IdentityServer.Configuration;
+using Duende.IdentityServer.Configuration.RequestProcessing;
 using Duende.IdentityServer.Hosts.Shared.Configuration;
+using Duende.IdentityServer.Hosts.Shared.Customization;
 using Duende.IdentityServer.UI.AspNetIdentity.Models;
 
 namespace IdentityServerHost;
@@ -26,6 +29,10 @@ internal static WebApplicationBuilder ConfigureIdentityServer(this WebApplicatio
             .AddInMemoryClients(TestClients.Get())
             .AddAspNetIdentity<ApplicationUser>();
 
+        builder.Services.AddIdentityServerConfiguration(opt => { })
+            .AddInMemoryClientConfigurationStore();
+        builder.Services.AddTransient<IDynamicClientRegistrationRequestProcessor, CustomClientRegistrationProcessor>();
+
         return builder;
     }
 }

identity-server/hosts/net9/Main9/HostingExtensions.cs

@@ -4,6 +4,7 @@
 using System.Globalization;
 using System.Security.Claims;
 using Duende.IdentityServer;
+using Duende.IdentityServer.Configuration;
 using Duende.IdentityServer.Hosts.Shared.Customization;
 using Duende.IdentityServer.UI;
 using Microsoft.AspNetCore.Mvc.Razor;
@@ -171,6 +172,9 @@ internal static WebApplication ConfigurePipeline(this WebApplication app)
         app.MapRazorPages()
             .RequireAuthorization();
 
+        app.MapDynamicClientRegistration()
+            .AllowAnonymous();
+
         return app;
     }
 }