diff --git a/BFF/v2/TokenExchange/TokenExchange.IdentityServer/TokenExchange.IdentityServer.csproj b/BFF/v2/TokenExchange/TokenExchange.IdentityServer/TokenExchange.IdentityServer.csproj index fe9e400c..42cedd59 100644 --- a/BFF/v2/TokenExchange/TokenExchange.IdentityServer/TokenExchange.IdentityServer.csproj +++ b/BFF/v2/TokenExchange/TokenExchange.IdentityServer/TokenExchange.IdentityServer.csproj @@ -7,7 +7,7 @@ - + diff --git a/BFF/v3/BlazorAutoRendering/BlazorAutoRendering/BlazorAutoRendering.csproj b/BFF/v3/BlazorAutoRendering/BlazorAutoRendering/BlazorAutoRendering.csproj index 7684cc39..2255ba59 100644 --- a/BFF/v3/BlazorAutoRendering/BlazorAutoRendering/BlazorAutoRendering.csproj +++ b/BFF/v3/BlazorAutoRendering/BlazorAutoRendering/BlazorAutoRendering.csproj @@ -9,7 +9,7 @@ - + diff --git a/BFF/v3/TokenExchange/TokenExchange.IdentityServer/TokenExchange.IdentityServer.csproj b/BFF/v3/TokenExchange/TokenExchange.IdentityServer/TokenExchange.IdentityServer.csproj index fe9e400c..42cedd59 100644 --- a/BFF/v3/TokenExchange/TokenExchange.IdentityServer/TokenExchange.IdentityServer.csproj +++ b/BFF/v3/TokenExchange/TokenExchange.IdentityServer/TokenExchange.IdentityServer.csproj @@ -7,7 +7,7 @@ - + diff --git a/BFF/v3/Vue/Vue.Bff/Vue.Bff.csproj b/BFF/v3/Vue/Vue.Bff/Vue.Bff.csproj index e8cc11e2..5784a8a5 100644 --- a/BFF/v3/Vue/Vue.Bff/Vue.Bff.csproj +++ b/BFF/v3/Vue/Vue.Bff/Vue.Bff.csproj @@ -14,7 +14,7 @@ - + diff --git a/BFF/v4/Angular/Angular.Api/Angular.Api.csproj b/BFF/v4/Angular/Angular.Api/Angular.Api.csproj index cc6a7b03..84d1f1e3 100644 --- a/BFF/v4/Angular/Angular.Api/Angular.Api.csproj +++ b/BFF/v4/Angular/Angular.Api/Angular.Api.csproj @@ -8,7 +8,7 @@ - + diff --git a/BFF/v4/Angular/Angular.Bff/Angular.Bff.csproj b/BFF/v4/Angular/Angular.Bff/Angular.Bff.csproj index 2b6918ce..5d838bfc 100644 --- a/BFF/v4/Angular/Angular.Bff/Angular.Bff.csproj +++ b/BFF/v4/Angular/Angular.Bff/Angular.Bff.csproj @@ -18,7 +18,7 @@ - + 10.0.2 diff --git a/BFF/v4/Angular/angular.ssr/package-lock.json b/BFF/v4/Angular/angular.ssr/package-lock.json index 32c94f9f..88ebfb7d 100644 --- a/BFF/v4/Angular/angular.ssr/package-lock.json +++ b/BFF/v4/Angular/angular.ssr/package-lock.json @@ -310,6 +310,40 @@ } } }, + "node_modules/@angular-devkit/architect/node_modules/chokidar": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz", + "integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true, + "dependencies": { + "readdirp": "^5.0.0" + }, + "engines": { + "node": ">= 20.19.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@angular-devkit/architect/node_modules/readdirp": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.0.0.tgz", + "integrity": "sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true, + "engines": { + "node": ">= 20.19.0" + }, + "funding": { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + }, "node_modules/@angular-devkit/schematics": { "version": "21.1.1", "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-21.1.1.tgz", @@ -357,6 +391,40 @@ } } }, + "node_modules/@angular-devkit/schematics/node_modules/chokidar": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz", + "integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true, + "dependencies": { + "readdirp": "^5.0.0" + }, + "engines": { + "node": ">= 20.19.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@angular-devkit/schematics/node_modules/readdirp": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.0.0.tgz", + "integrity": "sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true, + "engines": { + "node": ">= 20.19.0" + }, + "funding": { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + }, "node_modules/@angular/build": { "version": "21.1.1", "resolved": "https://registry.npmjs.org/@angular/build/-/build-21.1.1.tgz", @@ -899,6 +967,18 @@ "node": ">=18" } }, + "node_modules/@angular/build/node_modules/@types/node": { + "version": "25.3.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-25.3.3.tgz", + "integrity": "sha512-DpzbrH7wIcBaJibpKo9nnSQL0MTRdnWttGyE5haGwK86xgMOkFLp7vEyfQPGLOJh5wNYiJ3V9PmUMDhV9u8kkQ==", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true, + "dependencies": { + "undici-types": "~7.18.0" + } + }, "node_modules/@angular/build/node_modules/@vitejs/plugin-basic-ssl": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-2.1.0.tgz", @@ -954,6 +1034,15 @@ "@esbuild/win32-x64": "0.27.2" } }, + "node_modules/@angular/build/node_modules/undici-types": { + "version": "7.18.2", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.18.2.tgz", + "integrity": "sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true + }, "node_modules/@angular/build/node_modules/vite": { "version": "7.3.0", "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.0.tgz", @@ -1093,6 +1182,40 @@ } } }, + "node_modules/@angular/cli/node_modules/chokidar": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz", + "integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true, + "dependencies": { + "readdirp": "^5.0.0" + }, + "engines": { + "node": ">= 20.19.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@angular/cli/node_modules/readdirp": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.0.0.tgz", + "integrity": "sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true, + "engines": { + "node": ">= 20.19.0" + }, + "funding": { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + }, "node_modules/@angular/common": { "version": "21.1.1", "resolved": "https://registry.npmjs.org/@angular/common/-/common-21.1.1.tgz", @@ -4262,6 +4385,40 @@ } } }, + "node_modules/@schematics/angular/node_modules/chokidar": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz", + "integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true, + "dependencies": { + "readdirp": "^5.0.0" + }, + "engines": { + "node": ">= 20.19.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@schematics/angular/node_modules/readdirp": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.0.0.tgz", + "integrity": "sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true, + "engines": { + "node": ">= 20.19.0" + }, + "funding": { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + }, "node_modules/@sigstore/bundle": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-4.0.0.tgz", diff --git a/BFF/v4/BlazorAutoRendering/BlazorAutoRendering.Api/BlazorAutoRendering.Api.csproj b/BFF/v4/BlazorAutoRendering/BlazorAutoRendering.Api/BlazorAutoRendering.Api.csproj index 95b71224..c9cc10ec 100644 --- a/BFF/v4/BlazorAutoRendering/BlazorAutoRendering.Api/BlazorAutoRendering.Api.csproj +++ b/BFF/v4/BlazorAutoRendering/BlazorAutoRendering.Api/BlazorAutoRendering.Api.csproj @@ -7,7 +7,7 @@ - + diff --git a/BFF/v4/BlazorAutoRendering/BlazorAutoRendering.Client/BlazorAutoRendering.Client.csproj b/BFF/v4/BlazorAutoRendering/BlazorAutoRendering.Client/BlazorAutoRendering.Client.csproj index 753c9528..92a50501 100644 --- a/BFF/v4/BlazorAutoRendering/BlazorAutoRendering.Client/BlazorAutoRendering.Client.csproj +++ b/BFF/v4/BlazorAutoRendering/BlazorAutoRendering.Client/BlazorAutoRendering.Client.csproj @@ -9,9 +9,9 @@ - - - + + + diff --git a/BFF/v4/BlazorAutoRendering/BlazorAutoRendering/BlazorAutoRendering.csproj b/BFF/v4/BlazorAutoRendering/BlazorAutoRendering/BlazorAutoRendering.csproj index 4a31ad66..40c55123 100644 --- a/BFF/v4/BlazorAutoRendering/BlazorAutoRendering/BlazorAutoRendering.csproj +++ b/BFF/v4/BlazorAutoRendering/BlazorAutoRendering/BlazorAutoRendering.csproj @@ -8,10 +8,10 @@ - - - - + + + + diff --git a/BFF/v4/BlazorWasm/BFF/BFF.csproj b/BFF/v4/BlazorWasm/BFF/BFF.csproj index d03fd292..3e4c8d6c 100644 --- a/BFF/v4/BlazorWasm/BFF/BFF.csproj +++ b/BFF/v4/BlazorWasm/BFF/BFF.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/BFF/v4/BlazorWasm/BlazorWasm/BlazorWasm.csproj b/BFF/v4/BlazorWasm/BlazorWasm/BlazorWasm.csproj index 9344fafe..73e59e4b 100644 --- a/BFF/v4/BlazorWasm/BlazorWasm/BlazorWasm.csproj +++ b/BFF/v4/BlazorWasm/BlazorWasm/BlazorWasm.csproj @@ -8,10 +8,10 @@ - - - - + + + + diff --git a/BFF/v4/MultiFrontendSSO/MultiFrontendSSO.Client/MultiFrontendSSO.Client.csproj b/BFF/v4/MultiFrontendSSO/MultiFrontendSSO.Client/MultiFrontendSSO.Client.csproj index 307a945f..baf27c15 100644 --- a/BFF/v4/MultiFrontendSSO/MultiFrontendSSO.Client/MultiFrontendSSO.Client.csproj +++ b/BFF/v4/MultiFrontendSSO/MultiFrontendSSO.Client/MultiFrontendSSO.Client.csproj @@ -7,7 +7,7 @@ - + diff --git a/BFF/v4/MultiFrontendSSO/MultiFrontendSSO.IdentityServer/MultiFrontendSSO.IdentityServer.csproj b/BFF/v4/MultiFrontendSSO/MultiFrontendSSO.IdentityServer/MultiFrontendSSO.IdentityServer.csproj index 8e3e040b..61da200c 100644 --- a/BFF/v4/MultiFrontendSSO/MultiFrontendSSO.IdentityServer/MultiFrontendSSO.IdentityServer.csproj +++ b/BFF/v4/MultiFrontendSSO/MultiFrontendSSO.IdentityServer/MultiFrontendSSO.IdentityServer.csproj @@ -7,7 +7,7 @@ - + diff --git a/IdentityServer/v7/Apis/ResourceBasedApi/ResourceBasedApi.csproj b/IdentityServer/v7/Apis/ResourceBasedApi/ResourceBasedApi.csproj index bfec9cd8..46dc3aef 100755 --- a/IdentityServer/v7/Apis/ResourceBasedApi/ResourceBasedApi.csproj +++ b/IdentityServer/v7/Apis/ResourceBasedApi/ResourceBasedApi.csproj @@ -6,7 +6,7 @@ - + diff --git a/IdentityServer/v7/Apis/SimpleApi/SimpleApi.csproj b/IdentityServer/v7/Apis/SimpleApi/SimpleApi.csproj index 9c02fbde..92521018 100755 --- a/IdentityServer/v7/Apis/SimpleApi/SimpleApi.csproj +++ b/IdentityServer/v7/Apis/SimpleApi/SimpleApi.csproj @@ -6,7 +6,7 @@ - + diff --git a/IdentityServer/v7/AspNetIdentity/Client/Client.csproj b/IdentityServer/v7/AspNetIdentity/Client/Client.csproj index ca9c5a2a..880e71db 100755 --- a/IdentityServer/v7/AspNetIdentity/Client/Client.csproj +++ b/IdentityServer/v7/AspNetIdentity/Client/Client.csproj @@ -6,7 +6,7 @@ - + diff --git a/IdentityServer/v7/AspNetIdentity/IdentityServerAspNetIdentity/IdentityServerAspNetIdentity.csproj b/IdentityServer/v7/AspNetIdentity/IdentityServerAspNetIdentity/IdentityServerAspNetIdentity.csproj index e195bcc7..6b585f4c 100755 --- a/IdentityServer/v7/AspNetIdentity/IdentityServerAspNetIdentity/IdentityServerAspNetIdentity.csproj +++ b/IdentityServer/v7/AspNetIdentity/IdentityServerAspNetIdentity/IdentityServerAspNetIdentity.csproj @@ -7,15 +7,15 @@ - + - - - - - - - + + + + + + + diff --git a/IdentityServer/v7/AspNetIdentityPasskeys/IdentityServerAspNetIdentityPasskeys/IdentityServerAspNetIdentityPasskeys.csproj b/IdentityServer/v7/AspNetIdentityPasskeys/IdentityServerAspNetIdentityPasskeys/IdentityServerAspNetIdentityPasskeys.csproj index 39f26fe4..5dc46cab 100644 --- a/IdentityServer/v7/AspNetIdentityPasskeys/IdentityServerAspNetIdentityPasskeys/IdentityServerAspNetIdentityPasskeys.csproj +++ b/IdentityServer/v7/AspNetIdentityPasskeys/IdentityServerAspNetIdentityPasskeys/IdentityServerAspNetIdentityPasskeys.csproj @@ -6,14 +6,14 @@ - + - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/IdentityServer/v7/Basics/MvcBackChannelLogout/src/Client.csproj b/IdentityServer/v7/Basics/MvcBackChannelLogout/src/Client.csproj index cf67adc8..b40eca28 100755 --- a/IdentityServer/v7/Basics/MvcBackChannelLogout/src/Client.csproj +++ b/IdentityServer/v7/Basics/MvcBackChannelLogout/src/Client.csproj @@ -6,7 +6,7 @@ - + diff --git a/IdentityServer/v7/Basics/MvcBasic/src/Client.csproj b/IdentityServer/v7/Basics/MvcBasic/src/Client.csproj index 16af8e43..cde3fc99 100755 --- a/IdentityServer/v7/Basics/MvcBasic/src/Client.csproj +++ b/IdentityServer/v7/Basics/MvcBasic/src/Client.csproj @@ -7,7 +7,7 @@ - + diff --git a/IdentityServer/v7/Basics/MvcJarJwt/src/Client.csproj b/IdentityServer/v7/Basics/MvcJarJwt/src/Client.csproj index a609c4f6..f2918a50 100755 --- a/IdentityServer/v7/Basics/MvcJarJwt/src/Client.csproj +++ b/IdentityServer/v7/Basics/MvcJarJwt/src/Client.csproj @@ -6,7 +6,7 @@ - + diff --git a/IdentityServer/v7/Basics/MvcPar/src/Client.csproj b/IdentityServer/v7/Basics/MvcPar/src/Client.csproj index 9aaca3a7..4f4fc52f 100644 --- a/IdentityServer/v7/Basics/MvcPar/src/Client.csproj +++ b/IdentityServer/v7/Basics/MvcPar/src/Client.csproj @@ -7,7 +7,7 @@ - + diff --git a/IdentityServer/v7/Basics/MvcTokenManagement/src/Client.csproj b/IdentityServer/v7/Basics/MvcTokenManagement/src/Client.csproj index a609c4f6..f2918a50 100755 --- a/IdentityServer/v7/Basics/MvcTokenManagement/src/Client.csproj +++ b/IdentityServer/v7/Basics/MvcTokenManagement/src/Client.csproj @@ -6,7 +6,7 @@ - + diff --git a/IdentityServer/v7/Configuration/IdentityServerHost/IdentityServer.csproj b/IdentityServer/v7/Configuration/IdentityServerHost/IdentityServer.csproj index 939bc88f..3925e647 100644 --- a/IdentityServer/v7/Configuration/IdentityServerHost/IdentityServer.csproj +++ b/IdentityServer/v7/Configuration/IdentityServerHost/IdentityServer.csproj @@ -7,11 +7,11 @@ - + - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/IdentityServer/v7/Configuration/Permissions/Configuration/Configuration.csproj b/IdentityServer/v7/Configuration/Permissions/Configuration/Configuration.csproj index 4b7f3b8b..d6057588 100644 --- a/IdentityServer/v7/Configuration/Permissions/Configuration/Configuration.csproj +++ b/IdentityServer/v7/Configuration/Permissions/Configuration/Configuration.csproj @@ -7,10 +7,10 @@ - - - - + + + + diff --git a/IdentityServer/v7/Configuration/PipelineRegistration/Configuration/Configuration.csproj b/IdentityServer/v7/Configuration/PipelineRegistration/Configuration/Configuration.csproj index 62964281..e52f68b7 100644 --- a/IdentityServer/v7/Configuration/PipelineRegistration/Configuration/Configuration.csproj +++ b/IdentityServer/v7/Configuration/PipelineRegistration/Configuration/Configuration.csproj @@ -7,11 +7,11 @@ - - + + - - + + diff --git a/IdentityServer/v7/Configuration/PipelineRegistration/ConsoleDcrClient/ConsoleDcrClient.csproj b/IdentityServer/v7/Configuration/PipelineRegistration/ConsoleDcrClient/ConsoleDcrClient.csproj index 87d6274f..ddba3079 100644 --- a/IdentityServer/v7/Configuration/PipelineRegistration/ConsoleDcrClient/ConsoleDcrClient.csproj +++ b/IdentityServer/v7/Configuration/PipelineRegistration/ConsoleDcrClient/ConsoleDcrClient.csproj @@ -8,9 +8,9 @@ - - - + + + diff --git a/IdentityServer/v7/Configuration/SimpleDcr/Configuration/Configuration.csproj b/IdentityServer/v7/Configuration/SimpleDcr/Configuration/Configuration.csproj index 4b7f3b8b..d6057588 100644 --- a/IdentityServer/v7/Configuration/SimpleDcr/Configuration/Configuration.csproj +++ b/IdentityServer/v7/Configuration/SimpleDcr/Configuration/Configuration.csproj @@ -7,10 +7,10 @@ - - - - + + + + diff --git a/IdentityServer/v7/Configuration/SoftwareStatement/Configuration/Configuration.csproj b/IdentityServer/v7/Configuration/SoftwareStatement/Configuration/Configuration.csproj index 4b7f3b8b..d6057588 100644 --- a/IdentityServer/v7/Configuration/SoftwareStatement/Configuration/Configuration.csproj +++ b/IdentityServer/v7/Configuration/SoftwareStatement/Configuration/Configuration.csproj @@ -7,10 +7,10 @@ - - - - + + + + diff --git a/IdentityServer/v7/DPoP/Api/Api.csproj b/IdentityServer/v7/DPoP/Api/Api.csproj index 78a8a313..9eb40454 100644 --- a/IdentityServer/v7/DPoP/Api/Api.csproj +++ b/IdentityServer/v7/DPoP/Api/Api.csproj @@ -8,7 +8,7 @@ - + diff --git a/IdentityServer/v7/DPoP/Api/Program.cs b/IdentityServer/v7/DPoP/Api/Program.cs index 8d2773ca..e5f35336 100644 --- a/IdentityServer/v7/DPoP/Api/Program.cs +++ b/IdentityServer/v7/DPoP/Api/Program.cs @@ -33,7 +33,7 @@ // layers DPoP onto the "token" scheme above builder.Services.ConfigureDPoPTokensForScheme("token", opt => { - // Chose a validation mode: either Nonce or IssuedAt. With nonce validation, + // Choose a expiration mode: either Nonce or IssuedAt. With nonce validation, // the api supplies a nonce that must be used to prove that the token was // not pre-generated. With IssuedAt validation, the client includes the // current time in the proof token, which is compared to the clock. Nonce @@ -42,7 +42,7 @@ // required each time the API is invoked. // // See RFC 9449 for more details. - opt.ValidationMode = ExpirationValidationMode.IssuedAt; // IssuedAt is the default. + opt.ProofTokenExpirationMode = DPoPProofExpirationMode.IssuedAt; // IssuedAt is the default. }); var app = builder.Build(); diff --git a/IdentityServer/v7/DPoP/ClientCredentials/ClientCredentials.csproj b/IdentityServer/v7/DPoP/ClientCredentials/ClientCredentials.csproj index 3ca2fb80..b8e4aab7 100644 --- a/IdentityServer/v7/DPoP/ClientCredentials/ClientCredentials.csproj +++ b/IdentityServer/v7/DPoP/ClientCredentials/ClientCredentials.csproj @@ -6,7 +6,7 @@ - + diff --git a/IdentityServer/v7/DPoP/WebClient/WebClient.csproj b/IdentityServer/v7/DPoP/WebClient/WebClient.csproj index 7fef000a..1e9d54fd 100644 --- a/IdentityServer/v7/DPoP/WebClient/WebClient.csproj +++ b/IdentityServer/v7/DPoP/WebClient/WebClient.csproj @@ -6,9 +6,9 @@ - - - + + + diff --git a/IdentityServer/v7/Diagnostics/Aspire/Aspire.ApiService/Aspire.ApiService.csproj b/IdentityServer/v7/Diagnostics/Aspire/Aspire.ApiService/Aspire.ApiService.csproj index 122315fd..697a3292 100644 --- a/IdentityServer/v7/Diagnostics/Aspire/Aspire.ApiService/Aspire.ApiService.csproj +++ b/IdentityServer/v7/Diagnostics/Aspire/Aspire.ApiService/Aspire.ApiService.csproj @@ -8,7 +8,7 @@ - + diff --git a/IdentityServer/v7/Diagnostics/Aspire/Aspire.AppHost/Aspire.AppHost.csproj b/IdentityServer/v7/Diagnostics/Aspire/Aspire.AppHost/Aspire.AppHost.csproj index e329b371..0ca64c66 100644 --- a/IdentityServer/v7/Diagnostics/Aspire/Aspire.AppHost/Aspire.AppHost.csproj +++ b/IdentityServer/v7/Diagnostics/Aspire/Aspire.AppHost/Aspire.AppHost.csproj @@ -15,4 +15,8 @@ + + + + diff --git a/IdentityServer/v7/Diagnostics/Aspire/Aspire.Web/Aspire.Web.csproj b/IdentityServer/v7/Diagnostics/Aspire/Aspire.Web/Aspire.Web.csproj index 9e5040b5..d7828e20 100644 --- a/IdentityServer/v7/Diagnostics/Aspire/Aspire.Web/Aspire.Web.csproj +++ b/IdentityServer/v7/Diagnostics/Aspire/Aspire.Web/Aspire.Web.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/IdentityServer/v7/Diagnostics/Aspire/IdentityServer/IdentityServer.csproj b/IdentityServer/v7/Diagnostics/Aspire/IdentityServer/IdentityServer.csproj index c040ff8c..f549f394 100644 --- a/IdentityServer/v7/Diagnostics/Aspire/IdentityServer/IdentityServer.csproj +++ b/IdentityServer/v7/Diagnostics/Aspire/IdentityServer/IdentityServer.csproj @@ -7,7 +7,7 @@ - + diff --git a/IdentityServer/v7/Diagnostics/Otel/src/Otel.csproj b/IdentityServer/v7/Diagnostics/Otel/src/Otel.csproj index ebc184a2..42072714 100644 --- a/IdentityServer/v7/Diagnostics/Otel/src/Otel.csproj +++ b/IdentityServer/v7/Diagnostics/Otel/src/Otel.csproj @@ -6,7 +6,7 @@ - + diff --git a/IdentityServer/v7/IdentityServerHost/src/IdentityServerHost.csproj b/IdentityServer/v7/IdentityServerHost/src/IdentityServerHost.csproj index d499f806..f7118cff 100755 --- a/IdentityServer/v7/IdentityServerHost/src/IdentityServerHost.csproj +++ b/IdentityServer/v7/IdentityServerHost/src/IdentityServerHost.csproj @@ -6,7 +6,7 @@ - + diff --git a/IdentityServer/v7/MTLS/Api/Api.csproj b/IdentityServer/v7/MTLS/Api/Api.csproj index 2eab82f7..b6a52f82 100644 --- a/IdentityServer/v7/MTLS/Api/Api.csproj +++ b/IdentityServer/v7/MTLS/Api/Api.csproj @@ -6,7 +6,7 @@ - + diff --git a/IdentityServer/v7/MTLS/IdentityServerHost/IdentityServerHost.csproj b/IdentityServer/v7/MTLS/IdentityServerHost/IdentityServerHost.csproj index c2afba5a..0455ebc3 100644 --- a/IdentityServer/v7/MTLS/IdentityServerHost/IdentityServerHost.csproj +++ b/IdentityServer/v7/MTLS/IdentityServerHost/IdentityServerHost.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/IdentityServer/v7/McpDemo/McpDemo.Client/McpDemo.Client.csproj b/IdentityServer/v7/McpDemo/McpDemo.Client/McpDemo.Client.csproj index a92ab9d2..806a5507 100644 --- a/IdentityServer/v7/McpDemo/McpDemo.Client/McpDemo.Client.csproj +++ b/IdentityServer/v7/McpDemo/McpDemo.Client/McpDemo.Client.csproj @@ -8,7 +8,7 @@ - + diff --git a/IdentityServer/v7/McpDemo/McpDemo.IdentityServer/McpDemo.IdentityServer.csproj b/IdentityServer/v7/McpDemo/McpDemo.IdentityServer/McpDemo.IdentityServer.csproj index b93a689e..2ca95e7e 100644 --- a/IdentityServer/v7/McpDemo/McpDemo.IdentityServer/McpDemo.IdentityServer.csproj +++ b/IdentityServer/v7/McpDemo/McpDemo.IdentityServer/McpDemo.IdentityServer.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/IdentityServer/v7/McpDemo/McpDemo.McpServer/McpDemo.McpServer.csproj b/IdentityServer/v7/McpDemo/McpDemo.McpServer/McpDemo.McpServer.csproj index 759d7c77..bef1affc 100644 --- a/IdentityServer/v7/McpDemo/McpDemo.McpServer/McpDemo.McpServer.csproj +++ b/IdentityServer/v7/McpDemo/McpDemo.McpServer/McpDemo.McpServer.csproj @@ -7,7 +7,7 @@ - + diff --git a/IdentityServer/v7/PAT/Api/Api.csproj b/IdentityServer/v7/PAT/Api/Api.csproj index 817e6ed3..4fe08bb7 100644 --- a/IdentityServer/v7/PAT/Api/Api.csproj +++ b/IdentityServer/v7/PAT/Api/Api.csproj @@ -7,7 +7,7 @@ - + diff --git a/IdentityServer/v7/PAT/IdentityServerHost/IdentityServerHost.csproj b/IdentityServer/v7/PAT/IdentityServerHost/IdentityServerHost.csproj index 2710dbdd..684e6b94 100644 --- a/IdentityServer/v7/PAT/IdentityServerHost/IdentityServerHost.csproj +++ b/IdentityServer/v7/PAT/IdentityServerHost/IdentityServerHost.csproj @@ -6,8 +6,7 @@ - - + diff --git a/IdentityServer/v7/Quickstarts/1_ClientCredentials/src/Api/Api.csproj b/IdentityServer/v7/Quickstarts/1_ClientCredentials/src/Api/Api.csproj index cc6a7b03..84d1f1e3 100755 --- a/IdentityServer/v7/Quickstarts/1_ClientCredentials/src/Api/Api.csproj +++ b/IdentityServer/v7/Quickstarts/1_ClientCredentials/src/Api/Api.csproj @@ -8,7 +8,7 @@ - + diff --git a/IdentityServer/v7/Quickstarts/1_ClientCredentials/src/IdentityServer/IdentityServer.csproj b/IdentityServer/v7/Quickstarts/1_ClientCredentials/src/IdentityServer/IdentityServer.csproj index 2756a0cc..ee87509a 100755 --- a/IdentityServer/v7/Quickstarts/1_ClientCredentials/src/IdentityServer/IdentityServer.csproj +++ b/IdentityServer/v7/Quickstarts/1_ClientCredentials/src/IdentityServer/IdentityServer.csproj @@ -7,7 +7,7 @@ - + diff --git a/IdentityServer/v7/Quickstarts/2_InteractiveAspNetCore/src/Api/Api.csproj b/IdentityServer/v7/Quickstarts/2_InteractiveAspNetCore/src/Api/Api.csproj index cc6a7b03..84d1f1e3 100755 --- a/IdentityServer/v7/Quickstarts/2_InteractiveAspNetCore/src/Api/Api.csproj +++ b/IdentityServer/v7/Quickstarts/2_InteractiveAspNetCore/src/Api/Api.csproj @@ -8,7 +8,7 @@ - + diff --git a/IdentityServer/v7/Quickstarts/2_InteractiveAspNetCore/src/IdentityServer/IdentityServer.csproj b/IdentityServer/v7/Quickstarts/2_InteractiveAspNetCore/src/IdentityServer/IdentityServer.csproj index c51e0b93..eb170b33 100755 --- a/IdentityServer/v7/Quickstarts/2_InteractiveAspNetCore/src/IdentityServer/IdentityServer.csproj +++ b/IdentityServer/v7/Quickstarts/2_InteractiveAspNetCore/src/IdentityServer/IdentityServer.csproj @@ -7,7 +7,7 @@ - + diff --git a/IdentityServer/v7/Quickstarts/2_InteractiveAspNetCore/src/WebClient/WebClient.csproj b/IdentityServer/v7/Quickstarts/2_InteractiveAspNetCore/src/WebClient/WebClient.csproj index e3c55193..8dfc6a00 100644 --- a/IdentityServer/v7/Quickstarts/2_InteractiveAspNetCore/src/WebClient/WebClient.csproj +++ b/IdentityServer/v7/Quickstarts/2_InteractiveAspNetCore/src/WebClient/WebClient.csproj @@ -7,7 +7,7 @@ - + diff --git a/IdentityServer/v7/Quickstarts/3_AspNetCoreAndApis/src/Api/Api.csproj b/IdentityServer/v7/Quickstarts/3_AspNetCoreAndApis/src/Api/Api.csproj index cc6a7b03..84d1f1e3 100755 --- a/IdentityServer/v7/Quickstarts/3_AspNetCoreAndApis/src/Api/Api.csproj +++ b/IdentityServer/v7/Quickstarts/3_AspNetCoreAndApis/src/Api/Api.csproj @@ -8,7 +8,7 @@ - + diff --git a/IdentityServer/v7/Quickstarts/3_AspNetCoreAndApis/src/IdentityServer/IdentityServer.csproj b/IdentityServer/v7/Quickstarts/3_AspNetCoreAndApis/src/IdentityServer/IdentityServer.csproj index c51e0b93..2bc8c479 100755 --- a/IdentityServer/v7/Quickstarts/3_AspNetCoreAndApis/src/IdentityServer/IdentityServer.csproj +++ b/IdentityServer/v7/Quickstarts/3_AspNetCoreAndApis/src/IdentityServer/IdentityServer.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/IdentityServer/v7/Quickstarts/3_AspNetCoreAndApis/src/WebClient/WebClient.csproj b/IdentityServer/v7/Quickstarts/3_AspNetCoreAndApis/src/WebClient/WebClient.csproj index e3c55193..8dfc6a00 100644 --- a/IdentityServer/v7/Quickstarts/3_AspNetCoreAndApis/src/WebClient/WebClient.csproj +++ b/IdentityServer/v7/Quickstarts/3_AspNetCoreAndApis/src/WebClient/WebClient.csproj @@ -7,7 +7,7 @@ - + diff --git a/IdentityServer/v7/Quickstarts/3a_TokenManagement/src/Api/Api.csproj b/IdentityServer/v7/Quickstarts/3a_TokenManagement/src/Api/Api.csproj index cc6a7b03..84d1f1e3 100644 --- a/IdentityServer/v7/Quickstarts/3a_TokenManagement/src/Api/Api.csproj +++ b/IdentityServer/v7/Quickstarts/3a_TokenManagement/src/Api/Api.csproj @@ -8,7 +8,7 @@ - + diff --git a/IdentityServer/v7/Quickstarts/3a_TokenManagement/src/IdentityServer/IdentityServer.csproj b/IdentityServer/v7/Quickstarts/3a_TokenManagement/src/IdentityServer/IdentityServer.csproj index c51e0b93..eb170b33 100644 --- a/IdentityServer/v7/Quickstarts/3a_TokenManagement/src/IdentityServer/IdentityServer.csproj +++ b/IdentityServer/v7/Quickstarts/3a_TokenManagement/src/IdentityServer/IdentityServer.csproj @@ -7,7 +7,7 @@ - + diff --git a/IdentityServer/v7/Quickstarts/3a_TokenManagement/src/WebClient/WebClient.csproj b/IdentityServer/v7/Quickstarts/3a_TokenManagement/src/WebClient/WebClient.csproj index 8b72cf11..fe179522 100644 --- a/IdentityServer/v7/Quickstarts/3a_TokenManagement/src/WebClient/WebClient.csproj +++ b/IdentityServer/v7/Quickstarts/3a_TokenManagement/src/WebClient/WebClient.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/IdentityServer/v7/Quickstarts/4_EntityFramework/src/Api/Api.csproj b/IdentityServer/v7/Quickstarts/4_EntityFramework/src/Api/Api.csproj index cc6a7b03..84d1f1e3 100755 --- a/IdentityServer/v7/Quickstarts/4_EntityFramework/src/Api/Api.csproj +++ b/IdentityServer/v7/Quickstarts/4_EntityFramework/src/Api/Api.csproj @@ -8,7 +8,7 @@ - + diff --git a/IdentityServer/v7/Quickstarts/4_EntityFramework/src/IdentityServer/IdentityServer.csproj b/IdentityServer/v7/Quickstarts/4_EntityFramework/src/IdentityServer/IdentityServer.csproj index e37ec5a5..c5f4664c 100755 --- a/IdentityServer/v7/Quickstarts/4_EntityFramework/src/IdentityServer/IdentityServer.csproj +++ b/IdentityServer/v7/Quickstarts/4_EntityFramework/src/IdentityServer/IdentityServer.csproj @@ -7,13 +7,13 @@ - + - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + diff --git a/IdentityServer/v7/Quickstarts/4_EntityFramework/src/WebClient/WebClient.csproj b/IdentityServer/v7/Quickstarts/4_EntityFramework/src/WebClient/WebClient.csproj index e3c55193..8dfc6a00 100644 --- a/IdentityServer/v7/Quickstarts/4_EntityFramework/src/WebClient/WebClient.csproj +++ b/IdentityServer/v7/Quickstarts/4_EntityFramework/src/WebClient/WebClient.csproj @@ -7,7 +7,7 @@ - + diff --git a/IdentityServer/v7/Quickstarts/5_AspNetIdentity/src/Api/Api.csproj b/IdentityServer/v7/Quickstarts/5_AspNetIdentity/src/Api/Api.csproj index cc6a7b03..84d1f1e3 100755 --- a/IdentityServer/v7/Quickstarts/5_AspNetIdentity/src/Api/Api.csproj +++ b/IdentityServer/v7/Quickstarts/5_AspNetIdentity/src/Api/Api.csproj @@ -8,7 +8,7 @@ - + diff --git a/IdentityServer/v7/Quickstarts/5_AspNetIdentity/src/IdentityServerAspNetIdentity/IdentityServerAspNetIdentity.csproj b/IdentityServer/v7/Quickstarts/5_AspNetIdentity/src/IdentityServerAspNetIdentity/IdentityServerAspNetIdentity.csproj index 039c486a..90c0ce7f 100644 --- a/IdentityServer/v7/Quickstarts/5_AspNetIdentity/src/IdentityServerAspNetIdentity/IdentityServerAspNetIdentity.csproj +++ b/IdentityServer/v7/Quickstarts/5_AspNetIdentity/src/IdentityServerAspNetIdentity/IdentityServerAspNetIdentity.csproj @@ -7,14 +7,14 @@ - + - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/IdentityServer/v7/Quickstarts/5_AspNetIdentity/src/WebClient/WebClient.csproj b/IdentityServer/v7/Quickstarts/5_AspNetIdentity/src/WebClient/WebClient.csproj index e3c55193..8dfc6a00 100644 --- a/IdentityServer/v7/Quickstarts/5_AspNetIdentity/src/WebClient/WebClient.csproj +++ b/IdentityServer/v7/Quickstarts/5_AspNetIdentity/src/WebClient/WebClient.csproj @@ -7,7 +7,7 @@ - + diff --git a/IdentityServer/v7/Quickstarts/6_JS_with_backend/src/Api/Api.csproj b/IdentityServer/v7/Quickstarts/6_JS_with_backend/src/Api/Api.csproj index cc6a7b03..84d1f1e3 100755 --- a/IdentityServer/v7/Quickstarts/6_JS_with_backend/src/Api/Api.csproj +++ b/IdentityServer/v7/Quickstarts/6_JS_with_backend/src/Api/Api.csproj @@ -8,7 +8,7 @@ - + diff --git a/IdentityServer/v7/Quickstarts/6_JS_with_backend/src/IdentityServer/IdentityServer.csproj b/IdentityServer/v7/Quickstarts/6_JS_with_backend/src/IdentityServer/IdentityServer.csproj index c51e0b93..eb170b33 100755 --- a/IdentityServer/v7/Quickstarts/6_JS_with_backend/src/IdentityServer/IdentityServer.csproj +++ b/IdentityServer/v7/Quickstarts/6_JS_with_backend/src/IdentityServer/IdentityServer.csproj @@ -7,7 +7,7 @@ - + diff --git a/IdentityServer/v7/Quickstarts/6_JS_with_backend/src/JavaScriptClient/JavaScriptClient.csproj b/IdentityServer/v7/Quickstarts/6_JS_with_backend/src/JavaScriptClient/JavaScriptClient.csproj index 45679b78..f355b498 100644 --- a/IdentityServer/v7/Quickstarts/6_JS_with_backend/src/JavaScriptClient/JavaScriptClient.csproj +++ b/IdentityServer/v7/Quickstarts/6_JS_with_backend/src/JavaScriptClient/JavaScriptClient.csproj @@ -7,9 +7,9 @@ - - - + + + diff --git a/IdentityServer/v7/Quickstarts/6_JS_with_backend/src/WebClient/WebClient.csproj b/IdentityServer/v7/Quickstarts/6_JS_with_backend/src/WebClient/WebClient.csproj index e3c55193..8dfc6a00 100644 --- a/IdentityServer/v7/Quickstarts/6_JS_with_backend/src/WebClient/WebClient.csproj +++ b/IdentityServer/v7/Quickstarts/6_JS_with_backend/src/WebClient/WebClient.csproj @@ -7,7 +7,7 @@ - + diff --git a/IdentityServer/v7/Quickstarts/6_JS_without_backend/src/Api/Api.csproj b/IdentityServer/v7/Quickstarts/6_JS_without_backend/src/Api/Api.csproj index cc6a7b03..84d1f1e3 100755 --- a/IdentityServer/v7/Quickstarts/6_JS_without_backend/src/Api/Api.csproj +++ b/IdentityServer/v7/Quickstarts/6_JS_without_backend/src/Api/Api.csproj @@ -8,7 +8,7 @@ - + diff --git a/IdentityServer/v7/Quickstarts/6_JS_without_backend/src/IdentityServer/IdentityServer.csproj b/IdentityServer/v7/Quickstarts/6_JS_without_backend/src/IdentityServer/IdentityServer.csproj index c51e0b93..eb170b33 100755 --- a/IdentityServer/v7/Quickstarts/6_JS_without_backend/src/IdentityServer/IdentityServer.csproj +++ b/IdentityServer/v7/Quickstarts/6_JS_without_backend/src/IdentityServer/IdentityServer.csproj @@ -7,7 +7,7 @@ - + diff --git a/IdentityServer/v7/Quickstarts/6_JS_without_backend/src/WebClient/WebClient.csproj b/IdentityServer/v7/Quickstarts/6_JS_without_backend/src/WebClient/WebClient.csproj index e3c55193..8dfc6a00 100644 --- a/IdentityServer/v7/Quickstarts/6_JS_without_backend/src/WebClient/WebClient.csproj +++ b/IdentityServer/v7/Quickstarts/6_JS_without_backend/src/WebClient/WebClient.csproj @@ -7,7 +7,7 @@ - + diff --git a/IdentityServer/v7/Quickstarts/7_Blazor/BFF/BFF.csproj b/IdentityServer/v7/Quickstarts/7_Blazor/BFF/BFF.csproj index 2cb73bb3..9c4a701d 100644 --- a/IdentityServer/v7/Quickstarts/7_Blazor/BFF/BFF.csproj +++ b/IdentityServer/v7/Quickstarts/7_Blazor/BFF/BFF.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/IdentityServer/v7/Quickstarts/7_Blazor/BlazorWasm/BlazorWasm.csproj b/IdentityServer/v7/Quickstarts/7_Blazor/BlazorWasm/BlazorWasm.csproj index 9344fafe..73e59e4b 100644 --- a/IdentityServer/v7/Quickstarts/7_Blazor/BlazorWasm/BlazorWasm.csproj +++ b/IdentityServer/v7/Quickstarts/7_Blazor/BlazorWasm/BlazorWasm.csproj @@ -8,10 +8,10 @@ - - - - + + + + diff --git a/IdentityServer/v7/ScopesAndResources/IdentityServerHost/IdentityServerHost.csproj b/IdentityServer/v7/ScopesAndResources/IdentityServerHost/IdentityServerHost.csproj index 2c2e0ba1..f949c3e9 100644 --- a/IdentityServer/v7/ScopesAndResources/IdentityServerHost/IdentityServerHost.csproj +++ b/IdentityServer/v7/ScopesAndResources/IdentityServerHost/IdentityServerHost.csproj @@ -6,7 +6,7 @@ - + diff --git a/IdentityServer/v7/SessionManagement/Api/Api.csproj b/IdentityServer/v7/SessionManagement/Api/Api.csproj index de98ee6a..898eae21 100644 --- a/IdentityServer/v7/SessionManagement/Api/Api.csproj +++ b/IdentityServer/v7/SessionManagement/Api/Api.csproj @@ -6,7 +6,7 @@ - + diff --git a/IdentityServer/v7/SessionManagement/Client/Client.csproj b/IdentityServer/v7/SessionManagement/Client/Client.csproj index ac9720ad..3d44eaee 100644 --- a/IdentityServer/v7/SessionManagement/Client/Client.csproj +++ b/IdentityServer/v7/SessionManagement/Client/Client.csproj @@ -9,7 +9,7 @@ - + diff --git a/IdentityServer/v7/SessionManagement/IdentityServerHost/IdentityServerHost.csproj b/IdentityServer/v7/SessionManagement/IdentityServerHost/IdentityServerHost.csproj index 500c8673..26b95783 100644 --- a/IdentityServer/v7/SessionManagement/IdentityServerHost/IdentityServerHost.csproj +++ b/IdentityServer/v7/SessionManagement/IdentityServerHost/IdentityServerHost.csproj @@ -6,7 +6,7 @@ - + diff --git a/IdentityServer/v7/SessionManagement/IdentityServerHost/Pages/Diagnostics/ViewModel.cs b/IdentityServer/v7/SessionManagement/IdentityServerHost/Pages/Diagnostics/ViewModel.cs index 292d48f1..3830fb0b 100644 --- a/IdentityServer/v7/SessionManagement/IdentityServerHost/Pages/Diagnostics/ViewModel.cs +++ b/IdentityServer/v7/SessionManagement/IdentityServerHost/Pages/Diagnostics/ViewModel.cs @@ -2,6 +2,7 @@ // Licensed under the MIT License. See LICENSE in the project root for license information. +using System.Buffers.Text; using System.Text; using System.Text.Json; using Duende.IdentityModel; @@ -18,7 +19,7 @@ public ViewModel(AuthenticateResult result) if (result.Properties.Items.ContainsKey("client_list")) { var encoded = result.Properties.Items["client_list"]; - var bytes = Base64Url.Decode(encoded); + var bytes = Base64Url.DecodeFromChars(encoded); var value = Encoding.UTF8.GetString(bytes); Clients = JsonSerializer.Deserialize(value); diff --git a/IdentityServer/v7/SessionMigration/Pages/Diagnostics/ViewModel.cs b/IdentityServer/v7/SessionMigration/Pages/Diagnostics/ViewModel.cs index 9524c439..addc717d 100644 --- a/IdentityServer/v7/SessionMigration/Pages/Diagnostics/ViewModel.cs +++ b/IdentityServer/v7/SessionMigration/Pages/Diagnostics/ViewModel.cs @@ -2,6 +2,7 @@ // Licensed under the MIT License. See LICENSE in the project root for license information. +using System.Buffers.Text; using System.Text; using System.Text.Json; using Duende.IdentityModel; @@ -18,7 +19,7 @@ public ViewModel(AuthenticateResult result) if (result.Properties.Items.ContainsKey("client_list")) { var encoded = result.Properties.Items["client_list"]; - var bytes = Base64Url.Decode(encoded); + var bytes = Base64Url.DecodeFromChars(encoded); var value = Encoding.UTF8.GetString(bytes); Clients = JsonSerializer.Deserialize(value); diff --git a/IdentityServer/v7/SessionMigration/SessionMigration.csproj b/IdentityServer/v7/SessionMigration/SessionMigration.csproj index 72562723..0b1249de 100644 --- a/IdentityServer/v7/SessionMigration/SessionMigration.csproj +++ b/IdentityServer/v7/SessionMigration/SessionMigration.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/IdentityServer/v7/TokenExchange/IdentityServerHost/IdentityServerHost.csproj b/IdentityServer/v7/TokenExchange/IdentityServerHost/IdentityServerHost.csproj index cc0bd59d..9f0227da 100644 --- a/IdentityServer/v7/TokenExchange/IdentityServerHost/IdentityServerHost.csproj +++ b/IdentityServer/v7/TokenExchange/IdentityServerHost/IdentityServerHost.csproj @@ -6,7 +6,7 @@ - + diff --git a/IdentityServer/v7/UserInteraction/Ciba/Api/Api.csproj b/IdentityServer/v7/UserInteraction/Ciba/Api/Api.csproj index ce262978..ca9c34e2 100644 --- a/IdentityServer/v7/UserInteraction/Ciba/Api/Api.csproj +++ b/IdentityServer/v7/UserInteraction/Ciba/Api/Api.csproj @@ -7,7 +7,7 @@ - + diff --git a/IdentityServer/v7/UserInteraction/Ciba/IdentityServerHost/IdentityServerHost.csproj b/IdentityServer/v7/UserInteraction/Ciba/IdentityServerHost/IdentityServerHost.csproj index da75cb56..f7118cff 100644 --- a/IdentityServer/v7/UserInteraction/Ciba/IdentityServerHost/IdentityServerHost.csproj +++ b/IdentityServer/v7/UserInteraction/Ciba/IdentityServerHost/IdentityServerHost.csproj @@ -6,7 +6,7 @@ - + diff --git a/IdentityServer/v7/UserInteraction/Ciba/IdentityServerHost/Pages/Diagnostics/ViewModel.cs b/IdentityServer/v7/UserInteraction/Ciba/IdentityServerHost/Pages/Diagnostics/ViewModel.cs index 292d48f1..3830fb0b 100644 --- a/IdentityServer/v7/UserInteraction/Ciba/IdentityServerHost/Pages/Diagnostics/ViewModel.cs +++ b/IdentityServer/v7/UserInteraction/Ciba/IdentityServerHost/Pages/Diagnostics/ViewModel.cs @@ -2,6 +2,7 @@ // Licensed under the MIT License. See LICENSE in the project root for license information. +using System.Buffers.Text; using System.Text; using System.Text.Json; using Duende.IdentityModel; @@ -18,7 +19,7 @@ public ViewModel(AuthenticateResult result) if (result.Properties.Items.ContainsKey("client_list")) { var encoded = result.Properties.Items["client_list"]; - var bytes = Base64Url.Decode(encoded); + var bytes = Base64Url.DecodeFromChars(encoded); var value = Encoding.UTF8.GetString(bytes); Clients = JsonSerializer.Deserialize(value); diff --git a/IdentityServer/v7/UserInteraction/DynamicProviders/Client/Client.csproj b/IdentityServer/v7/UserInteraction/DynamicProviders/Client/Client.csproj index aada8290..621dfdb3 100644 --- a/IdentityServer/v7/UserInteraction/DynamicProviders/Client/Client.csproj +++ b/IdentityServer/v7/UserInteraction/DynamicProviders/Client/Client.csproj @@ -7,7 +7,7 @@ - + diff --git a/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServerHost/IdentityServerHost.csproj b/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServerHost/IdentityServerHost.csproj index 46b3873a..590cc6b0 100644 --- a/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServerHost/IdentityServerHost.csproj +++ b/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServerHost/IdentityServerHost.csproj @@ -6,12 +6,12 @@ - - + + - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServerHost/Pages/Diagnostics/ViewModel.cs b/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServerHost/Pages/Diagnostics/ViewModel.cs index 292d48f1..3830fb0b 100644 --- a/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServerHost/Pages/Diagnostics/ViewModel.cs +++ b/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServerHost/Pages/Diagnostics/ViewModel.cs @@ -2,6 +2,7 @@ // Licensed under the MIT License. See LICENSE in the project root for license information. +using System.Buffers.Text; using System.Text; using System.Text.Json; using Duende.IdentityModel; @@ -18,7 +19,7 @@ public ViewModel(AuthenticateResult result) if (result.Properties.Items.ContainsKey("client_list")) { var encoded = result.Properties.Items["client_list"]; - var bytes = Base64Url.Decode(encoded); + var bytes = Base64Url.DecodeFromChars(encoded); var value = Encoding.UTF8.GetString(bytes); Clients = JsonSerializer.Deserialize(value); diff --git a/IdentityServer/v7/UserInteraction/ProfileService/Api/Api.csproj b/IdentityServer/v7/UserInteraction/ProfileService/Api/Api.csproj index 93263913..468674f8 100644 --- a/IdentityServer/v7/UserInteraction/ProfileService/Api/Api.csproj +++ b/IdentityServer/v7/UserInteraction/ProfileService/Api/Api.csproj @@ -8,7 +8,7 @@ - + diff --git a/IdentityServer/v7/UserInteraction/ProfileService/Client/Client.csproj b/IdentityServer/v7/UserInteraction/ProfileService/Client/Client.csproj index 8f3f3f83..af0bb694 100644 --- a/IdentityServer/v7/UserInteraction/ProfileService/Client/Client.csproj +++ b/IdentityServer/v7/UserInteraction/ProfileService/Client/Client.csproj @@ -7,7 +7,7 @@ - + diff --git a/IdentityServer/v7/UserInteraction/ProfileService/IdentityServerHost/IdentityServerHost.csproj b/IdentityServer/v7/UserInteraction/ProfileService/IdentityServerHost/IdentityServerHost.csproj index da75cb56..f7118cff 100644 --- a/IdentityServer/v7/UserInteraction/ProfileService/IdentityServerHost/IdentityServerHost.csproj +++ b/IdentityServer/v7/UserInteraction/ProfileService/IdentityServerHost/IdentityServerHost.csproj @@ -6,7 +6,7 @@ - + diff --git a/IdentityServer/v7/UserInteraction/ProfileService/IdentityServerHost/Pages/Diagnostics/ViewModel.cs b/IdentityServer/v7/UserInteraction/ProfileService/IdentityServerHost/Pages/Diagnostics/ViewModel.cs index 292d48f1..3830fb0b 100644 --- a/IdentityServer/v7/UserInteraction/ProfileService/IdentityServerHost/Pages/Diagnostics/ViewModel.cs +++ b/IdentityServer/v7/UserInteraction/ProfileService/IdentityServerHost/Pages/Diagnostics/ViewModel.cs @@ -2,6 +2,7 @@ // Licensed under the MIT License. See LICENSE in the project root for license information. +using System.Buffers.Text; using System.Text; using System.Text.Json; using Duende.IdentityModel; @@ -18,7 +19,7 @@ public ViewModel(AuthenticateResult result) if (result.Properties.Items.ContainsKey("client_list")) { var encoded = result.Properties.Items["client_list"]; - var bytes = Base64Url.Decode(encoded); + var bytes = Base64Url.DecodeFromChars(encoded); var value = Encoding.UTF8.GetString(bytes); Clients = JsonSerializer.Deserialize(value); diff --git a/IdentityServer/v7/UserInteraction/SpaLoginUi/Client/Client.csproj b/IdentityServer/v7/UserInteraction/SpaLoginUi/Client/Client.csproj index 6b3844b2..399c58bf 100644 --- a/IdentityServer/v7/UserInteraction/SpaLoginUi/Client/Client.csproj +++ b/IdentityServer/v7/UserInteraction/SpaLoginUi/Client/Client.csproj @@ -7,7 +7,7 @@ - + diff --git a/IdentityServer/v7/UserInteraction/SpaLoginUi/IdentityServerHost/IdentityServerHost.csproj b/IdentityServer/v7/UserInteraction/SpaLoginUi/IdentityServerHost/IdentityServerHost.csproj index 8d92914f..aad6c187 100644 --- a/IdentityServer/v7/UserInteraction/SpaLoginUi/IdentityServerHost/IdentityServerHost.csproj +++ b/IdentityServer/v7/UserInteraction/SpaLoginUi/IdentityServerHost/IdentityServerHost.csproj @@ -6,7 +6,7 @@ - + diff --git a/IdentityServer/v7/UserInteraction/StepUp/Api/Api.csproj b/IdentityServer/v7/UserInteraction/StepUp/Api/Api.csproj index 345a5dbb..8c8cf357 100644 --- a/IdentityServer/v7/UserInteraction/StepUp/Api/Api.csproj +++ b/IdentityServer/v7/UserInteraction/StepUp/Api/Api.csproj @@ -7,6 +7,6 @@ - + diff --git a/IdentityServer/v7/UserInteraction/StepUp/Client/Client.csproj b/IdentityServer/v7/UserInteraction/StepUp/Client/Client.csproj index 032796d8..059ad715 100644 --- a/IdentityServer/v7/UserInteraction/StepUp/Client/Client.csproj +++ b/IdentityServer/v7/UserInteraction/StepUp/Client/Client.csproj @@ -5,8 +5,8 @@ enable - - + + diff --git a/IdentityServer/v7/UserInteraction/StepUp/IdentityServerHost/IdentityServerHost.csproj b/IdentityServer/v7/UserInteraction/StepUp/IdentityServerHost/IdentityServerHost.csproj index 8d92914f..aad6c187 100644 --- a/IdentityServer/v7/UserInteraction/StepUp/IdentityServerHost/IdentityServerHost.csproj +++ b/IdentityServer/v7/UserInteraction/StepUp/IdentityServerHost/IdentityServerHost.csproj @@ -6,7 +6,7 @@ - + diff --git a/IdentityServer/v7/UserInteraction/StepUp/IdentityServerHost/Pages/Diagnostics/ViewModel.cs b/IdentityServer/v7/UserInteraction/StepUp/IdentityServerHost/Pages/Diagnostics/ViewModel.cs index 292d48f1..3830fb0b 100644 --- a/IdentityServer/v7/UserInteraction/StepUp/IdentityServerHost/Pages/Diagnostics/ViewModel.cs +++ b/IdentityServer/v7/UserInteraction/StepUp/IdentityServerHost/Pages/Diagnostics/ViewModel.cs @@ -2,6 +2,7 @@ // Licensed under the MIT License. See LICENSE in the project root for license information. +using System.Buffers.Text; using System.Text; using System.Text.Json; using Duende.IdentityModel; @@ -18,7 +19,7 @@ public ViewModel(AuthenticateResult result) if (result.Properties.Items.ContainsKey("client_list")) { var encoded = result.Properties.Items["client_list"]; - var bytes = Base64Url.Decode(encoded); + var bytes = Base64Url.DecodeFromChars(encoded); var value = Encoding.UTF8.GetString(bytes); Clients = JsonSerializer.Deserialize(value); diff --git a/IdentityServer/v7/UserInteraction/WindowsAuthentication/Client/Client.csproj b/IdentityServer/v7/UserInteraction/WindowsAuthentication/Client/Client.csproj index 6b3844b2..399c58bf 100644 --- a/IdentityServer/v7/UserInteraction/WindowsAuthentication/Client/Client.csproj +++ b/IdentityServer/v7/UserInteraction/WindowsAuthentication/Client/Client.csproj @@ -7,7 +7,7 @@ - + diff --git a/IdentityServer/v7/UserInteraction/WindowsAuthentication/IdentityServerHost/IdentityServerHost.csproj b/IdentityServer/v7/UserInteraction/WindowsAuthentication/IdentityServerHost/IdentityServerHost.csproj index d2a190f4..b1ac3572 100644 --- a/IdentityServer/v7/UserInteraction/WindowsAuthentication/IdentityServerHost/IdentityServerHost.csproj +++ b/IdentityServer/v7/UserInteraction/WindowsAuthentication/IdentityServerHost/IdentityServerHost.csproj @@ -6,7 +6,7 @@ - + diff --git a/IdentityServer/v7/UserInteraction/WindowsAuthentication/IdentityServerHost/Pages/Diagnostics/ViewModel.cs b/IdentityServer/v7/UserInteraction/WindowsAuthentication/IdentityServerHost/Pages/Diagnostics/ViewModel.cs index 292d48f1..3830fb0b 100644 --- a/IdentityServer/v7/UserInteraction/WindowsAuthentication/IdentityServerHost/Pages/Diagnostics/ViewModel.cs +++ b/IdentityServer/v7/UserInteraction/WindowsAuthentication/IdentityServerHost/Pages/Diagnostics/ViewModel.cs @@ -2,6 +2,7 @@ // Licensed under the MIT License. See LICENSE in the project root for license information. +using System.Buffers.Text; using System.Text; using System.Text.Json; using Duende.IdentityModel; @@ -18,7 +19,7 @@ public ViewModel(AuthenticateResult result) if (result.Properties.Items.ContainsKey("client_list")) { var encoded = result.Properties.Items["client_list"]; - var bytes = Base64Url.Decode(encoded); + var bytes = Base64Url.DecodeFromChars(encoded); var value = Encoding.UTF8.GetString(bytes); Clients = JsonSerializer.Deserialize(value); diff --git a/IdentityServer/v7/UserInteraction/WsFederationDynamicProviders/Client/Client.csproj b/IdentityServer/v7/UserInteraction/WsFederationDynamicProviders/Client/Client.csproj index aada8290..621dfdb3 100644 --- a/IdentityServer/v7/UserInteraction/WsFederationDynamicProviders/Client/Client.csproj +++ b/IdentityServer/v7/UserInteraction/WsFederationDynamicProviders/Client/Client.csproj @@ -7,7 +7,7 @@ - + diff --git a/IdentityServer/v7/UserInteraction/WsFederationDynamicProviders/IdentityServerHost/IdentityServerHost.csproj b/IdentityServer/v7/UserInteraction/WsFederationDynamicProviders/IdentityServerHost/IdentityServerHost.csproj index f9dbbc3c..49d80616 100755 --- a/IdentityServer/v7/UserInteraction/WsFederationDynamicProviders/IdentityServerHost/IdentityServerHost.csproj +++ b/IdentityServer/v7/UserInteraction/WsFederationDynamicProviders/IdentityServerHost/IdentityServerHost.csproj @@ -6,12 +6,12 @@ - - + + - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/IdentityServer/v7/UserInteraction/WsFederationDynamicProviders/IdentityServerHost/Pages/Diagnostics/ViewModel.cs b/IdentityServer/v7/UserInteraction/WsFederationDynamicProviders/IdentityServerHost/Pages/Diagnostics/ViewModel.cs index 292d48f1..3830fb0b 100644 --- a/IdentityServer/v7/UserInteraction/WsFederationDynamicProviders/IdentityServerHost/Pages/Diagnostics/ViewModel.cs +++ b/IdentityServer/v7/UserInteraction/WsFederationDynamicProviders/IdentityServerHost/Pages/Diagnostics/ViewModel.cs @@ -2,6 +2,7 @@ // Licensed under the MIT License. See LICENSE in the project root for license information. +using System.Buffers.Text; using System.Text; using System.Text.Json; using Duende.IdentityModel; @@ -18,7 +19,7 @@ public ViewModel(AuthenticateResult result) if (result.Properties.Items.ContainsKey("client_list")) { var encoded = result.Properties.Items["client_list"]; - var bytes = Base64Url.Decode(encoded); + var bytes = Base64Url.DecodeFromChars(encoded); var value = Encoding.UTF8.GetString(bytes); Clients = JsonSerializer.Deserialize(value); diff --git a/samples.slnx b/samples.slnx index 30e6bfa5..b429c5cd 100644 --- a/samples.slnx +++ b/samples.slnx @@ -100,6 +100,7 @@ + @@ -124,7 +125,9 @@ - + + + @@ -339,10 +342,4 @@ - - - - - -