From d711bce5ef44958c6d0ce6ab841bcc3c47c07d11 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 3 Dec 2020 11:29:17 +0100
Subject: [PATCH] build fix

---
 .../Security/BackOfficeCookieManagerTests.cs     | 16 ++++++----------
 .../Security/ConfigureBackOfficeCookieOptions.cs |  9 ++++-----
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeCookieManagerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeCookieManagerTests.cs
index e1a8ff9c58..d45887b3c3 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeCookieManagerTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeCookieManagerTests.cs
@@ -28,8 +28,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Web.Backoffice.Security
                 runtime,
                 Mock.Of<IHostingEnvironment>(),
                 globalSettings,
-                Mock.Of<IRequestCache>(),
-                Mock.Of<LinkGenerator>());
+                Mock.Of<IRequestCache>());
 
             var result = mgr.ShouldAuthenticateRequest(new Uri("http://localhost/umbraco"));
 
@@ -47,8 +46,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Web.Backoffice.Security
                 runtime,
                 Mock.Of<IHostingEnvironment>(x => x.ApplicationVirtualPath == "/" && x.ToAbsolute(globalSettings.UmbracoPath) == "/umbraco"),
                 globalSettings,
-                Mock.Of<IRequestCache>(),
-                Mock.Of<LinkGenerator>());
+                Mock.Of<IRequestCache>());
 
             var result = mgr.ShouldAuthenticateRequest(new Uri("http://localhost/umbraco"));
 
@@ -62,13 +60,13 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Web.Backoffice.Security
 
             var runtime = Mock.Of<IRuntimeState>(x => x.Level == RuntimeLevel.Run);
 
+            GetMockLinkGenerator(out var remainingTimeoutSecondsPath, out var isAuthPath);
             var mgr = new BackOfficeCookieManager(
                 Mock.Of<IUmbracoContextAccessor>(),
                 runtime,
                 Mock.Of<IHostingEnvironment>(x => x.ApplicationVirtualPath == "/" && x.ToAbsolute(globalSettings.UmbracoPath) == "/umbraco" && x.ToAbsolute(Constants.SystemDirectories.Install) == "/install"),
                 globalSettings,
-                Mock.Of<IRequestCache>(),
-                GetMockLinkGenerator(out var remainingTimeoutSecondsPath, out var isAuthPath));
+                Mock.Of<IRequestCache>());
 
             var result = mgr.ShouldAuthenticateRequest(new Uri($"http://localhost{remainingTimeoutSecondsPath}"));
             Assert.IsTrue(result);
@@ -89,8 +87,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Web.Backoffice.Security
                 runtime,
                 Mock.Of<IHostingEnvironment>(x => x.ApplicationVirtualPath == "/" && x.ToAbsolute(globalSettings.UmbracoPath) == "/umbraco" && x.ToAbsolute(Constants.SystemDirectories.Install) == "/install"),
                 globalSettings,
-                Mock.Of<IRequestCache>(x => x.IsAvailable == true && x.Get(Constants.Security.ForceReAuthFlag) == "not null"),
-                GetMockLinkGenerator(out var remainingTimeoutSecondsPath, out var isAuthPath));
+                Mock.Of<IRequestCache>(x => x.IsAvailable == true && x.Get(Constants.Security.ForceReAuthFlag) == "not null"));
 
             var result = mgr.ShouldAuthenticateRequest(new Uri($"http://localhost/notbackoffice"));
             Assert.IsTrue(result);
@@ -108,8 +105,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Web.Backoffice.Security
                 runtime,
                 Mock.Of<IHostingEnvironment>(x => x.ApplicationVirtualPath == "/" && x.ToAbsolute(globalSettings.UmbracoPath) == "/umbraco" && x.ToAbsolute(Constants.SystemDirectories.Install) == "/install"),
                 globalSettings,
-                Mock.Of<IRequestCache>(),
-                GetMockLinkGenerator(out var remainingTimeoutSecondsPath, out var isAuthPath));
+                Mock.Of<IRequestCache>());
 
             var result = mgr.ShouldAuthenticateRequest(new Uri($"http://localhost/notbackoffice"));
             Assert.IsFalse(result);
diff --git a/src/Umbraco.Web.BackOffice/Security/ConfigureBackOfficeCookieOptions.cs b/src/Umbraco.Web.BackOffice/Security/ConfigureBackOfficeCookieOptions.cs
index 4a9ebcaf46..bd816e9382 100644
--- a/src/Umbraco.Web.BackOffice/Security/ConfigureBackOfficeCookieOptions.cs
+++ b/src/Umbraco.Web.BackOffice/Security/ConfigureBackOfficeCookieOptions.cs
@@ -105,8 +105,7 @@ namespace Umbraco.Web.BackOffice.Security
                 _runtimeState,
                 _hostingEnvironment,
                 _globalSettings,
-                _requestCache,
-                _linkGenerator);
+                _requestCache);
             // _explicitPaths); TODO: Implement this once we do OAuth somehow
 
 
@@ -119,7 +118,7 @@ namespace Umbraco.Web.BackOffice.Security
                 // It would be possible to re-use the default behavior if any of these need to be set but that must be taken into account else
                 // our back office requests will not function correctly. For now we don't need to set/configure any of these callbacks because
                 // the defaults work fine with our setup.
-                
+
                 OnValidatePrincipal = async ctx =>
                 {
                     // We need to resolve the BackOfficeSecurityStampValidator per request as a requirement (even in aspnetcore they do this)
@@ -177,7 +176,7 @@ namespace Umbraco.Web.BackOffice.Security
                     // occurs when sign in is successful and after the ticket is written to the outbound cookie
 
                     // When we are signed in with the cookie, assign the principal to the current HttpContext
-                    ctx.HttpContext.User = ctx.Principal;                    
+                    ctx.HttpContext.User = ctx.Principal;
 
                     return Task.CompletedTask;
                 },
@@ -226,7 +225,7 @@ namespace Umbraco.Web.BackOffice.Security
         private async Task EnsureValidSessionId(CookieValidatePrincipalContext context)
         {
             if (_runtimeState.Level != RuntimeLevel.Run) return;
-            
+
             using var scope = _serviceProvider.CreateScope();
             var validator = scope.ServiceProvider.GetRequiredService<BackOfficeSessionIdValidator>();
             await validator.ValidateSessionAsync(TimeSpan.FromMinutes(1), context);