Merge branch 'release' into dev

This commit is contained in:
Chris R 2016-04-22 10:03:34 -07:00
Родитель 40abffefcb 14860290d0
Коммит 547d7dc227
2 изменённых файлов: 5 добавлений и 1 удалений

Просмотреть файл

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

Просмотреть файл

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