Fix deploy Umbraco as a child IIS application not working umbraco#11891

a-t-k · Dec 17, 2022 · 58649b1 · 58649b1
1 parent d5e1c73
commit 58649b1
Show file tree

Hide file tree

Showing 16 changed files with 81 additions and 17 deletions.
diff --git a/src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs b/src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs
@@ -5,7 +5,6 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
@@ -30,6 +29,7 @@
 using Umbraco.Cms.Web.Common.Controllers;
 using Umbraco.Cms.Web.Common.Filters;
 using Umbraco.Cms.Web.Common.Models;
+using Umbraco.Cms.Web.Common.Routing;
 using Umbraco.Extensions;
 using SignInResult = Microsoft.AspNetCore.Identity.SignInResult;
 

diff --git a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
@@ -2,7 +2,6 @@
 using System.Web;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
-using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Umbraco.Cms.Core;
@@ -13,7 +12,6 @@
 using Umbraco.Cms.Core.Hosting;
 using Umbraco.Cms.Core.Mail;
 using Umbraco.Cms.Core.Media;
-using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.ContentEditing;
 using Umbraco.Cms.Core.Models.TemplateQuery;
 using Umbraco.Cms.Core.Services;
@@ -27,6 +25,7 @@
 using Umbraco.Cms.Web.BackOffice.Trees;
 using Umbraco.Cms.Web.Common.Attributes;
 using Umbraco.Cms.Web.Common.Models;
+using Umbraco.Cms.Web.Common.Routing;
 using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Web.BackOffice.Controllers

diff --git a/src/Umbraco.Web.BackOffice/Controllers/UsersController.cs b/src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
@@ -6,7 +6,6 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
@@ -35,6 +34,7 @@
 using Umbraco.Cms.Web.Common.ActionsResults;
 using Umbraco.Cms.Web.Common.Attributes;
 using Umbraco.Cms.Web.Common.Authorization;
+using Umbraco.Cms.Web.Common.Routing;
 using Umbraco.Cms.Web.Common.Security;
 using Umbraco.Extensions;
 

diff --git a/src/Umbraco.Web.BackOffice/Extensions/LinkGeneratorExtensions.cs b/src/Umbraco.Web.BackOffice/Extensions/LinkGeneratorExtensions.cs
@@ -1,7 +1,6 @@
-using Microsoft.AspNetCore.Routing;
-using Umbraco.Cms.Core;
 using Umbraco.Cms.Web.BackOffice.Install;
-
+using Umbraco.Cms.Web.Common.Routing;
+using Constants = Umbraco.Cms.Core.Constants;
 namespace Umbraco.Extensions;
 
 public static class BackofficeLinkGeneratorExtensions

diff --git a/src/Umbraco.Web.BackOffice/Install/InstallAreaRoutes.cs b/src/Umbraco.Web.BackOffice/Install/InstallAreaRoutes.cs
@@ -5,6 +5,7 @@
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Web.Common.Routing;
 using Umbraco.Extensions;
+using LinkGenerator = Umbraco.Cms.Web.Common.Routing.LinkGenerator;
 
 namespace Umbraco.Cms.Web.BackOffice.Install;
 

diff --git a/src/Umbraco.Web.BackOffice/Install/InstallAuthorizeAttribute.cs b/src/Umbraco.Web.BackOffice/Install/InstallAuthorizeAttribute.cs
@@ -1,12 +1,12 @@
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.Logging;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Hosting;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Web.BackOffice.Controllers;
+using Umbraco.Cms.Web.Common.Routing;
 using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Web.BackOffice.Install;

diff --git a/src/Umbraco.Web.BackOffice/Install/InstallController.cs b/src/Umbraco.Web.BackOffice/Install/InstallController.cs
@@ -1,6 +1,5 @@
 using System.Net;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Umbraco.Cms.Core;
@@ -13,6 +12,7 @@
 using Umbraco.Cms.Infrastructure.Install;
 using Umbraco.Cms.Web.Common.Attributes;
 using Umbraco.Cms.Web.Common.Filters;
+using Umbraco.Cms.Web.Common.Routing;
 using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Web.BackOffice.Install;

