From 9c73429da7e21f2adc95ab9562e04d75dc28772d Mon Sep 17 00:00:00 2001
From: Emma Garland <emmagarland77@gmail.com>
Date: Tue, 1 Dec 2020 18:19:36 +0000
Subject: [PATCH] Merge branch 'netcore/netcore' into netcore/members-userstore

# Conflicts:
#	src/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs
#	src/Umbraco.Web.BackOffice/Controllers/MemberController.cs
#	src/Umbraco.Web.BackOffice/Extensions/UmbracoBuilderExtensions.cs
---
 .../Extensions/UmbracoBuilderExtensions.cs                   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.BackOffice/Extensions/UmbracoBuilderExtensions.cs b/src/Umbraco.Web.BackOffice/Extensions/UmbracoBuilderExtensions.cs
index 198f0c10d8..d02c4c1235 100644
--- a/src/Umbraco.Web.BackOffice/Extensions/UmbracoBuilderExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/Extensions/UmbracoBuilderExtensions.cs
@@ -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;
         }