From 17e941d58726076b5c6108f531643c163fe21f54 Mon Sep 17 00:00:00 2001 From: Dano V Date: Fri, 31 Jan 2025 09:49:45 +0100 Subject: [PATCH 01/22] upgrade to net8.0 --- Dockerfile | 2 +- README.md | 2 +- global.json | 2 +- samples/Clients/old/MvcHybrid/MvcHybrid.csproj | 2 +- samples/Clients/old/MvcImplicit/MvcImplicit.csproj | 2 +- .../old/MvcImplicitJwtRequest/MvcImplicitJwtRequest.csproj | 2 +- samples/Clients/old/MvcManual/MvcManual.csproj | 2 +- .../src/APIs/ResourceBasedApi/ResourceBasedApi.csproj | 2 +- samples/Clients/src/APIs/SimpleApi/SimpleApi.csproj | 2 +- .../ConsoleClientCredentialsFlow.csproj | 2 +- ...soleClientCredentialsFlowCallingIdentityServerApi.csproj | 2 +- .../ConsoleClientCredentialsFlowPostBody.csproj | 2 +- samples/Clients/src/ConsoleCode/ConsoleCode.csproj | 2 +- .../src/ConsoleCustomGrant/ConsoleExtensionGrant.csproj | 2 +- .../Clients/src/ConsoleDeviceFlow/ConsoleDeviceFlow.csproj | 2 +- .../ConsoleEphemeralMtlsClient.csproj | 2 +- .../ConsoleIntrospectionClient.csproj | 2 +- .../Clients/src/ConsoleMTLSClient/ConsoleMTLSClient.csproj | 2 +- .../ConsoleParameterizedScopeClient.csproj | 2 +- .../ConsolePrivateKeyJwtClient.csproj | 2 +- .../ConsoleResourceOwnerFlow.csproj | 2 +- .../ConsoleResourceOwnerFlowPublic.csproj | 2 +- .../ConsoleResourceOwnerFlowReference.csproj | 2 +- .../ConsoleResourceOwnerFlowRefreshToken.csproj | 2 +- .../ConsoleResourceOwnerFlowUserInfo.csproj | 2 +- samples/Clients/src/JsOidc/JsOidc.csproj | 2 +- .../MvcAutomaticTokenManagement.csproj | 2 +- samples/Clients/src/MvcCode/MvcCode.csproj | 2 +- .../src/MvcHybridBackChannel/MvcHybridBackChannel.csproj | 2 +- samples/KeyManagement/FileSystem/FileSystemSample.csproj | 2 +- samples/KeyManagement/database/EF/EfSample.csproj | 2 +- samples/KeyManagement/database/migrations/migrations.csproj | 2 +- samples/Quickstarts/1_ClientCredentials/src/Api/Api.csproj | 2 +- .../1_ClientCredentials/src/Client/Client.csproj | 2 +- .../src/IdentityServer/IdentityServer.csproj | 2 +- .../Quickstarts/2_InteractiveAspNetCore/src/Api/Api.csproj | 2 +- .../2_InteractiveAspNetCore/src/Client/Client.csproj | 2 +- .../src/IdentityServer/IdentityServer.csproj | 2 +- .../2_InteractiveAspNetCore/src/MvcClient/MvcClient.csproj | 2 +- samples/Quickstarts/3_AspNetCoreAndApis/src/Api/Api.csproj | 2 +- .../3_AspNetCoreAndApis/src/Client/Client.csproj | 2 +- .../src/IdentityServer/IdentityServer.csproj | 2 +- .../3_AspNetCoreAndApis/src/MvcClient/MvcClient.csproj | 2 +- samples/Quickstarts/4_JavaScriptClient/src/Api/Api.csproj | 2 +- .../Quickstarts/4_JavaScriptClient/src/Client/Client.csproj | 2 +- .../src/IdentityServer/IdentityServer.csproj | 2 +- .../src/JavaScriptClient/JavaScriptClient.csproj | 2 +- .../4_JavaScriptClient/src/MvcClient/MvcClient.csproj | 2 +- samples/Quickstarts/5_EntityFramework/src/Api/Api.csproj | 2 +- .../Quickstarts/5_EntityFramework/src/Client/Client.csproj | 2 +- .../src/IdentityServer/IdentityServer.csproj | 2 +- .../5_EntityFramework/src/MvcClient/MvcClient.csproj | 2 +- samples/Quickstarts/6_AspNetIdentity/src/Api/Api.csproj | 2 +- .../Quickstarts/6_AspNetIdentity/src/Client/Client.csproj | 2 +- .../IdentityServerAspNetIdentity.csproj | 2 +- .../6_AspNetIdentity/src/MvcClient/MvcClient.csproj | 2 +- src/AspNetIdentity/build/build.csproj | 2 +- src/AspNetIdentity/host/Host.csproj | 2 +- src/AspNetIdentity/migrations/SqlServer/SqlServer.csproj | 2 +- .../src/IdentityServer4.AspNetIdentity.csproj | 2 +- src/Directory.Build.targets | 6 +++--- src/EntityFramework.Storage/build/build.csproj | 2 +- .../host/ConsoleHost/ConsoleHost.csproj | 2 +- .../migrations/SqlServer/SqlServer.csproj | 2 +- .../src/IdentityServer4.EntityFramework.Storage.csproj | 2 +- .../IdentityServer4.EntityFramework.IntegrationTests.csproj | 2 +- .../IdentityServer4.EntityFramework.UnitTests.csproj | 2 +- src/EntityFramework/build/build.csproj | 2 +- src/EntityFramework/host/Host.csproj | 2 +- src/EntityFramework/migrations/SqlServer/SqlServer.csproj | 2 +- .../src/IdentityServer4.EntityFramework.csproj | 2 +- .../IdentityServer4.EntityFramework.Tests.csproj | 2 +- src/IdentityServer4/build/build.csproj | 2 +- src/IdentityServer4/host/Host.csproj | 2 +- src/IdentityServer4/src/IdentityServer4.csproj | 2 +- .../IdentityServer.IntegrationTests.csproj | 2 +- .../IdentityServer.UnitTests.csproj | 2 +- src/Storage/build/build.csproj | 2 +- 78 files changed, 80 insertions(+), 80 deletions(-) diff --git a/Dockerfile b/Dockerfile index 524132a16..e1dcba413 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:6.0 +FROM mcr.microsoft.com/dotnet/sdk:8.0 WORKDIR /src COPY . . RUN /src/build.sh \ No newline at end of file diff --git a/README.md b/README.md index b00b65b6d..8f65542a8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# .NET 6.0 Port of IdentityServer4 +# .NET 8.0 Port of IdentityServer4 Once a new tag is created, NuGet packages are automatically added to a release as an asset. Packages are to be uploaded manually to whathever package hosting server you please - Nexus, etc. ## Important update from the original creators diff --git a/global.json b/global.json index adf50e1f7..51ea768a3 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "6.0.412" + "version": "8.0.405" } } \ No newline at end of file diff --git a/samples/Clients/old/MvcHybrid/MvcHybrid.csproj b/samples/Clients/old/MvcHybrid/MvcHybrid.csproj index 0f9a84153..9e20d004c 100644 --- a/samples/Clients/old/MvcHybrid/MvcHybrid.csproj +++ b/samples/Clients/old/MvcHybrid/MvcHybrid.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Clients/old/MvcImplicit/MvcImplicit.csproj b/samples/Clients/old/MvcImplicit/MvcImplicit.csproj index 3c844c78a..a95d8634d 100644 --- a/samples/Clients/old/MvcImplicit/MvcImplicit.csproj +++ b/samples/Clients/old/MvcImplicit/MvcImplicit.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Clients/old/MvcImplicitJwtRequest/MvcImplicitJwtRequest.csproj b/samples/Clients/old/MvcImplicitJwtRequest/MvcImplicitJwtRequest.csproj index 330d86809..bdcaa3f59 100644 --- a/samples/Clients/old/MvcImplicitJwtRequest/MvcImplicitJwtRequest.csproj +++ b/samples/Clients/old/MvcImplicitJwtRequest/MvcImplicitJwtRequest.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Clients/old/MvcManual/MvcManual.csproj b/samples/Clients/old/MvcManual/MvcManual.csproj index f928ec165..0c1bb005c 100644 --- a/samples/Clients/old/MvcManual/MvcManual.csproj +++ b/samples/Clients/old/MvcManual/MvcManual.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Clients/src/APIs/ResourceBasedApi/ResourceBasedApi.csproj b/samples/Clients/src/APIs/ResourceBasedApi/ResourceBasedApi.csproj index 0e02bd21c..449a2b999 100644 --- a/samples/Clients/src/APIs/ResourceBasedApi/ResourceBasedApi.csproj +++ b/samples/Clients/src/APIs/ResourceBasedApi/ResourceBasedApi.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Clients/src/APIs/SimpleApi/SimpleApi.csproj b/samples/Clients/src/APIs/SimpleApi/SimpleApi.csproj index bc24c9142..356d888f7 100644 --- a/samples/Clients/src/APIs/SimpleApi/SimpleApi.csproj +++ b/samples/Clients/src/APIs/SimpleApi/SimpleApi.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Clients/src/ConsoleClientCredentialsFlow/ConsoleClientCredentialsFlow.csproj b/samples/Clients/src/ConsoleClientCredentialsFlow/ConsoleClientCredentialsFlow.csproj index fddfa4c4c..193f9022e 100644 --- a/samples/Clients/src/ConsoleClientCredentialsFlow/ConsoleClientCredentialsFlow.csproj +++ b/samples/Clients/src/ConsoleClientCredentialsFlow/ConsoleClientCredentialsFlow.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Exe diff --git a/samples/Clients/src/ConsoleClientCredentialsFlowCallingIdentityServerApi/ConsoleClientCredentialsFlowCallingIdentityServerApi.csproj b/samples/Clients/src/ConsoleClientCredentialsFlowCallingIdentityServerApi/ConsoleClientCredentialsFlowCallingIdentityServerApi.csproj index fddfa4c4c..193f9022e 100644 --- a/samples/Clients/src/ConsoleClientCredentialsFlowCallingIdentityServerApi/ConsoleClientCredentialsFlowCallingIdentityServerApi.csproj +++ b/samples/Clients/src/ConsoleClientCredentialsFlowCallingIdentityServerApi/ConsoleClientCredentialsFlowCallingIdentityServerApi.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Exe diff --git a/samples/Clients/src/ConsoleClientCredentialsFlowPostBody/ConsoleClientCredentialsFlowPostBody.csproj b/samples/Clients/src/ConsoleClientCredentialsFlowPostBody/ConsoleClientCredentialsFlowPostBody.csproj index be424b745..981758807 100644 --- a/samples/Clients/src/ConsoleClientCredentialsFlowPostBody/ConsoleClientCredentialsFlowPostBody.csproj +++ b/samples/Clients/src/ConsoleClientCredentialsFlowPostBody/ConsoleClientCredentialsFlowPostBody.csproj @@ -1,6 +1,6 @@  - net6.0 + net8.0 Exe diff --git a/samples/Clients/src/ConsoleCode/ConsoleCode.csproj b/samples/Clients/src/ConsoleCode/ConsoleCode.csproj index f13a17911..6bd4d5cae 100644 --- a/samples/Clients/src/ConsoleCode/ConsoleCode.csproj +++ b/samples/Clients/src/ConsoleCode/ConsoleCode.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Exe ConsoleHybridWithPkce diff --git a/samples/Clients/src/ConsoleCustomGrant/ConsoleExtensionGrant.csproj b/samples/Clients/src/ConsoleCustomGrant/ConsoleExtensionGrant.csproj index fddfa4c4c..193f9022e 100644 --- a/samples/Clients/src/ConsoleCustomGrant/ConsoleExtensionGrant.csproj +++ b/samples/Clients/src/ConsoleCustomGrant/ConsoleExtensionGrant.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Exe diff --git a/samples/Clients/src/ConsoleDeviceFlow/ConsoleDeviceFlow.csproj b/samples/Clients/src/ConsoleDeviceFlow/ConsoleDeviceFlow.csproj index fddfa4c4c..193f9022e 100644 --- a/samples/Clients/src/ConsoleDeviceFlow/ConsoleDeviceFlow.csproj +++ b/samples/Clients/src/ConsoleDeviceFlow/ConsoleDeviceFlow.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Exe diff --git a/samples/Clients/src/ConsoleEphemeralMtlsClient/ConsoleEphemeralMtlsClient.csproj b/samples/Clients/src/ConsoleEphemeralMtlsClient/ConsoleEphemeralMtlsClient.csproj index ff708bb4e..e944b98c9 100644 --- a/samples/Clients/src/ConsoleEphemeralMtlsClient/ConsoleEphemeralMtlsClient.csproj +++ b/samples/Clients/src/ConsoleEphemeralMtlsClient/ConsoleEphemeralMtlsClient.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 diff --git a/samples/Clients/src/ConsoleIntrospectionClient/ConsoleIntrospectionClient.csproj b/samples/Clients/src/ConsoleIntrospectionClient/ConsoleIntrospectionClient.csproj index fddfa4c4c..193f9022e 100644 --- a/samples/Clients/src/ConsoleIntrospectionClient/ConsoleIntrospectionClient.csproj +++ b/samples/Clients/src/ConsoleIntrospectionClient/ConsoleIntrospectionClient.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Exe diff --git a/samples/Clients/src/ConsoleMTLSClient/ConsoleMTLSClient.csproj b/samples/Clients/src/ConsoleMTLSClient/ConsoleMTLSClient.csproj index 0da5c0567..60c7f9822 100644 --- a/samples/Clients/src/ConsoleMTLSClient/ConsoleMTLSClient.csproj +++ b/samples/Clients/src/ConsoleMTLSClient/ConsoleMTLSClient.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Exe diff --git a/samples/Clients/src/ConsoleParameterizedScopeClient/ConsoleParameterizedScopeClient.csproj b/samples/Clients/src/ConsoleParameterizedScopeClient/ConsoleParameterizedScopeClient.csproj index b9433b0c2..8b3cf2ad9 100644 --- a/samples/Clients/src/ConsoleParameterizedScopeClient/ConsoleParameterizedScopeClient.csproj +++ b/samples/Clients/src/ConsoleParameterizedScopeClient/ConsoleParameterizedScopeClient.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 ConsoleStructuredScopeClient diff --git a/samples/Clients/src/ConsolePrivateKeyJwtClient/ConsolePrivateKeyJwtClient.csproj b/samples/Clients/src/ConsolePrivateKeyJwtClient/ConsolePrivateKeyJwtClient.csproj index 4f549d8a6..d5600b96f 100644 --- a/samples/Clients/src/ConsolePrivateKeyJwtClient/ConsolePrivateKeyJwtClient.csproj +++ b/samples/Clients/src/ConsolePrivateKeyJwtClient/ConsolePrivateKeyJwtClient.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Exe diff --git a/samples/Clients/src/ConsoleResourceOwnerFlow/ConsoleResourceOwnerFlow.csproj b/samples/Clients/src/ConsoleResourceOwnerFlow/ConsoleResourceOwnerFlow.csproj index fddfa4c4c..193f9022e 100644 --- a/samples/Clients/src/ConsoleResourceOwnerFlow/ConsoleResourceOwnerFlow.csproj +++ b/samples/Clients/src/ConsoleResourceOwnerFlow/ConsoleResourceOwnerFlow.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Exe diff --git a/samples/Clients/src/ConsoleResourceOwnerFlowPublic/ConsoleResourceOwnerFlowPublic.csproj b/samples/Clients/src/ConsoleResourceOwnerFlowPublic/ConsoleResourceOwnerFlowPublic.csproj index fddfa4c4c..193f9022e 100644 --- a/samples/Clients/src/ConsoleResourceOwnerFlowPublic/ConsoleResourceOwnerFlowPublic.csproj +++ b/samples/Clients/src/ConsoleResourceOwnerFlowPublic/ConsoleResourceOwnerFlowPublic.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Exe diff --git a/samples/Clients/src/ConsoleResourceOwnerFlowReference/ConsoleResourceOwnerFlowReference.csproj b/samples/Clients/src/ConsoleResourceOwnerFlowReference/ConsoleResourceOwnerFlowReference.csproj index fddfa4c4c..193f9022e 100644 --- a/samples/Clients/src/ConsoleResourceOwnerFlowReference/ConsoleResourceOwnerFlowReference.csproj +++ b/samples/Clients/src/ConsoleResourceOwnerFlowReference/ConsoleResourceOwnerFlowReference.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Exe diff --git a/samples/Clients/src/ConsoleResourceOwnerFlowRefreshToken/ConsoleResourceOwnerFlowRefreshToken.csproj b/samples/Clients/src/ConsoleResourceOwnerFlowRefreshToken/ConsoleResourceOwnerFlowRefreshToken.csproj index fddfa4c4c..193f9022e 100644 --- a/samples/Clients/src/ConsoleResourceOwnerFlowRefreshToken/ConsoleResourceOwnerFlowRefreshToken.csproj +++ b/samples/Clients/src/ConsoleResourceOwnerFlowRefreshToken/ConsoleResourceOwnerFlowRefreshToken.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Exe diff --git a/samples/Clients/src/ConsoleResourceOwnerFlowUserInfo/ConsoleResourceOwnerFlowUserInfo.csproj b/samples/Clients/src/ConsoleResourceOwnerFlowUserInfo/ConsoleResourceOwnerFlowUserInfo.csproj index fddfa4c4c..193f9022e 100644 --- a/samples/Clients/src/ConsoleResourceOwnerFlowUserInfo/ConsoleResourceOwnerFlowUserInfo.csproj +++ b/samples/Clients/src/ConsoleResourceOwnerFlowUserInfo/ConsoleResourceOwnerFlowUserInfo.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Exe diff --git a/samples/Clients/src/JsOidc/JsOidc.csproj b/samples/Clients/src/JsOidc/JsOidc.csproj index 51c150a86..fbd3afa8a 100644 --- a/samples/Clients/src/JsOidc/JsOidc.csproj +++ b/samples/Clients/src/JsOidc/JsOidc.csproj @@ -1,6 +1,6 @@  - net6.0 + net8.0 \ No newline at end of file diff --git a/samples/Clients/src/MvcAutomaticTokenManagement/MvcAutomaticTokenManagement.csproj b/samples/Clients/src/MvcAutomaticTokenManagement/MvcAutomaticTokenManagement.csproj index d0290a8e7..fe7877f0a 100644 --- a/samples/Clients/src/MvcAutomaticTokenManagement/MvcAutomaticTokenManagement.csproj +++ b/samples/Clients/src/MvcAutomaticTokenManagement/MvcAutomaticTokenManagement.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Clients/src/MvcCode/MvcCode.csproj b/samples/Clients/src/MvcCode/MvcCode.csproj index cb1ac7a8f..c37ef772e 100644 --- a/samples/Clients/src/MvcCode/MvcCode.csproj +++ b/samples/Clients/src/MvcCode/MvcCode.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Clients/src/MvcHybridBackChannel/MvcHybridBackChannel.csproj b/samples/Clients/src/MvcHybridBackChannel/MvcHybridBackChannel.csproj index 3c844c78a..a95d8634d 100644 --- a/samples/Clients/src/MvcHybridBackChannel/MvcHybridBackChannel.csproj +++ b/samples/Clients/src/MvcHybridBackChannel/MvcHybridBackChannel.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/KeyManagement/FileSystem/FileSystemSample.csproj b/samples/KeyManagement/FileSystem/FileSystemSample.csproj index 23283cd5e..fab51d516 100644 --- a/samples/KeyManagement/FileSystem/FileSystemSample.csproj +++ b/samples/KeyManagement/FileSystem/FileSystemSample.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 diff --git a/samples/KeyManagement/database/EF/EfSample.csproj b/samples/KeyManagement/database/EF/EfSample.csproj index 3573c07cf..7b1dd8e99 100644 --- a/samples/KeyManagement/database/EF/EfSample.csproj +++ b/samples/KeyManagement/database/EF/EfSample.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/KeyManagement/database/migrations/migrations.csproj b/samples/KeyManagement/database/migrations/migrations.csproj index 527eb978b..c292cda05 100644 --- a/samples/KeyManagement/database/migrations/migrations.csproj +++ b/samples/KeyManagement/database/migrations/migrations.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Quickstarts/1_ClientCredentials/src/Api/Api.csproj b/samples/Quickstarts/1_ClientCredentials/src/Api/Api.csproj index 349516ccf..0e32db300 100644 --- a/samples/Quickstarts/1_ClientCredentials/src/Api/Api.csproj +++ b/samples/Quickstarts/1_ClientCredentials/src/Api/Api.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Quickstarts/1_ClientCredentials/src/Client/Client.csproj b/samples/Quickstarts/1_ClientCredentials/src/Client/Client.csproj index fc777d05e..ec3bcc8d8 100644 --- a/samples/Quickstarts/1_ClientCredentials/src/Client/Client.csproj +++ b/samples/Quickstarts/1_ClientCredentials/src/Client/Client.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Exe diff --git a/samples/Quickstarts/1_ClientCredentials/src/IdentityServer/IdentityServer.csproj b/samples/Quickstarts/1_ClientCredentials/src/IdentityServer/IdentityServer.csproj index cbc1e0bd1..a081e4fa6 100644 --- a/samples/Quickstarts/1_ClientCredentials/src/IdentityServer/IdentityServer.csproj +++ b/samples/Quickstarts/1_ClientCredentials/src/IdentityServer/IdentityServer.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Quickstarts/2_InteractiveAspNetCore/src/Api/Api.csproj b/samples/Quickstarts/2_InteractiveAspNetCore/src/Api/Api.csproj index 349516ccf..0e32db300 100644 --- a/samples/Quickstarts/2_InteractiveAspNetCore/src/Api/Api.csproj +++ b/samples/Quickstarts/2_InteractiveAspNetCore/src/Api/Api.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Quickstarts/2_InteractiveAspNetCore/src/Client/Client.csproj b/samples/Quickstarts/2_InteractiveAspNetCore/src/Client/Client.csproj index fc777d05e..ec3bcc8d8 100644 --- a/samples/Quickstarts/2_InteractiveAspNetCore/src/Client/Client.csproj +++ b/samples/Quickstarts/2_InteractiveAspNetCore/src/Client/Client.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Exe diff --git a/samples/Quickstarts/2_InteractiveAspNetCore/src/IdentityServer/IdentityServer.csproj b/samples/Quickstarts/2_InteractiveAspNetCore/src/IdentityServer/IdentityServer.csproj index 4c2dae2b7..7b6335395 100644 --- a/samples/Quickstarts/2_InteractiveAspNetCore/src/IdentityServer/IdentityServer.csproj +++ b/samples/Quickstarts/2_InteractiveAspNetCore/src/IdentityServer/IdentityServer.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Quickstarts/2_InteractiveAspNetCore/src/MvcClient/MvcClient.csproj b/samples/Quickstarts/2_InteractiveAspNetCore/src/MvcClient/MvcClient.csproj index e08aacd4f..4905641d5 100644 --- a/samples/Quickstarts/2_InteractiveAspNetCore/src/MvcClient/MvcClient.csproj +++ b/samples/Quickstarts/2_InteractiveAspNetCore/src/MvcClient/MvcClient.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Quickstarts/3_AspNetCoreAndApis/src/Api/Api.csproj b/samples/Quickstarts/3_AspNetCoreAndApis/src/Api/Api.csproj index 349516ccf..0e32db300 100644 --- a/samples/Quickstarts/3_AspNetCoreAndApis/src/Api/Api.csproj +++ b/samples/Quickstarts/3_AspNetCoreAndApis/src/Api/Api.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Quickstarts/3_AspNetCoreAndApis/src/Client/Client.csproj b/samples/Quickstarts/3_AspNetCoreAndApis/src/Client/Client.csproj index fc777d05e..ec3bcc8d8 100644 --- a/samples/Quickstarts/3_AspNetCoreAndApis/src/Client/Client.csproj +++ b/samples/Quickstarts/3_AspNetCoreAndApis/src/Client/Client.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Exe diff --git a/samples/Quickstarts/3_AspNetCoreAndApis/src/IdentityServer/IdentityServer.csproj b/samples/Quickstarts/3_AspNetCoreAndApis/src/IdentityServer/IdentityServer.csproj index 4c2dae2b7..7b6335395 100644 --- a/samples/Quickstarts/3_AspNetCoreAndApis/src/IdentityServer/IdentityServer.csproj +++ b/samples/Quickstarts/3_AspNetCoreAndApis/src/IdentityServer/IdentityServer.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Quickstarts/3_AspNetCoreAndApis/src/MvcClient/MvcClient.csproj b/samples/Quickstarts/3_AspNetCoreAndApis/src/MvcClient/MvcClient.csproj index a9f9ff051..e27988ebc 100644 --- a/samples/Quickstarts/3_AspNetCoreAndApis/src/MvcClient/MvcClient.csproj +++ b/samples/Quickstarts/3_AspNetCoreAndApis/src/MvcClient/MvcClient.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Quickstarts/4_JavaScriptClient/src/Api/Api.csproj b/samples/Quickstarts/4_JavaScriptClient/src/Api/Api.csproj index 349516ccf..0e32db300 100644 --- a/samples/Quickstarts/4_JavaScriptClient/src/Api/Api.csproj +++ b/samples/Quickstarts/4_JavaScriptClient/src/Api/Api.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Quickstarts/4_JavaScriptClient/src/Client/Client.csproj b/samples/Quickstarts/4_JavaScriptClient/src/Client/Client.csproj index fc777d05e..ec3bcc8d8 100644 --- a/samples/Quickstarts/4_JavaScriptClient/src/Client/Client.csproj +++ b/samples/Quickstarts/4_JavaScriptClient/src/Client/Client.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Exe diff --git a/samples/Quickstarts/4_JavaScriptClient/src/IdentityServer/IdentityServer.csproj b/samples/Quickstarts/4_JavaScriptClient/src/IdentityServer/IdentityServer.csproj index 4c2dae2b7..7b6335395 100644 --- a/samples/Quickstarts/4_JavaScriptClient/src/IdentityServer/IdentityServer.csproj +++ b/samples/Quickstarts/4_JavaScriptClient/src/IdentityServer/IdentityServer.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Quickstarts/4_JavaScriptClient/src/JavaScriptClient/JavaScriptClient.csproj b/samples/Quickstarts/4_JavaScriptClient/src/JavaScriptClient/JavaScriptClient.csproj index e948168d3..d1e4d6ede 100644 --- a/samples/Quickstarts/4_JavaScriptClient/src/JavaScriptClient/JavaScriptClient.csproj +++ b/samples/Quickstarts/4_JavaScriptClient/src/JavaScriptClient/JavaScriptClient.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 diff --git a/samples/Quickstarts/4_JavaScriptClient/src/MvcClient/MvcClient.csproj b/samples/Quickstarts/4_JavaScriptClient/src/MvcClient/MvcClient.csproj index a9f9ff051..e27988ebc 100644 --- a/samples/Quickstarts/4_JavaScriptClient/src/MvcClient/MvcClient.csproj +++ b/samples/Quickstarts/4_JavaScriptClient/src/MvcClient/MvcClient.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Quickstarts/5_EntityFramework/src/Api/Api.csproj b/samples/Quickstarts/5_EntityFramework/src/Api/Api.csproj index 349516ccf..0e32db300 100644 --- a/samples/Quickstarts/5_EntityFramework/src/Api/Api.csproj +++ b/samples/Quickstarts/5_EntityFramework/src/Api/Api.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Quickstarts/5_EntityFramework/src/Client/Client.csproj b/samples/Quickstarts/5_EntityFramework/src/Client/Client.csproj index fc777d05e..ec3bcc8d8 100644 --- a/samples/Quickstarts/5_EntityFramework/src/Client/Client.csproj +++ b/samples/Quickstarts/5_EntityFramework/src/Client/Client.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Exe diff --git a/samples/Quickstarts/5_EntityFramework/src/IdentityServer/IdentityServer.csproj b/samples/Quickstarts/5_EntityFramework/src/IdentityServer/IdentityServer.csproj index 632b9fc94..6eb759a23 100644 --- a/samples/Quickstarts/5_EntityFramework/src/IdentityServer/IdentityServer.csproj +++ b/samples/Quickstarts/5_EntityFramework/src/IdentityServer/IdentityServer.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 diff --git a/samples/Quickstarts/5_EntityFramework/src/MvcClient/MvcClient.csproj b/samples/Quickstarts/5_EntityFramework/src/MvcClient/MvcClient.csproj index a9f9ff051..e27988ebc 100644 --- a/samples/Quickstarts/5_EntityFramework/src/MvcClient/MvcClient.csproj +++ b/samples/Quickstarts/5_EntityFramework/src/MvcClient/MvcClient.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Quickstarts/6_AspNetIdentity/src/Api/Api.csproj b/samples/Quickstarts/6_AspNetIdentity/src/Api/Api.csproj index 349516ccf..0e32db300 100644 --- a/samples/Quickstarts/6_AspNetIdentity/src/Api/Api.csproj +++ b/samples/Quickstarts/6_AspNetIdentity/src/Api/Api.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Quickstarts/6_AspNetIdentity/src/Client/Client.csproj b/samples/Quickstarts/6_AspNetIdentity/src/Client/Client.csproj index fc777d05e..ec3bcc8d8 100644 --- a/samples/Quickstarts/6_AspNetIdentity/src/Client/Client.csproj +++ b/samples/Quickstarts/6_AspNetIdentity/src/Client/Client.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Exe diff --git a/samples/Quickstarts/6_AspNetIdentity/src/IdentityServerAspNetIdentity/IdentityServerAspNetIdentity.csproj b/samples/Quickstarts/6_AspNetIdentity/src/IdentityServerAspNetIdentity/IdentityServerAspNetIdentity.csproj index 9f455bf76..12eef7bb4 100644 --- a/samples/Quickstarts/6_AspNetIdentity/src/IdentityServerAspNetIdentity/IdentityServerAspNetIdentity.csproj +++ b/samples/Quickstarts/6_AspNetIdentity/src/IdentityServerAspNetIdentity/IdentityServerAspNetIdentity.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Quickstarts/6_AspNetIdentity/src/MvcClient/MvcClient.csproj b/samples/Quickstarts/6_AspNetIdentity/src/MvcClient/MvcClient.csproj index a9f9ff051..e27988ebc 100644 --- a/samples/Quickstarts/6_AspNetIdentity/src/MvcClient/MvcClient.csproj +++ b/samples/Quickstarts/6_AspNetIdentity/src/MvcClient/MvcClient.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/src/AspNetIdentity/build/build.csproj b/src/AspNetIdentity/build/build.csproj index b9a5a48d9..d8b27a074 100644 --- a/src/AspNetIdentity/build/build.csproj +++ b/src/AspNetIdentity/build/build.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 diff --git a/src/AspNetIdentity/host/Host.csproj b/src/AspNetIdentity/host/Host.csproj index 490b95451..04f0950e3 100644 --- a/src/AspNetIdentity/host/Host.csproj +++ b/src/AspNetIdentity/host/Host.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/src/AspNetIdentity/migrations/SqlServer/SqlServer.csproj b/src/AspNetIdentity/migrations/SqlServer/SqlServer.csproj index e8c87b6f2..274e828c7 100644 --- a/src/AspNetIdentity/migrations/SqlServer/SqlServer.csproj +++ b/src/AspNetIdentity/migrations/SqlServer/SqlServer.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/src/AspNetIdentity/src/IdentityServer4.AspNetIdentity.csproj b/src/AspNetIdentity/src/IdentityServer4.AspNetIdentity.csproj index 1e84a8fb7..5fd869a22 100644 --- a/src/AspNetIdentity/src/IdentityServer4.AspNetIdentity.csproj +++ b/src/AspNetIdentity/src/IdentityServer4.AspNetIdentity.csproj @@ -2,7 +2,7 @@ IdentityServer4.AspNetIdentity - net6.0 + net8.0 ASP.NET Core Identity Integration for IdentityServer4 Brock Allen;Dominick Baier diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index b2a9bad25..1310c530c 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -1,9 +1,9 @@ - 6.0.20 - 6.0.20 - 6.0.20 + 8.0.12 + 8.0.12 + 8.0.12 4.1.3-kistler.* diff --git a/src/EntityFramework.Storage/build/build.csproj b/src/EntityFramework.Storage/build/build.csproj index b9a5a48d9..d8b27a074 100644 --- a/src/EntityFramework.Storage/build/build.csproj +++ b/src/EntityFramework.Storage/build/build.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 diff --git a/src/EntityFramework.Storage/host/ConsoleHost/ConsoleHost.csproj b/src/EntityFramework.Storage/host/ConsoleHost/ConsoleHost.csproj index ce90be60b..d6fb6623f 100644 --- a/src/EntityFramework.Storage/host/ConsoleHost/ConsoleHost.csproj +++ b/src/EntityFramework.Storage/host/ConsoleHost/ConsoleHost.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 diff --git a/src/EntityFramework.Storage/migrations/SqlServer/SqlServer.csproj b/src/EntityFramework.Storage/migrations/SqlServer/SqlServer.csproj index ed2f56466..782672215 100644 --- a/src/EntityFramework.Storage/migrations/SqlServer/SqlServer.csproj +++ b/src/EntityFramework.Storage/migrations/SqlServer/SqlServer.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/src/EntityFramework.Storage/src/IdentityServer4.EntityFramework.Storage.csproj b/src/EntityFramework.Storage/src/IdentityServer4.EntityFramework.Storage.csproj index 3ccf24783..426f88e55 100644 --- a/src/EntityFramework.Storage/src/IdentityServer4.EntityFramework.Storage.csproj +++ b/src/EntityFramework.Storage/src/IdentityServer4.EntityFramework.Storage.csproj @@ -2,7 +2,7 @@ IdentityServer4.EntityFramework.Storage - net6.0 + net8.0 EntityFramework persistence layer for IdentityServer4 Brock Allen;Dominick Baier;Scott Brady diff --git a/src/EntityFramework.Storage/test/IntegrationTests/IdentityServer4.EntityFramework.IntegrationTests.csproj b/src/EntityFramework.Storage/test/IntegrationTests/IdentityServer4.EntityFramework.IntegrationTests.csproj index 6f27fe939..a08904389 100644 --- a/src/EntityFramework.Storage/test/IntegrationTests/IdentityServer4.EntityFramework.IntegrationTests.csproj +++ b/src/EntityFramework.Storage/test/IntegrationTests/IdentityServer4.EntityFramework.IntegrationTests.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 ../../../../key.snk true diff --git a/src/EntityFramework.Storage/test/UnitTests/IdentityServer4.EntityFramework.UnitTests.csproj b/src/EntityFramework.Storage/test/UnitTests/IdentityServer4.EntityFramework.UnitTests.csproj index e01330b77..a289be71a 100644 --- a/src/EntityFramework.Storage/test/UnitTests/IdentityServer4.EntityFramework.UnitTests.csproj +++ b/src/EntityFramework.Storage/test/UnitTests/IdentityServer4.EntityFramework.UnitTests.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 ../../../../key.snk true diff --git a/src/EntityFramework/build/build.csproj b/src/EntityFramework/build/build.csproj index b9a5a48d9..d8b27a074 100644 --- a/src/EntityFramework/build/build.csproj +++ b/src/EntityFramework/build/build.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 diff --git a/src/EntityFramework/host/Host.csproj b/src/EntityFramework/host/Host.csproj index 8e5ed0cb2..6bd1cefa1 100644 --- a/src/EntityFramework/host/Host.csproj +++ b/src/EntityFramework/host/Host.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/src/EntityFramework/migrations/SqlServer/SqlServer.csproj b/src/EntityFramework/migrations/SqlServer/SqlServer.csproj index 0ce43c362..51a50258c 100644 --- a/src/EntityFramework/migrations/SqlServer/SqlServer.csproj +++ b/src/EntityFramework/migrations/SqlServer/SqlServer.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/src/EntityFramework/src/IdentityServer4.EntityFramework.csproj b/src/EntityFramework/src/IdentityServer4.EntityFramework.csproj index 17153ff8f..aba2f24e1 100644 --- a/src/EntityFramework/src/IdentityServer4.EntityFramework.csproj +++ b/src/EntityFramework/src/IdentityServer4.EntityFramework.csproj @@ -2,7 +2,7 @@ IdentityServer4.EntityFramework - net6.0 + net8.0 EntityFramework persistence layer for IdentityServer4 Brock Allen;Dominick Baier;Scott Brady diff --git a/src/EntityFramework/test/IdentityServer4.EntityFramework.Tests/IdentityServer4.EntityFramework.Tests.csproj b/src/EntityFramework/test/IdentityServer4.EntityFramework.Tests/IdentityServer4.EntityFramework.Tests.csproj index 857d701ba..ec91d09ff 100644 --- a/src/EntityFramework/test/IdentityServer4.EntityFramework.Tests/IdentityServer4.EntityFramework.Tests.csproj +++ b/src/EntityFramework/test/IdentityServer4.EntityFramework.Tests/IdentityServer4.EntityFramework.Tests.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 false diff --git a/src/IdentityServer4/build/build.csproj b/src/IdentityServer4/build/build.csproj index b9a5a48d9..d8b27a074 100644 --- a/src/IdentityServer4/build/build.csproj +++ b/src/IdentityServer4/build/build.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 diff --git a/src/IdentityServer4/host/Host.csproj b/src/IdentityServer4/host/Host.csproj index 55377f75c..a7c6aa41b 100644 --- a/src/IdentityServer4/host/Host.csproj +++ b/src/IdentityServer4/host/Host.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 InProcess diff --git a/src/IdentityServer4/src/IdentityServer4.csproj b/src/IdentityServer4/src/IdentityServer4.csproj index 07e6d2376..61faeba98 100644 --- a/src/IdentityServer4/src/IdentityServer4.csproj +++ b/src/IdentityServer4/src/IdentityServer4.csproj @@ -2,7 +2,7 @@ IdentityServer4 - net6.0 + net8.0 OpenID Connect and OAuth 2.0 Framework for ASP.NET Core Brock Allen;Dominick Baier IdentityServer4 diff --git a/src/IdentityServer4/test/IdentityServer.IntegrationTests/IdentityServer.IntegrationTests.csproj b/src/IdentityServer4/test/IdentityServer.IntegrationTests/IdentityServer.IntegrationTests.csproj index e3007c9ff..0ca58d70a 100644 --- a/src/IdentityServer4/test/IdentityServer.IntegrationTests/IdentityServer.IntegrationTests.csproj +++ b/src/IdentityServer4/test/IdentityServer.IntegrationTests/IdentityServer.IntegrationTests.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/src/IdentityServer4/test/IdentityServer.UnitTests/IdentityServer.UnitTests.csproj b/src/IdentityServer4/test/IdentityServer.UnitTests/IdentityServer.UnitTests.csproj index 007ba67c6..405718e90 100644 --- a/src/IdentityServer4/test/IdentityServer.UnitTests/IdentityServer.UnitTests.csproj +++ b/src/IdentityServer4/test/IdentityServer.UnitTests/IdentityServer.UnitTests.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/src/Storage/build/build.csproj b/src/Storage/build/build.csproj index b9a5a48d9..d8b27a074 100644 --- a/src/Storage/build/build.csproj +++ b/src/Storage/build/build.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 From e5623485a2106acb4823c6d513b9f57285c9fd76 Mon Sep 17 00:00:00 2001 From: Dano V Date: Fri, 31 Jan 2025 09:54:38 +0100 Subject: [PATCH 02/22] use sdk version 8.0.112 in global.json --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 51ea768a3..3bcb6240b 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "8.0.405" + "version": "8.0.112" } } \ No newline at end of file From 5d4bd31fdb76fd795d612a9e51f632d03af698df Mon Sep 17 00:00:00 2001 From: Dano V Date: Fri, 31 Jan 2025 11:58:54 +0100 Subject: [PATCH 03/22] upgrade Microsoft.IdentityModel.Protocols.OpenIdConnect to 7.1.2 --- src/Directory.Build.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index 1310c530c..5ce6e74b1 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -40,7 +40,7 @@ - + From 1ffa975cf6319f59d8647b668b5c459b1e3137e5 Mon Sep 17 00:00:00 2001 From: Dano V Date: Fri, 31 Jan 2025 12:11:58 +0100 Subject: [PATCH 04/22] use net sdk 8.0.405 --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 3bcb6240b..51ea768a3 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "8.0.112" + "version": "8.0.405" } } \ No newline at end of file From 86d953cd50fab5cb0ae0d3877ff668d1e8a979a5 Mon Sep 17 00:00:00 2001 From: Dano V Date: Fri, 31 Jan 2025 12:14:43 +0100 Subject: [PATCH 05/22] use net sdk 8.0.* --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 51ea768a3..70976d298 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "8.0.405" + "version": "8.0.*" } } \ No newline at end of file From f9224028558de96df624032a115824bcda36bf12 Mon Sep 17 00:00:00 2001 From: Dano V Date: Fri, 31 Jan 2025 12:16:56 +0100 Subject: [PATCH 06/22] use System.IdentityModel.Tokens.Jwt 7.1.2 --- samples/Quickstarts/Directory.Build.targets | 2 +- src/Directory.Build.targets | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/Quickstarts/Directory.Build.targets b/samples/Quickstarts/Directory.Build.targets index 1611f8603..bdab1cb9d 100644 --- a/samples/Quickstarts/Directory.Build.targets +++ b/samples/Quickstarts/Directory.Build.targets @@ -16,7 +16,7 @@ - + diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index 5ce6e74b1..9c5f517e8 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -41,7 +41,7 @@ - + From 7b0167c334864cc25cf225c340b624d33ebc6a27 Mon Sep 17 00:00:00 2001 From: Dano V Date: Fri, 31 Jan 2025 12:23:25 +0100 Subject: [PATCH 07/22] IsNullOrEmpty() --- .../src/ResponseHandling/Default/DiscoveryResponseGenerator.cs | 2 +- .../src/Services/Default/DefaultKeyMaterialService.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/IdentityServer4/src/ResponseHandling/Default/DiscoveryResponseGenerator.cs b/src/IdentityServer4/src/ResponseHandling/Default/DiscoveryResponseGenerator.cs index 48755d073..9a4effc9d 100644 --- a/src/IdentityServer4/src/ResponseHandling/Default/DiscoveryResponseGenerator.cs +++ b/src/IdentityServer4/src/ResponseHandling/Default/DiscoveryResponseGenerator.cs @@ -334,7 +334,7 @@ where scope.ShowInDiscoveryDocument } // custom entries - if (!Options.Discovery.CustomEntries.IsNullOrEmpty()) + if (!IEnumerableExtensions.IsNullOrEmpty(Options.Discovery.CustomEntries)) { foreach ((string key, object value) in Options.Discovery.CustomEntries) { diff --git a/src/IdentityServer4/src/Services/Default/DefaultKeyMaterialService.cs b/src/IdentityServer4/src/Services/Default/DefaultKeyMaterialService.cs index a7590dc7a..c5ba6300d 100644 --- a/src/IdentityServer4/src/Services/Default/DefaultKeyMaterialService.cs +++ b/src/IdentityServer4/src/Services/Default/DefaultKeyMaterialService.cs @@ -38,7 +38,7 @@ public async Task GetSigningCredentialsAsync(IEnumerable Date: Fri, 31 Jan 2025 12:49:31 +0100 Subject: [PATCH 08/22] use System.IdentityModel.Tokens.Jwt 8.3.1 --- src/Directory.Build.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index 9c5f517e8..5dc6606c4 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -41,7 +41,7 @@ - + From 7ba11e71c8b190859f76e4383fb30d7dc8e18ccf Mon Sep 17 00:00:00 2001 From: Dano V Date: Tue, 4 Feb 2025 09:14:39 +0100 Subject: [PATCH 09/22] String -> var, invalid_request -> invalid_request_object --- .../Endpoints/Authorize/JwtRequestAuthorizeTests.cs | 10 +++++----- .../IdentityServerBuilderExtensionsCryptoTests.cs | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/IdentityServer4/test/IdentityServer.IntegrationTests/Endpoints/Authorize/JwtRequestAuthorizeTests.cs b/src/IdentityServer4/test/IdentityServer.IntegrationTests/Endpoints/Authorize/JwtRequestAuthorizeTests.cs index 308a12a7e..091879d97 100644 --- a/src/IdentityServer4/test/IdentityServer.IntegrationTests/Endpoints/Authorize/JwtRequestAuthorizeTests.cs +++ b/src/IdentityServer4/test/IdentityServer.IntegrationTests/Endpoints/Authorize/JwtRequestAuthorizeTests.cs @@ -203,7 +203,7 @@ public async Task missing_request_object_should_fail() var response = await _mockPipeline.BrowserClient.GetAsync(url); - _mockPipeline.ErrorMessage.Error.Should().Be("invalid_request"); + _mockPipeline.ErrorMessage.Error.Should().Be("invalid_request_object"); _mockPipeline.ErrorMessage.ErrorDescription.Should().Be("Client must use request object, but no request or request_uri parameter present"); _mockPipeline.LoginRequest.Should().BeNull(); } @@ -479,7 +479,7 @@ public async Task mismatch_in_jwt_values_should_error() }); var response = await _mockPipeline.BrowserClient.GetAsync(url); - _mockPipeline.ErrorMessage.Error.Should().Be("invalid_request"); + _mockPipeline.ErrorMessage.Error.Should().Be("invalid_request_object"); _mockPipeline.ErrorMessage.ErrorDescription.Should().Be("Parameter mismatch in JWT request"); _mockPipeline.LoginRequest.Should().BeNull(); } @@ -572,7 +572,7 @@ public async Task authorize_should_reject_jwt_request_without_client_id() }); var response = await _mockPipeline.BrowserClient.GetAsync(url); - _mockPipeline.ErrorMessage.Error.Should().Be("invalid_request"); + _mockPipeline.ErrorMessage.Error.Should().Be("invalid_request_object"); _mockPipeline.ErrorMessage.ErrorDescription.Should().Be("Invalid client_id"); _mockPipeline.LoginRequest.Should().BeNull(); } @@ -791,7 +791,7 @@ public async Task authorize_should_reject_jwt_request_if_response_type_does_not_ var response = await _mockPipeline.BrowserClient.GetAsync(url); - _mockPipeline.ErrorMessage.Error.Should().Be("invalid_request"); + _mockPipeline.ErrorMessage.Error.Should().Be("invalid_request_object"); _mockPipeline.ErrorMessage.ErrorDescription.Should().Be("Invalid JWT request"); _mockPipeline.LoginRequest.Should().BeNull(); } @@ -828,7 +828,7 @@ public async Task authorize_should_reject_jwt_request_if_client_id_does_not_matc var response = await _mockPipeline.BrowserClient.GetAsync(url); - _mockPipeline.ErrorMessage.Error.Should().Be("invalid_request"); + _mockPipeline.ErrorMessage.Error.Should().Be("_object"); _mockPipeline.ErrorMessage.ErrorDescription.Should().Be("Invalid JWT request"); _mockPipeline.LoginRequest.Should().BeNull(); } diff --git a/src/IdentityServer4/test/IdentityServer.UnitTests/Extensions/IdentityServerBuilderExtensionsCryptoTests.cs b/src/IdentityServer4/test/IdentityServer.UnitTests/Extensions/IdentityServerBuilderExtensionsCryptoTests.cs index 1cad80a09..31e48dc7d 100644 --- a/src/IdentityServer4/test/IdentityServer.UnitTests/Extensions/IdentityServerBuilderExtensionsCryptoTests.cs +++ b/src/IdentityServer4/test/IdentityServer.UnitTests/Extensions/IdentityServerBuilderExtensionsCryptoTests.cs @@ -21,7 +21,7 @@ public void AddSigningCredential_with_json_web_key_containing_asymmetric_key_sho IServiceCollection services = new ServiceCollection(); IIdentityServerBuilder identityServerBuilder = new IdentityServerBuilder(services); - String json = + var json = @"{ ""alg"" : ""RS256"", ""kty"" : ""RSA"", @@ -47,7 +47,7 @@ public void AddSigningCredential_with_json_web_key_containing_symmetric_key_shou IServiceCollection services = new ServiceCollection(); IIdentityServerBuilder identityServerBuilder = new IdentityServerBuilder(services); - String json = + var json = @"{ ""alg"" : ""HS256"", ""kty"" : ""oct"", From 02ed72b761d4f85e06cb94ce96773bd632732bfd Mon Sep 17 00:00:00 2001 From: Dano V Date: Tue, 4 Feb 2025 09:52:51 +0100 Subject: [PATCH 10/22] remove trailing comma from jsonwebkey json --- .../Extensions/IdentityServerBuilderExtensionsCryptoTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/IdentityServer4/test/IdentityServer.UnitTests/Extensions/IdentityServerBuilderExtensionsCryptoTests.cs b/src/IdentityServer4/test/IdentityServer.UnitTests/Extensions/IdentityServerBuilderExtensionsCryptoTests.cs index 31e48dc7d..7b54ad1e2 100644 --- a/src/IdentityServer4/test/IdentityServer.UnitTests/Extensions/IdentityServerBuilderExtensionsCryptoTests.cs +++ b/src/IdentityServer4/test/IdentityServer.UnitTests/Extensions/IdentityServerBuilderExtensionsCryptoTests.cs @@ -33,7 +33,7 @@ public void AddSigningCredential_with_json_web_key_containing_asymmetric_key_sho ""q"" : ""yDKBrS8l1DOx4dwP9hdwhqZJ3XahidiIZSL7m46I/6+cjaki/1mtNiA60MOgqTKegP7Fo7jAYvliqQwnvVGmQvLv19cfKywlIuKN9DdkLHnKh75hfo7aakEbO7GJ5zVgsNnKOdf8wvpclfvIuRDEVva4cksPzsJy6K7C8ENCSCM="", ""dp"" : ""GlYJ6o6wgawxCEQ5z5uWwETau5CS/Fk7kI2ceI14SZVHzlJQC2WglAcnQcqhmQCk57Xsy5iLM6vKyi8sdMJPh+nvR2HlyNA+w7YBy4L7odqn01VmLgv7zVVjZpNq4ZXEoDC1Q+xjtF1LoYaUt7wsRLp+a7znuPyHBXj1sAAeBwk="", ""dq"" : ""W8OK3S83T8VCTBzq1Ap6cb3XLcQq11yBaJpYaj0zXr/IKsbUW+dnFeBAFWEWS3gAX3Bod1tAFB3rs0D3FjhO1XE1ruHUT520iAEAwGiDaj+JLh994NzqELo3GW2PoIM/BtFNeKYgHd9UgQsgPnQJCzOb6Aev/z3yHeW9RRQPVbE="", - ""qi"" : ""w4KdmiDN1GtK71JxaasqmEKPNfV3v2KZDXKnfyhUsdx/idKbdTVjvMOkxFPJ4FqV4yIVn06f3QHTm4NEG18Diqxsrzd6kXQIHOa858tLsCcmt9FoGfrgCFgVceh3K/Zah/r8rl9Y61u0Z1kZumwMvFpFE+mVU01t9HgTEAVkHTc="", + ""qi"" : ""w4KdmiDN1GtK71JxaasqmEKPNfV3v2KZDXKnfyhUsdx/idKbdTVjvMOkxFPJ4FqV4yIVn06f3QHTm4NEG18Diqxsrzd6kXQIHOa858tLsCcmt9FoGfrgCFgVceh3K/Zah/r8rl9Y61u0Z1kZumwMvFpFE+mVU01t9HgTEAVkHTc="" }"; JsonWebKey jsonWebKey = new JsonWebKey(json); From 0c66bf122e817c12533bfd1eae4a3a4cf4b01211 Mon Sep 17 00:00:00 2001 From: Dano V Date: Tue, 4 Feb 2025 10:00:13 +0100 Subject: [PATCH 11/22] amend another set of unit tests --- .../Endpoints/Authorize/JwtRequestAuthorizeTests.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/IdentityServer4/test/IdentityServer.IntegrationTests/Endpoints/Authorize/JwtRequestAuthorizeTests.cs b/src/IdentityServer4/test/IdentityServer.IntegrationTests/Endpoints/Authorize/JwtRequestAuthorizeTests.cs index 091879d97..7d0ad0412 100644 --- a/src/IdentityServer4/test/IdentityServer.IntegrationTests/Endpoints/Authorize/JwtRequestAuthorizeTests.cs +++ b/src/IdentityServer4/test/IdentityServer.IntegrationTests/Endpoints/Authorize/JwtRequestAuthorizeTests.cs @@ -203,7 +203,7 @@ public async Task missing_request_object_should_fail() var response = await _mockPipeline.BrowserClient.GetAsync(url); - _mockPipeline.ErrorMessage.Error.Should().Be("invalid_request_object"); + _mockPipeline.ErrorMessage.Error.Should().Be("invalid_request"); _mockPipeline.ErrorMessage.ErrorDescription.Should().Be("Client must use request object, but no request or request_uri parameter present"); _mockPipeline.LoginRequest.Should().BeNull(); } @@ -572,7 +572,7 @@ public async Task authorize_should_reject_jwt_request_without_client_id() }); var response = await _mockPipeline.BrowserClient.GetAsync(url); - _mockPipeline.ErrorMessage.Error.Should().Be("invalid_request_object"); + _mockPipeline.ErrorMessage.Error.Should().Be("invalid_request"); _mockPipeline.ErrorMessage.ErrorDescription.Should().Be("Invalid client_id"); _mockPipeline.LoginRequest.Should().BeNull(); } @@ -828,7 +828,7 @@ public async Task authorize_should_reject_jwt_request_if_client_id_does_not_matc var response = await _mockPipeline.BrowserClient.GetAsync(url); - _mockPipeline.ErrorMessage.Error.Should().Be("_object"); + _mockPipeline.ErrorMessage.Error.Should().Be("invalid_request_object"); _mockPipeline.ErrorMessage.ErrorDescription.Should().Be("Invalid JWT request"); _mockPipeline.LoginRequest.Should().BeNull(); } From 2ccb07adf132429daac4268417396b8f7b60db4e Mon Sep 17 00:00:00 2001 From: Dano V Date: Tue, 4 Feb 2025 10:23:34 +0100 Subject: [PATCH 12/22] Parameter mismatch in JWT request -> Invalid JWT request --- .../Endpoints/Authorize/JwtRequestAuthorizeTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/IdentityServer4/test/IdentityServer.IntegrationTests/Endpoints/Authorize/JwtRequestAuthorizeTests.cs b/src/IdentityServer4/test/IdentityServer.IntegrationTests/Endpoints/Authorize/JwtRequestAuthorizeTests.cs index 7d0ad0412..aa72af51a 100644 --- a/src/IdentityServer4/test/IdentityServer.IntegrationTests/Endpoints/Authorize/JwtRequestAuthorizeTests.cs +++ b/src/IdentityServer4/test/IdentityServer.IntegrationTests/Endpoints/Authorize/JwtRequestAuthorizeTests.cs @@ -480,7 +480,7 @@ public async Task mismatch_in_jwt_values_should_error() var response = await _mockPipeline.BrowserClient.GetAsync(url); _mockPipeline.ErrorMessage.Error.Should().Be("invalid_request_object"); - _mockPipeline.ErrorMessage.ErrorDescription.Should().Be("Parameter mismatch in JWT request"); + _mockPipeline.ErrorMessage.ErrorDescription.Should().Be("Invalid JWT request"); _mockPipeline.LoginRequest.Should().BeNull(); } From 88f829d8a6ec27913b9b0e98ae08aaec4a321ece Mon Sep 17 00:00:00 2001 From: Dano V Date: Tue, 4 Feb 2025 12:46:03 +0100 Subject: [PATCH 13/22] double-quotes in json string --- .../Endpoints/Authorize/JwtRequestAuthorizeTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/IdentityServer4/test/IdentityServer.IntegrationTests/Endpoints/Authorize/JwtRequestAuthorizeTests.cs b/src/IdentityServer4/test/IdentityServer.IntegrationTests/Endpoints/Authorize/JwtRequestAuthorizeTests.cs index aa72af51a..98b1eae58 100644 --- a/src/IdentityServer4/test/IdentityServer.IntegrationTests/Endpoints/Authorize/JwtRequestAuthorizeTests.cs +++ b/src/IdentityServer4/test/IdentityServer.IntegrationTests/Endpoints/Authorize/JwtRequestAuthorizeTests.cs @@ -31,7 +31,7 @@ public class JwtRequestAuthorizeTests private readonly IdentityServerPipeline _mockPipeline = new IdentityServerPipeline(); private readonly Client _client; - private readonly string _symmetricJwk = @"{ 'kty': 'oct', 'use': 'sig', 'kid': '1', 'k': 'nYA-IFt8xTsdBHe9hunvizcp3Dt7f6qGqudq18kZHNtvqEGjJ9Ud-9x3kbQ-LYfLHS3xM2MpFQFg1JzT_0U_F8DI40oby4TvBDGszP664UgA8_5GjB7Flnrlsap1NlitvNpgQX3lpyTvC2zVuQ-UVsXbBDAaSBUSlnw7SE4LM8Ye2WYZrdCCXL8yAX9vIR7vf77yvNTEcBCI6y4JlvZaqMB4YKVSfygs8XqGGCHjLpE5bvI-A4ESbAUX26cVFvCeDg9pR6HK7BmwPMlO96krgtKZcXEJtUELYPys6-rbwAIdmxJxKxpgRpt0FRv_9fm6YPwG7QivYBX-vRwaodL1TA', 'alg': 'HS256'}"; + private readonly string _symmetricJwk = @"{ ""kty"": ""oct"", ""use"": ""sig"", ""kid"": ""1"", ""k"": ""nYA-IFt8xTsdBHe9hunvizcp3Dt7f6qGqudq18kZHNtvqEGjJ9Ud-9x3kbQ-LYfLHS3xM2MpFQFg1JzT_0U_F8DI40oby4TvBDGszP664UgA8_5GjB7Flnrlsap1NlitvNpgQX3lpyTvC2zVuQ-UVsXbBDAaSBUSlnw7SE4LM8Ye2WYZrdCCXL8yAX9vIR7vf77yvNTEcBCI6y4JlvZaqMB4YKVSfygs8XqGGCHjLpE5bvI-A4ESbAUX26cVFvCeDg9pR6HK7BmwPMlO96krgtKZcXEJtUELYPys6-rbwAIdmxJxKxpgRpt0FRv_9fm6YPwG7QivYBX-vRwaodL1TA"", ""alg"": ""HS256""}"; private readonly RsaSecurityKey _rsaKey; public JwtRequestAuthorizeTests() From 54b1204d80eac53669480c5072c22bfba05792ae Mon Sep 17 00:00:00 2001 From: Dano V Date: Tue, 4 Feb 2025 12:50:25 +0100 Subject: [PATCH 14/22] amend error responses --- .../Endpoints/Authorize/JwtRequestAuthorizeTests.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/IdentityServer4/test/IdentityServer.IntegrationTests/Endpoints/Authorize/JwtRequestAuthorizeTests.cs b/src/IdentityServer4/test/IdentityServer.IntegrationTests/Endpoints/Authorize/JwtRequestAuthorizeTests.cs index 98b1eae58..8ec50a48c 100644 --- a/src/IdentityServer4/test/IdentityServer.IntegrationTests/Endpoints/Authorize/JwtRequestAuthorizeTests.cs +++ b/src/IdentityServer4/test/IdentityServer.IntegrationTests/Endpoints/Authorize/JwtRequestAuthorizeTests.cs @@ -479,7 +479,7 @@ public async Task mismatch_in_jwt_values_should_error() }); var response = await _mockPipeline.BrowserClient.GetAsync(url); - _mockPipeline.ErrorMessage.Error.Should().Be("invalid_request_object"); + _mockPipeline.ErrorMessage.Error.Should().Be("invalid_request"); _mockPipeline.ErrorMessage.ErrorDescription.Should().Be("Invalid JWT request"); _mockPipeline.LoginRequest.Should().BeNull(); } @@ -791,7 +791,7 @@ public async Task authorize_should_reject_jwt_request_if_response_type_does_not_ var response = await _mockPipeline.BrowserClient.GetAsync(url); - _mockPipeline.ErrorMessage.Error.Should().Be("invalid_request_object"); + _mockPipeline.ErrorMessage.Error.Should().Be("invalid_request"); _mockPipeline.ErrorMessage.ErrorDescription.Should().Be("Invalid JWT request"); _mockPipeline.LoginRequest.Should().BeNull(); } @@ -828,7 +828,7 @@ public async Task authorize_should_reject_jwt_request_if_client_id_does_not_matc var response = await _mockPipeline.BrowserClient.GetAsync(url); - _mockPipeline.ErrorMessage.Error.Should().Be("invalid_request_object"); + _mockPipeline.ErrorMessage.Error.Should().Be("invalid_request"); _mockPipeline.ErrorMessage.ErrorDescription.Should().Be("Invalid JWT request"); _mockPipeline.LoginRequest.Should().BeNull(); } From 9a2d8e1ce0a7f854c583151b2a7fe69e1b514d32 Mon Sep 17 00:00:00 2001 From: Dano V Date: Tue, 4 Feb 2025 12:53:15 +0100 Subject: [PATCH 15/22] amend error responses --- .../Endpoints/Authorize/JwtRequestAuthorizeTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/IdentityServer4/test/IdentityServer.IntegrationTests/Endpoints/Authorize/JwtRequestAuthorizeTests.cs b/src/IdentityServer4/test/IdentityServer.IntegrationTests/Endpoints/Authorize/JwtRequestAuthorizeTests.cs index 8ec50a48c..31b6cd73b 100644 --- a/src/IdentityServer4/test/IdentityServer.IntegrationTests/Endpoints/Authorize/JwtRequestAuthorizeTests.cs +++ b/src/IdentityServer4/test/IdentityServer.IntegrationTests/Endpoints/Authorize/JwtRequestAuthorizeTests.cs @@ -480,7 +480,7 @@ public async Task mismatch_in_jwt_values_should_error() var response = await _mockPipeline.BrowserClient.GetAsync(url); _mockPipeline.ErrorMessage.Error.Should().Be("invalid_request"); - _mockPipeline.ErrorMessage.ErrorDescription.Should().Be("Invalid JWT request"); + _mockPipeline.ErrorMessage.ErrorDescription.Should().Be("Parameter mismatch in JWT request"); _mockPipeline.LoginRequest.Should().BeNull(); } From 23bbf0777b4f3359e3db3dac660e22f4c7a41b2e Mon Sep 17 00:00:00 2001 From: Dano V Date: Tue, 4 Feb 2025 13:09:23 +0100 Subject: [PATCH 16/22] update automapper --- src/Directory.Build.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index 5dc6606c4..b6223468f 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -43,7 +43,7 @@ - + From 4d4ae96e9dd21ad4ddfeb8c243dba97c3e1a425b Mon Sep 17 00:00:00 2001 From: Dano V Date: Tue, 4 Feb 2025 13:16:53 +0100 Subject: [PATCH 17/22] Mapper: change to non-generic method --- .../test/UnitTests/Mappers/ApiResourceMappersTests.cs | 2 +- .../test/UnitTests/Mappers/ClientMappersTests.cs | 2 +- .../test/UnitTests/Mappers/IdentityResourcesMappersTests.cs | 2 +- .../test/UnitTests/Mappers/PersistedGrantMappersTests.cs | 2 +- .../test/UnitTests/Mappers/ScopeMappersTests.cs | 2 +- .../src/Services/Default/DefaultBackChannelLogoutService.cs | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/EntityFramework.Storage/test/UnitTests/Mappers/ApiResourceMappersTests.cs b/src/EntityFramework.Storage/test/UnitTests/Mappers/ApiResourceMappersTests.cs index ec55c1a66..b297caff5 100644 --- a/src/EntityFramework.Storage/test/UnitTests/Mappers/ApiResourceMappersTests.cs +++ b/src/EntityFramework.Storage/test/UnitTests/Mappers/ApiResourceMappersTests.cs @@ -15,7 +15,7 @@ public class ApiResourceMappersTests [Fact] public void AutomapperConfigurationIsValid() { - ApiResourceMappers.Mapper.ConfigurationProvider.AssertConfigurationIsValid(); + ApiResourceMappers.Mapper.ConfigurationProvider.AssertConfigurationIsValid(); } [Fact] diff --git a/src/EntityFramework.Storage/test/UnitTests/Mappers/ClientMappersTests.cs b/src/EntityFramework.Storage/test/UnitTests/Mappers/ClientMappersTests.cs index 99a0e4459..91ac1b01f 100644 --- a/src/EntityFramework.Storage/test/UnitTests/Mappers/ClientMappersTests.cs +++ b/src/EntityFramework.Storage/test/UnitTests/Mappers/ClientMappersTests.cs @@ -16,7 +16,7 @@ public class ClientMappersTests [Fact] public void AutomapperConfigurationIsValid() { - ClientMappers.Mapper.ConfigurationProvider.AssertConfigurationIsValid(); + ClientMappers.Mapper.ConfigurationProvider.AssertConfigurationIsValid(); } [Fact] diff --git a/src/EntityFramework.Storage/test/UnitTests/Mappers/IdentityResourcesMappersTests.cs b/src/EntityFramework.Storage/test/UnitTests/Mappers/IdentityResourcesMappersTests.cs index fe2119319..783b11079 100644 --- a/src/EntityFramework.Storage/test/UnitTests/Mappers/IdentityResourcesMappersTests.cs +++ b/src/EntityFramework.Storage/test/UnitTests/Mappers/IdentityResourcesMappersTests.cs @@ -13,7 +13,7 @@ public class IdentityResourcesMappersTests [Fact] public void IdentityResourceAutomapperConfigurationIsValid() { - IdentityResourceMappers.Mapper.ConfigurationProvider.AssertConfigurationIsValid(); + IdentityResourceMappers.Mapper.ConfigurationProvider.AssertConfigurationIsValid(); } [Fact] diff --git a/src/EntityFramework.Storage/test/UnitTests/Mappers/PersistedGrantMappersTests.cs b/src/EntityFramework.Storage/test/UnitTests/Mappers/PersistedGrantMappersTests.cs index 48fbeffb4..6cdad39ac 100644 --- a/src/EntityFramework.Storage/test/UnitTests/Mappers/PersistedGrantMappersTests.cs +++ b/src/EntityFramework.Storage/test/UnitTests/Mappers/PersistedGrantMappersTests.cs @@ -14,7 +14,7 @@ public class PersistedGrantMappersTests [Fact] public void PersistedGrantAutomapperConfigurationIsValid() { - PersistedGrantMappers.Mapper.ConfigurationProvider.AssertConfigurationIsValid(); + PersistedGrantMappers.Mapper.ConfigurationProvider.AssertConfigurationIsValid(); } [Fact] diff --git a/src/EntityFramework.Storage/test/UnitTests/Mappers/ScopeMappersTests.cs b/src/EntityFramework.Storage/test/UnitTests/Mappers/ScopeMappersTests.cs index 2765e4aa4..a7395b540 100644 --- a/src/EntityFramework.Storage/test/UnitTests/Mappers/ScopeMappersTests.cs +++ b/src/EntityFramework.Storage/test/UnitTests/Mappers/ScopeMappersTests.cs @@ -15,7 +15,7 @@ public class ScopesMappersTests [Fact] public void ScopeAutomapperConfigurationIsValid() { - ScopeMappers.Mapper.ConfigurationProvider.AssertConfigurationIsValid(); + ScopeMappers.Mapper.ConfigurationProvider.AssertConfigurationIsValid(); } [Fact] diff --git a/src/IdentityServer4/src/Services/Default/DefaultBackChannelLogoutService.cs b/src/IdentityServer4/src/Services/Default/DefaultBackChannelLogoutService.cs index 09ce783c8..ba06704ea 100644 --- a/src/IdentityServer4/src/Services/Default/DefaultBackChannelLogoutService.cs +++ b/src/IdentityServer4/src/Services/Default/DefaultBackChannelLogoutService.cs @@ -27,7 +27,7 @@ public class DefaultBackChannelLogoutService : IBackChannelLogoutService /// /// The system clock; /// - protected ISystemClock Clock { get; } + protected TimeProvider Clock { get; } /// /// The IdentityServerTools used to create and the JWT. From 9ab340f22fd8eb58a3f04f13cf25ec7bd18ba042 Mon Sep 17 00:00:00 2001 From: Dano V Date: Tue, 4 Feb 2025 13:20:59 +0100 Subject: [PATCH 18/22] revert ISystemClock --- .../src/Services/Default/DefaultBackChannelLogoutService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/IdentityServer4/src/Services/Default/DefaultBackChannelLogoutService.cs b/src/IdentityServer4/src/Services/Default/DefaultBackChannelLogoutService.cs index ba06704ea..09ce783c8 100644 --- a/src/IdentityServer4/src/Services/Default/DefaultBackChannelLogoutService.cs +++ b/src/IdentityServer4/src/Services/Default/DefaultBackChannelLogoutService.cs @@ -27,7 +27,7 @@ public class DefaultBackChannelLogoutService : IBackChannelLogoutService /// /// The system clock; /// - protected TimeProvider Clock { get; } + protected ISystemClock Clock { get; } /// /// The IdentityServerTools used to create and the JWT. From 1f97a7f899e1ff0b06cfb45acb6a8f54f072e101 Mon Sep 17 00:00:00 2001 From: Dano V Date: Tue, 4 Feb 2025 13:25:12 +0100 Subject: [PATCH 19/22] System.Security.Principal.Windows 4.7.0 -> 5.0.0 --- src/Directory.Build.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index b6223468f..63f269ad1 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -42,7 +42,7 @@ - + From 3439ed48d271842d97da873426f28b5988d862e3 Mon Sep 17 00:00:00 2001 From: Dano V Date: Wed, 5 Feb 2025 09:02:02 +0100 Subject: [PATCH 20/22] upgrade Newtonsoft.Json to 13.0.3 --- src/Directory.Build.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index 63f269ad1..10cc6b9ae 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -39,7 +39,7 @@ - + From d7d2030e7517001ab2e928149fd8d2a8bc44f796 Mon Sep 17 00:00:00 2001 From: Dano V Date: Wed, 5 Feb 2025 09:08:17 +0100 Subject: [PATCH 21/22] test ISystemClock -> TimeProvider --- .../src/Validation/Default/TokenRequestValidator.cs | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/IdentityServer4/src/Validation/Default/TokenRequestValidator.cs b/src/IdentityServer4/src/Validation/Default/TokenRequestValidator.cs index ecdb1de98..7ee6bc54a 100644 --- a/src/IdentityServer4/src/Validation/Default/TokenRequestValidator.cs +++ b/src/IdentityServer4/src/Validation/Default/TokenRequestValidator.cs @@ -35,7 +35,6 @@ internal class TokenRequestValidator : ITokenRequestValidator private readonly IResourceOwnerPasswordValidator _resourceOwnerValidator; private readonly IProfileService _profile; private readonly IDeviceCodeValidator _deviceCodeValidator; - private readonly ISystemClock _clock; private readonly ILogger _logger; private ValidatedTokenRequest _validatedRequest; @@ -55,7 +54,6 @@ internal class TokenRequestValidator : ITokenRequestValidator /// The token validator. /// /// The events. - /// The clock. /// The logger. public TokenRequestValidator(IdentityServerOptions options, IAuthorizationCodeStore authorizationCodeStore, @@ -68,13 +66,11 @@ public TokenRequestValidator(IdentityServerOptions options, IResourceStore resourceStore, ITokenValidator tokenValidator, IRefreshTokenService refreshTokenService, - IEventService events, - ISystemClock clock, + IEventService events, ILogger logger) { _logger = logger; _options = options; - _clock = clock; _authorizationCodeStore = authorizationCodeStore; _resourceOwnerValidator = resourceOwnerValidator; _profile = profile; @@ -249,7 +245,7 @@ private async Task ValidateAuthorizationCodeReques // todo: set to consumed in the future? await _authorizationCodeStore.RemoveAuthorizationCodeAsync(code); - if (authZcode.CreationTime.HasExceeded(authZcode.Lifetime, _clock.UtcNow.UtcDateTime)) + if (authZcode.CreationTime.HasExceeded(authZcode.Lifetime, TimeProvider.GetUtcNow().UtcDateTime)) { LogError("Authorization code expired", new { code }); return Invalid(OidcConstants.TokenErrors.InvalidGrant); @@ -266,7 +262,7 @@ private async Task ValidateAuthorizationCodeReques ///////////////////////////////////////////// // validate code expiration ///////////////////////////////////////////// - if (authZcode.CreationTime.HasExceeded(_validatedRequest.Client.AuthorizationCodeLifetime, _clock.UtcNow.UtcDateTime)) + if (authZcode.CreationTime.HasExceeded(_validatedRequest.Client.AuthorizationCodeLifetime, TimeProvider.GetUtcNow().UtcDateTime)) { LogError("Authorization code is expired"); return Invalid(OidcConstants.TokenErrors.InvalidGrant); From 5f41b8aa37ba08eb4d4fd579f22a6310173a6cb9 Mon Sep 17 00:00:00 2001 From: Dano V Date: Wed, 5 Feb 2025 09:23:57 +0100 Subject: [PATCH 22/22] revert test ISystemClock -> TimeProvider --- .../src/Validation/Default/TokenRequestValidator.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/IdentityServer4/src/Validation/Default/TokenRequestValidator.cs b/src/IdentityServer4/src/Validation/Default/TokenRequestValidator.cs index 7ee6bc54a..ecdb1de98 100644 --- a/src/IdentityServer4/src/Validation/Default/TokenRequestValidator.cs +++ b/src/IdentityServer4/src/Validation/Default/TokenRequestValidator.cs @@ -35,6 +35,7 @@ internal class TokenRequestValidator : ITokenRequestValidator private readonly IResourceOwnerPasswordValidator _resourceOwnerValidator; private readonly IProfileService _profile; private readonly IDeviceCodeValidator _deviceCodeValidator; + private readonly ISystemClock _clock; private readonly ILogger _logger; private ValidatedTokenRequest _validatedRequest; @@ -54,6 +55,7 @@ internal class TokenRequestValidator : ITokenRequestValidator /// The token validator. /// /// The events. + /// The clock. /// The logger. public TokenRequestValidator(IdentityServerOptions options, IAuthorizationCodeStore authorizationCodeStore, @@ -66,11 +68,13 @@ public TokenRequestValidator(IdentityServerOptions options, IResourceStore resourceStore, ITokenValidator tokenValidator, IRefreshTokenService refreshTokenService, - IEventService events, + IEventService events, + ISystemClock clock, ILogger logger) { _logger = logger; _options = options; + _clock = clock; _authorizationCodeStore = authorizationCodeStore; _resourceOwnerValidator = resourceOwnerValidator; _profile = profile; @@ -245,7 +249,7 @@ private async Task ValidateAuthorizationCodeReques // todo: set to consumed in the future? await _authorizationCodeStore.RemoveAuthorizationCodeAsync(code); - if (authZcode.CreationTime.HasExceeded(authZcode.Lifetime, TimeProvider.GetUtcNow().UtcDateTime)) + if (authZcode.CreationTime.HasExceeded(authZcode.Lifetime, _clock.UtcNow.UtcDateTime)) { LogError("Authorization code expired", new { code }); return Invalid(OidcConstants.TokenErrors.InvalidGrant); @@ -262,7 +266,7 @@ private async Task ValidateAuthorizationCodeReques ///////////////////////////////////////////// // validate code expiration ///////////////////////////////////////////// - if (authZcode.CreationTime.HasExceeded(_validatedRequest.Client.AuthorizationCodeLifetime, TimeProvider.GetUtcNow().UtcDateTime)) + if (authZcode.CreationTime.HasExceeded(_validatedRequest.Client.AuthorizationCodeLifetime, _clock.UtcNow.UtcDateTime)) { LogError("Authorization code is expired"); return Invalid(OidcConstants.TokenErrors.InvalidGrant);