huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[ApiAuth] Update partner dependencies to their final versions (#13260) 

* Update oidc-client dependency to 1.9.4
* Update to the Identity Server 4 RTM version
* Updated entity framework migrations
This commit is contained in:
Javier Calvarro Nelson 2019-09-07 02:39:47 +02:00 committed by GitHub
parent 8a8a0a5b82
commit c3fa16970d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 84 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
eng/Versions.props
View File

@ -226,11 +226,11 @@
<FSharpCorePackageVersion>4.2.1</FSharpCorePackageVersion> <FSharpCorePackageVersion>4.2.1</FSharpCorePackageVersion>
<GoogleProtobufPackageVersion>3.8.0</GoogleProtobufPackageVersion> <GoogleProtobufPackageVersion>3.8.0</GoogleProtobufPackageVersion>
<GrpcAspNetCorePackageVersion>0.2.23-pre1</GrpcAspNetCorePackageVersion> <GrpcAspNetCorePackageVersion>0.2.23-pre1</GrpcAspNetCorePackageVersion>
<IdentityServer4AspNetIdentityPackageVersion>3.0.0-preview7.33</IdentityServer4AspNetIdentityPackageVersion> <IdentityServer4AspNetIdentityPackageVersion>3.0.0</IdentityServer4AspNetIdentityPackageVersion>
<IdentityServer4EntityFrameworkPackageVersion>3.0.0-preview7.33</IdentityServer4EntityFrameworkPackageVersion> <IdentityServer4EntityFrameworkPackageVersion>3.0.0</IdentityServer4EntityFrameworkPackageVersion>
<IdentityServer4PackageVersion>3.0.0-preview7.33</IdentityServer4PackageVersion> <IdentityServer4PackageVersion>3.0.0</IdentityServer4PackageVersion>
<IdentityServer4StoragePackageVersion>3.0.0-preview7.33</IdentityServer4StoragePackageVersion> <IdentityServer4StoragePackageVersion>3.0.0</IdentityServer4StoragePackageVersion>
<IdentityServer4EntityFrameworkStoragePackageVersion>3.0.0-preview7.33</IdentityServer4EntityFrameworkStoragePackageVersion> <IdentityServer4EntityFrameworkStoragePackageVersion>3.0.0</IdentityServer4EntityFrameworkStoragePackageVersion>
<MessagePackPackageVersion>1.7.3.7</MessagePackPackageVersion> <MessagePackPackageVersion>1.7.3.7</MessagePackPackageVersion>
<MoqPackageVersion>4.10.0</MoqPackageVersion> <MoqPackageVersion>4.10.0</MoqPackageVersion>
<MonoCecilPackageVersion>0.10.1</MonoCecilPackageVersion> <MonoCecilPackageVersion>0.10.1</MonoCecilPackageVersion>

11
src/Identity/ApiAuthorization.IdentityServer/src/IdentityServerBuilderConfigurationExtensions.cs
View File

@ -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. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
@ -236,7 +236,14 @@ namespace Microsoft.Extensions.DependencyInjection
builder.Services.AddSingleton<IValidationKeysStore>(sp => builder.Services.AddSingleton<IValidationKeysStore>(sp =>
{ {
var options = sp.GetRequiredService<IOptions<ApiAuthorizationOptions>>(); var options = sp.GetRequiredService<IOptions<ApiAuthorizationOptions>>();
return new DefaultValidationKeysStore(new[] { options.Value.SigningCredential.Key }); return new DefaultValidationKeysStore(new[]
{
new SecurityKeyInfo
{
Key = options.Value.SigningCredential.Key,
SigningAlgorithm = options.Value.SigningCredential.Algorithm
}
});
}); });
return builder; return builder;

6
src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/package-lock.json generated
View File

@ -7157,9 +7157,9 @@
"dev": true "dev": true
}, },
"oidc-client": { "oidc-client": {
"version": "1.9.0-beta.4", "version": "1.9.0",
"resolved": "https://registry.npmjs.org/oidc-client/-/oidc-client-1.9.0-beta.4.tgz", "resolved": "https://registry.npmjs.org/oidc-client/-/oidc-client-1.9.0.tgz",
"integrity": "sha512-BE6o220w9kDTicmsX324Z5t3Gg20G9NgQjCOFP6SUY7glJYBohyw9DVPt/khPmmg+wabufJq1tH2zyEadMf7Pw==", "integrity": "sha512-fJradf/BsRYh96YzWPlm38DRQJRg1wm1nZU21OX8P9NBNxBXRems9BmvOIoh8sO8Y7gmMemESOn4A2TgId+36g==",
"requires": { "requires": {
"base64-js": "^1.3.0", "base64-js": "^1.3.0",
"core-js": "^2.6.4", "core-js": "^2.6.4",

2
src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/package.json
View File

@ -26,7 +26,7 @@
"bootstrap": "^4.3.1", "bootstrap": "^4.3.1",
"core-js": "^2.6.5", "core-js": "^2.6.5",
"jquery": "3.4.1", "jquery": "3.4.1",
"oidc-client": "^1.9.0-beta.4", "oidc-client": "^1.9.0",
"popper.js": "^1.14.3", "popper.js": "^1.14.3",
"rxjs": "^6.4.0", "rxjs": "^6.4.0",
"zone.js": "~0.9.1" "zone.js": "~0.9.1"

8
src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/Data/SQLServer/00000000000000_CreateIdentitySchema.Designer.cs generated
View File

@ -10,14 +10,14 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Company.WebApplication1.Data.Migrations namespace Company.WebApplication1.Data.Migrations
{ {
[DbContext(typeof(ApplicationDbContext))] [DbContext(typeof(ApplicationDbContext))]
[Migration("20190808120446_CreateIdentitySchema")] [Migration("00000000000000_CreateIdentitySchema")]
partial class CreateIdentitySchema partial class CreateIdentitySchema
{ {
protected override void BuildTargetModel(ModelBuilder modelBuilder) protected override void BuildTargetModel(ModelBuilder modelBuilder)
{ {
#pragma warning disable 612, 618 #pragma warning disable 612, 618
modelBuilder modelBuilder
.HasAnnotation("ProductVersion", "3.0.0-preview9.19405.13") .HasAnnotation("ProductVersion", "3.0.0-rc1.19455.8")
.HasAnnotation("Relational:MaxIdentifierLength", 128) .HasAnnotation("Relational:MaxIdentifierLength", 128)
.HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
@ -161,7 +161,9 @@ namespace Company.WebApplication1.Data.Migrations
b.HasKey("Key"); b.HasKey("Key");
b.HasIndex("SubjectId", "ClientId", "Type", "Expiration"); b.HasIndex("Expiration");
b.HasIndex("SubjectId", "ClientId", "Type");
b.ToTable("PersistedGrants"); b.ToTable("PersistedGrants");
}); });

9
src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/Data/SQLServer/00000000000000_CreateIdentitySchema.cs
View File

@ -237,9 +237,14 @@ namespace Company.WebApplication1.Data.Migrations
column: "Expiration"); column: "Expiration");
migrationBuilder.CreateIndex( migrationBuilder.CreateIndex(
name: "IX_PersistedGrants_SubjectId_ClientId_Type_Expiration", name: "IX_PersistedGrants_Expiration",
table: "PersistedGrants", table: "PersistedGrants",
columns: new[] { "SubjectId", "ClientId", "Type", "Expiration" }); column: "Expiration");
migrationBuilder.CreateIndex(
name: "IX_PersistedGrants_SubjectId_ClientId_Type",
table: "PersistedGrants",
columns: new[] { "SubjectId", "ClientId", "Type" });
} }
protected override void Down(MigrationBuilder migrationBuilder) protected override void Down(MigrationBuilder migrationBuilder)

6
src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/Data/SQLServer/ApplicationDbContextModelSnapshot.cs
View File

@ -15,7 +15,7 @@ namespace Company.WebApplication1.Data.Migrations
{ {
#pragma warning disable 612, 618 #pragma warning disable 612, 618
modelBuilder modelBuilder
.HasAnnotation("ProductVersion", "3.0.0-preview9.19405.13") .HasAnnotation("ProductVersion", "3.0.0-rc1.19455.8")
.HasAnnotation("Relational:MaxIdentifierLength", 128) .HasAnnotation("Relational:MaxIdentifierLength", 128)
.HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
@ -159,7 +159,9 @@ namespace Company.WebApplication1.Data.Migrations
b.HasKey("Key"); b.HasKey("Key");
b.HasIndex("SubjectId", "ClientId", "Type", "Expiration"); b.HasIndex("Expiration");
b.HasIndex("SubjectId", "ClientId", "Type");
b.ToTable("PersistedGrants"); b.ToTable("PersistedGrants");
}); });

