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

Merge remote-tracking branch 'origin/release/2.2' into origin/master

This commit is contained in:
Javier Calvarro Nelson 2018-11-20 15:22:36 -08:00
parent 68b878f0e1 4046c842af
commit 781ca09033
5 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/dependencies.props
View File

@ -4,9 +4,9 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup Label="Package Versions"> <PropertyGroup Label="Package Versions">
<AngleSharpPackageVersion>0.9.9</AngleSharpPackageVersion> <AngleSharpPackageVersion>0.9.9</AngleSharpPackageVersion>
<IdentityServer4AspNetIdentityPackageVersion>2.3.0-preview1-update2</IdentityServer4AspNetIdentityPackageVersion> <IdentityServer4AspNetIdentityPackageVersion>2.3.0</IdentityServer4AspNetIdentityPackageVersion>
<IdentityServer4EntityFrameworkPackageVersion>2.3.0-preview1-update1</IdentityServer4EntityFrameworkPackageVersion> <IdentityServer4EntityFrameworkPackageVersion>2.3.0</IdentityServer4EntityFrameworkPackageVersion>
<IdentityServer4PackageVersion>2.3.0-preview1-update2</IdentityServer4PackageVersion> <IdentityServer4PackageVersion>2.3.0</IdentityServer4PackageVersion>
<InternalAspNetCoreSdkPackageVersion>3.0.0-build-20181114.5</InternalAspNetCoreSdkPackageVersion> <InternalAspNetCoreSdkPackageVersion>3.0.0-build-20181114.5</InternalAspNetCoreSdkPackageVersion>
<MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreAuthenticationCookiesPackageVersion> <MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>
<MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreAuthenticationFacebookPackageVersion> <MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>

BIN
samples/ApiAuthSample/app.db Normal file
View File

Binary file not shown.

3
src/ApiAuth.IS/Configuration/AspNetConventionsConfigureOptions.cs
View File

@ -16,9 +16,6 @@ namespace Microsoft.AspNetCore.ApiAuthorization.IdentityServer
options.Events.RaiseFailureEvents = true; options.Events.RaiseFailureEvents = true;
options.Events.RaiseSuccessEvents = true; options.Events.RaiseSuccessEvents = true;
options.Authentication.CookieAuthenticationScheme = IdentityConstants.ApplicationScheme; options.Authentication.CookieAuthenticationScheme = IdentityConstants.ApplicationScheme;
options.UserInteraction.LoginUrl = "/Identity/Account/Login";
options.UserInteraction.LogoutUrl = "/Identity/Account/Logout";
options.UserInteraction.ErrorUrl = "/Identity/Error";
} }
} }
} }

7
src/ApiAuth.IS/Data/ApiAuthorizationDbContext.cs
View File

@ -35,10 +35,15 @@ namespace Microsoft.AspNetCore.ApiAuthorization.IdentityServer
} }
/// <summary> /// <summary>
/// Gets or sets the <see cref="PersistedGrant"/>. /// Gets or sets the <see cref="DbSet{PersistedGrant}"/>.
/// </summary> /// </summary>
public DbSet<PersistedGrant> PersistedGrants { get; set; } public DbSet<PersistedGrant> PersistedGrants { get; set; }
/// <summary>
/// Gets or sets the <see cref="DbSet{DeviceFlowCodes}"/>.
/// </summary>
public DbSet<DeviceFlowCodes> DeviceFlowCodes { get; set; }
Task<int> IPersistedGrantDbContext.SaveChangesAsync() => base.SaveChangesAsync(); Task<int> IPersistedGrantDbContext.SaveChangesAsync() => base.SaveChangesAsync();
/// <inheritdoc /> /// <inheritdoc />

3
test/ApiAuth.IS.Test/Configuration/AspNetConventionsConfigureOptionsTests.cs
View File

@ -20,9 +20,6 @@ namespace Microsoft.AspNetCore.ApiAuthorization.IdentityServer
configure.Configure(options); configure.Configure(options);
// Assert // Assert
Assert.Equal("/Identity/Account/Login", options.UserInteraction.LoginUrl);
Assert.Equal("/Identity/Account/Logout", options.UserInteraction.LogoutUrl);
Assert.Equal("/Identity/Error", options.UserInteraction.ErrorUrl);
Assert.Equal(IdentityConstants.ApplicationScheme, options.Authentication.CookieAuthenticationScheme); Assert.Equal(IdentityConstants.ApplicationScheme, options.Authentication.CookieAuthenticationScheme);
} }