Upgraded to dotnet 9.

Removed custom PAR event class (handled by default in dotnet9). Upgraded to preview versions of Identity Server and Duende.BFF
StuFrankish · Dec 18, 2024 · 661d177 · 661d177
1 parent ffd6f70
commit 661d177
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 225 deletions.
diff --git a/AspireForIdentityServer.ApiResource/WeatherApi.csproj b/AspireForIdentityServer.ApiResource/WeatherApi.csproj
@@ -9,7 +9,7 @@
     <PackageReference Include="MediatR" Version="12.4.1" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.0" />
-    <PackageReference Include="StackExchange.Redis" Version="2.8.16" />
+    <PackageReference Include="StackExchange.Redis" Version="2.8.24" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\AspireForIdentityServer.ServiceDefaults\AspireForIdentityServer.ServiceDefaults.csproj" />

diff --git a/AspireForIdentityServer.IdentityServer/IdentityServer.csproj b/AspireForIdentityServer.IdentityServer/IdentityServer.csproj
@@ -30,8 +30,8 @@
 		<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.0" />
 
 		<PackageReference Include="Microsoft.Identity.Client" Version="4.66.2" />
-		<PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
-		<PackageReference Include="StackExchange.Redis" Version="2.8.16" />
+		<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
+		<PackageReference Include="StackExchange.Redis" Version="2.8.24" />
 		<PackageReference Include="System.Formats.Asn1" Version="9.0.0" />
 		<PackageReference Include="System.Text.Json" Version="9.0.0" />
 	</ItemGroup>

diff --git a/AspireForIdentityServer.ParClient/Client.csproj b/AspireForIdentityServer.ParClient/Client.csproj
@@ -7,16 +7,14 @@
 	<ItemGroup>
 		<PackageReference Include="AspNetCore.HealthChecks.OpenIdConnectServer" Version="8.0.1" />
 		<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="8.0.1" />
-		<PackageReference Include="Duende.AccessTokenManagement.OpenIdConnect" Version="3.0.1" />
-		<PackageReference Include="Duende.BFF" Version="3.0.0-preview.1" />
+		<PackageReference Include="Duende.BFF" Version="3.0.0-preview.3" />
 		<PackageReference Include="HealthChecks.Uptime" Version="2.0.5" />
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="9.0.0" />
 		<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="9.0.0" />
-		<PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
-		<PackageReference Include="StackExchange.Redis" Version="2.8.16" />
-		<PackageReference Include="System.Formats.Asn1" Version="9.0.0" />
+		<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
+		<PackageReference Include="StackExchange.Redis" Version="2.8.24" />
 		<PackageReference Include="System.Text.Json" Version="9.0.0" />
 	</ItemGroup>
 

diff --git a/AspireForIdentityServer.ParClient/Controllers/HomeController.cs b/AspireForIdentityServer.ParClient/Controllers/HomeController.cs
@@ -1,7 +1,7 @@
 using Client.Dtos;
 using Client.Services;
 using Duende.AccessTokenManagement.OpenIdConnect;
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Authentication.OpenIdConnect;
 using Microsoft.AspNetCore.Authorization;

diff --git a/AspireForIdentityServer.ParClient/Extensions/ClaimActionsExtensions.cs b/AspireForIdentityServer.ParClient/Extensions/ClaimActionsExtensions.cs
@@ -1,5 +1,5 @@
 using Client.Common;
-using IdentityModel;
+using Duende.IdentityModel;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.OAuth.Claims;
 using System.Collections.Generic;