diff --git a/src/Umbraco.Web.BackOffice/Mapping/CommonTreeNodeMapper.cs b/src/Umbraco.Web.BackOffice/Mapping/CommonTreeNodeMapper.cs
@@ -1,7 +1,7 @@
-using Microsoft.AspNetCore.Routing;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Web.BackOffice.Trees;
 using Umbraco.Cms.Web.Common.Controllers;
+using Umbraco.Cms.Web.Common.Routing;
 using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Web.BackOffice.Mapping;

diff --git a/src/Umbraco.Web.BackOffice/ModelsBuilder/ModelsBuilderDashboardProvider.cs b/src/Umbraco.Web.BackOffice/ModelsBuilder/ModelsBuilderDashboardProvider.cs
@@ -1,5 +1,5 @@
-using Microsoft.AspNetCore.Routing;
 using Umbraco.Cms.Web.Common.ModelsBuilder;
+using Umbraco.Cms.Web.Common.Routing;
 using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Web.BackOffice.ModelsBuilder;

diff --git a/src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilderExtensions.cs b/src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilderExtensions.cs
@@ -55,6 +55,7 @@
 using Umbraco.Cms.Web.Common.ModelBinders;
 using Umbraco.Cms.Web.Common.Mvc;
 using Umbraco.Cms.Web.Common.Profiler;
+using Umbraco.Cms.Web.Common.Routing;
 using Umbraco.Cms.Web.Common.RuntimeMinification;
 using Umbraco.Cms.Web.Common.Security;
 using Umbraco.Cms.Web.Common.Templates;
@@ -168,7 +169,7 @@ public static IUmbracoBuilder AddUmbracoCore(this IUmbracoBuilder builder)
         builder.Services.AddUnique<IUmbracoApplicationLifetime, AspNetCoreUmbracoApplicationLifetime>();
         builder.Services.AddUnique<IApplicationShutdownRegistry, AspNetCoreApplicationShutdownRegistry>();
         builder.Services.AddTransient<IIpAddressUtilities, IpAddressUtilities>();
-
+        builder.Services.AddSingleton<LinkGenerator, LinkGenerator>();
         return builder;
     }
 

diff --git a/src/Umbraco.Web.Common/Extensions/LinkGeneratorExtensions.cs b/src/Umbraco.Web.Common/Extensions/LinkGeneratorExtensions.cs
@@ -2,11 +2,11 @@
 using System.Linq.Expressions;
 using System.Reflection;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Routing;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Hosting;
 using Umbraco.Cms.Core.Web.Mvc;
 using Umbraco.Cms.Web.Common.Controllers;
+using Umbraco.Cms.Web.Common.Routing;
 
 namespace Umbraco.Extensions;
 