6
src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/Data/SQLite/00000000000000_CreateIdentitySchema.Designer.cs generated
View File

@ -16,7 +16,7 @@ namespace Company.WebApplication1.Data.Migrations
{ {
#pragma warning disable 612, 618 #pragma warning disable 612, 618
modelBuilder modelBuilder
.HasAnnotation("ProductVersion", "3.0.0-preview9.19405.13"); .HasAnnotation("ProductVersion", "3.0.0-rc1.19455.8");
modelBuilder.Entity("Company.WebApplication1.Models.ApplicationUser", b => modelBuilder.Entity("Company.WebApplication1.Models.ApplicationUser", b =>
{ {
@ -157,7 +157,9 @@ namespace Company.WebApplication1.Data.Migrations
b.HasKey("Key"); b.HasKey("Key");
b.HasIndex("SubjectId", "ClientId", "Type", "Expiration"); b.HasIndex("Expiration");
b.HasIndex("SubjectId", "ClientId", "Type");
b.ToTable("PersistedGrants"); b.ToTable("PersistedGrants");
}); });

9
src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/Data/SQLite/00000000000000_CreateIdentitySchema.cs
View File

@ -235,9 +235,14 @@ namespace Company.WebApplication1.Data.Migrations
column: "Expiration"); column: "Expiration");
migrationBuilder.CreateIndex( migrationBuilder.CreateIndex(
name: "IX_PersistedGrants_SubjectId_ClientId_Type_Expiration", name: "IX_PersistedGrants_Expiration",
table: "PersistedGrants", table: "PersistedGrants",
columns: new[] { "SubjectId", "ClientId", "Type", "Expiration" }); column: "Expiration");
migrationBuilder.CreateIndex(
name: "IX_PersistedGrants_SubjectId_ClientId_Type",
table: "PersistedGrants",
columns: new[] { "SubjectId", "ClientId", "Type" });
} }
protected override void Down(MigrationBuilder migrationBuilder) protected override void Down(MigrationBuilder migrationBuilder)

