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

Merge branch 'release' into dev

This commit is contained in:
Chris R 2016-04-22 10:03:34 -07:00
parent 40abffefcb 14860290d0
commit 547d7dc227
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shared/Mocks/StartupOpenIdConnectTesting.cs
View File

@ -11,6 +11,7 @@ using Microsoft.Extensions.Caching.Memory;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.IdentityModel.Protocols.OpenIdConnect;
using MusicStore.Components; using MusicStore.Components;
using MusicStore.Mocks.Common; using MusicStore.Mocks.Common;
using MusicStore.Mocks.OpenIdConnect; using MusicStore.Mocks.OpenIdConnect;
@ -124,6 +125,7 @@ namespace MusicStore
BackchannelHttpHandler = new OpenIdConnectBackChannelHttpHandler(), BackchannelHttpHandler = new OpenIdConnectBackChannelHttpHandler(),
StringDataFormat = new CustomStringDataFormat(), StringDataFormat = new CustomStringDataFormat(),
StateDataFormat = new CustomStateDataFormat(), StateDataFormat = new CustomStateDataFormat(),
ResponseType = OpenIdConnectResponseTypes.CodeIdToken,
UseTokenLifetime = false, UseTokenLifetime = false,
Events = new OpenIdConnectEvents Events = new OpenIdConnectEvents

4
src/MusicStore/StartupOpenIdConnect.cs
View File

@ -5,6 +5,7 @@ using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.PlatformAbstractions; using Microsoft.Extensions.PlatformAbstractions;
using Microsoft.IdentityModel.Protocols.OpenIdConnect;
using MusicStore.Components; using MusicStore.Components;
using MusicStore.Models; using MusicStore.Models;
@ -133,7 +134,8 @@ namespace MusicStore
app.UseOpenIdConnectAuthentication(new OpenIdConnectOptions app.UseOpenIdConnectAuthentication(new OpenIdConnectOptions
{ {
Authority = "https://login.windows.net/[tenantName].onmicrosoft.com", Authority = "https://login.windows.net/[tenantName].onmicrosoft.com",
ClientId = "[ClientId]" ClientId = "[ClientId]",
ResponseType = OpenIdConnectResponseTypes.CodeIdToken,
}); });
// Add MVC to the request pipeline // Add MVC to the request pipeline