diff --git a/src/Umbraco.Web.Common/Routing/LinkGenerator.cs b/src/Umbraco.Web.Common/Routing/LinkGenerator.cs
@@ -0,0 +1,64 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Routing;
+using Umbraco.Cms.Core.Hosting;
+
+namespace Umbraco.Cms.Web.Common.Routing;
+
+/// <summary>
+/// Umbraco LinkGenerator. Generates Links with path, when no path is given.
+/// </summary>
+public class LinkGenerator
+{
+    private readonly Microsoft.AspNetCore.Routing.LinkGenerator _linkGenerator;
+    private readonly string _pathBase;
+
+    /// <summary>
+    /// Initialize Umbraco LinkGenerator
+    /// </summary>
+    /// <param name="linkGenerator"></param>
+    /// <param name="hostingEnvironment"></param>
+    public LinkGenerator(Microsoft.AspNetCore.Routing.LinkGenerator linkGenerator, IHostingEnvironment hostingEnvironment)
+    {
+        _linkGenerator = linkGenerator;
+        _pathBase = hostingEnvironment.ApplicationVirtualPath;
+    }
+
+    public string? GetPathByAddress<TAddress>(
+        HttpContext httpContext,
+        TAddress address,
+        RouteValueDictionary values,
+        RouteValueDictionary? ambientValues = null,
+        PathString? pathBase = null,
+        FragmentString fragment = new FragmentString(),
+        LinkOptions? options = null)
+    {
+        pathBase ??= _pathBase;
+        return _linkGenerator.GetPathByAddress(httpContext, address, values, ambientValues, pathBase, fragment, options);
+    }
+
+    public string? GetPathByAddress<TAddress>(TAddress address, RouteValueDictionary values,
+        PathString pathBase = new PathString(), FragmentString fragment = new FragmentString(),
+        LinkOptions? options = null)
+    {
+        pathBase = string.IsNullOrWhiteSpace(pathBase.Value) ? new PathString(_pathBase) : pathBase;
+        return _linkGenerator.GetPathByAddress(address, values, pathBase, fragment, options);
+    }
+
+    public string? GetUriByAddress<TAddress>(HttpContext httpContext, TAddress address, RouteValueDictionary values,
+        RouteValueDictionary? ambientValues = null, string? scheme = null, HostString? host = null,
+        PathString? pathBase = null, FragmentString fragment = new FragmentString(), LinkOptions? options = null)
+    {
+        pathBase ??= _pathBase;
+        return _linkGenerator.GetUriByAddress(httpContext, address, values, ambientValues, scheme, host, pathBase, fragment, options);
+    }
+
+    public string? GetUriByAddress<TAddress>(TAddress address, RouteValueDictionary values, string? scheme, HostString host,
+        PathString pathBase = new PathString(), FragmentString fragment = new FragmentString(),
+        LinkOptions? options = null)
+    {
+        pathBase = string.IsNullOrWhiteSpace(pathBase.Value) ? new PathString(_pathBase) : pathBase;
+        return _linkGenerator.GetUriByAddress(address, values, scheme, host, pathBase, fragment, options);
+    }
+
+    public string? GetPathByAction(string action, string controllerName, object values) => _linkGenerator.GetPathByAction(action, controllerName, values, _pathBase);
+}
diff --git a/src/Umbraco.Web.Website/Extensions/LinkGeneratorExtensions.cs b/src/Umbraco.Web.Website/Extensions/LinkGeneratorExtensions.cs
@@ -1,7 +1,7 @@
 using System.Linq.Expressions;
 using System.Reflection;
-using Microsoft.AspNetCore.Routing;
 using Umbraco.Cms.Core;
+using Umbraco.Cms.Web.Common.Routing;
 using Umbraco.Cms.Web.Website.Controllers;
 
 namespace Umbraco.Extensions;

diff --git a/tests/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs b/tests/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs
@@ -5,7 +5,6 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Testing;
-using Microsoft.AspNetCore.Routing;
 using Microsoft.AspNetCore.TestHost;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -25,6 +24,7 @@
 using Umbraco.Cms.Tests.Integration.Testing;
 using Umbraco.Cms.Web.BackOffice.Controllers;
 using Umbraco.Cms.Web.Common.Controllers;
+using Umbraco.Cms.Web.Common.Routing;
 using Umbraco.Cms.Web.Website.Controllers;
 
 namespace Umbraco.Cms.Tests.Integration.TestServerTest

diff --git a/...s/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/MemberControllerUnitTests.cs b/...s/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/MemberControllerUnitTests.cs
@@ -7,7 +7,6 @@
 using AutoFixture.NUnit3;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Identity;
-using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
@@ -39,6 +38,7 @@
 using Umbraco.Cms.Web.BackOffice.Controllers;
 using Umbraco.Cms.Web.BackOffice.Mapping;
 using Umbraco.Cms.Web.Common.ActionsResults;
+using Umbraco.Cms.Web.Common.Routing;
 using Umbraco.Cms.Web.Common.Security;
 using MemberMapDefinition = Umbraco.Cms.Web.BackOffice.Mapping.MemberMapDefinition;
 

diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/InstallAreaRoutesTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/InstallAreaRoutesTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-using System.Linq;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Routing;
 using Moq;
@@ -12,6 +11,7 @@
 using Umbraco.Cms.Web.BackOffice.Install;
 using Umbraco.Extensions;
 using static Umbraco.Cms.Core.Constants.Web.Routing;
+using LinkGenerator = Umbraco.Cms.Web.Common.Routing.LinkGenerator;
 
 namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Routing;