Skip to content

Update IdentityServer4 -> Duende #33590

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HaoK merged 15 commits into from
Jul 13, 2021
Merged

Update IdentityServer4 -> Duende #33590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
fc70893
Update to Duende
HaoK Jun 16, 2021
7be0130
Update Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj
HaoK Jun 16, 2021
29a5d1c
Fix test projects
HaoK Jun 29, 2021
49753a4
Fix samples
HaoK Jun 29, 2021
3b2829c
Fix component project
HaoK Jun 29, 2021
5fb15c6
Fix public api
HaoK Jun 29, 2021
d2a82cc
Fix public api
HaoK Jun 30, 2021
01ea1cc
Update PublicAPI.Shipped.txt
HaoK Jun 30, 2021
0114734
Fix migrations
HaoK Jun 30, 2021
c8f22ab
Update 20200324213904_Initial.Designer.cs
HaoK Jun 30, 2021
9224a96
Update ApplicationDbContextModelSnapshot.cs
HaoK Jun 30, 2021
3ddfdbc
Update 20200324213904_Initial.Designer.cs
HaoK Jun 30, 2021
0dd52db
Update ApplicationDbContextModelSnapshot.cs
HaoK Jun 30, 2021
2d5318f
Clean up whitespace
HaoK Jul 3, 2021
e8a53b7
Clarify comments, fix sample migration
HaoK Jul 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions eng/Dependencies.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,17 +160,17 @@ and are generated based on the last package release.
<LatestPackageReference Include="AngleSharp" />
<LatestPackageReference Include="BenchmarkDotNet" />
<LatestPackageReference Include="CommandLineParser" />
<LatestPackageReference Include="Duende.IdentityServer" />
<LatestPackageReference Include="Duende.IdentityServer.AspNetIdentity" />
<LatestPackageReference Include="Duende.IdentityServer.EntityFramework" />
<LatestPackageReference Include="Duende.IdentityServer.EntityFramework.Storage" />
<LatestPackageReference Include="Duende.IdentityServer.Storage" />
<LatestPackageReference Include="FSharp.Core" />
<LatestPackageReference Include="Google.Protobuf" />
<LatestPackageReference Include="Grpc.AspNetCore" />
<LatestPackageReference Include="Grpc.Auth" />
<LatestPackageReference Include="Grpc.Net.Client" />
<LatestPackageReference Include="Grpc.Tools" />
<LatestPackageReference Include="IdentityServer4" />
<LatestPackageReference Include="IdentityServer4.AspNetIdentity" />
<LatestPackageReference Include="IdentityServer4.EntityFramework" />
<LatestPackageReference Include="IdentityServer4.EntityFramework.Storage" />
<LatestPackageReference Include="IdentityServer4.Storage" />
<LatestPackageReference Include="Libuv" />
<LatestPackageReference Include="MessagePack" />
<LatestPackageReference Include="MessagePackAnalyzer" />
Expand Down
10 changes: 5 additions & 5 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,11 +229,11 @@
<GrpcAuthVersion>2.32.0</GrpcAuthVersion>
<GrpcNetClientVersion>2.32.0</GrpcNetClientVersion>
<GrpcToolsVersion>2.32.0</GrpcToolsVersion>
<IdentityServer4AspNetIdentityVersion>4.1.0</IdentityServer4AspNetIdentityVersion>
<IdentityServer4EntityFrameworkVersion>4.1.0</IdentityServer4EntityFrameworkVersion>
<IdentityServer4Version>4.1.0</IdentityServer4Version>
<IdentityServer4StorageVersion>4.1.0</IdentityServer4StorageVersion>
<IdentityServer4EntityFrameworkStorageVersion>4.1.0</IdentityServer4EntityFrameworkStorageVersion>
<DuendeIdentityServerAspNetIdentityVersion>5.2.0</DuendeIdentityServerAspNetIdentityVersion>
<DuendeIdentityServerEntityFrameworkVersion>5.2.0</DuendeIdentityServerEntityFrameworkVersion>
<DuendeIdentityServerVersion>5.2.0</DuendeIdentityServerVersion>
<DuendeIdentityServerStorageVersion>5.2.0</DuendeIdentityServerStorageVersion>
<DuendeIdentityServerEntityFrameworkStorageVersion>5.2.0</DuendeIdentityServerEntityFrameworkStorageVersion>
<MessagePackVersion>2.1.90</MessagePackVersion>
<MicrosoftIdentityWebVersion>1.1.0</MicrosoftIdentityWebVersion>
<MicrosoftIdentityWebMicrosoftGraphVersion>1.1.0</MicrosoftIdentityWebMicrosoftGraphVersion>
Expand Down
2 changes: 1 addition & 1 deletion ...Components/WebAssembly/testassets/Wasm.Authentication.Server/Data/ApplicationDbContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
40 changes: 38 additions & 2 deletions .../testassets/Wasm.Authentication.Server/Data/Migrations/20200324213904_Initial.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions ...bAssembly/testassets/Wasm.Authentication.Server/Data/Migrations/20200324213904_Initial.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<string>(nullable: false),
Version = table.Column<int>(nullable: false),
Created = table.Column<DateTime>(nullable: false),
Use = table.Column<string>(nullable: true),
Algorithm = table.Column<string>(maxLength: 100, nullable: false),
IsX509Certificate = table.Column<bool>(nullable: false),
DataProtected = table.Column<bool>(nullable: false),
Data = table.Column<string>(nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_Keys", x => x.Id);
});

