diff --git a/eng/Dependencies.props b/eng/Dependencies.props index f4594285e69c..b0904d2b2413 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 0949310fba7e..851c24fa19d8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -229,11 +229,11 @@ 2.32.0 2.32.0 2.32.0 - 5.2.0 - 5.2.0 - 5.2.0 - 5.2.0 - 5.2.0 + 4.1.0 + 4.1.0 + 4.1.0 + 4.1.0 + 4.1.0 2.1.90 1.1.0 1.1.0 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 ae1031562b22..dbb7e235131d 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 Duende.IdentityServer.EntityFramework.Options; +using IdentityServer4.EntityFramework.Options; using Microsoft.AspNetCore.ApiAuthorization.IdentityServer; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Options; 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 0bdcef9eb0c0..5a9de57b6de8 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("Duende.IdentityServer.EntityFramework.Entities.DeviceFlowCodes", b => + modelBuilder.Entity("IdentityServer4.EntityFramework.Entities.DeviceFlowCodes", b => { b.Property("UserCode") .HasColumnType("TEXT") @@ -60,43 +60,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) 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 => + modelBuilder.Entity("IdentityServer4.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 1ed98d30c773..fcafd568d1e4 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,24 +63,6 @@ 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 @@ -308,9 +290,6 @@ 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 1bbf5f9b4576..c68c2e09660c 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,7 +16,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) modelBuilder .HasAnnotation("ProductVersion", "5.0.0-rc.1.20416.1"); - modelBuilder.Entity("Duende.IdentityServer.EntityFramework.Entities.DeviceFlowCodes", b => + modelBuilder.Entity("IdentityServer4.EntityFramework.Entities.DeviceFlowCodes", b => { b.Property("UserCode") .HasMaxLength(200) @@ -66,46 +66,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) 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("Created") - .HasColumnType("TEXT"); - - b.Property("Data") - .IsRequired() - .HasColumnType("TEXT") - .HasMaxLength(50000); - - b.Property("DataProtected") - .HasColumnType("bit"); - - 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 => + modelBuilder.Entity("IdentityServer4.EntityFramework.Entities.PersistedGrant", b => { b.Property("Key") .HasMaxLength(200) 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 be508df6644d..cdf4e7684bd6 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,8 +3,6 @@ $(DefaultNetCoreTargetFramework) - - CS8002 false diff --git a/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/ApiAuthSample.csproj b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/ApiAuthSample.csproj index ec21f0bbc980..fc7fd6784f5a 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/ApiAuthSample.csproj +++ b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/ApiAuthSample.csproj @@ -3,15 +3,13 @@ $(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 80618e816349..cb0f0e9eed28 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 Duende.IdentityServer.EntityFramework.Options; +using IdentityServer4.EntityFramework.Options; using Microsoft.AspNetCore.ApiAuthorization.IdentityServer; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Options; 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 421d375524f0..ae62ed80fc85 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,119 +18,32 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) modelBuilder .HasAnnotation("ProductVersion", "2.1.3-rtm-32065"); - 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 => + modelBuilder.Entity("IdentityServer4.EntityFramework.Entities.PersistedGrant", b => { b.Property("Key") - .HasColumnType("TEXT") .HasMaxLength(200); b.Property("ClientId") .IsRequired() - .HasColumnType("TEXT") .HasMaxLength(200); - b.Property("CreationTime") - .HasColumnType("TEXT"); + b.Property("CreationTime"); b.Property("Data") .IsRequired() - .HasColumnType("TEXT") .HasMaxLength(50000); - b.Property("Expiration") - .HasColumnType("TEXT"); + b.Property("Expiration"); 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 a1a6097b0671..e801149f5f95 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,41 +46,6 @@ 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 1055d1c700a8..23b1f3414fe9 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Data/Migrations/ApplicationDbContextModelSnapshot.cs +++ b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Data/Migrations/ApplicationDbContextModelSnapshot.cs @@ -16,145 +16,34 @@ protected override void BuildModel(ModelBuilder modelBuilder) modelBuilder .HasAnnotation("ProductVersion", "2.1.3-rtm-32065"); - modelBuilder.Entity("Duende.IdentityServer.EntityFramework.Entities.DeviceFlowCodes", b => - { - b.Property("UserCode") - .HasMaxLength(200) - .HasColumnType("TEXT"); - - b.Property("ClientId") - .IsRequired() - .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("Created") - .HasColumnType("TEXT"); - - b.Property("Data") - .IsRequired() - .HasColumnType("TEXT") - .HasMaxLength(50000); - - b.Property("DataProtected") - .HasColumnType("bit"); - - 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 => + modelBuilder.Entity("IdentityServer4.EntityFramework.Entities.PersistedGrant", b => { b.Property("Key") - .HasMaxLength(200) - .HasColumnType("TEXT"); + .HasMaxLength(200); b.Property("ClientId") .IsRequired() - .HasMaxLength(200) - .HasColumnType("TEXT"); - - b.Property("ConsumedTime") - .HasColumnType("TEXT"); + .HasMaxLength(200); - b.Property("CreationTime") - .HasColumnType("TEXT"); + b.Property("CreationTime"); b.Property("Data") .IsRequired() - .HasMaxLength(50000) - .HasColumnType("TEXT"); - - b.Property("Description") - .HasMaxLength(200) - .HasColumnType("TEXT"); - - b.Property("Expiration") - .HasColumnType("TEXT"); + .HasMaxLength(50000); - b.Property("SessionId") - .HasMaxLength(100) - .HasColumnType("TEXT"); + b.Property("Expiration"); b.Property("SubjectId") - .HasMaxLength(200) - .HasColumnType("TEXT"); + .HasMaxLength(200); b.Property("Type") .IsRequired() - .HasMaxLength(50) - .HasColumnType("TEXT"); + .HasMaxLength(50); 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/ApiAuthorizationDbContext.cs b/src/Identity/ApiAuthorization.IdentityServer/src/ApiAuthorizationDbContext.cs deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/src/Identity/ApiAuthorization.IdentityServer/src/Authentication/AuthenticationBuilderExtensions.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Authentication/AuthenticationBuilderExtensions.cs index 6fa1abbdfbfb..65d2c327fa4c 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 Duende.IdentityServer.Stores; +using IdentityServer4.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 9d9654bc8cdc..3e7c002a3dec 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 Duende.IdentityServer.Extensions; -using Duende.IdentityServer.Stores; +using IdentityServer4.Extensions; +using IdentityServer4.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 0588c4abb856..67372253809c 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 Duende.IdentityServer.Models; +using IdentityServer4.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 cedefb2f9877..9fba8195fac1 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 Duende.IdentityServer.Models; +using IdentityServer4.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 04a9fd33d88b..9699941961d6 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 Duende.IdentityServer.Configuration; +using IdentityServer4.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 ac1ac6d1af21..27fa9f614ce2 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 Duende.IdentityServer.Models; +using IdentityServer4.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 6ce7f0011e46..468c9700d72d 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 Duende.IdentityServer.Models; +using IdentityServer4.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 6e374dd94d35..85650c64d3f9 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 Duende.IdentityServer.Models; +using IdentityServer4.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 b1dc5ae7488d..f242fdd9823c 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 Duende.IdentityServer.Models; +using IdentityServer4.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 f8622d20a6d8..438efe385a0e 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 Duende.IdentityServer.IdentityServerConstants.StandardScopes.OpenId: + case IdentityServer4.IdentityServerConstants.StandardScopes.OpenId: options.IdentityResources.Add(IdentityResourceBuilder.OpenId() .AllowAllClients() .FromConfiguration() .Build()); break; - case Duende.IdentityServer.IdentityServerConstants.StandardScopes.Profile: + case IdentityServer4.IdentityServerConstants.StandardScopes.Profile: options.IdentityResources.Add(IdentityResourceBuilder.Profile() .AllowAllClients() .FromConfiguration() .Build()); break; - case Duende.IdentityServer.IdentityServerConstants.StandardScopes.Address: + case IdentityServer4.IdentityServerConstants.StandardScopes.Address: options.IdentityResources.Add(IdentityResourceBuilder.Address() .AllowAllClients() .FromConfiguration() .Build()); break; - case Duende.IdentityServer.IdentityServerConstants.StandardScopes.Email: + case IdentityServer4.IdentityServerConstants.StandardScopes.Email: options.IdentityResources.Add(IdentityResourceBuilder.Email() .AllowAllClients() .FromConfiguration() .Build()); break; - case Duende.IdentityServer.IdentityServerConstants.StandardScopes.Phone: + case IdentityServer4.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 07e66cca2334..464e6c4c989f 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 Duende.IdentityServer.EntityFramework.Entities; -using Duende.IdentityServer.EntityFramework.Extensions; -using Duende.IdentityServer.EntityFramework.Interfaces; -using Duende.IdentityServer.EntityFramework.Options; +using IdentityServer4.EntityFramework.Entities; +using IdentityServer4.EntityFramework.Extensions; +using IdentityServer4.EntityFramework.Interfaces; +using IdentityServer4.EntityFramework.Options; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Identity.EntityFrameworkCore; using Microsoft.EntityFrameworkCore; @@ -45,11 +45,6 @@ public ApiAuthorizationDbContext( /// public DbSet DeviceFlowCodes { get; set; } - /// - /// Gets or sets the . - /// - 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 bc20f7f30877..8fd763004db1 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 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 IdentityServer4.Configuration; +using IdentityServer4.Endpoints.Results; +using IdentityServer4.Extensions; +using IdentityServer4.Hosting; +using IdentityServer4.Services; +using IdentityServer4.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 397fd4c67a95..793a6f9d77fb 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 Duende.IdentityServer.Extensions; +using IdentityServer4.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 83503b7398f5..72a142f9348d 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 Duende.IdentityServer.Models; -using Duende.IdentityServer.Validation; +using IdentityServer4.Models; +using IdentityServer4.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 e3761466b866..bfb5d6d049f9 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 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 IdentityServer4.Configuration; +using IdentityServer4.EntityFramework.Interfaces; +using IdentityServer4.Hosting; +using IdentityServer4.Models; +using IdentityServer4.Stores; +using IdentityServer4.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 8e2283e2c480..69a21f955ce3 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/src/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj +++ b/src/Identity/ApiAuthorization.IdentityServer/src/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj @@ -8,27 +8,19 @@ false - - CS8002 disable - + - - - - - + + + + + - - - - - - diff --git a/src/Identity/ApiAuthorization.IdentityServer/src/Options/ApiResourceBuilder.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Options/ApiResourceBuilder.cs index 8e79198e3ad1..bff201bcba1f 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 Duende.IdentityServer.Models; +using IdentityServer4.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 0b8ef366ac88..104df03cbc05 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 Duende.IdentityServer.Models; +using IdentityServer4.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 2c3059c20fcd..4ad0f2e62443 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 Duende.IdentityServer.Models; +using IdentityServer4.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 9c22b90a54b4..2e66158f0d08 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 Duende.IdentityServer; -using Duende.IdentityServer.Models; +using IdentityServer4; +using IdentityServer4.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 c4ca12b58182..9f3dd10e1d01 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 Duende.IdentityServer.Models; +using IdentityServer4.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 8bfabf654e00..6a04a6640ee4 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/src/Options/IdentityResourceBuilder.cs +++ b/src/Identity/ApiAuthorization.IdentityServer/src/Options/IdentityResourceBuilder.cs @@ -1,9 +1,9 @@ -// 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; -using Duende.IdentityServer; -using Duende.IdentityServer.Models; +using IdentityServer4; +using IdentityServer4.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) @@ -129,4 +129,4 @@ private static IdentityResource GetResource(string name) } } } -} +} \ No newline at end of file diff --git a/src/Identity/ApiAuthorization.IdentityServer/src/Options/IdentityResourceCollection.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Options/IdentityResourceCollection.cs index 0e036d5c85fb..e57358489c65 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 Duende.IdentityServer.Models; +using IdentityServer4.Models; using System; using System.Collections.Generic; using System.Collections.ObjectModel; diff --git a/src/Identity/ApiAuthorization.IdentityServer/src/PublicAPI.Unshipped.txt b/src/Identity/ApiAuthorization.IdentityServer/src/PublicAPI.Unshipped.txt index 20b40db34927..7dc5c58110bf 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/src/PublicAPI.Unshipped.txt +++ b/src/Identity/ApiAuthorization.IdentityServer/src/PublicAPI.Unshipped.txt @@ -1,52 +1 @@ #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 -~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 diff --git a/src/Identity/ApiAuthorization.IdentityServer/test/Authentication/LocalApiJwtBearerConfigurationTest.cs b/src/Identity/ApiAuthorization.IdentityServer/test/Authentication/LocalApiJwtBearerConfigurationTest.cs index 6414d4ef0d66..1d6dc35261cc 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 Duende.IdentityServer.Configuration; -using Duende.IdentityServer.Stores; +using IdentityServer4.Configuration; +using IdentityServer4.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 36efeb20d17a..8a1eecb5cd0c 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 Duende.IdentityServer.Configuration; +using IdentityServer4.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 c5d2c6d13523..42f1fcc2d06f 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 Duende.IdentityServer; -using Duende.IdentityServer.Models; +using IdentityServer4; +using IdentityServer4.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 a777a39f6510..389e83621787 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 Duende.IdentityServer.Configuration; -using Duende.IdentityServer.Endpoints.Results; -using Duende.IdentityServer.Models; -using Duende.IdentityServer.Services; -using Duende.IdentityServer.Validation; +using IdentityServer4.Configuration; +using IdentityServer4.Endpoints.Results; +using IdentityServer4.Models; +using IdentityServer4.Services; +using IdentityServer4.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 f16176e11600..308c17160147 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 Duende.IdentityServer.Configuration; +using IdentityServer4.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 31c02a466a3b..440536272f9e 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 Duende.IdentityServer.EntityFramework.Entities; -using Duende.IdentityServer.EntityFramework.Interfaces; -using Duende.IdentityServer.Stores; +using IdentityServer4.EntityFramework.Entities; +using IdentityServer4.EntityFramework.Interfaces; +using IdentityServer4.Stores; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Testing; using Microsoft.EntityFrameworkCore; @@ -109,8 +109,6 @@ 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 d427d712c1e2..f067b2c65e36 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 Duende.IdentityServer.Models; +using IdentityServer4.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 68c2b18fc1b5..8b291f49797b 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,12 +5,10 @@ false - - CS8002 - +