From 4f7c87d1d2bebe3272928242528e80a9fa3fa361 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 2 Dec 2020 13:19:08 +1100
Subject: [PATCH] Fix build issues after merge

---
 .../TestServerTest/TestAuthHandler.cs                       | 2 +-
 .../TestServerTest/UmbracoTestServerTestBase.cs             | 6 +++---
 .../Authorization/DenyLocalLoginHandler.cs                  | 1 +
 .../Extensions/UmbracoBuilderExtensions.cs                  | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Tests.Integration/TestServerTest/TestAuthHandler.cs b/src/Umbraco.Tests.Integration/TestServerTest/TestAuthHandler.cs
index 1f7340787e..1163d60055 100644
--- a/src/Umbraco.Tests.Integration/TestServerTest/TestAuthHandler.cs
+++ b/src/Umbraco.Tests.Integration/TestServerTest/TestAuthHandler.cs
@@ -33,7 +33,7 @@ namespace Umbraco.Tests.Integration.TestServerTest
         {
 
             var principal = await _backOfficeSignInManager.CreateUserPrincipalAsync(_fakeUser);
-            var ticket = new AuthenticationTicket(principal, TestAuthenticationScheme);
+            var ticket = new AuthenticationTicket(principal, Constants.Security.BackOfficeAuthenticationType);
 
             return AuthenticateResult.Success(ticket);
         }
diff --git a/src/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs b/src/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs
index 5867e6522c..b5ab4cacbb 100644
--- a/src/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs
+++ b/src/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs
@@ -48,8 +48,8 @@ namespace Umbraco.Tests.Integration.TestServerTest
                 builder.ConfigureTestServices(services =>
                 {
                     // Add a test auth scheme with a test auth handler to authn and assign the user
-                    services.AddAuthentication(TestAuthHandler.TestAuthenticationScheme)
-                        .AddScheme<AuthenticationSchemeOptions, TestAuthHandler>(TestAuthHandler.TestAuthenticationScheme, options => { });
+                    services.AddAuthentication(Constants.Security.BackOfficeAuthenticationType)
+                        .AddScheme<AuthenticationSchemeOptions, TestAuthHandler>(Constants.Security.BackOfficeAuthenticationType, options => { });
                 });
             });
 
@@ -144,7 +144,7 @@ namespace Umbraco.Tests.Integration.TestServerTest
                 .AddRuntimeMinifier()
                 .AddBackOffice()
                 .AddBackOfficeIdentity()
-                .AddBackOfficeAuthorizationPolicies(TestAuthHandler.TestAuthenticationScheme)
+                .AddBackOfficeAuthorizationPolicies()
                 .AddPreviewSupport()
                 //.WithMiniProfiler() // we don't want this running in tests
                 .AddMvcAndRazor(mvcBuilding: mvcBuilder =>
diff --git a/src/Umbraco.Web.BackOffice/Authorization/DenyLocalLoginHandler.cs b/src/Umbraco.Web.BackOffice/Authorization/DenyLocalLoginHandler.cs
index 771f462b8c..96341c5b1f 100644
--- a/src/Umbraco.Web.BackOffice/Authorization/DenyLocalLoginHandler.cs
+++ b/src/Umbraco.Web.BackOffice/Authorization/DenyLocalLoginHandler.cs
@@ -1,5 +1,6 @@
 using Microsoft.AspNetCore.Authorization;
 using System.Threading.Tasks;
+using Umbraco.Web.BackOffice.Security;
 using Umbraco.Web.Common.Security;
 
 namespace Umbraco.Web.BackOffice.Authorization
diff --git a/src/Umbraco.Web.BackOffice/Extensions/UmbracoBuilderExtensions.cs b/src/Umbraco.Web.BackOffice/Extensions/UmbracoBuilderExtensions.cs
index 35b7e8e859..85ec4dfac0 100644
--- a/src/Umbraco.Web.BackOffice/Extensions/UmbracoBuilderExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/Extensions/UmbracoBuilderExtensions.cs
@@ -62,9 +62,9 @@ namespace Umbraco.Extensions
             return builder;
         }
 
-        public static IUmbracoBuilder AddBackOfficeAuthorizationPolicies(this IUmbracoBuilder builder, string backOfficeAuthenticationScheme = Umbraco.Core.Constants.Security.BackOfficeAuthenticationType)
+        public static IUmbracoBuilder AddBackOfficeAuthorizationPolicies(this IUmbracoBuilder builder)
         {
-            builder.Services.AddBackOfficeAuthorizationPolicies(backOfficeAuthenticationScheme);
+            builder.Services.AddBackOfficeAuthorizationPolicies(Umbraco.Core.Constants.Security.BackOfficeAuthenticationType);
             // TODO: See other TODOs in things like UmbracoApiControllerBase ... AFAIK all of this is only used for the back office
             // so IMO these controllers and the features auth policies should just be moved to the back office project and then this
             // ext method can be removed.