6
src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/Data/SQLite/ApplicationDbContextModelSnapshot.cs
View File

@ -14,7 +14,7 @@ namespace Company.WebApplication1.Data.Migrations
{ {
#pragma warning disable 612, 618 #pragma warning disable 612, 618
modelBuilder modelBuilder
.HasAnnotation("ProductVersion", "3.0.0-preview9.19405.13"); .HasAnnotation("ProductVersion", "3.0.0-rc1.19455.8");
modelBuilder.Entity("Company.WebApplication1.Models.ApplicationUser", b => modelBuilder.Entity("Company.WebApplication1.Models.ApplicationUser", b =>
{ {
@ -155,7 +155,9 @@ namespace Company.WebApplication1.Data.Migrations
b.HasKey("Key"); b.HasKey("Key");
b.HasIndex("SubjectId", "ClientId", "Type", "Expiration"); b.HasIndex("Expiration");
b.HasIndex("SubjectId", "ClientId", "Type");
b.ToTable("PersistedGrants"); b.ToTable("PersistedGrants");
}); });

BIN
src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/app.db
View File

Binary file not shown.

6
src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/ClientApp/package-lock.json generated
View File

@ -8565,9 +8565,9 @@
"integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==" "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="
}, },
"oidc-client": { "oidc-client": {
"version": "1.9.0-beta.4", "version": "1.9.0",
"resolved": "https://registry.npmjs.org/oidc-client/-/oidc-client-1.9.0-beta.4.tgz", "resolved": "https://registry.npmjs.org/oidc-client/-/oidc-client-1.9.0.tgz",
"integrity": "sha512-BE6o220w9kDTicmsX324Z5t3Gg20G9NgQjCOFP6SUY7glJYBohyw9DVPt/khPmmg+wabufJq1tH2zyEadMf7Pw==", "integrity": "sha512-fJradf/BsRYh96YzWPlm38DRQJRg1wm1nZU21OX8P9NBNxBXRems9BmvOIoh8sO8Y7gmMemESOn4A2TgId+36g==",
"requires": { "requires": {
"base64-js": "^1.3.0", "base64-js": "^1.3.0",
"core-js": "^2.6.4", "core-js": "^2.6.4",

2
src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/ClientApp/package.json
View File

@ -7,7 +7,7 @@
"bootstrap": "^4.1.3", "bootstrap": "^4.1.3",
"jquery": "^3.4.1", "jquery": "^3.4.1",
"merge": "^1.2.1", "merge": "^1.2.1",
"oidc-client": "^1.9.0-beta.4", "oidc-client": "^1.9.0",
"react": "^16.0.0", "react": "^16.0.0",
"react-dom": "^16.0.0", "react-dom": "^16.0.0",
"react-router-bootstrap": "^0.24.4", "react-router-bootstrap": "^0.24.4",

8
src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Data/SQLServer/00000000000000_CreateIdentitySchema.Designer.cs generated
View File

@ -10,14 +10,14 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Company.WebApplication1.Data.Migrations namespace Company.WebApplication1.Data.Migrations
{ {
[DbContext(typeof(ApplicationDbContext))] [DbContext(typeof(ApplicationDbContext))]
[Migration("20190808120446_CreateIdentitySchema")] [Migration("00000000000000_CreateIdentitySchema")]
partial class CreateIdentitySchema partial class CreateIdentitySchema
{ {
protected override void BuildTargetModel(ModelBuilder modelBuilder) protected override void BuildTargetModel(ModelBuilder modelBuilder)
{ {
#pragma warning disable 612, 618 #pragma warning disable 612, 618
modelBuilder modelBuilder
.HasAnnotation("ProductVersion", "3.0.0-preview9.19405.13") .HasAnnotation("ProductVersion", "3.0.0-rc1.19455.8")
.HasAnnotation("Relational:MaxIdentifierLength", 128) .HasAnnotation("Relational:MaxIdentifierLength", 128)
.HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
@ -161,7 +161,9 @@ namespace Company.WebApplication1.Data.Migrations
b.HasKey("Key"); b.HasKey("Key");
b.HasIndex("SubjectId", "ClientId", "Type", "Expiration"); b.HasIndex("Expiration");
b.HasIndex("SubjectId", "ClientId", "Type");
b.ToTable("PersistedGrants"); b.ToTable("PersistedGrants");
}); });

9
src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Data/SQLServer/00000000000000_CreateIdentitySchema.cs
View File

@ -237,9 +237,14 @@ namespace Company.WebApplication1.Data.Migrations
column: "Expiration"); column: "Expiration");
migrationBuilder.CreateIndex( migrationBuilder.CreateIndex(
name: "IX_PersistedGrants_SubjectId_ClientId_Type_Expiration", name: "IX_PersistedGrants_Expiration",
table: "PersistedGrants", table: "PersistedGrants",
columns: new[] { "SubjectId", "ClientId", "Type", "Expiration" }); column: "Expiration");
migrationBuilder.CreateIndex(
name: "IX_PersistedGrants_SubjectId_ClientId_Type",
table: "PersistedGrants",
columns: new[] { "SubjectId", "ClientId", "Type" });
} }
protected override void Down(MigrationBuilder migrationBuilder) protected override void Down(MigrationBuilder migrationBuilder)

6
src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Data/SQLServer/ApplicationDbContextModelSnapshot.cs
View File

@ -15,7 +15,7 @@ namespace Company.WebApplication1.Data.Migrations
{ {
#pragma warning disable 612, 618 #pragma warning disable 612, 618
modelBuilder modelBuilder
.HasAnnotation("ProductVersion", "3.0.0-preview9.19405.13") .HasAnnotation("ProductVersion", "3.0.0-rc1.19455.8")
.HasAnnotation("Relational:MaxIdentifierLength", 128) .HasAnnotation("Relational:MaxIdentifierLength", 128)
.HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
@ -159,7 +159,9 @@ namespace Company.WebApplication1.Data.Migrations
b.HasKey("Key"); b.HasKey("Key");
b.HasIndex("SubjectId", "ClientId", "Type", "Expiration"); b.HasIndex("Expiration");
b.HasIndex("SubjectId", "ClientId", "Type");
b.ToTable("PersistedGrants"); b.ToTable("PersistedGrants");
}); });

