From fc70893e1a6a3968588e30c1b27513c4b42e8dc4 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 16 Jun 2021 14:14:22 -0700 Subject: [PATCH 01/15] Update to Duende --- eng/Dependencies.props | 10 +++++----- eng/Versions.props | 10 +++++----- .../src/ApiAuthorizationDbContext.cs | 0 .../AuthenticationBuilderExtensions.cs | 2 +- ...tityServerJwtBearerOptionsConfiguration.cs | 4 ++-- .../ApplicationProfilesPropertyNames.cs | 2 +- .../ApplicationProfilesPropertyValues.cs | 2 +- .../AspNetConventionsConfigureOptions.cs | 2 +- .../Configuration/ConfigureApiResources.cs | 2 +- .../src/Configuration/ConfigureApiScopes.cs | 2 +- .../Configuration/ConfigureClientScopes.cs | 2 +- .../src/Configuration/ConfigureClients.cs | 2 +- .../ConfigureIdentityResources.cs | 10 +++++----- .../src/Data/ApiAuthorizationDbContext.cs | 16 +++++++++++---- .../AutoRedirectEndSessionEndpoint.cs | 12 +++++------ .../DefaultClientRequestParametersProvider.cs | 2 +- .../RelativeRedirectUriValidator.cs | 4 ++-- ...ityServerBuilderConfigurationExtensions.cs | 12 +++++------ ...ore.ApiAuthorization.IdentityServer.csproj | 20 ++++++++++++++----- .../src/Options/ApiResourceBuilder.cs | 4 ++-- .../src/Options/ApiResourceCollection.cs | 2 +- .../src/Options/ApiScopeCollection.cs | 2 +- .../src/Options/ClientBuilder.cs | 4 ++-- .../src/Options/ClientCollection.cs | 2 +- .../src/Options/IdentityResourceBuilder.cs | 6 +++--- .../src/Options/IdentityResourceCollection.cs | 2 +- 26 files changed, 78 insertions(+), 60 deletions(-) create mode 100644 src/Identity/ApiAuthorization.IdentityServer/src/ApiAuthorizationDbContext.cs diff --git a/eng/Dependencies.props b/eng/Dependencies.props index b0904d2b2413..f4594285e69c 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -160,17 +160,17 @@ and are generated based on the last package release. + + + + + - - - - - diff --git a/eng/Versions.props b/eng/Versions.props index 851c24fa19d8..0949310fba7e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -229,11 +229,11 @@ 2.32.0 2.32.0 2.32.0 - 4.1.0 - 4.1.0 - 4.1.0 - 4.1.0 - 4.1.0 + 5.2.0 + 5.2.0 + 5.2.0 + 5.2.0 + 5.2.0 2.1.90 1.1.0 1.1.0 diff --git a/src/Identity/ApiAuthorization.IdentityServer/src/ApiAuthorizationDbContext.cs b/src/Identity/ApiAuthorization.IdentityServer/src/ApiAuthorizationDbContext.cs new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/src/Identity/ApiAuthorization.IdentityServer/src/Authentication/AuthenticationBuilderExtensions.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Authentication/AuthenticationBuilderExtensions.cs index 65d2c327fa4c..6fa1abbdfbfb 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/src/Authentication/AuthenticationBuilderExtensions.cs +++ b/src/Identity/ApiAuthorization.IdentityServer/src/Authentication/AuthenticationBuilderExtensions.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using IdentityServer4.Stores; +using Duende.IdentityServer.Stores; using Microsoft.AspNetCore.ApiAuthorization.IdentityServer; using Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Authentication; using Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Configuration; diff --git a/src/Identity/ApiAuthorization.IdentityServer/src/Authentication/IdentityServerJwtBearerOptionsConfiguration.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Authentication/IdentityServerJwtBearerOptionsConfiguration.cs index 3e7c002a3dec..9d9654bc8cdc 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/src/Authentication/IdentityServerJwtBearerOptionsConfiguration.cs +++ b/src/Identity/ApiAuthorization.IdentityServer/src/Authentication/IdentityServerJwtBearerOptionsConfiguration.cs @@ -2,8 +2,8 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using IdentityServer4.Extensions; -using IdentityServer4.Stores; +using Duende.IdentityServer.Extensions; +using Duende.IdentityServer.Stores; using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Configuration; diff --git a/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ApplicationProfilesPropertyNames.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ApplicationProfilesPropertyNames.cs index 67372253809c..0588c4abb856 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ApplicationProfilesPropertyNames.cs +++ b/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ApplicationProfilesPropertyNames.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using IdentityServer4.Models; +using Duende.IdentityServer.Models; namespace Microsoft.AspNetCore.ApiAuthorization.IdentityServer { diff --git a/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ApplicationProfilesPropertyValues.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ApplicationProfilesPropertyValues.cs index 9fba8195fac1..cedefb2f9877 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ApplicationProfilesPropertyValues.cs +++ b/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ApplicationProfilesPropertyValues.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using IdentityServer4.Models; +using Duende.IdentityServer.Models; namespace Microsoft.AspNetCore.ApiAuthorization.IdentityServer { diff --git a/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/AspNetConventionsConfigureOptions.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/AspNetConventionsConfigureOptions.cs index 9699941961d6..04a9fd33d88b 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/AspNetConventionsConfigureOptions.cs +++ b/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/AspNetConventionsConfigureOptions.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using IdentityServer4.Configuration; +using Duende.IdentityServer.Configuration; using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Options; diff --git a/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ConfigureApiResources.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ConfigureApiResources.cs index 27fa9f614ce2..ac1ac6d1af21 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ConfigureApiResources.cs +++ b/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ConfigureApiResources.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; -using IdentityServer4.Models; +using Duende.IdentityServer.Models; using Microsoft.AspNetCore.ApiAuthorization.IdentityServer; using Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Configuration; using Microsoft.Extensions.Configuration; diff --git a/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ConfigureApiScopes.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ConfigureApiScopes.cs index 468c9700d72d..6ce7f0011e46 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ConfigureApiScopes.cs +++ b/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ConfigureApiScopes.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using IdentityServer4.Models; +using Duende.IdentityServer.Models; using Microsoft.Extensions.Options; namespace Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Configuration diff --git a/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ConfigureClientScopes.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ConfigureClientScopes.cs index 85650c64d3f9..6e374dd94d35 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ConfigureClientScopes.cs +++ b/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ConfigureClientScopes.cs @@ -3,7 +3,7 @@ using System; using System.Linq; -using IdentityServer4.Models; +using Duende.IdentityServer.Models; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; diff --git a/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ConfigureClients.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ConfigureClients.cs index f242fdd9823c..b1dc5ae7488d 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ConfigureClients.cs +++ b/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ConfigureClients.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; -using IdentityServer4.Models; +using Duende.IdentityServer.Models; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; diff --git a/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ConfigureIdentityResources.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ConfigureIdentityResources.cs index 438efe385a0e..f8622d20a6d8 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ConfigureIdentityResources.cs +++ b/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ConfigureIdentityResources.cs @@ -34,31 +34,31 @@ public void Configure(ApiAuthorizationOptions options) { switch (scope) { - case IdentityServer4.IdentityServerConstants.StandardScopes.OpenId: + case Duende.IdentityServer.IdentityServerConstants.StandardScopes.OpenId: options.IdentityResources.Add(IdentityResourceBuilder.OpenId() .AllowAllClients() .FromConfiguration() .Build()); break; - case IdentityServer4.IdentityServerConstants.StandardScopes.Profile: + case Duende.IdentityServer.IdentityServerConstants.StandardScopes.Profile: options.IdentityResources.Add(IdentityResourceBuilder.Profile() .AllowAllClients() .FromConfiguration() .Build()); break; - case IdentityServer4.IdentityServerConstants.StandardScopes.Address: + case Duende.IdentityServer.IdentityServerConstants.StandardScopes.Address: options.IdentityResources.Add(IdentityResourceBuilder.Address() .AllowAllClients() .FromConfiguration() .Build()); break; - case IdentityServer4.IdentityServerConstants.StandardScopes.Email: + case Duende.IdentityServer.IdentityServerConstants.StandardScopes.Email: options.IdentityResources.Add(IdentityResourceBuilder.Email() .AllowAllClients() .FromConfiguration() .Build()); break; - case IdentityServer4.IdentityServerConstants.StandardScopes.Phone: + case Duende.IdentityServer.IdentityServerConstants.StandardScopes.Phone: options.IdentityResources.Add(IdentityResourceBuilder.Phone() .AllowAllClients() .FromConfiguration() diff --git a/src/Identity/ApiAuthorization.IdentityServer/src/Data/ApiAuthorizationDbContext.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Data/ApiAuthorizationDbContext.cs index 464e6c4c989f..482f5624cb0a 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/src/Data/ApiAuthorizationDbContext.cs +++ b/src/Identity/ApiAuthorization.IdentityServer/src/Data/ApiAuthorizationDbContext.cs @@ -3,10 +3,10 @@ using System; using System.Threading.Tasks; -using IdentityServer4.EntityFramework.Entities; -using IdentityServer4.EntityFramework.Extensions; -using IdentityServer4.EntityFramework.Interfaces; -using IdentityServer4.EntityFramework.Options; +using Duende.IdentityServer.EntityFramework.Entities; +using Duende.IdentityServer.EntityFramework.Extensions; +using Duende.IdentityServer.EntityFramework.Interfaces; +using Duende.IdentityServer.EntityFramework.Options; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Identity.EntityFrameworkCore; using Microsoft.EntityFrameworkCore; @@ -45,6 +45,14 @@ public ApiAuthorizationDbContext( /// public DbSet DeviceFlowCodes { get; set; } + /// + /// Gets or sets the keys. + /// + /// + /// The keys. + /// + public DbSet Keys { get; set; } + Task IPersistedGrantDbContext.SaveChangesAsync() => base.SaveChangesAsync(); /// diff --git a/src/Identity/ApiAuthorization.IdentityServer/src/Extensions/AutoRedirectEndSessionEndpoint.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Extensions/AutoRedirectEndSessionEndpoint.cs index 8fd763004db1..bc20f7f30877 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/src/Extensions/AutoRedirectEndSessionEndpoint.cs +++ b/src/Identity/ApiAuthorization.IdentityServer/src/Extensions/AutoRedirectEndSessionEndpoint.cs @@ -5,12 +5,12 @@ using System.Collections.Specialized; using System.Net; using System.Threading.Tasks; -using IdentityServer4.Configuration; -using IdentityServer4.Endpoints.Results; -using IdentityServer4.Extensions; -using IdentityServer4.Hosting; -using IdentityServer4.Services; -using IdentityServer4.Validation; +using Duende.IdentityServer.Configuration; +using Duende.IdentityServer.Endpoints.Results; +using Duende.IdentityServer.Extensions; +using Duende.IdentityServer.Hosting; +using Duende.IdentityServer.Services; +using Duende.IdentityServer.Validation; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.WebUtilities; diff --git a/src/Identity/ApiAuthorization.IdentityServer/src/Extensions/DefaultClientRequestParametersProvider.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Extensions/DefaultClientRequestParametersProvider.cs index 793a6f9d77fb..397fd4c67a95 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/src/Extensions/DefaultClientRequestParametersProvider.cs +++ b/src/Identity/ApiAuthorization.IdentityServer/src/Extensions/DefaultClientRequestParametersProvider.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using IdentityServer4.Extensions; +using Duende.IdentityServer.Extensions; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Options; using System; diff --git a/src/Identity/ApiAuthorization.IdentityServer/src/Extensions/RelativeRedirectUriValidator.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Extensions/RelativeRedirectUriValidator.cs index 72a142f9348d..83503b7398f5 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/src/Extensions/RelativeRedirectUriValidator.cs +++ b/src/Identity/ApiAuthorization.IdentityServer/src/Extensions/RelativeRedirectUriValidator.cs @@ -4,8 +4,8 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using IdentityServer4.Models; -using IdentityServer4.Validation; +using Duende.IdentityServer.Models; +using Duende.IdentityServer.Validation; namespace Microsoft.AspNetCore.ApiAuthorization.IdentityServer { diff --git a/src/Identity/ApiAuthorization.IdentityServer/src/IdentityServerBuilderConfigurationExtensions.cs b/src/Identity/ApiAuthorization.IdentityServer/src/IdentityServerBuilderConfigurationExtensions.cs index bfb5d6d049f9..e3761466b866 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/src/IdentityServerBuilderConfigurationExtensions.cs +++ b/src/Identity/ApiAuthorization.IdentityServer/src/IdentityServerBuilderConfigurationExtensions.cs @@ -4,12 +4,12 @@ using System; using System.Collections.Generic; using System.Linq; -using IdentityServer4.Configuration; -using IdentityServer4.EntityFramework.Interfaces; -using IdentityServer4.Hosting; -using IdentityServer4.Models; -using IdentityServer4.Stores; -using IdentityServer4.Validation; +using Duende.IdentityServer.Configuration; +using Duende.IdentityServer.EntityFramework.Interfaces; +using Duende.IdentityServer.Hosting; +using Duende.IdentityServer.Models; +using Duende.IdentityServer.Stores; +using Duende.IdentityServer.Validation; using Microsoft.AspNetCore.ApiAuthorization.IdentityServer; using Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Configuration; using Microsoft.EntityFrameworkCore; diff --git a/src/Identity/ApiAuthorization.IdentityServer/src/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj b/src/Identity/ApiAuthorization.IdentityServer/src/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj index 69a21f955ce3..d2bbca91a614 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/src/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj +++ b/src/Identity/ApiAuthorization.IdentityServer/src/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj @@ -8,19 +8,29 @@ false + + CS8002 disable + + false - - - - - + + + + + + + + + + + diff --git a/src/Identity/ApiAuthorization.IdentityServer/src/Options/ApiResourceBuilder.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Options/ApiResourceBuilder.cs index bff201bcba1f..8e79198e3ad1 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/src/Options/ApiResourceBuilder.cs +++ b/src/Identity/ApiAuthorization.IdentityServer/src/Options/ApiResourceBuilder.cs @@ -3,7 +3,7 @@ using System; using System.Linq; -using IdentityServer4.Models; +using Duende.IdentityServer.Models; namespace Microsoft.AspNetCore.ApiAuthorization.IdentityServer { @@ -112,7 +112,7 @@ public ApiResourceBuilder AllowAllClients() /// /// Builds the API resource. /// - /// The built . + /// The built . public ApiResource Build() { if (_built) diff --git a/src/Identity/ApiAuthorization.IdentityServer/src/Options/ApiResourceCollection.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Options/ApiResourceCollection.cs index 104df03cbc05..0b8ef366ac88 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/src/Options/ApiResourceCollection.cs +++ b/src/Identity/ApiAuthorization.IdentityServer/src/Options/ApiResourceCollection.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; -using IdentityServer4.Models; +using Duende.IdentityServer.Models; namespace Microsoft.AspNetCore.ApiAuthorization.IdentityServer { diff --git a/src/Identity/ApiAuthorization.IdentityServer/src/Options/ApiScopeCollection.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Options/ApiScopeCollection.cs index 4ad0f2e62443..2c3059c20fcd 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/src/Options/ApiScopeCollection.cs +++ b/src/Identity/ApiAuthorization.IdentityServer/src/Options/ApiScopeCollection.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; -using IdentityServer4.Models; +using Duende.IdentityServer.Models; namespace Microsoft.AspNetCore.ApiAuthorization.IdentityServer { diff --git a/src/Identity/ApiAuthorization.IdentityServer/src/Options/ClientBuilder.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Options/ClientBuilder.cs index 2e66158f0d08..9c22b90a54b4 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/src/Options/ClientBuilder.cs +++ b/src/Identity/ApiAuthorization.IdentityServer/src/Options/ClientBuilder.cs @@ -3,8 +3,8 @@ using System; using System.Collections.Generic; -using IdentityServer4; -using IdentityServer4.Models; +using Duende.IdentityServer; +using Duende.IdentityServer.Models; namespace Microsoft.AspNetCore.ApiAuthorization.IdentityServer { diff --git a/src/Identity/ApiAuthorization.IdentityServer/src/Options/ClientCollection.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Options/ClientCollection.cs index 9f3dd10e1d01..c4ca12b58182 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/src/Options/ClientCollection.cs +++ b/src/Identity/ApiAuthorization.IdentityServer/src/Options/ClientCollection.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using IdentityServer4.Models; +using Duende.IdentityServer.Models; using System; using System.Collections.Generic; using System.Collections.ObjectModel; diff --git a/src/Identity/ApiAuthorization.IdentityServer/src/Options/IdentityResourceBuilder.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Options/IdentityResourceBuilder.cs index 6a04a6640ee4..7f04a2a82c5b 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/src/Options/IdentityResourceBuilder.cs +++ b/src/Identity/ApiAuthorization.IdentityServer/src/Options/IdentityResourceBuilder.cs @@ -2,8 +2,8 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using IdentityServer4; -using IdentityServer4.Models; +using Duende.IdentityServer; +using Duende.IdentityServer.Models; namespace Microsoft.AspNetCore.ApiAuthorization.IdentityServer { @@ -74,7 +74,7 @@ public IdentityResourceBuilder AllowAllClients() /// /// Builds the API resource. /// - /// The built . + /// The built . public IdentityResource Build() { if (_built) diff --git a/src/Identity/ApiAuthorization.IdentityServer/src/Options/IdentityResourceCollection.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Options/IdentityResourceCollection.cs index e57358489c65..0e036d5c85fb 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/src/Options/IdentityResourceCollection.cs +++ b/src/Identity/ApiAuthorization.IdentityServer/src/Options/IdentityResourceCollection.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using IdentityServer4.Models; +using Duende.IdentityServer.Models; using System; using System.Collections.Generic; using System.Collections.ObjectModel; From 7be01307de1b621e94aa76c8468162f1d0a8b80f Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 16 Jun 2021 15:01:20 -0700 Subject: [PATCH 02/15] Update Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj --- .../Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Identity/ApiAuthorization.IdentityServer/src/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj b/src/Identity/ApiAuthorization.IdentityServer/src/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj index d2bbca91a614..bee17e8ae0f1 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/src/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj +++ b/src/Identity/ApiAuthorization.IdentityServer/src/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj @@ -13,6 +13,7 @@ disable false + false From 29a5d1ca23759d7055da5cb9c0844e72906c4ad5 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 29 Jun 2021 09:46:22 -0700 Subject: [PATCH 03/15] Fix test projects --- .../LocalApiJwtBearerConfigurationTest.cs | 4 ++-- .../AspNetConventionsConfigureOptionsTests.cs | 2 +- .../test/Configuration/ConfigureClientsTests.cs | 4 ++-- .../Extensions/AutoRedirectEndSessionEndpointTests.cs | 10 +++++----- .../DefaultClientRequestParametersProviderTests.cs | 2 +- ...dentityServerBuilderConfigurationExtensionsTests.cs | 8 +++++--- .../Extensions/RelativeRedirectUriValidatorTests.cs | 2 +- ...etCore.ApiAuthorization.IdentityServer.Tests.csproj | 4 +++- 8 files changed, 20 insertions(+), 16 deletions(-) diff --git a/src/Identity/ApiAuthorization.IdentityServer/test/Authentication/LocalApiJwtBearerConfigurationTest.cs b/src/Identity/ApiAuthorization.IdentityServer/test/Authentication/LocalApiJwtBearerConfigurationTest.cs index 1d6dc35261cc..6414d4ef0d66 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/test/Authentication/LocalApiJwtBearerConfigurationTest.cs +++ b/src/Identity/ApiAuthorization.IdentityServer/test/Authentication/LocalApiJwtBearerConfigurationTest.cs @@ -4,8 +4,8 @@ using System.Collections.Generic; using System.Security.Cryptography; using System.Threading.Tasks; -using IdentityServer4.Configuration; -using IdentityServer4.Stores; +using Duende.IdentityServer.Configuration; +using Duende.IdentityServer.Stores; using Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Configuration; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authentication.JwtBearer; diff --git a/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/AspNetConventionsConfigureOptionsTests.cs b/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/AspNetConventionsConfigureOptionsTests.cs index 8a1eecb5cd0c..36efeb20d17a 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/AspNetConventionsConfigureOptionsTests.cs +++ b/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/AspNetConventionsConfigureOptionsTests.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using IdentityServer4.Configuration; +using Duende.IdentityServer.Configuration; using Microsoft.AspNetCore.Identity; using Xunit; diff --git a/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/ConfigureClientsTests.cs b/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/ConfigureClientsTests.cs index 42f1fcc2d06f..c5d2c6d13523 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/ConfigureClientsTests.cs +++ b/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/ConfigureClientsTests.cs @@ -1,8 +1,8 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using IdentityServer4; -using IdentityServer4.Models; +using Duende.IdentityServer; +using Duende.IdentityServer.Models; using Microsoft.Extensions.Configuration; using System; using System.Collections.Generic; diff --git a/src/Identity/ApiAuthorization.IdentityServer/test/Extensions/AutoRedirectEndSessionEndpointTests.cs b/src/Identity/ApiAuthorization.IdentityServer/test/Extensions/AutoRedirectEndSessionEndpointTests.cs index 389e83621787..a777a39f6510 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/test/Extensions/AutoRedirectEndSessionEndpointTests.cs +++ b/src/Identity/ApiAuthorization.IdentityServer/test/Extensions/AutoRedirectEndSessionEndpointTests.cs @@ -5,11 +5,11 @@ using System.Collections.Specialized; using System.Security.Claims; using System.Threading.Tasks; -using IdentityServer4.Configuration; -using IdentityServer4.Endpoints.Results; -using IdentityServer4.Models; -using IdentityServer4.Services; -using IdentityServer4.Validation; +using Duende.IdentityServer.Configuration; +using Duende.IdentityServer.Endpoints.Results; +using Duende.IdentityServer.Models; +using Duende.IdentityServer.Services; +using Duende.IdentityServer.Validation; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Identity; diff --git a/src/Identity/ApiAuthorization.IdentityServer/test/Extensions/DefaultClientRequestParametersProviderTests.cs b/src/Identity/ApiAuthorization.IdentityServer/test/Extensions/DefaultClientRequestParametersProviderTests.cs index 308c17160147..f16176e11600 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/test/Extensions/DefaultClientRequestParametersProviderTests.cs +++ b/src/Identity/ApiAuthorization.IdentityServer/test/Extensions/DefaultClientRequestParametersProviderTests.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; -using IdentityServer4.Configuration; +using Duende.IdentityServer.Configuration; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; diff --git a/src/Identity/ApiAuthorization.IdentityServer/test/Extensions/IdentityServerBuilderConfigurationExtensionsTests.cs b/src/Identity/ApiAuthorization.IdentityServer/test/Extensions/IdentityServerBuilderConfigurationExtensionsTests.cs index 440536272f9e..31c02a466a3b 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/test/Extensions/IdentityServerBuilderConfigurationExtensionsTests.cs +++ b/src/Identity/ApiAuthorization.IdentityServer/test/Extensions/IdentityServerBuilderConfigurationExtensionsTests.cs @@ -4,9 +4,9 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using IdentityServer4.EntityFramework.Entities; -using IdentityServer4.EntityFramework.Interfaces; -using IdentityServer4.Stores; +using Duende.IdentityServer.EntityFramework.Entities; +using Duende.IdentityServer.EntityFramework.Interfaces; +using Duende.IdentityServer.Stores; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Testing; using Microsoft.EntityFrameworkCore; @@ -109,6 +109,8 @@ public MyUserContext(DbContextOptions options) public DbSet DeviceFlowCodes { get; set; } + public DbSet Keys { get; set; } + public Task SaveChangesAsync() { throw new NotImplementedException(); diff --git a/src/Identity/ApiAuthorization.IdentityServer/test/Extensions/RelativeRedirectUriValidatorTests.cs b/src/Identity/ApiAuthorization.IdentityServer/test/Extensions/RelativeRedirectUriValidatorTests.cs index f067b2c65e36..d427d712c1e2 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/test/Extensions/RelativeRedirectUriValidatorTests.cs +++ b/src/Identity/ApiAuthorization.IdentityServer/test/Extensions/RelativeRedirectUriValidatorTests.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using IdentityServer4.Models; +using Duende.IdentityServer.Models; using Microsoft.AspNetCore.Http; using System.Collections.Generic; using System.Threading.Tasks; diff --git a/src/Identity/ApiAuthorization.IdentityServer/test/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Tests.csproj b/src/Identity/ApiAuthorization.IdentityServer/test/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Tests.csproj index 8b291f49797b..f20f2008e51f 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/test/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Tests.csproj +++ b/src/Identity/ApiAuthorization.IdentityServer/test/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Tests.csproj @@ -5,10 +5,12 @@ false + + CS8002 - + From 49753a43ff543675111b4dead2f2e02bf3e48c8e Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 29 Jun 2021 09:53:56 -0700 Subject: [PATCH 04/15] Fix samples --- .../samples/ApiAuthSample/ApiAuthSample.csproj | 4 +++- .../samples/ApiAuthSample/Data/ApplicationDbContext.cs | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/ApiAuthSample.csproj b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/ApiAuthSample.csproj index fc7fd6784f5a..b3f8fc7126ac 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/ApiAuthSample.csproj +++ b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/ApiAuthSample.csproj @@ -3,13 +3,15 @@ $(DefaultNetCoreTargetFramework) aspnet-ApiAuthSample-12ED8ECC-9EF1-4D31-87B4-1405B3198E5E + + CS8002 false - + diff --git a/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Data/ApplicationDbContext.cs b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Data/ApplicationDbContext.cs index cb0f0e9eed28..80618e816349 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Data/ApplicationDbContext.cs +++ b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Data/ApplicationDbContext.cs @@ -1,4 +1,4 @@ -using IdentityServer4.EntityFramework.Options; +using Duende.IdentityServer.EntityFramework.Options; using Microsoft.AspNetCore.ApiAuthorization.IdentityServer; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Options; From 3b2829cc183539809e30a4c4e2f3f775ce810965 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 29 Jun 2021 10:29:55 -0700 Subject: [PATCH 05/15] Fix component project --- .../Wasm.Authentication.Server/Data/ApplicationDbContext.cs | 2 +- .../Wasm.Authentication.Server.csproj | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Data/ApplicationDbContext.cs b/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Data/ApplicationDbContext.cs index dbb7e235131d..ae1031562b22 100644 --- a/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Data/ApplicationDbContext.cs +++ b/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Data/ApplicationDbContext.cs @@ -1,5 +1,5 @@ using Wasm.Authentication.Server.Models; -using IdentityServer4.EntityFramework.Options; +using Duende.IdentityServer.EntityFramework.Options; using Microsoft.AspNetCore.ApiAuthorization.IdentityServer; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Options; diff --git a/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Wasm.Authentication.Server.csproj b/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Wasm.Authentication.Server.csproj index cdf4e7684bd6..be508df6644d 100644 --- a/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Wasm.Authentication.Server.csproj +++ b/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Wasm.Authentication.Server.csproj @@ -3,6 +3,8 @@ $(DefaultNetCoreTargetFramework) + + CS8002 false From 5fb15c68e316fb055f0342e117be277fd57fca2b Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 29 Jun 2021 15:56:58 -0700 Subject: [PATCH 06/15] Fix public api --- ...ore.ApiAuthorization.IdentityServer.csproj | 3 --- .../src/Options/IdentityResourceBuilder.cs | 4 +-- .../src/PublicAPI.Shipped.txt | 24 ----------------- .../src/PublicAPI.Unshipped.txt | 26 +++++++++++++++++++ 4 files changed, 28 insertions(+), 29 deletions(-) diff --git a/src/Identity/ApiAuthorization.IdentityServer/src/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj b/src/Identity/ApiAuthorization.IdentityServer/src/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj index bee17e8ae0f1..8c9d22eec4e1 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/src/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj +++ b/src/Identity/ApiAuthorization.IdentityServer/src/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj @@ -11,9 +11,6 @@ CS8002 disable - - false - false diff --git a/src/Identity/ApiAuthorization.IdentityServer/src/Options/IdentityResourceBuilder.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Options/IdentityResourceBuilder.cs index 7f04a2a82c5b..8bfabf654e00 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/src/Options/IdentityResourceBuilder.cs +++ b/src/Identity/ApiAuthorization.IdentityServer/src/Options/IdentityResourceBuilder.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -129,4 +129,4 @@ private static IdentityResource GetResource(string name) } } } -} \ No newline at end of file +} diff --git a/src/Identity/ApiAuthorization.IdentityServer/src/PublicAPI.Shipped.txt b/src/Identity/ApiAuthorization.IdentityServer/src/PublicAPI.Shipped.txt index 2eaa8f7d1ee9..ed7c44f39237 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/src/PublicAPI.Shipped.txt +++ b/src/Identity/ApiAuthorization.IdentityServer/src/PublicAPI.Shipped.txt @@ -30,10 +30,7 @@ Microsoft.AspNetCore.ApiAuthorization.IdentityServer.IdentityServerJwtConstants. Microsoft.AspNetCore.Authentication.AuthenticationBuilderExtensions Microsoft.Extensions.DependencyInjection.IdentityServerBuilderConfigurationExtensions ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiAuthorizationDbContext -~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiAuthorizationDbContext.ApiAuthorizationDbContext(Microsoft.EntityFrameworkCore.DbContextOptions options, Microsoft.Extensions.Options.IOptions operationalStoreOptions) -> void -~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiAuthorizationDbContext.DeviceFlowCodes.get -> Microsoft.EntityFrameworkCore.DbSet ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiAuthorizationDbContext.DeviceFlowCodes.set -> void -~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiAuthorizationDbContext.PersistedGrants.get -> Microsoft.EntityFrameworkCore.DbSet ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiAuthorizationDbContext.PersistedGrants.set -> void ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiAuthorizationOptions.ApiResources.get -> Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiResourceCollection ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiAuthorizationOptions.ApiResources.set -> void @@ -46,34 +43,18 @@ Microsoft.Extensions.DependencyInjection.IdentityServerBuilderConfigurationExten ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiAuthorizationOptions.SigningCredential.get -> Microsoft.IdentityModel.Tokens.SigningCredentials ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiAuthorizationOptions.SigningCredential.set -> void ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiResourceBuilder.AllowAllClients() -> Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiResourceBuilder -~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiResourceBuilder.ApiResourceBuilder(IdentityServer4.Models.ApiResource resource) -> void -~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiResourceBuilder.Build() -> IdentityServer4.Models.ApiResource ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiResourceBuilder.ReplaceScopes(params string[] resourceScopes) -> Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiResourceBuilder ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiResourceBuilder.WithApplicationProfile(string profile) -> Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiResourceBuilder ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiResourceBuilder.WithScopes(params string[] resourceScopes) -> Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiResourceBuilder ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiResourceCollection.AddApiResource(string name, System.Action configure) -> void ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiResourceCollection.AddIdentityServerJwt(string name, System.Action configure) -> void -~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiResourceCollection.AddRange(params IdentityServer4.Models.ApiResource[] resources) -> void -~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiResourceCollection.ApiResourceCollection(System.Collections.Generic.IList list) -> void -~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiResourceCollection.this[string key].get -> IdentityServer4.Models.ApiResource -~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiScopeCollection.AddRange(params IdentityServer4.Models.ApiScope[] scopes) -> void -~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiScopeCollection.ApiScopeCollection(System.Collections.Generic.IList list) -> void ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiScopeCollection.ContainsScope(string key) -> bool -~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiScopeCollection.this[string key].get -> IdentityServer4.Models.ApiScope -~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientBuilder.Build() -> IdentityServer4.Models.Client -~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientBuilder.ClientBuilder(IdentityServer4.Models.Client client) -> void ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientBuilder.WithApplicationProfile(string profile) -> Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientBuilder ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientBuilder.WithClientId(string clientId) -> Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientBuilder ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientBuilder.WithLogoutRedirectUri(string logoutUri) -> Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientBuilder ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientBuilder.WithRedirectUri(string redirectUri) -> Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientBuilder ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientBuilder.WithScopes(params string[] scopes) -> Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientBuilder ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientBuilder.WithoutClientSecrets() -> Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientBuilder -~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientCollection.AddIdentityServerSPA(string clientId, System.Action configure) -> IdentityServer4.Models.Client -~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientCollection.AddNativeApp(string clientId, System.Action configure) -> IdentityServer4.Models.Client -~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientCollection.AddRange(params IdentityServer4.Models.Client[] clients) -> void -~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientCollection.AddSPA(string clientId, System.Action configure) -> IdentityServer4.Models.Client -~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientCollection.ClientCollection(System.Collections.Generic.IList list) -> void -~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientCollection.this[string key].get -> IdentityServer4.Models.Client ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientParametersTagHelper.ClientId.get -> string ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientParametersTagHelper.ClientId.set -> void ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientParametersTagHelper.ClientParametersTagHelper(Microsoft.AspNetCore.ApiAuthorization.IdentityServer.IClientRequestParametersProvider clientRequestParametersProvider) -> void @@ -81,16 +62,11 @@ Microsoft.Extensions.DependencyInjection.IdentityServerBuilderConfigurationExten ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientParametersTagHelper.ViewContext.set -> void ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.IClientRequestParametersProvider.GetClientParameters(Microsoft.AspNetCore.Http.HttpContext context, string clientId) -> System.Collections.Generic.IDictionary ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.IdentityResourceBuilder.AllowAllClients() -> Microsoft.AspNetCore.ApiAuthorization.IdentityServer.IdentityResourceBuilder -~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.IdentityResourceBuilder.Build() -> IdentityServer4.Models.IdentityResource -~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.IdentityResourceBuilder.IdentityResourceBuilder(IdentityServer4.Models.IdentityResource resource) -> void ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.IdentityResourceCollection.AddAddress(System.Action configure) -> void ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.IdentityResourceCollection.AddEmail(System.Action configure) -> void ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.IdentityResourceCollection.AddOpenId(System.Action configure) -> void ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.IdentityResourceCollection.AddPhone(System.Action configure) -> void ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.IdentityResourceCollection.AddProfile(System.Action configure) -> void -~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.IdentityResourceCollection.AddRange(params IdentityServer4.Models.IdentityResource[] identityResources) -> void -~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.IdentityResourceCollection.IdentityResourceCollection(System.Collections.Generic.IList list) -> void -~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.IdentityResourceCollection.this[string key].get -> IdentityServer4.Models.IdentityResource ~const Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApplicationProfiles.API = "API" -> string ~const Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApplicationProfiles.IdentityServerJwt = "IdentityServerJwt" -> string ~const Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApplicationProfiles.IdentityServerSPA = "IdentityServerSPA" -> string diff --git a/src/Identity/ApiAuthorization.IdentityServer/src/PublicAPI.Unshipped.txt b/src/Identity/ApiAuthorization.IdentityServer/src/PublicAPI.Unshipped.txt index 7dc5c58110bf..df71ca088f18 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/src/PublicAPI.Unshipped.txt +++ b/src/Identity/ApiAuthorization.IdentityServer/src/PublicAPI.Unshipped.txt @@ -1 +1,27 @@ #nullable enable +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiAuthorizationDbContext.ApiAuthorizationDbContext(Microsoft.EntityFrameworkCore.DbContextOptions options, Microsoft.Extensions.Options.IOptions operationalStoreOptions) -> void +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiAuthorizationDbContext.DeviceFlowCodes.get -> Microsoft.EntityFrameworkCore.DbSet +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiAuthorizationDbContext.Keys.get -> Microsoft.EntityFrameworkCore.DbSet +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiAuthorizationDbContext.Keys.set -> void +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiAuthorizationDbContext.PersistedGrants.get -> Microsoft.EntityFrameworkCore.DbSet +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiResourceBuilder.ApiResourceBuilder(Duende.IdentityServer.Models.ApiResource resource) -> void +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiResourceBuilder.Build() -> Duende.IdentityServer.Models.ApiResource +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiResourceCollection.AddRange(params Duende.IdentityServer.Models.ApiResource[] resources) -> void +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiResourceCollection.ApiResourceCollection(System.Collections.Generic.IList list) -> void +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiResourceCollection.this[string key].get -> Duende.IdentityServer.Models.ApiResource +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiScopeCollection.AddRange(params Duende.IdentityServer.Models.ApiScope[] scopes) -> void +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiScopeCollection.ApiScopeCollection(System.Collections.Generic.IList list) -> void +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiScopeCollection.this[string key].get -> Duende.IdentityServer.Models.ApiScope +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientBuilder.Build() -> Duende.IdentityServer.Models.Client +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientBuilder.ClientBuilder(Duende.IdentityServer.Models.Client client) -> void +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientCollection.AddIdentityServerSPA(string clientId, System.Action configure) -> Duende.IdentityServer.Models.Client +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientCollection.AddNativeApp(string clientId, System.Action configure) -> Duende.IdentityServer.Models.Client +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientCollection.AddRange(params Duende.IdentityServer.Models.Client[] clients) -> void +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientCollection.AddSPA(string clientId, System.Action configure) -> Duende.IdentityServer.Models.Client +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientCollection.ClientCollection(System.Collections.Generic.IList list) -> void +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientCollection.this[string key].get -> Duende.IdentityServer.Models.Client +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.IdentityResourceBuilder.Build() -> Duende.IdentityServer.Models.IdentityResource +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.IdentityResourceBuilder.IdentityResourceBuilder(Duende.IdentityServer.Models.IdentityResource resource) -> void +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.IdentityResourceCollection.AddRange(params Duende.IdentityServer.Models.IdentityResource[] identityResources) -> void +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.IdentityResourceCollection.IdentityResourceCollection(System.Collections.Generic.IList list) -> void +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.IdentityResourceCollection.this[string key].get -> Duende.IdentityServer.Models.IdentityResource From d2a82cc0e137bb29164537fc5d43e4be0f0769be Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 29 Jun 2021 22:17:06 -0700 Subject: [PATCH 07/15] Fix public api --- .../src/PublicAPI.Shipped.txt | 26 ++++++++++++++++++- .../src/PublicAPI.Unshipped.txt | 25 ++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/src/Identity/ApiAuthorization.IdentityServer/src/PublicAPI.Shipped.txt b/src/Identity/ApiAuthorization.IdentityServer/src/PublicAPI.Shipped.txt index ed7c44f39237..35ee741b0a91 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/src/PublicAPI.Shipped.txt +++ b/src/Identity/ApiAuthorization.IdentityServer/src/PublicAPI.Shipped.txt @@ -30,7 +30,10 @@ Microsoft.AspNetCore.ApiAuthorization.IdentityServer.IdentityServerJwtConstants. Microsoft.AspNetCore.Authentication.AuthenticationBuilderExtensions Microsoft.Extensions.DependencyInjection.IdentityServerBuilderConfigurationExtensions ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiAuthorizationDbContext +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiAuthorizationDbContext.ApiAuthorizationDbContext(Microsoft.EntityFrameworkCore.DbContextOptions options, Microsoft.Extensions.Options.IOptions operationalStoreOptions) -> void +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiAuthorizationDbContext.DeviceFlowCodes.get -> Microsoft.EntityFrameworkCore.DbSet ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiAuthorizationDbContext.DeviceFlowCodes.set -> void +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiAuthorizationDbContext.PersistedGrants.get -> Microsoft.EntityFrameworkCore.DbSet ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiAuthorizationDbContext.PersistedGrants.set -> void ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiAuthorizationOptions.ApiResources.get -> Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiResourceCollection ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiAuthorizationOptions.ApiResources.set -> void @@ -43,18 +46,34 @@ Microsoft.Extensions.DependencyInjection.IdentityServerBuilderConfigurationExten ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiAuthorizationOptions.SigningCredential.get -> Microsoft.IdentityModel.Tokens.SigningCredentials ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiAuthorizationOptions.SigningCredential.set -> void ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiResourceBuilder.AllowAllClients() -> Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiResourceBuilder +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiResourceBuilder.ApiResourceBuilder(IdentityServer4.Models.ApiResource resource) -> void +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiResourceBuilder.Build() -> IdentityServer4.Models.ApiResource ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiResourceBuilder.ReplaceScopes(params string[] resourceScopes) -> Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiResourceBuilder ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiResourceBuilder.WithApplicationProfile(string profile) -> Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiResourceBuilder ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiResourceBuilder.WithScopes(params string[] resourceScopes) -> Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiResourceBuilder ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiResourceCollection.AddApiResource(string name, System.Action configure) -> void ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiResourceCollection.AddIdentityServerJwt(string name, System.Action configure) -> void +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiResourceCollection.AddRange(params IdentityServer4.Models.ApiResource[] resources) -> void +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiResourceCollection.ApiResourceCollection(System.Collections.Generic.IList list) -> void +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiResourceCollection.this[string key].get -> IdentityServer4.Models.ApiResource +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiScopeCollection.AddRange(params IdentityServer4.Models.ApiScope[] scopes) -> void +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiScopeCollection.ApiScopeCollection(System.Collections.Generic.IList list) -> void ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiScopeCollection.ContainsScope(string key) -> bool +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiScopeCollection.this[string key].get -> IdentityServer4.Models.ApiScope +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientBuilder.Build() -> IdentityServer4.Models.Client +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientBuilder.ClientBuilder(IdentityServer4.Models.Client client) -> void ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientBuilder.WithApplicationProfile(string profile) -> Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientBuilder ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientBuilder.WithClientId(string clientId) -> Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientBuilder ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientBuilder.WithLogoutRedirectUri(string logoutUri) -> Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientBuilder ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientBuilder.WithRedirectUri(string redirectUri) -> Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientBuilder ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientBuilder.WithScopes(params string[] scopes) -> Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientBuilder ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientBuilder.WithoutClientSecrets() -> Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientBuilder +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientCollection.AddIdentityServerSPA(string clientId, System.Action configure) -> IdentityServer4.Models.Client +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientCollection.AddNativeApp(string clientId, System.Action configure) -> IdentityServer4.Models.Client +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientCollection.AddRange(params IdentityServer4.Models.Client[] clients) -> void +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientCollection.AddSPA(string clientId, System.Action configure) -> IdentityServer4.Models.Client +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientCollection.ClientCollection(System.Collections.Generic.IList list) -> void +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientCollection.this[string key].get -> IdentityServer4.Models.Client ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientParametersTagHelper.ClientId.get -> string ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientParametersTagHelper.ClientId.set -> void ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientParametersTagHelper.ClientParametersTagHelper(Microsoft.AspNetCore.ApiAuthorization.IdentityServer.IClientRequestParametersProvider clientRequestParametersProvider) -> void @@ -62,11 +81,16 @@ Microsoft.Extensions.DependencyInjection.IdentityServerBuilderConfigurationExten ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientParametersTagHelper.ViewContext.set -> void ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.IClientRequestParametersProvider.GetClientParameters(Microsoft.AspNetCore.Http.HttpContext context, string clientId) -> System.Collections.Generic.IDictionary ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.IdentityResourceBuilder.AllowAllClients() -> Microsoft.AspNetCore.ApiAuthorization.IdentityServer.IdentityResourceBuilder +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.IdentityResourceBuilder.Build() -> IdentityServer4.Models.IdentityResource +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.IdentityResourceBuilder.IdentityResourceBuilder(IdentityServer4.Models.IdentityResource resource) -> void ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.IdentityResourceCollection.AddAddress(System.Action configure) -> void ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.IdentityResourceCollection.AddEmail(System.Action configure) -> void ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.IdentityResourceCollection.AddOpenId(System.Action configure) -> void ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.IdentityResourceCollection.AddPhone(System.Action configure) -> void ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.IdentityResourceCollection.AddProfile(System.Action configure) -> void +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.IdentityResourceCollection.AddRange(params IdentityServer4.Models.IdentityResource[] identityResources) -> void +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.IdentityResourceCollection.IdentityResourceCollection(System.Collections.Generic.IList list) -> void +~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.IdentityResourceCollection.this[string key].get -> IdentityServer4.Models.IdentityResource ~const Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApplicationProfiles.API = "API" -> string ~const Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApplicationProfiles.IdentityServerJwt = "IdentityServerJwt" -> string ~const Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApplicationProfiles.IdentityServerSPA = "IdentityServerSPA" -> string @@ -102,4 +126,4 @@ Microsoft.Extensions.DependencyInjection.IdentityServerBuilderConfigurationExten ~static Microsoft.Extensions.DependencyInjection.IdentityServerBuilderConfigurationExtensions.AddIdentityResources(this Microsoft.Extensions.DependencyInjection.IIdentityServerBuilder builder) -> Microsoft.Extensions.DependencyInjection.IIdentityServerBuilder ~static Microsoft.Extensions.DependencyInjection.IdentityServerBuilderConfigurationExtensions.AddIdentityResources(this Microsoft.Extensions.DependencyInjection.IIdentityServerBuilder builder, Microsoft.Extensions.Configuration.IConfiguration configuration) -> Microsoft.Extensions.DependencyInjection.IIdentityServerBuilder ~static Microsoft.Extensions.DependencyInjection.IdentityServerBuilderConfigurationExtensions.AddSigningCredentials(this Microsoft.Extensions.DependencyInjection.IIdentityServerBuilder builder) -> Microsoft.Extensions.DependencyInjection.IIdentityServerBuilder -~static Microsoft.Extensions.DependencyInjection.IdentityServerBuilderConfigurationExtensions.AddSigningCredentials(this Microsoft.Extensions.DependencyInjection.IIdentityServerBuilder builder, Microsoft.Extensions.Configuration.IConfiguration configuration) -> Microsoft.Extensions.DependencyInjection.IIdentityServerBuilder +~static Microsoft.Extensions.DependencyInjection.IdentityServerBuilderConfigurationExtensions.AddSigningCredentials(this Microsoft.Extensions.DependencyInjection.IIdentityServerBuilder builder, Microsoft.Extensions.Configuration.IConfiguration configuration) -> Microsoft.Extensions.DependencyInjection.IIdentityServerBuilder \ No newline at end of file diff --git a/src/Identity/ApiAuthorization.IdentityServer/src/PublicAPI.Unshipped.txt b/src/Identity/ApiAuthorization.IdentityServer/src/PublicAPI.Unshipped.txt index df71ca088f18..20b40db34927 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/src/PublicAPI.Unshipped.txt +++ b/src/Identity/ApiAuthorization.IdentityServer/src/PublicAPI.Unshipped.txt @@ -1,4 +1,29 @@ #nullable enable +*REMOVED*~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiAuthorizationDbContext.ApiAuthorizationDbContext(Microsoft.EntityFrameworkCore.DbContextOptions options, Microsoft.Extensions.Options.IOptions operationalStoreOptions) -> void +*REMOVED*~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiAuthorizationDbContext.DeviceFlowCodes.get -> Microsoft.EntityFrameworkCore.DbSet +*REMOVED*~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiAuthorizationDbContext.PersistedGrants.get -> Microsoft.EntityFrameworkCore.DbSet +*REMOVED*~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiResourceBuilder.ApiResourceBuilder(IdentityServer4.Models.ApiResource resource) -> void +*REMOVED*~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiResourceBuilder.Build() -> IdentityServer4.Models.ApiResource +*REMOVED*~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiResourceCollection.AddRange(params IdentityServer4.Models.ApiResource[] resources) -> void +*REMOVED*~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiResourceCollection.ApiResourceCollection(System.Collections.Generic.IList list) -> void +*REMOVED*~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiResourceCollection.this[string key].get -> IdentityServer4.Models.ApiResource +*REMOVED*~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiScopeCollection.AddRange(params IdentityServer4.Models.ApiScope[] scopes) -> void +*REMOVED*~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiScopeCollection.ApiScopeCollection(System.Collections.Generic.IList list) -> void +*REMOVED*~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiScopeCollection.this[string key].get -> IdentityServer4.Models.ApiScope +*REMOVED*~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientBuilder.Build() -> IdentityServer4.Models.Client +*REMOVED*~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientBuilder.ClientBuilder(IdentityServer4.Models.Client client) -> void +*REMOVED*~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientCollection.AddIdentityServerSPA(string clientId, System.Action configure) -> IdentityServer4.Models.Client +*REMOVED*~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientCollection.AddNativeApp(string clientId, System.Action configure) -> IdentityServer4.Models.Client +*REMOVED*~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientCollection.AddRange(params IdentityServer4.Models.Client[] clients) -> void +*REMOVED*~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientCollection.AddSPA(string clientId, System.Action configure) -> IdentityServer4.Models.Client +*REMOVED*~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientCollection.ClientCollection(System.Collections.Generic.IList list) -> void +*REMOVED*~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientCollection.this[string key].get -> IdentityServer4.Models.Client +*REMOVED*~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.IdentityResourceBuilder.Build() -> IdentityServer4.Models.IdentityResource +*REMOVED*~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.IdentityResourceBuilder.IdentityResourceBuilder(IdentityServer4.Models.IdentityResource resource) -> void +*REMOVED*~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.IdentityResourceCollection.AddRange(params IdentityServer4.Models.IdentityResource[] identityResources) -> void +*REMOVED*~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.IdentityResourceCollection.IdentityResourceCollection(System.Collections.Generic.IList list) -> void +*REMOVED*~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.IdentityResourceCollection.this[string key].get -> IdentityServer4.Models.IdentityResource +*REMOVED*~static Microsoft.Extensions.DependencyInjection.IdentityServerBuilderConfigurationExtensions.AddSigningCredentials(this Microsoft.Extensions.DependencyInjection.IIdentityServerBuilder builder, Microsoft.Extensions.Configuration.IConfiguration configuration) -> Microsoft.Extensions.DependencyInjection.IIdentityServerBuilder ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiAuthorizationDbContext.ApiAuthorizationDbContext(Microsoft.EntityFrameworkCore.DbContextOptions options, Microsoft.Extensions.Options.IOptions operationalStoreOptions) -> void ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiAuthorizationDbContext.DeviceFlowCodes.get -> Microsoft.EntityFrameworkCore.DbSet ~Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiAuthorizationDbContext.Keys.get -> Microsoft.EntityFrameworkCore.DbSet From 01ea1cc009fbee3057d3e4f88cf96b8d318ac68e Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 30 Jun 2021 00:02:41 -0700 Subject: [PATCH 08/15] Update PublicAPI.Shipped.txt --- .../ApiAuthorization.IdentityServer/src/PublicAPI.Shipped.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Identity/ApiAuthorization.IdentityServer/src/PublicAPI.Shipped.txt b/src/Identity/ApiAuthorization.IdentityServer/src/PublicAPI.Shipped.txt index 35ee741b0a91..2eaa8f7d1ee9 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/src/PublicAPI.Shipped.txt +++ b/src/Identity/ApiAuthorization.IdentityServer/src/PublicAPI.Shipped.txt @@ -126,4 +126,4 @@ Microsoft.Extensions.DependencyInjection.IdentityServerBuilderConfigurationExten ~static Microsoft.Extensions.DependencyInjection.IdentityServerBuilderConfigurationExtensions.AddIdentityResources(this Microsoft.Extensions.DependencyInjection.IIdentityServerBuilder builder) -> Microsoft.Extensions.DependencyInjection.IIdentityServerBuilder ~static Microsoft.Extensions.DependencyInjection.IdentityServerBuilderConfigurationExtensions.AddIdentityResources(this Microsoft.Extensions.DependencyInjection.IIdentityServerBuilder builder, Microsoft.Extensions.Configuration.IConfiguration configuration) -> Microsoft.Extensions.DependencyInjection.IIdentityServerBuilder ~static Microsoft.Extensions.DependencyInjection.IdentityServerBuilderConfigurationExtensions.AddSigningCredentials(this Microsoft.Extensions.DependencyInjection.IIdentityServerBuilder builder) -> Microsoft.Extensions.DependencyInjection.IIdentityServerBuilder -~static Microsoft.Extensions.DependencyInjection.IdentityServerBuilderConfigurationExtensions.AddSigningCredentials(this Microsoft.Extensions.DependencyInjection.IIdentityServerBuilder builder, Microsoft.Extensions.Configuration.IConfiguration configuration) -> Microsoft.Extensions.DependencyInjection.IIdentityServerBuilder \ No newline at end of file +~static Microsoft.Extensions.DependencyInjection.IdentityServerBuilderConfigurationExtensions.AddSigningCredentials(this Microsoft.Extensions.DependencyInjection.IIdentityServerBuilder builder, Microsoft.Extensions.Configuration.IConfiguration configuration) -> Microsoft.Extensions.DependencyInjection.IIdentityServerBuilder From 01147341a5e7007e0b92cf7bf827e85dc6e9fb43 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 30 Jun 2021 12:04:47 -0700 Subject: [PATCH 09/15] Fix migrations --- .../20200324213904_Initial.Designer.cs | 40 ++++++- .../Data/Migrations/20200324213904_Initial.cs | 21 ++++ .../ApplicationDbContextModelSnapshot.cs | 108 ++++++++++++------ 3 files changed, 132 insertions(+), 37 deletions(-) diff --git a/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Data/Migrations/20200324213904_Initial.Designer.cs b/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Data/Migrations/20200324213904_Initial.Designer.cs index 5a9de57b6de8..421f81870da5 100644 --- a/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Data/Migrations/20200324213904_Initial.Designer.cs +++ b/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Data/Migrations/20200324213904_Initial.Designer.cs @@ -18,7 +18,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) modelBuilder .HasAnnotation("ProductVersion", "3.1.2"); - modelBuilder.Entity("IdentityServer4.EntityFramework.Entities.DeviceFlowCodes", b => + modelBuilder.Entity("Duende.IdentityServer.EntityFramework.Entities.DeviceFlowCodes", b => { b.Property("UserCode") .HasColumnType("TEXT") @@ -60,7 +60,43 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.ToTable("DeviceCodes"); }); - modelBuilder.Entity("IdentityServer4.EntityFramework.Entities.PersistedGrant", b => + modelBuilder.Entity("Duende.IdentityServer.EntityFramework.Entities.Key", b => + { + b.Property("Id") + .HasColumnType("nvarchar(450)"); + + b.Property("Algorithm") + .IsRequired() + .HasColumnType("nvarchar(100)") + .HasMaxLength(100); + + b.Property("Created") + .HasColumnType("datetime2"); + + b.Property("Data") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("DataProtected") + .HasColumnType("bit"); + + b.Property("IsX509Certificate") + .HasColumnType("bit"); + + b.Property("Use") + .HasColumnType("nvarchar(450)"); + + b.Property("Version") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("Use"); + + b.ToTable("Keys"); + }); + + modelBuilder.Entity("Duende.IdentityServer.EntityFramework.Entities.PersistedGrant", b => { b.Property("Key") .HasColumnType("TEXT") diff --git a/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Data/Migrations/20200324213904_Initial.cs b/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Data/Migrations/20200324213904_Initial.cs index fcafd568d1e4..1ed98d30c773 100644 --- a/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Data/Migrations/20200324213904_Initial.cs +++ b/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Data/Migrations/20200324213904_Initial.cs @@ -63,6 +63,24 @@ protected override void Up(MigrationBuilder migrationBuilder) table.PrimaryKey("PK_DeviceCodes", x => x.UserCode); }); + migrationBuilder.CreateTable( + name: "Keys", + columns: table => new + { + Id = table.Column(nullable: false), + Version = table.Column(nullable: false), + Created = table.Column(nullable: false), + Use = table.Column(nullable: true), + Algorithm = table.Column(maxLength: 100, nullable: false), + IsX509Certificate = table.Column(nullable: false), + DataProtected = table.Column(nullable: false), + Data = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Keys", x => x.Id); + }); + migrationBuilder.CreateTable( name: "PersistedGrants", columns: table => new @@ -290,6 +308,9 @@ protected override void Down(MigrationBuilder migrationBuilder) migrationBuilder.DropTable( name: "DeviceCodes"); + migrationBuilder.DropTable( + name: "Keys"); + migrationBuilder.DropTable( name: "PersistedGrants"); diff --git a/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Data/Migrations/ApplicationDbContextModelSnapshot.cs b/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Data/Migrations/ApplicationDbContextModelSnapshot.cs index c68c2e09660c..2819ce09846c 100644 --- a/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Data/Migrations/ApplicationDbContextModelSnapshot.cs +++ b/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Data/Migrations/ApplicationDbContextModelSnapshot.cs @@ -16,45 +16,45 @@ protected override void BuildModel(ModelBuilder modelBuilder) modelBuilder .HasAnnotation("ProductVersion", "5.0.0-rc.1.20416.1"); - modelBuilder.Entity("IdentityServer4.EntityFramework.Entities.DeviceFlowCodes", b => + modelBuilder.Entity("Duende.IdentityServer.EntityFramework.Entities.DeviceFlowCodes", b => { b.Property("UserCode") - .HasMaxLength(200) - .HasColumnType("TEXT"); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.Property("ClientId") .IsRequired() - .HasMaxLength(200) - .HasColumnType("TEXT"); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.Property("CreationTime") - .HasColumnType("TEXT"); + .HasColumnType("datetime2"); b.Property("Data") .IsRequired() - .HasMaxLength(50000) - .HasColumnType("TEXT"); + .HasColumnType("nvarchar(max)") + .HasMaxLength(50000); b.Property("Description") - .HasMaxLength(200) - .HasColumnType("TEXT"); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.Property("DeviceCode") .IsRequired() - .HasMaxLength(200) - .HasColumnType("TEXT"); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.Property("Expiration") .IsRequired() - .HasColumnType("TEXT"); + .HasColumnType("datetime2"); b.Property("SessionId") - .HasMaxLength(100) - .HasColumnType("TEXT"); + .HasColumnType("nvarchar(100)") + .HasMaxLength(100); b.Property("SubjectId") - .HasMaxLength(200) - .HasColumnType("TEXT"); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.HasKey("UserCode"); @@ -66,50 +66,88 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("DeviceCodes"); }); - modelBuilder.Entity("IdentityServer4.EntityFramework.Entities.PersistedGrant", b => + modelBuilder.Entity("Duende.IdentityServer.EntityFramework.Entities.Key", b => + { + b.Property("Id") + .HasColumnType("nvarchar(450)"); + + b.Property("Algorithm") + .IsRequired() + .HasColumnType("nvarchar(100)") + .HasMaxLength(100); + + b.Property("Created") + .HasColumnType("datetime2"); + + b.Property("Data") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("DataProtected") + .HasColumnType("bit"); + + b.Property("IsX509Certificate") + .HasColumnType("bit"); + + b.Property("Use") + .HasColumnType("nvarchar(450)"); + + b.Property("Version") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("Use"); + + b.ToTable("Keys"); + }); + + modelBuilder.Entity("Duende.IdentityServer.EntityFramework.Entities.PersistedGrant", b => { b.Property("Key") - .HasMaxLength(200) - .HasColumnType("TEXT"); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.Property("ClientId") .IsRequired() - .HasMaxLength(200) - .HasColumnType("TEXT"); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.Property("ConsumedTime") - .HasColumnType("TEXT"); + .HasColumnType("datetime2"); b.Property("CreationTime") - .HasColumnType("TEXT"); + .HasColumnType("datetime2"); b.Property("Data") .IsRequired() - .HasMaxLength(50000) - .HasColumnType("TEXT"); + .HasColumnType("nvarchar(max)") + .HasMaxLength(50000); b.Property("Description") - .HasMaxLength(200) - .HasColumnType("TEXT"); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.Property("Expiration") - .HasColumnType("TEXT"); + .HasColumnType("datetime2"); b.Property("SessionId") - .HasMaxLength(100) - .HasColumnType("TEXT"); + .HasColumnType("nvarchar(100)") + .HasMaxLength(100); b.Property("SubjectId") - .HasMaxLength(200) - .HasColumnType("TEXT"); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.Property("Type") .IsRequired() - .HasMaxLength(50) - .HasColumnType("TEXT"); + .HasColumnType("nvarchar(50)") + .HasMaxLength(50); b.HasKey("Key"); + b.HasIndex("ConsumedTime"); + b.HasIndex("Expiration"); b.HasIndex("SubjectId", "ClientId", "Type"); From c8f22ab0cabd9fc799908b23875813499e670f30 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 30 Jun 2021 14:46:39 -0700 Subject: [PATCH 10/15] Update 20200324213904_Initial.Designer.cs --- .../Data/Migrations/20200324213904_Initial.Designer.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Data/Migrations/20200324213904_Initial.Designer.cs b/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Data/Migrations/20200324213904_Initial.Designer.cs index 421f81870da5..43a84517ca0f 100644 --- a/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Data/Migrations/20200324213904_Initial.Designer.cs +++ b/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Data/Migrations/20200324213904_Initial.Designer.cs @@ -63,11 +63,11 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) modelBuilder.Entity("Duende.IdentityServer.EntityFramework.Entities.Key", b => { b.Property("Id") - .HasColumnType("nvarchar(450)"); + .HasColumnType("TEXT"); b.Property("Algorithm") .IsRequired() - .HasColumnType("nvarchar(100)") + .HasColumnType("TEXT"); .HasMaxLength(100); b.Property("Created") @@ -75,7 +75,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.Property("Data") .IsRequired() - .HasColumnType("nvarchar(max)"); + .HasColumnType("TEXT"); b.Property("DataProtected") .HasColumnType("bit"); @@ -84,7 +84,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) .HasColumnType("bit"); b.Property("Use") - .HasColumnType("nvarchar(450)"); + .HasColumnType("TEXT"); b.Property("Version") .HasColumnType("int"); From 9224a968bd2487a59a09793033c606563deb9748 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 30 Jun 2021 14:48:36 -0700 Subject: [PATCH 11/15] Update ApplicationDbContextModelSnapshot.cs --- .../ApplicationDbContextModelSnapshot.cs | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Data/Migrations/ApplicationDbContextModelSnapshot.cs b/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Data/Migrations/ApplicationDbContextModelSnapshot.cs index 2819ce09846c..7c93db49bfac 100644 --- a/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Data/Migrations/ApplicationDbContextModelSnapshot.cs +++ b/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Data/Migrations/ApplicationDbContextModelSnapshot.cs @@ -19,42 +19,42 @@ protected override void BuildModel(ModelBuilder modelBuilder) modelBuilder.Entity("Duende.IdentityServer.EntityFramework.Entities.DeviceFlowCodes", b => { b.Property("UserCode") - .HasColumnType("nvarchar(200)") - .HasMaxLength(200); - + .HasMaxLength(200) + .HasColumnType("TEXT"); + b.Property("ClientId") .IsRequired() - .HasColumnType("nvarchar(200)") - .HasMaxLength(200); + .HasMaxLength(200) + .HasColumnType("TEXT"); b.Property("CreationTime") - .HasColumnType("datetime2"); + .HasColumnType("TEXT"); b.Property("Data") .IsRequired() - .HasColumnType("nvarchar(max)") - .HasMaxLength(50000); + .HasMaxLength(50000) + .HasColumnType("TEXT"); b.Property("Description") - .HasColumnType("nvarchar(200)") - .HasMaxLength(200); + .HasMaxLength(200) + .HasColumnType("TEXT"); b.Property("DeviceCode") .IsRequired() - .HasColumnType("nvarchar(200)") - .HasMaxLength(200); + .HasMaxLength(200) + .HasColumnType("TEXT"); b.Property("Expiration") .IsRequired() - .HasColumnType("datetime2"); + .HasColumnType("TEXT"); b.Property("SessionId") - .HasColumnType("nvarchar(100)") - .HasMaxLength(100); + .HasMaxLength(100) + .HasColumnType("TEXT"); b.Property("SubjectId") - .HasColumnType("nvarchar(200)") - .HasMaxLength(200); + .HasMaxLength(200) + .HasColumnType("TEXT"); b.HasKey("UserCode"); From 3ddfdbc1c368b52c8cee62f9e707bf5cf617f0cd Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 30 Jun 2021 14:49:18 -0700 Subject: [PATCH 12/15] Update 20200324213904_Initial.Designer.cs --- .../Data/Migrations/20200324213904_Initial.Designer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Data/Migrations/20200324213904_Initial.Designer.cs b/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Data/Migrations/20200324213904_Initial.Designer.cs index 43a84517ca0f..0bdcef9eb0c0 100644 --- a/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Data/Migrations/20200324213904_Initial.Designer.cs +++ b/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Data/Migrations/20200324213904_Initial.Designer.cs @@ -67,7 +67,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.Property("Algorithm") .IsRequired() - .HasColumnType("TEXT"); + .HasColumnType("TEXT") .HasMaxLength(100); b.Property("Created") From 0dd52db8f7ed36cc568d91c6f49bff0fdb6a01c2 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 30 Jun 2021 14:52:37 -0700 Subject: [PATCH 13/15] Update ApplicationDbContextModelSnapshot.cs --- .../ApplicationDbContextModelSnapshot.cs | 55 ++++++++++--------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Data/Migrations/ApplicationDbContextModelSnapshot.cs b/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Data/Migrations/ApplicationDbContextModelSnapshot.cs index 7c93db49bfac..c6a0e3447f81 100644 --- a/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Data/Migrations/ApplicationDbContextModelSnapshot.cs +++ b/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Data/Migrations/ApplicationDbContextModelSnapshot.cs @@ -69,20 +69,22 @@ protected override void BuildModel(ModelBuilder modelBuilder) modelBuilder.Entity("Duende.IdentityServer.EntityFramework.Entities.Key", b => { b.Property("Id") - .HasColumnType("nvarchar(450)"); + .HasMaxLength(450) + .HasColumnType("TEXT"); b.Property("Algorithm") .IsRequired() - .HasColumnType("nvarchar(100)") - .HasMaxLength(100); + .HasMaxLength(100) + .HasColumnType("TEXT"); b.Property("Created") - .HasColumnType("datetime2"); + .HasColumnType("TEXT"); b.Property("Data") .IsRequired() - .HasColumnType("nvarchar(max)"); - + .HasColumnType("TEXT") + .HasMaxLength(50000); + b.Property("DataProtected") .HasColumnType("bit"); @@ -90,7 +92,8 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasColumnType("bit"); b.Property("Use") - .HasColumnType("nvarchar(450)"); + .HasMaxLength(450) + .HasColumnType("TEXT"); b.Property("Version") .HasColumnType("int"); @@ -105,49 +108,47 @@ protected override void BuildModel(ModelBuilder modelBuilder) modelBuilder.Entity("Duende.IdentityServer.EntityFramework.Entities.PersistedGrant", b => { b.Property("Key") - .HasColumnType("nvarchar(200)") - .HasMaxLength(200); + .HasMaxLength(200) + .HasColumnType("TEXT"); b.Property("ClientId") .IsRequired() - .HasColumnType("nvarchar(200)") - .HasMaxLength(200); + .HasMaxLength(200) + .HasColumnType("TEXT"); b.Property("ConsumedTime") - .HasColumnType("datetime2"); + .HasColumnType("TEXT"); b.Property("CreationTime") - .HasColumnType("datetime2"); + .HasColumnType("TEXT"); b.Property("Data") .IsRequired() - .HasColumnType("nvarchar(max)") - .HasMaxLength(50000); + .HasMaxLength(50000) + .HasColumnType("TEXT"); b.Property("Description") - .HasColumnType("nvarchar(200)") - .HasMaxLength(200); + .HasMaxLength(200) + .HasColumnType("TEXT"); b.Property("Expiration") - .HasColumnType("datetime2"); + .HasColumnType("TEXT"); b.Property("SessionId") - .HasColumnType("nvarchar(100)") - .HasMaxLength(100); + .HasMaxLength(100) + .HasColumnType("TEXT"); b.Property("SubjectId") - .HasColumnType("nvarchar(200)") - .HasMaxLength(200); + .HasMaxLength(200) + .HasColumnType("TEXT"); b.Property("Type") .IsRequired() - .HasColumnType("nvarchar(50)") - .HasMaxLength(50); + .HasMaxLength(50) + .HasColumnType("TEXT"); b.HasKey("Key"); - b.HasIndex("ConsumedTime"); - b.HasIndex("Expiration"); b.HasIndex("SubjectId", "ClientId", "Type"); @@ -156,7 +157,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("PersistedGrants"); }); - + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b => { b.Property("Id") From 2d5318fa32ded9cd20ab87e871e39d7c542dc0d4 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Sat, 3 Jul 2021 16:55:08 -0700 Subject: [PATCH 14/15] Clean up whitespace --- .../Data/Migrations/ApplicationDbContextModelSnapshot.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Data/Migrations/ApplicationDbContextModelSnapshot.cs b/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Data/Migrations/ApplicationDbContextModelSnapshot.cs index c6a0e3447f81..1bbf5f9b4576 100644 --- a/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Data/Migrations/ApplicationDbContextModelSnapshot.cs +++ b/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Data/Migrations/ApplicationDbContextModelSnapshot.cs @@ -21,7 +21,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Property("UserCode") .HasMaxLength(200) .HasColumnType("TEXT"); - + b.Property("ClientId") .IsRequired() .HasMaxLength(200) @@ -157,7 +157,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("PersistedGrants"); }); - + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b => { b.Property("Id") From e8a53b7de0079bbae1f54daa1c700218dfcf248d Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 6 Jul 2021 10:26:56 -0700 Subject: [PATCH 15/15] Clarify comments, fix sample migration --- .../ApiAuthSample/ApiAuthSample.csproj | 2 +- ...0180919224505_InitialMigration.Designer.cs | 93 ++++++++++++- .../20180919224505_InitialMigration.cs | 35 +++++ .../ApplicationDbContextModelSnapshot.cs | 127 ++++++++++++++++-- .../src/Data/ApiAuthorizationDbContext.cs | 5 +- ...ore.ApiAuthorization.IdentityServer.csproj | 4 +- ...iAuthorization.IdentityServer.Tests.csproj | 2 +- 7 files changed, 249 insertions(+), 19 deletions(-) diff --git a/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/ApiAuthSample.csproj b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/ApiAuthSample.csproj index b3f8fc7126ac..ec21f0bbc980 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/ApiAuthSample.csproj +++ b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/ApiAuthSample.csproj @@ -3,7 +3,7 @@ $(DefaultNetCoreTargetFramework) aspnet-ApiAuthSample-12ED8ECC-9EF1-4D31-87B4-1405B3198E5E - + CS8002 diff --git a/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Data/Migrations/20180919224505_InitialMigration.Designer.cs b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Data/Migrations/20180919224505_InitialMigration.Designer.cs index ae62ed80fc85..421d375524f0 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Data/Migrations/20180919224505_InitialMigration.Designer.cs +++ b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Data/Migrations/20180919224505_InitialMigration.Designer.cs @@ -18,32 +18,119 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) modelBuilder .HasAnnotation("ProductVersion", "2.1.3-rtm-32065"); - modelBuilder.Entity("IdentityServer4.EntityFramework.Entities.PersistedGrant", b => + modelBuilder.Entity("Duende.IdentityServer.EntityFramework.Entities.DeviceFlowCodes", b => + { + b.Property("UserCode") + .HasColumnType("TEXT") + .HasMaxLength(200); + + b.Property("ClientId") + .IsRequired() + .HasColumnType("TEXT") + .HasMaxLength(200); + + b.Property("CreationTime") + .HasColumnType("TEXT"); + + b.Property("Data") + .IsRequired() + .HasColumnType("TEXT") + .HasMaxLength(50000); + + b.Property("DeviceCode") + .IsRequired() + .HasColumnType("TEXT") + .HasMaxLength(200); + + b.Property("Expiration") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("SubjectId") + .HasColumnType("TEXT") + .HasMaxLength(200); + + b.HasKey("UserCode"); + + b.HasIndex("DeviceCode") + .IsUnique(); + + b.HasIndex("Expiration"); + + b.ToTable("DeviceCodes"); + }); + + modelBuilder.Entity("Duende.IdentityServer.EntityFramework.Entities.Key", b => + { + b.Property("Id") + .HasColumnType("TEXT"); + + b.Property("Algorithm") + .IsRequired() + .HasColumnType("TEXT") + .HasMaxLength(100); + + b.Property("Created") + .HasColumnType("datetime2"); + + b.Property("Data") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("DataProtected") + .HasColumnType("bit"); + + b.Property("IsX509Certificate") + .HasColumnType("bit"); + + b.Property("Use") + .HasColumnType("TEXT"); + + b.Property("Version") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("Use"); + + b.ToTable("Keys"); + }); + + modelBuilder.Entity("Duende.IdentityServer.EntityFramework.Entities.PersistedGrant", b => { b.Property("Key") + .HasColumnType("TEXT") .HasMaxLength(200); b.Property("ClientId") .IsRequired() + .HasColumnType("TEXT") .HasMaxLength(200); - b.Property("CreationTime"); + b.Property("CreationTime") + .HasColumnType("TEXT"); b.Property("Data") .IsRequired() + .HasColumnType("TEXT") .HasMaxLength(50000); - b.Property("Expiration"); + b.Property("Expiration") + .HasColumnType("TEXT"); b.Property("SubjectId") + .HasColumnType("TEXT") .HasMaxLength(200); b.Property("Type") .IsRequired() + .HasColumnType("TEXT") .HasMaxLength(50); b.HasKey("Key"); + b.HasIndex("Expiration"); + b.HasIndex("SubjectId", "ClientId", "Type"); b.ToTable("PersistedGrants"); diff --git a/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Data/Migrations/20180919224505_InitialMigration.cs b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Data/Migrations/20180919224505_InitialMigration.cs index e801149f5f95..a1a6097b0671 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Data/Migrations/20180919224505_InitialMigration.cs +++ b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Data/Migrations/20180919224505_InitialMigration.cs @@ -46,6 +46,41 @@ protected override void Up(MigrationBuilder migrationBuilder) table.PrimaryKey("PK_AspNetUsers", x => x.Id); }); + migrationBuilder.CreateTable( + name: "DeviceCodes", + columns: table => new + { + UserCode = table.Column(maxLength: 200, nullable: false), + DeviceCode = table.Column(maxLength: 200, nullable: false), + SubjectId = table.Column(maxLength: 200, nullable: true), + ClientId = table.Column(maxLength: 200, nullable: false), + CreationTime = table.Column(nullable: false), + Expiration = table.Column(nullable: false), + Data = table.Column(maxLength: 50000, nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_DeviceCodes", x => x.UserCode); + }); + + migrationBuilder.CreateTable( + name: "Keys", + columns: table => new + { + Id = table.Column(nullable: false), + Version = table.Column(nullable: false), + Created = table.Column(nullable: false), + Use = table.Column(nullable: true), + Algorithm = table.Column(maxLength: 100, nullable: false), + IsX509Certificate = table.Column(nullable: false), + DataProtected = table.Column(nullable: false), + Data = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Keys", x => x.Id); + }); + migrationBuilder.CreateTable( name: "PersistedGrants", columns: table => new diff --git a/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Data/Migrations/ApplicationDbContextModelSnapshot.cs b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Data/Migrations/ApplicationDbContextModelSnapshot.cs index 23b1f3414fe9..1055d1c700a8 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Data/Migrations/ApplicationDbContextModelSnapshot.cs +++ b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Data/Migrations/ApplicationDbContextModelSnapshot.cs @@ -16,34 +16,145 @@ protected override void BuildModel(ModelBuilder modelBuilder) modelBuilder .HasAnnotation("ProductVersion", "2.1.3-rtm-32065"); - modelBuilder.Entity("IdentityServer4.EntityFramework.Entities.PersistedGrant", b => + modelBuilder.Entity("Duende.IdentityServer.EntityFramework.Entities.DeviceFlowCodes", b => { - b.Property("Key") - .HasMaxLength(200); + b.Property("UserCode") + .HasMaxLength(200) + .HasColumnType("TEXT"); b.Property("ClientId") .IsRequired() - .HasMaxLength(200); + .HasMaxLength(200) + .HasColumnType("TEXT"); + + b.Property("CreationTime") + .HasColumnType("TEXT"); + + b.Property("Data") + .IsRequired() + .HasMaxLength(50000) + .HasColumnType("TEXT"); + + b.Property("Description") + .HasMaxLength(200) + .HasColumnType("TEXT"); + + b.Property("DeviceCode") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("TEXT"); + + b.Property("Expiration") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("SessionId") + .HasMaxLength(100) + .HasColumnType("TEXT"); + + b.Property("SubjectId") + .HasMaxLength(200) + .HasColumnType("TEXT"); + + b.HasKey("UserCode"); + + b.HasIndex("DeviceCode") + .IsUnique(); + + b.HasIndex("Expiration"); + + b.ToTable("DeviceCodes"); + }); + + modelBuilder.Entity("Duende.IdentityServer.EntityFramework.Entities.Key", b => + { + b.Property("Id") + .HasMaxLength(450) + .HasColumnType("TEXT"); + + b.Property("Algorithm") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("TEXT"); - b.Property("CreationTime"); + b.Property("Created") + .HasColumnType("TEXT"); b.Property("Data") .IsRequired() + .HasColumnType("TEXT") .HasMaxLength(50000); + + b.Property("DataProtected") + .HasColumnType("bit"); - b.Property("Expiration"); + b.Property("IsX509Certificate") + .HasColumnType("bit"); + + b.Property("Use") + .HasMaxLength(450) + .HasColumnType("TEXT"); + + b.Property("Version") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("Use"); + + b.ToTable("Keys"); + }); + + modelBuilder.Entity("Duende.IdentityServer.EntityFramework.Entities.PersistedGrant", b => + { + b.Property("Key") + .HasMaxLength(200) + .HasColumnType("TEXT"); + + b.Property("ClientId") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("TEXT"); + + b.Property("ConsumedTime") + .HasColumnType("TEXT"); + + b.Property("CreationTime") + .HasColumnType("TEXT"); + + b.Property("Data") + .IsRequired() + .HasMaxLength(50000) + .HasColumnType("TEXT"); + + b.Property("Description") + .HasMaxLength(200) + .HasColumnType("TEXT"); + + b.Property("Expiration") + .HasColumnType("TEXT"); + + b.Property("SessionId") + .HasMaxLength(100) + .HasColumnType("TEXT"); b.Property("SubjectId") - .HasMaxLength(200); + .HasMaxLength(200) + .HasColumnType("TEXT"); b.Property("Type") .IsRequired() - .HasMaxLength(50); + .HasMaxLength(50) + .HasColumnType("TEXT"); b.HasKey("Key"); + b.HasIndex("Expiration"); + b.HasIndex("SubjectId", "ClientId", "Type"); + b.HasIndex("SubjectId", "SessionId", "Type"); + b.ToTable("PersistedGrants"); }); diff --git a/src/Identity/ApiAuthorization.IdentityServer/src/Data/ApiAuthorizationDbContext.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Data/ApiAuthorizationDbContext.cs index 482f5624cb0a..07e66cca2334 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/src/Data/ApiAuthorizationDbContext.cs +++ b/src/Identity/ApiAuthorization.IdentityServer/src/Data/ApiAuthorizationDbContext.cs @@ -46,11 +46,8 @@ public ApiAuthorizationDbContext( public DbSet DeviceFlowCodes { get; set; } /// - /// Gets or sets the keys. + /// Gets or sets the . /// - /// - /// The keys. - /// public DbSet Keys { get; set; } Task IPersistedGrantDbContext.SaveChangesAsync() => base.SaveChangesAsync(); diff --git a/src/Identity/ApiAuthorization.IdentityServer/src/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj b/src/Identity/ApiAuthorization.IdentityServer/src/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj index 8c9d22eec4e1..8e2283e2c480 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/src/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj +++ b/src/Identity/ApiAuthorization.IdentityServer/src/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj @@ -8,13 +8,13 @@ false - + CS8002 disable - + diff --git a/src/Identity/ApiAuthorization.IdentityServer/test/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Tests.csproj b/src/Identity/ApiAuthorization.IdentityServer/test/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Tests.csproj index f20f2008e51f..68c2b18fc1b5 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/test/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Tests.csproj +++ b/src/Identity/ApiAuthorization.IdentityServer/test/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Tests.csproj @@ -5,7 +5,7 @@ false - + CS8002