migrationBuilder.CreateTable(
name: "PersistedGrants",
columns: table => new
Expand Down Expand Up @@ -290,6 +308,9 @@ protected override void Down(MigrationBuilder migrationBuilder)
migrationBuilder.DropTable(
name: "DeviceCodes");

migrationBuilder.DropTable(
name: "Keys");

migrationBuilder.DropTable(
name: "PersistedGrants");

Expand Down
43 changes: 41 additions & 2 deletions ...estassets/Wasm.Authentication.Server/Data/Migrations/ApplicationDbContextModelSnapshot.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ 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<string>("UserCode")
.HasMaxLength(200)
Expand Down Expand Up @@ -66,7 +66,46 @@ 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<string>("Id")
.HasMaxLength(450)
.HasColumnType("TEXT");
Comment thread
HaoK marked this conversation as resolved.

b.Property<string>("Algorithm")
.IsRequired()
.HasMaxLength(100)
.HasColumnType("TEXT");

b.Property<DateTime>("Created")
.HasColumnType("TEXT");

b.Property<string>("Data")
.IsRequired()
.HasColumnType("TEXT")
.HasMaxLength(50000);

b.Property<bool>("DataProtected")
.HasColumnType("bit");

b.Property<bool>("IsX509Certificate")
.HasColumnType("bit");

b.Property<string>("Use")
.HasMaxLength(450)
.HasColumnType("TEXT");

b.Property<int>("Version")
.HasColumnType("int");

b.HasKey("Id");

b.HasIndex("Use");

b.ToTable("Keys");
});

modelBuilder.Entity("Duende.IdentityServer.EntityFramework.Entities.PersistedGrant", b =>
{
b.Property<string>("Key")
.HasMaxLength(200)
Expand Down
2 changes: 2 additions & 0 deletions ...nents/WebAssembly/testassets/Wasm.Authentication.Server/Wasm.Authentication.Server.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>

<!-- IdentityServer packages are not signed -->
<NoWarn>CS8002</NoWarn>
<!-- This project references the shared framework transitively. Prevent restore errors by setting this flag. -->
<GenerateErrorForMissingTargetingPacks>false</GenerateErrorForMissingTargetingPacks>
</PropertyGroup>
Expand Down
4 changes: 3 additions & 1 deletion src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/ApiAuthSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<UserSecretsId>aspnet-ApiAuthSample-12ED8ECC-9EF1-4D31-87B4-1405B3198E5E</UserSecretsId>
<!-- IdentityServer packages are not strong named -->
<NoWarn>CS8002</NoWarn>
<!-- We are a package that depends on the shared framework, this allows us to
avoid errors during restore -->
<GenerateErrorForMissingTargetingPacks>false</GenerateErrorForMissingTargetingPacks>
</PropertyGroup>

<ItemGroup>
<!-- Remove the reference to Microsoft.AspNetCore.App from IdentityServer4 -->
<!-- Remove the reference to Microsoft.AspNetCore.App from Duende.IdentityServer -->
<FrameworkReference Remove="Microsoft.AspNetCore.App" />
<Reference Include="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" />
<Reference Include="Microsoft.AspNetCore.CookiePolicy" />
Expand Down
2 changes: 1 addition & 1 deletion ...entity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Data/ApplicationDbContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
93 changes: 90 additions & 3 deletions ...yServer/samples/ApiAuthSample/Data/Migrations/20180919224505_InitialMigration.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 35 additions & 0 deletions ...n.IdentityServer/samples/ApiAuthSample/Data/Migrations/20180919224505_InitialMigration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<string>(maxLength: 200, nullable: false),
DeviceCode = table.Column<string>(maxLength: 200, nullable: false),
SubjectId = table.Column<string>(maxLength: 200, nullable: true),
ClientId = table.Column<string>(maxLength: 200, nullable: false),
CreationTime = table.Column<DateTime>(nullable: false),
Expiration = table.Column<DateTime>(nullable: false),
Data = table.Column<string>(maxLength: 50000, nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_DeviceCodes", x => x.UserCode);
});

migrationBuilder.CreateTable(
name: "Keys",
columns: table => new
{
Id = table.Column<string>(nullable: false),
Version = table.Column<int>(nullable: false),
Created = table.Column<DateTime>(nullable: false),
Use = table.Column<string>(nullable: true),
Algorithm = table.Column<string>(maxLength: 100, nullable: false),
IsX509Certificate = table.Column<bool>(nullable: false),
DataProtected = table.Column<bool>(nullable: false),
Data = table.Column<string>(nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_Keys", x => x.Id);
});

migrationBuilder.CreateTable(
name: "PersistedGrants",
columns: table => new
Expand Down
Loading