6
src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Data/SQLite/00000000000000_CreateIdentitySchema.Designer.cs generated
View File

@ -16,7 +16,7 @@ namespace Company.WebApplication1.Data.Migrations
{ {
#pragma warning disable 612, 618 #pragma warning disable 612, 618
modelBuilder modelBuilder
.HasAnnotation("ProductVersion", "3.0.0-preview9.19405.13"); .HasAnnotation("ProductVersion", "3.0.0-rc1.19455.8");
modelBuilder.Entity("Company.WebApplication1.Models.ApplicationUser", b => modelBuilder.Entity("Company.WebApplication1.Models.ApplicationUser", b =>
{ {
@ -157,7 +157,9 @@ namespace Company.WebApplication1.Data.Migrations
b.HasKey("Key"); b.HasKey("Key");
b.HasIndex("SubjectId", "ClientId", "Type", "Expiration"); b.HasIndex("Expiration");
b.HasIndex("SubjectId", "ClientId", "Type");
b.ToTable("PersistedGrants"); b.ToTable("PersistedGrants");
}); });

9
src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Data/SQLite/00000000000000_CreateIdentitySchema.cs
View File

@ -235,9 +235,14 @@ namespace Company.WebApplication1.Data.Migrations
column: "Expiration"); column: "Expiration");
migrationBuilder.CreateIndex( migrationBuilder.CreateIndex(
name: "IX_PersistedGrants_SubjectId_ClientId_Type_Expiration", name: "IX_PersistedGrants_Expiration",
table: "PersistedGrants", table: "PersistedGrants",
columns: new[] { "SubjectId", "ClientId", "Type", "Expiration" }); column: "Expiration");
migrationBuilder.CreateIndex(
name: "IX_PersistedGrants_SubjectId_ClientId_Type",
table: "PersistedGrants",
columns: new[] { "SubjectId", "ClientId", "Type" });
} }
protected override void Down(MigrationBuilder migrationBuilder) protected override void Down(MigrationBuilder migrationBuilder)

6
src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Data/SQLite/ApplicationDbContextModelSnapshot.cs
View File

@ -14,7 +14,7 @@ namespace Company.WebApplication1.Data.Migrations
{ {
#pragma warning disable 612, 618 #pragma warning disable 612, 618
modelBuilder modelBuilder
.HasAnnotation("ProductVersion", "3.0.0-preview9.19405.13"); .HasAnnotation("ProductVersion", "3.0.0-rc1.19455.8");
modelBuilder.Entity("Company.WebApplication1.Models.ApplicationUser", b => modelBuilder.Entity("Company.WebApplication1.Models.ApplicationUser", b =>
{ {
@ -155,7 +155,9 @@ namespace Company.WebApplication1.Data.Migrations
b.HasKey("Key"); b.HasKey("Key");
b.HasIndex("SubjectId", "ClientId", "Type", "Expiration"); b.HasIndex("Expiration");
b.HasIndex("SubjectId", "ClientId", "Type");
b.ToTable("PersistedGrants"); b.ToTable("PersistedGrants");
}); });

BIN
src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/app.db
View File

Binary file not shown.