diff --git a/AspireForIdentityServer.ParClient/Extensions/HostingExtensions.cs b/AspireForIdentityServer.ParClient/Extensions/HostingExtensions.cs
@@ -11,7 +11,6 @@ public static class HostingExtensions
     public static WebApplication ConfigureServices(this WebApplicationBuilder builder)
     {
         // Add custom services
-        builder.AddAndConfigurePushedAuthorizationSupport();
         builder.AddAndConfigureRemoteApi();
         builder.AddAndConfigureSessionWithRedis();
         builder.AddAndConfigureAuthorization();

diff --git a/AspireForIdentityServer.ParClient/Extensions/WebApplicationBuilderExtensions.cs b/AspireForIdentityServer.ParClient/Extensions/WebApplicationBuilderExtensions.cs
@@ -1,10 +1,9 @@
 using Client.Options;
 using Client.Services;
-using IdentityModel;
-using IdentityModel.Client;
+using Duende.IdentityModel;
+using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Authentication.OpenIdConnect;
-using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
@@ -18,24 +17,6 @@ namespace Client.Extensions;
 
 public static class WebApplicationBuilderExtensions
 {
-    public static void AddAndConfigurePushedAuthorizationSupport(this WebApplicationBuilder builder)
-    {
-        var identityProviderOptions = builder.GetCustomOptionsConfiguration<IdentityProviderOptions>(ConfigurationSections.IdentityProvider);
-
-        // Register the IdentityProviderOptions for DI
-        builder.Services.Configure<IdentityProviderOptions>(builder.Configuration.GetSection(ConfigurationSections.IdentityProvider));
-
-        // Setup the rest of the client.
-        builder.Services.AddTransient<ParOidcEvents>();
-        builder.Services.AddSingleton<IDiscoveryCache>(_ => new DiscoveryCache(identityProviderOptions.Authority));
-
-        // Add PAR interaction httpClient
-        builder.Services.AddHttpClient<ParOidcEvents>(name: "par_interaction_client", options =>
-        {
-            options.BaseAddress = new Uri(uriString: identityProviderOptions.Authority);
-        });
-    }
-
     public static void AddAndConfigureRemoteApi(this WebApplicationBuilder builder)
     {
         var identityProviderOptions = builder.GetCustomOptionsConfiguration<IdentityProviderOptions>(ConfigurationSections.IdentityProvider);
@@ -125,7 +106,7 @@ public static void AddAndConfigureAuthorization(this WebApplicationBuilder build
             .AddOpenIdConnect(OpenIdConnectDefaults.AuthenticationScheme, options =>
             {
                 // Needed to add PAR support
-                options.EventsType = typeof(ParOidcEvents);
+                //options.EventsType = typeof(ParOidcEvents);
 
                 // Setup Client
                 options.Authority = identityProviderOptions.Authority;

diff --git a/AspireForIdentityServer.ParClient/ParOidcEvents.cs b/AspireForIdentityServer.ParClient/ParOidcEvents.cs
diff --git a/AspireForIdentityServer.ParClient/Services/IdentityServerApiServiceBase.cs b/AspireForIdentityServer.ParClient/Services/IdentityServerApiServiceBase.cs
@@ -1,5 +1,5 @@
 using Duende.AccessTokenManagement.OpenIdConnect;
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
 using Microsoft.AspNetCore.Http;
 using System.Net;
 using System.Net.Http;

diff --git a/AspireForIdentityServer.ServiceDefaults/AspireForIdentityServer.ServiceDefaults.csproj b/AspireForIdentityServer.ServiceDefaults/AspireForIdentityServer.ServiceDefaults.csproj
@@ -14,9 +14,9 @@
     <PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.0.0" />
     <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.10.0" />
     <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.10.0" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.10.1" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.10.0" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.10.0" />
   </ItemGroup>
 
 </Project>
diff --git a/AspireForIdentityServer.Tests/AspireForIdentityServer.Tests.csproj b/AspireForIdentityServer.Tests/AspireForIdentityServer.Tests.csproj
@@ -14,12 +14,12 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="FluentAssertions" Version="6.12.2" />
+    <PackageReference Include="FluentAssertions" Version="7.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="System.Text.Json" Version="9.0.0" />
     <PackageReference Include="xunit" Version="2.9.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>