yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'netcore/netcore' into netcore/members-userstore

Browse Source 
# Conflicts:
#	src/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs
#	src/Umbraco.Web.BackOffice/Controllers/MemberController.cs
#	src/Umbraco.Web.BackOffice/Extensions/UmbracoBuilderExtensions.cs
This commit is contained in:
Emma Garland
2020-12-01 18:19:36 +00:00
parent 9c41d335ea
commit 9c73429da7
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Web.BackOffice/Extensions/UmbracoBuilderExtensions.cs
View File

@@ -44,12 +44,15 @@ namespace Umbraco.Extensions
});
// TODO: Need to add more cookie options, see https://github.com/dotnet/aspnetcore/blob/3.0/src/Identity/Core/src/IdentityServiceCollectionExtensions.cs#L45
builder.Services.ConfigureOptions<ConfigureBackOfficeCookieOptions>();
return builder;
}
public static IUmbracoBuilder AddUmbracoMembersIdentity(this IUmbracoBuilder builder)
{
builder.Services.ConfigureOptions<ConfigureBackOfficeCookieOptions>();
builder.Services.AddUmbracoMembersIdentity();
return builder;
}