diff --git a/Directory.Build.props b/Directory.Build.props index 9a4744e5..3648a2ec 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,9 +1,9 @@ - net8.0 + net10.0 - 8.0.4 + 8.0.4-alpha.170 8.0.4 HigginsSoft.$(MSBuildProjectName) $(MSBuildProjectName) diff --git a/Directory.Build.targets b/Directory.Build.targets index a6f1625a..292e4cd8 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -8,7 +8,7 @@ BeforeTargets="ProcessFrameworkReferences"> diff --git a/Directory.Packages.props b/Directory.Packages.props index 2b0e2c7b..81d90a1f 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -2,14 +2,14 @@ true true - 8.0.0 - 8.0.1 - 8.0.0 - 8.0.0 - 8.0.0 + 10.0.9 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 8.0.0-preview.2.23619.3 2.59.0 - 8.0.0 + 10.0.0 $(NoWarn);AD0001;ASP0003;ASP0004;ASP0005;ASP0007;ASP0020;ASP0021;ASP0022;ASP0024 true @@ -22,20 +22,20 @@ - - - - - - + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - - - + + + + + @@ -45,41 +45,38 @@ - - - - + + + + + - - + + - + - + - + - - - - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - @@ -87,6 +84,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive + @@ -95,22 +93,17 @@ - - - - - - + @@ -143,16 +136,14 @@ - - - - + + @@ -160,17 +151,28 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all + + + + + + + + + + + \ No newline at end of file diff --git a/global.json b/global.json index f3365c41..12f5b9de 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "8.0.100" + "version": "10.0.301" } } \ No newline at end of file diff --git a/samples/Clients/src/ConsoleClientCredentialsFlow/ConsoleClientCredentialsFlow.csproj b/samples/Clients/src/ConsoleClientCredentialsFlow/ConsoleClientCredentialsFlow.csproj index 11afe8d5..6449304a 100644 --- a/samples/Clients/src/ConsoleClientCredentialsFlow/ConsoleClientCredentialsFlow.csproj +++ b/samples/Clients/src/ConsoleClientCredentialsFlow/ConsoleClientCredentialsFlow.csproj @@ -1,5 +1,9 @@ - - Exe - + + Exe + 8.1.0.0 + 8.1.0.0 + 8.1.0-alpha.171+Branch.develop.Sha.da2987cb01112daf4921052899b0e1ba7d228de4 + 8.1.0-alpha.171 + \ No newline at end of file diff --git a/samples/Clients/src/ConsoleClientCredentialsFlowCallingIdentityServerApi/ConsoleClientCredentialsFlowCallingIdentityServerApi.csproj b/samples/Clients/src/ConsoleClientCredentialsFlowCallingIdentityServerApi/ConsoleClientCredentialsFlowCallingIdentityServerApi.csproj index d1e5b472..6449304a 100644 --- a/samples/Clients/src/ConsoleClientCredentialsFlowCallingIdentityServerApi/ConsoleClientCredentialsFlowCallingIdentityServerApi.csproj +++ b/samples/Clients/src/ConsoleClientCredentialsFlowCallingIdentityServerApi/ConsoleClientCredentialsFlowCallingIdentityServerApi.csproj @@ -1,5 +1,9 @@ Exe + 8.1.0.0 + 8.1.0.0 + 8.1.0-alpha.171+Branch.develop.Sha.da2987cb01112daf4921052899b0e1ba7d228de4 + 8.1.0-alpha.171 \ No newline at end of file diff --git a/samples/Clients/src/ConsoleClientCredentialsFlowPostBody/ConsoleClientCredentialsFlowPostBody.csproj b/samples/Clients/src/ConsoleClientCredentialsFlowPostBody/ConsoleClientCredentialsFlowPostBody.csproj index 11afe8d5..6449304a 100644 --- a/samples/Clients/src/ConsoleClientCredentialsFlowPostBody/ConsoleClientCredentialsFlowPostBody.csproj +++ b/samples/Clients/src/ConsoleClientCredentialsFlowPostBody/ConsoleClientCredentialsFlowPostBody.csproj @@ -1,5 +1,9 @@ - - Exe - + + Exe + 8.1.0.0 + 8.1.0.0 + 8.1.0-alpha.171+Branch.develop.Sha.da2987cb01112daf4921052899b0e1ba7d228de4 + 8.1.0-alpha.171 + \ No newline at end of file diff --git a/samples/Clients/src/ConsoleCode/ConsoleCode.csproj b/samples/Clients/src/ConsoleCode/ConsoleCode.csproj index 11afe8d5..6449304a 100644 --- a/samples/Clients/src/ConsoleCode/ConsoleCode.csproj +++ b/samples/Clients/src/ConsoleCode/ConsoleCode.csproj @@ -1,5 +1,9 @@ - - Exe - + + Exe + 8.1.0.0 + 8.1.0.0 + 8.1.0-alpha.171+Branch.develop.Sha.da2987cb01112daf4921052899b0e1ba7d228de4 + 8.1.0-alpha.171 + \ No newline at end of file diff --git a/samples/Clients/src/ConsoleCustomGrant/ConsoleExtensionGrant.csproj b/samples/Clients/src/ConsoleCustomGrant/ConsoleExtensionGrant.csproj index d1e5b472..6449304a 100644 --- a/samples/Clients/src/ConsoleCustomGrant/ConsoleExtensionGrant.csproj +++ b/samples/Clients/src/ConsoleCustomGrant/ConsoleExtensionGrant.csproj @@ -1,5 +1,9 @@ Exe + 8.1.0.0 + 8.1.0.0 + 8.1.0-alpha.171+Branch.develop.Sha.da2987cb01112daf4921052899b0e1ba7d228de4 + 8.1.0-alpha.171 \ No newline at end of file diff --git a/samples/Clients/src/ConsoleDeviceFlow/ConsoleDeviceFlow.csproj b/samples/Clients/src/ConsoleDeviceFlow/ConsoleDeviceFlow.csproj index d1e5b472..6449304a 100644 --- a/samples/Clients/src/ConsoleDeviceFlow/ConsoleDeviceFlow.csproj +++ b/samples/Clients/src/ConsoleDeviceFlow/ConsoleDeviceFlow.csproj @@ -1,5 +1,9 @@ Exe + 8.1.0.0 + 8.1.0.0 + 8.1.0-alpha.171+Branch.develop.Sha.da2987cb01112daf4921052899b0e1ba7d228de4 + 8.1.0-alpha.171 \ No newline at end of file diff --git a/samples/Clients/src/ConsoleEphemeralMtlsClient/ConsoleEphemeralMtlsClient.csproj b/samples/Clients/src/ConsoleEphemeralMtlsClient/ConsoleEphemeralMtlsClient.csproj index 11afe8d5..6449304a 100644 --- a/samples/Clients/src/ConsoleEphemeralMtlsClient/ConsoleEphemeralMtlsClient.csproj +++ b/samples/Clients/src/ConsoleEphemeralMtlsClient/ConsoleEphemeralMtlsClient.csproj @@ -1,5 +1,9 @@ - - Exe - + + Exe + 8.1.0.0 + 8.1.0.0 + 8.1.0-alpha.171+Branch.develop.Sha.da2987cb01112daf4921052899b0e1ba7d228de4 + 8.1.0-alpha.171 + \ No newline at end of file diff --git a/samples/Clients/src/ConsoleIntrospectionClient/ConsoleIntrospectionClient.csproj b/samples/Clients/src/ConsoleIntrospectionClient/ConsoleIntrospectionClient.csproj index 11afe8d5..6449304a 100644 --- a/samples/Clients/src/ConsoleIntrospectionClient/ConsoleIntrospectionClient.csproj +++ b/samples/Clients/src/ConsoleIntrospectionClient/ConsoleIntrospectionClient.csproj @@ -1,5 +1,9 @@ - - Exe - + + Exe + 8.1.0.0 + 8.1.0.0 + 8.1.0-alpha.171+Branch.develop.Sha.da2987cb01112daf4921052899b0e1ba7d228de4 + 8.1.0-alpha.171 + \ No newline at end of file diff --git a/samples/Clients/src/ConsoleMTLSClient/ConsoleMTLSClient.csproj b/samples/Clients/src/ConsoleMTLSClient/ConsoleMTLSClient.csproj index a736cb41..5d87fddd 100644 --- a/samples/Clients/src/ConsoleMTLSClient/ConsoleMTLSClient.csproj +++ b/samples/Clients/src/ConsoleMTLSClient/ConsoleMTLSClient.csproj @@ -1,6 +1,10 @@ - + Exe + 8.1.0.0 + 8.1.0.0 + 8.1.0-alpha.171+Branch.develop.Sha.da2987cb01112daf4921052899b0e1ba7d228de4 + 8.1.0-alpha.171 diff --git a/samples/Clients/src/ConsoleParameterizedScopeClient/ConsoleParameterizedScopeClient.csproj b/samples/Clients/src/ConsoleParameterizedScopeClient/ConsoleParameterizedScopeClient.csproj index fe078d4a..6449304a 100644 --- a/samples/Clients/src/ConsoleParameterizedScopeClient/ConsoleParameterizedScopeClient.csproj +++ b/samples/Clients/src/ConsoleParameterizedScopeClient/ConsoleParameterizedScopeClient.csproj @@ -1,5 +1,9 @@ - - Exe - - + + Exe + 8.1.0.0 + 8.1.0.0 + 8.1.0-alpha.171+Branch.develop.Sha.da2987cb01112daf4921052899b0e1ba7d228de4 + 8.1.0-alpha.171 + + \ No newline at end of file diff --git a/samples/Clients/src/ConsolePrivateKeyJwtClient/ConsolePrivateKeyJwtClient.csproj b/samples/Clients/src/ConsolePrivateKeyJwtClient/ConsolePrivateKeyJwtClient.csproj index 95b2eaf9..5d87fddd 100644 --- a/samples/Clients/src/ConsolePrivateKeyJwtClient/ConsolePrivateKeyJwtClient.csproj +++ b/samples/Clients/src/ConsolePrivateKeyJwtClient/ConsolePrivateKeyJwtClient.csproj @@ -1,10 +1,14 @@ Exe + 8.1.0.0 + 8.1.0.0 + 8.1.0-alpha.171+Branch.develop.Sha.da2987cb01112daf4921052899b0e1ba7d228de4 + 8.1.0-alpha.171 PreserveNewest - + \ No newline at end of file diff --git a/samples/Clients/src/ConsoleResourceOwnerFlow/ConsoleResourceOwnerFlow.csproj b/samples/Clients/src/ConsoleResourceOwnerFlow/ConsoleResourceOwnerFlow.csproj index d1e5b472..6449304a 100644 --- a/samples/Clients/src/ConsoleResourceOwnerFlow/ConsoleResourceOwnerFlow.csproj +++ b/samples/Clients/src/ConsoleResourceOwnerFlow/ConsoleResourceOwnerFlow.csproj @@ -1,5 +1,9 @@ Exe + 8.1.0.0 + 8.1.0.0 + 8.1.0-alpha.171+Branch.develop.Sha.da2987cb01112daf4921052899b0e1ba7d228de4 + 8.1.0-alpha.171 \ No newline at end of file diff --git a/samples/Clients/src/ConsoleResourceOwnerFlowPublic/ConsoleResourceOwnerFlowPublic.csproj b/samples/Clients/src/ConsoleResourceOwnerFlowPublic/ConsoleResourceOwnerFlowPublic.csproj index d1e5b472..6449304a 100644 --- a/samples/Clients/src/ConsoleResourceOwnerFlowPublic/ConsoleResourceOwnerFlowPublic.csproj +++ b/samples/Clients/src/ConsoleResourceOwnerFlowPublic/ConsoleResourceOwnerFlowPublic.csproj @@ -1,5 +1,9 @@ Exe + 8.1.0.0 + 8.1.0.0 + 8.1.0-alpha.171+Branch.develop.Sha.da2987cb01112daf4921052899b0e1ba7d228de4 + 8.1.0-alpha.171 \ No newline at end of file diff --git a/samples/Clients/src/ConsoleResourceOwnerFlowReference/ConsoleResourceOwnerFlowReference.csproj b/samples/Clients/src/ConsoleResourceOwnerFlowReference/ConsoleResourceOwnerFlowReference.csproj index 11afe8d5..6449304a 100644 --- a/samples/Clients/src/ConsoleResourceOwnerFlowReference/ConsoleResourceOwnerFlowReference.csproj +++ b/samples/Clients/src/ConsoleResourceOwnerFlowReference/ConsoleResourceOwnerFlowReference.csproj @@ -1,5 +1,9 @@ - - Exe - + + Exe + 8.1.0.0 + 8.1.0.0 + 8.1.0-alpha.171+Branch.develop.Sha.da2987cb01112daf4921052899b0e1ba7d228de4 + 8.1.0-alpha.171 + \ No newline at end of file diff --git a/samples/Clients/src/ConsoleResourceOwnerFlowRefreshToken/ConsoleResourceOwnerFlowRefreshToken.csproj b/samples/Clients/src/ConsoleResourceOwnerFlowRefreshToken/ConsoleResourceOwnerFlowRefreshToken.csproj index 11afe8d5..6449304a 100644 --- a/samples/Clients/src/ConsoleResourceOwnerFlowRefreshToken/ConsoleResourceOwnerFlowRefreshToken.csproj +++ b/samples/Clients/src/ConsoleResourceOwnerFlowRefreshToken/ConsoleResourceOwnerFlowRefreshToken.csproj @@ -1,5 +1,9 @@ - - Exe - + + Exe + 8.1.0.0 + 8.1.0.0 + 8.1.0-alpha.171+Branch.develop.Sha.da2987cb01112daf4921052899b0e1ba7d228de4 + 8.1.0-alpha.171 + \ No newline at end of file diff --git a/samples/Clients/src/ConsoleResourceOwnerFlowUserInfo/ConsoleResourceOwnerFlowUserInfo.csproj b/samples/Clients/src/ConsoleResourceOwnerFlowUserInfo/ConsoleResourceOwnerFlowUserInfo.csproj index 11afe8d5..6449304a 100644 --- a/samples/Clients/src/ConsoleResourceOwnerFlowUserInfo/ConsoleResourceOwnerFlowUserInfo.csproj +++ b/samples/Clients/src/ConsoleResourceOwnerFlowUserInfo/ConsoleResourceOwnerFlowUserInfo.csproj @@ -1,5 +1,9 @@ - - Exe - + + Exe + 8.1.0.0 + 8.1.0.0 + 8.1.0-alpha.171+Branch.develop.Sha.da2987cb01112daf4921052899b0e1ba7d228de4 + 8.1.0-alpha.171 + \ No newline at end of file diff --git a/samples/Clients/src/WindowsConsoleSystemBrowser/WindowsConsoleSystemBrowser.csproj b/samples/Clients/src/WindowsConsoleSystemBrowser/WindowsConsoleSystemBrowser.csproj index 11afe8d5..6449304a 100644 --- a/samples/Clients/src/WindowsConsoleSystemBrowser/WindowsConsoleSystemBrowser.csproj +++ b/samples/Clients/src/WindowsConsoleSystemBrowser/WindowsConsoleSystemBrowser.csproj @@ -1,5 +1,9 @@ - - Exe - + + Exe + 8.1.0.0 + 8.1.0.0 + 8.1.0-alpha.171+Branch.develop.Sha.da2987cb01112daf4921052899b0e1ba7d228de4 + 8.1.0-alpha.171 + \ No newline at end of file diff --git a/samples/Quickstarts/Shared/src/Client/Client.csproj b/samples/Quickstarts/Shared/src/Client/Client.csproj index a771c688..22778580 100644 --- a/samples/Quickstarts/Shared/src/Client/Client.csproj +++ b/samples/Quickstarts/Shared/src/Client/Client.csproj @@ -1,11 +1,12 @@ - Exe + 8.1.0.0 + 8.1.0.0 + 8.1.0-alpha.171+Branch.develop.Sha.da2987cb01112daf4921052899b0e1ba7d228de4 + 8.1.0-alpha.171 - - - + \ No newline at end of file diff --git a/src/AspNetIdentity/src/IdentityServer8.AspNetIdentity.csproj b/src/AspNetIdentity/src/IdentityServer8.AspNetIdentity.csproj index da89fcb8..45503266 100644 --- a/src/AspNetIdentity/src/IdentityServer8.AspNetIdentity.csproj +++ b/src/AspNetIdentity/src/IdentityServer8.AspNetIdentity.csproj @@ -1,19 +1,19 @@ - - ASP.NET Core Identity Integration for IdentityServer8 - true - true - true + ASP.NET Core Identity Integration for IdentityServer8 + true + true + true + 8.1.0.0 + 8.1.0.0 + 8.1.0-alpha.171+Branch.develop.Sha.da2987cb01112daf4921052899b0e1ba7d228de4 + 8.1.0-alpha.171 - True True - - \ No newline at end of file diff --git a/src/EntityFramework.Storage/host/ConsoleHost/ConsoleHost.csproj b/src/EntityFramework.Storage/host/ConsoleHost/ConsoleHost.csproj index cb06fd34..507eccfb 100644 --- a/src/EntityFramework.Storage/host/ConsoleHost/ConsoleHost.csproj +++ b/src/EntityFramework.Storage/host/ConsoleHost/ConsoleHost.csproj @@ -1,16 +1,16 @@ - Exe + 8.1.0.0 + 8.1.0.0 + 8.1.0-alpha.171+Branch.develop.Sha.da2987cb01112daf4921052899b0e1ba7d228de4 + 8.1.0-alpha.171 - - - - + \ No newline at end of file diff --git a/src/EntityFramework.Storage/src/IdentityServer8.EntityFramework.Storage.csproj b/src/EntityFramework.Storage/src/IdentityServer8.EntityFramework.Storage.csproj index 133a3f67..00ad71e7 100644 --- a/src/EntityFramework.Storage/src/IdentityServer8.EntityFramework.Storage.csproj +++ b/src/EntityFramework.Storage/src/IdentityServer8.EntityFramework.Storage.csproj @@ -1,24 +1,23 @@ - - - EntityFramework persistence layer for IdentityServer8 - true - true - - - - True - True - - - - - - - - - - - - - + + EntityFramework persistence layer for IdentityServer8 + true + true + 8.1.0.0 + 8.1.0.0 + 8.1.0-alpha.171+Branch.develop.Sha.da2987cb01112daf4921052899b0e1ba7d228de4 + 8.1.0-alpha.171 + + + True + True + + + + + + + + + + \ No newline at end of file diff --git a/src/EntityFramework.Storage/test/IntegrationTests/IdentityServer8.EntityFramework.IntegrationTests.csproj b/src/EntityFramework.Storage/test/IntegrationTests/IdentityServer8.EntityFramework.IntegrationTests.csproj index 43cf9a9d..23d4be03 100644 --- a/src/EntityFramework.Storage/test/IntegrationTests/IdentityServer8.EntityFramework.IntegrationTests.csproj +++ b/src/EntityFramework.Storage/test/IntegrationTests/IdentityServer8.EntityFramework.IntegrationTests.csproj @@ -1,19 +1,18 @@ - - ../../../../key.snk true true + 8.1.0.0 + 8.1.0.0 + 8.1.0-alpha.171+Branch.develop.Sha.da2987cb01112daf4921052899b0e1ba7d228de4 + 8.1.0-alpha.171 - - - diff --git a/src/EntityFramework.Storage/test/IntegrationTests/Stores/PersistedGrantStoreTests.cs b/src/EntityFramework.Storage/test/IntegrationTests/Stores/PersistedGrantStoreTests.cs index 11c16d9d..d188339b 100644 --- a/src/EntityFramework.Storage/test/IntegrationTests/Stores/PersistedGrantStoreTests.cs +++ b/src/EntityFramework.Storage/test/IntegrationTests/Stores/PersistedGrantStoreTests.cs @@ -114,6 +114,12 @@ public async Task GetAllAsync_Should_Filter(DbContextOptions.Create()); + (await store.GetAllAsync(new PersistedGrantFilter + { + SubjectId = "sub1" + })).ToList().Count.Should().Be(0); + context.PersistedGrants.Add(CreateTestObject(sub: "sub1", clientId: "c1", sid: "s1", type: "t1").ToEntity()); context.PersistedGrants.Add(CreateTestObject(sub: "sub1", clientId: "c1", sid: "s1", type: "t2").ToEntity()); context.PersistedGrants.Add(CreateTestObject(sub: "sub1", clientId: "c1", sid: "s2", type: "t1").ToEntity()); diff --git a/src/EntityFramework.Storage/test/UnitTests/IdentityServer8.EntityFramework.UnitTests.csproj b/src/EntityFramework.Storage/test/UnitTests/IdentityServer8.EntityFramework.UnitTests.csproj index f334d594..70210713 100644 --- a/src/EntityFramework.Storage/test/UnitTests/IdentityServer8.EntityFramework.UnitTests.csproj +++ b/src/EntityFramework.Storage/test/UnitTests/IdentityServer8.EntityFramework.UnitTests.csproj @@ -1,15 +1,16 @@ - ../../../../key.snk true true + 8.1.0.0 + 8.1.0.0 + 8.1.0-alpha.171+Branch.develop.Sha.da2987cb01112daf4921052899b0e1ba7d228de4 + 8.1.0-alpha.171 - - @@ -21,5 +22,4 @@ - - + \ No newline at end of file diff --git a/src/EntityFramework/src/IdentityServer8.EntityFramework.csproj b/src/EntityFramework/src/IdentityServer8.EntityFramework.csproj index e687b3ce..83f00fb5 100644 --- a/src/EntityFramework/src/IdentityServer8.EntityFramework.csproj +++ b/src/EntityFramework/src/IdentityServer8.EntityFramework.csproj @@ -1,18 +1,19 @@ - - - EntityFramework persistence layer for IdentityServer8 - true - true - - - - True - True - - - - - - + + EntityFramework persistence layer for IdentityServer8 + true + true + 8.1.0.0 + 8.1.0.0 + 8.1.0-alpha.171+Branch.develop.Sha.da2987cb01112daf4921052899b0e1ba7d228de4 + 8.1.0-alpha.171 + + + True + True + + + + + \ No newline at end of file diff --git a/src/EntityFramework/test/IdentityServer8.EntityFramework.Tests/IdentityServer8.EntityFramework.Tests.csproj b/src/EntityFramework/test/IdentityServer8.EntityFramework.Tests/IdentityServer8.EntityFramework.Tests.csproj index 5cf1bb62..e4769c19 100644 --- a/src/EntityFramework/test/IdentityServer8.EntityFramework.Tests/IdentityServer8.EntityFramework.Tests.csproj +++ b/src/EntityFramework/test/IdentityServer8.EntityFramework.Tests/IdentityServer8.EntityFramework.Tests.csproj @@ -1,27 +1,25 @@ - false + 8.1.0.0 + 8.1.0.0 + 8.1.0-alpha.171+Branch.develop.Sha.da2987cb01112daf4921052899b0e1ba7d228de4 + 8.1.0-alpha.171 - - runtime; build; native; contentfiles; analyzers; buildtransitive - all + runtime; build; native; contentfiles; analyzers; buildtransitive + all - + - - - - - + \ No newline at end of file diff --git a/src/IdentityServer8/src/IdentityServer8.csproj b/src/IdentityServer8/src/IdentityServer8.csproj index f60327ff..eefaaa48 100644 --- a/src/IdentityServer8/src/IdentityServer8.csproj +++ b/src/IdentityServer8/src/IdentityServer8.csproj @@ -1,23 +1,23 @@ - - - true - true - - - - True - True - - - - - - - - - - - - + + true + true + 8.1.0.0 + 8.1.0.0 + 8.1.0-alpha.171+Branch.develop.Sha.da2987cb01112daf4921052899b0e1ba7d228de4 + 8.1.0-alpha.171 + + + True + True + + + + + + + + + + \ No newline at end of file diff --git a/src/IdentityServer8/src/ResponseHandling/Default/DiscoveryResponseGenerator.cs b/src/IdentityServer8/src/ResponseHandling/Default/DiscoveryResponseGenerator.cs index 0bdce2f3..c31e8f39 100644 --- a/src/IdentityServer8/src/ResponseHandling/Default/DiscoveryResponseGenerator.cs +++ b/src/IdentityServer8/src/ResponseHandling/Default/DiscoveryResponseGenerator.cs @@ -331,7 +331,7 @@ where scope.ShowInDiscoveryDocument } // custom entries - if (!Options.Discovery.CustomEntries.IsNullOrEmpty()) + if (!Options.Discovery.CustomEntries.EnumerableIsNullOrEmpty()) { foreach ((string key, object value) in Options.Discovery.CustomEntries) { diff --git a/src/IdentityServer8/src/Services/Default/DefaultKeyMaterialService.cs b/src/IdentityServer8/src/Services/Default/DefaultKeyMaterialService.cs index caed7439..fc5d6f8c 100644 --- a/src/IdentityServer8/src/Services/Default/DefaultKeyMaterialService.cs +++ b/src/IdentityServer8/src/Services/Default/DefaultKeyMaterialService.cs @@ -39,7 +39,7 @@ public async Task GetSigningCredentialsAsync(IEnumerable GetFields(JsonElement json) } private void ValidateCustomFields(TokenResponse response) { - var fields = GetFields(response.Json); + var fields = GetFields(response.Json ?? throw new InvalidOperationException("Response does not contain JSON")); fields["custom"].ToString().Should().Be("custom"); - } } diff --git a/src/IdentityServer8/test/IdentityServer.IntegrationTests/Clients/CustomTokenResponseClients.cs b/src/IdentityServer8/test/IdentityServer.IntegrationTests/Clients/CustomTokenResponseClients.cs index 8e8721ae..9a9cf402 100644 --- a/src/IdentityServer8/test/IdentityServer.IntegrationTests/Clients/CustomTokenResponseClients.cs +++ b/src/IdentityServer8/test/IdentityServer.IntegrationTests/Clients/CustomTokenResponseClients.cs @@ -287,13 +287,13 @@ private CustomResponseDto GetDto(JsonElement responseObject) private Dictionary GetFieldsD(TokenResponse response) { - return response.Json.ToObject>(); + return (response.Json ?? throw new InvalidOperationException("Response does not contain JSON")).ToObject>(); } private Dictionary GetFields(TokenResponse response) { - return GetFields(response.Json); + return GetFields(response.Json ?? throw new InvalidOperationException("Response does not contain JSON")); } private Dictionary GetFields(JsonElement json) diff --git a/src/IdentityServer8/test/IdentityServer.IntegrationTests/Clients/UserInfoClient.cs b/src/IdentityServer8/test/IdentityServer.IntegrationTests/Clients/UserInfoClient.cs index 1f6600b6..8c408343 100644 --- a/src/IdentityServer8/test/IdentityServer.IntegrationTests/Clients/UserInfoClient.cs +++ b/src/IdentityServer8/test/IdentityServer.IntegrationTests/Clients/UserInfoClient.cs @@ -203,7 +203,8 @@ public async Task Complex_json_should_be_correct() }); //roles = ((JArray)userInfo.Json["role"]).Select(x => x.ToString()).ToArray(); - roles = userInfo.Json.TryGetStringArray("role").ToArray(); + roles = (userInfo.Json ?? throw new InvalidOperationException("Response does not contain JSON")) + .TryGetStringArray("role").ToArray(); roles.Length.Should().Be(2); roles.Should().Contain("Geek"); roles.Should().Contain("Developer"); diff --git a/src/IdentityServer8/test/IdentityServer.IntegrationTests/Common/IdentityServerPipeline.cs b/src/IdentityServer8/test/IdentityServer.IntegrationTests/Common/IdentityServerPipeline.cs index c8823491..6f5bfcdf 100644 --- a/src/IdentityServer8/test/IdentityServer.IntegrationTests/Common/IdentityServerPipeline.cs +++ b/src/IdentityServer8/test/IdentityServer.IntegrationTests/Common/IdentityServerPipeline.cs @@ -20,6 +20,7 @@ copies or substantial portions of the Software. using System.Threading.Tasks; using FluentAssertions; using IdentityModel.Client; +using static IdentityModel.OidcConstants; using IdentityServer8; using IdentityServer8.Configuration; using IdentityServer8.Extensions; @@ -329,7 +330,35 @@ public string CreateAuthorizeUrl( object extra = null) { Parameters prms = extra is null ? null : Parameters.FromObject(extra); - var url = new RequestUrl(AuthorizeEndpoint).CreateAuthorizeUrl( + + string url; + if (clientId == null || responseType == null) + { + url = AuthorizeEndpoint; + if (clientId != null) url = url.AddQueryString(AuthorizeRequest.ClientId, clientId); + if (responseType != null) url = url.AddQueryString(AuthorizeRequest.ResponseType, responseType); + if (scope != null) url = url.AddQueryString(AuthorizeRequest.Scope, scope); + if (redirectUri != null) url = url.AddQueryString(AuthorizeRequest.RedirectUri, redirectUri); + if (state != null) url = url.AddQueryString(AuthorizeRequest.State, state); + if (nonce != null) url = url.AddQueryString(AuthorizeRequest.Nonce, nonce); + if (loginHint != null) url = url.AddQueryString(AuthorizeRequest.LoginHint, loginHint); + if (acrValues != null) url = url.AddQueryString(AuthorizeRequest.AcrValues, acrValues); + if (responseMode != null) url = url.AddQueryString(AuthorizeRequest.ResponseMode, responseMode); + if (codeChallenge != null) url = url.AddQueryString(AuthorizeRequest.CodeChallenge, codeChallenge); + if (codeChallengeMethod != null) url = url.AddQueryString(AuthorizeRequest.CodeChallengeMethod, codeChallengeMethod); + if (prms != null) + { + var extraQuery = prms.ToString(); + if (!string.IsNullOrWhiteSpace(extraQuery)) + { + url = url.AddQueryString(extraQuery); + } + } + + return url; + } + + url = new RequestUrl(AuthorizeEndpoint).CreateAuthorizeUrl( clientId: clientId, responseType: responseType, scope: scope, @@ -345,12 +374,12 @@ public string CreateAuthorizeUrl( return url; } - public AuthorizeResponse ParseAuthorizationResponseUrl(string url) + public IdentityModel.Client.AuthorizeResponse ParseAuthorizationResponseUrl(string url) { - return new AuthorizeResponse(url); + return new IdentityModel.Client.AuthorizeResponse(url); } - public async Task RequestAuthorizationEndpointAsync( + public async Task RequestAuthorizationEndpointAsync( string clientId, string responseType, string scope = null, @@ -383,7 +412,7 @@ public async Task RequestAuthorizationEndpointAsync( return null; } - return new AuthorizeResponse(redirect); + return new IdentityModel.Client.AuthorizeResponse(redirect); } } diff --git a/src/IdentityServer8/test/IdentityServer.IntegrationTests/Endpoints/Introspection/IntrospectionTests.cs b/src/IdentityServer8/test/IdentityServer.IntegrationTests/Endpoints/Introspection/IntrospectionTests.cs index 630a317f..ceefe147 100644 --- a/src/IdentityServer8/test/IdentityServer.IntegrationTests/Endpoints/Introspection/IntrospectionTests.cs +++ b/src/IdentityServer8/test/IdentityServer.IntegrationTests/Endpoints/Introspection/IntrospectionTests.cs @@ -188,7 +188,8 @@ public async Task Response_data_should_be_valid_using_single_scope() Token = tokenResponse.AccessToken }); - var values = introspectionResponse.Json.ToObject>(); + var values = (introspectionResponse.Json ?? throw new InvalidOperationException("Response does not contain JSON")) + .ToObject>(); values["aud"].ValueKind.Should().Be(JsonValueKind.String); values["iss"].ValueKind.Should().Be(JsonValueKind.String); @@ -227,7 +228,8 @@ public async Task Response_data_with_user_authentication_should_be_valid_using_s Token = tokenResponse.AccessToken }); - var values = introspectionResponse.Json.ToObject>(); + var values = (introspectionResponse.Json ?? throw new InvalidOperationException("Response does not contain JSON")) + .ToObject>(); values["aud"].ValueKind.Should().Be(JsonValueKind.String); values["iss"].ValueKind.Should().Be(JsonValueKind.String); @@ -266,7 +268,8 @@ public async Task Response_data_should_be_valid_using_multiple_scopes_multiple_a Token = tokenResponse.AccessToken }); - var values = introspectionResponse.Json.ToObject>(); + var values = (introspectionResponse.Json ?? throw new InvalidOperationException("Response does not contain JSON")) + .ToObject>(); values["aud"].GetType().Name.Should().Be("JsonElement"); @@ -317,7 +320,8 @@ public async Task Response_data_should_be_valid_using_multiple_scopes_single_aud Token = tokenResponse.AccessToken }); - var values = introspectionResponse.Json.ToObject>(); + var values = (introspectionResponse.Json ?? throw new InvalidOperationException("Response does not contain JSON")) + .ToObject>(); values["aud"].ValueKind.Should().Be(JsonValueKind.String); values["aud"].ValueKind.Should().Be(JsonValueKind.String); values["iss"].ValueKind.Should().Be(JsonValueKind.String); diff --git a/src/IdentityServer8/test/IdentityServer.IntegrationTests/IdentityServer.IntegrationTests.csproj b/src/IdentityServer8/test/IdentityServer.IntegrationTests/IdentityServer.IntegrationTests.csproj index 8a80ba9b..1bd5d4eb 100644 --- a/src/IdentityServer8/test/IdentityServer.IntegrationTests/IdentityServer.IntegrationTests.csproj +++ b/src/IdentityServer8/test/IdentityServer.IntegrationTests/IdentityServer.IntegrationTests.csproj @@ -1,25 +1,25 @@ - ../../../../key.snk true true + 8.1.0.0 + 8.1.0.0 + 8.1.0-alpha.171+Branch.develop.Sha.da2987cb01112daf4921052899b0e1ba7d228de4 + 8.1.0-alpha.171 - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - + runtime; build; native; contentfiles; analyzers; buildtransitive + all + - Always @@ -31,9 +31,7 @@ PreserveNewest - - \ No newline at end of file diff --git a/src/IdentityServer8/test/IdentityServer.UnitTests/IdentityServer.UnitTests.csproj b/src/IdentityServer8/test/IdentityServer.UnitTests/IdentityServer.UnitTests.csproj index fa89d5a8..d331d4af 100644 --- a/src/IdentityServer8/test/IdentityServer.UnitTests/IdentityServer.UnitTests.csproj +++ b/src/IdentityServer8/test/IdentityServer.UnitTests/IdentityServer.UnitTests.csproj @@ -1,16 +1,15 @@ - - ../../../../key.snk true true + 8.1.0.0 + 8.1.0.0 + 8.1.0-alpha.171+Branch.develop.Sha.da2987cb01112daf4921052899b0e1ba7d228de4 + 8.1.0-alpha.171 - - - @@ -19,7 +18,6 @@ all - Always @@ -28,8 +26,7 @@ Always - - + \ No newline at end of file diff --git a/src/IdentityServer8/test/IdentityServer.UnitTests/Services/Default/NumericUserCodeServiceTests.cs b/src/IdentityServer8/test/IdentityServer.UnitTests/Services/Default/NumericUserCodeServiceTests.cs index 227b2e95..0e7688d4 100644 --- a/src/IdentityServer8/test/IdentityServer.UnitTests/Services/Default/NumericUserCodeServiceTests.cs +++ b/src/IdentityServer8/test/IdentityServer.UnitTests/Services/Default/NumericUserCodeServiceTests.cs @@ -27,8 +27,8 @@ public async Task GenerateAsync_should_return_expected_code() var userCode = await sut.GenerateAsync(); var userCodeInt = int.Parse(userCode); - userCodeInt.Should().BeGreaterOrEqualTo(100000000); - userCodeInt.Should().BeLessOrEqualTo(999999999); + userCodeInt.Should().BeGreaterThanOrEqualTo(100000000); + userCodeInt.Should().BeLessThanOrEqualTo(999999999); } } } diff --git a/src/Security/IdentityServer8.Security/IdentityServer8.Security.csproj b/src/Security/IdentityServer8.Security/IdentityServer8.Security.csproj index 91f5d03b..262e68a9 100644 --- a/src/Security/IdentityServer8.Security/IdentityServer8.Security.csproj +++ b/src/Security/IdentityServer8.Security/IdentityServer8.Security.csproj @@ -1,20 +1,16 @@ - - - Security package for user input sanitzation IdentityServer8 services and packages. - true - true - enable - enable - - - - - - - - - - - - + + Security package for user input sanitzation IdentityServer8 services and packages. + true + true + enable + enable + 8.1.0.0 + 8.1.0.0 + 8.1.0-alpha.171+Branch.develop.Sha.da2987cb01112daf4921052899b0e1ba7d228de4 + 8.1.0-alpha.171 + + + + + \ No newline at end of file diff --git a/src/Security/test/IdentityServer8.Santizer.Tests/IdentityServer8.Sanitizer.Tests.csproj b/src/Security/test/IdentityServer8.Santizer.Tests/IdentityServer8.Sanitizer.Tests.csproj index 885e7e6b..0fc9436f 100644 --- a/src/Security/test/IdentityServer8.Santizer.Tests/IdentityServer8.Sanitizer.Tests.csproj +++ b/src/Security/test/IdentityServer8.Santizer.Tests/IdentityServer8.Sanitizer.Tests.csproj @@ -1,25 +1,23 @@ - false + 8.1.0.0 + 8.1.0.0 + 8.1.0-alpha.171+Branch.develop.Sha.da2987cb01112daf4921052899b0e1ba7d228de4 + 8.1.0-alpha.171 - - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + - - - - - + \ No newline at end of file diff --git a/src/Storage/build/build.csproj b/src/Storage/build/build.csproj index 8e7391a7..40e43ac5 100644 --- a/src/Storage/build/build.csproj +++ b/src/Storage/build/build.csproj @@ -1,16 +1,16 @@ - Exe + 8.1.0.0 + 8.1.0.0 + 8.1.0-alpha.171+Branch.develop.Sha.da2987cb01112daf4921052899b0e1ba7d228de4 + 8.1.0-alpha.171 - - - - + \ No newline at end of file diff --git a/src/Storage/src/Extensions/IEnumerableExtensions.cs b/src/Storage/src/Extensions/IEnumerableExtensions.cs index 2781e0a0..a1c66454 100644 --- a/src/Storage/src/Extensions/IEnumerableExtensions.cs +++ b/src/Storage/src/Extensions/IEnumerableExtensions.cs @@ -17,7 +17,7 @@ namespace IdentityServer8.Extensions; internal static class IEnumerableExtensions { [DebuggerStepThrough] - public static bool IsNullOrEmpty(this IEnumerable list) + public static bool CollectionIsNullOrEmpty(this IEnumerable list) { if (list == null) { diff --git a/src/Storage/src/IdentityServer8.Storage.csproj b/src/Storage/src/IdentityServer8.Storage.csproj index 0bf3dcb5..b64a839a 100644 --- a/src/Storage/src/IdentityServer8.Storage.csproj +++ b/src/Storage/src/IdentityServer8.Storage.csproj @@ -1,29 +1,25 @@ - - - - Storage interfaces and models for IdentityServer8 - true - True - - - - True - True - - - - - - True - \ - - - - - - - - - + + Storage interfaces and models for IdentityServer8 + true + True + 8.1.0.0 + 8.1.0.0 + 8.1.0-alpha.171+Branch.develop.Sha.da2987cb01112daf4921052899b0e1ba7d228de4 + 8.1.0-alpha.171 + + + True + True + + + + True + \ + + + + + + \ No newline at end of file diff --git a/src/Storage/src/Models/ApiResource.cs b/src/Storage/src/Models/ApiResource.cs index 8070c2ac..bba1ade7 100644 --- a/src/Storage/src/Models/ApiResource.cs +++ b/src/Storage/src/Models/ApiResource.cs @@ -70,7 +70,7 @@ public ApiResource(string name, string displayName, IEnumerable userClai Name = name; DisplayName = displayName; - if (!userClaims.IsNullOrEmpty()) + if (!userClaims.CollectionIsNullOrEmpty()) { foreach (var type in userClaims) { diff --git a/src/Storage/src/Models/ApiScope.cs b/src/Storage/src/Models/ApiScope.cs index ae89ec41..9befdc77 100644 --- a/src/Storage/src/Models/ApiScope.cs +++ b/src/Storage/src/Models/ApiScope.cs @@ -70,7 +70,7 @@ public ApiScope(string name, string displayName, IEnumerable userClaims) Name = name; DisplayName = displayName; - if (!userClaims.IsNullOrEmpty()) + if (!userClaims.CollectionIsNullOrEmpty()) { foreach (var type in userClaims) { diff --git a/src/Storage/src/Models/IdentityResource.cs b/src/Storage/src/Models/IdentityResource.cs index a4328beb..cd60153d 100644 --- a/src/Storage/src/Models/IdentityResource.cs +++ b/src/Storage/src/Models/IdentityResource.cs @@ -48,7 +48,7 @@ public IdentityResource(string name, IEnumerable userClaims) public IdentityResource(string name, string displayName, IEnumerable userClaims) { if (name.IsMissing()) throw new ArgumentNullException(nameof(name)); - if (userClaims.IsNullOrEmpty()) throw new ArgumentException("Must provide at least one claim type", nameof(userClaims)); + if (userClaims.CollectionIsNullOrEmpty()) throw new ArgumentException("Must provide at least one claim type", nameof(userClaims)); Name = name; DisplayName = displayName;