Merge remote-tracking branch 'origin/v8/8.17' into v8/dev

# Conflicts:
#	src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
#	src/Umbraco.Web/Editors/AuthenticationController.cs
#	src/Umbraco.Web/Editors/UsersController.cs

Author: bergmania

src/SolutionInfo.cs

@@ -18,5 +18,5 @@
 [assembly: AssemblyVersion("8.0.0")]
 
 // these are FYI and changed automatically
-[assembly: AssemblyFileVersion("8.17.1")]
-[assembly: AssemblyInformationalVersion("8.17.1")]
+[assembly: AssemblyFileVersion("8.17.2")]
+[assembly: AssemblyInformationalVersion("8.17.2")]

src/Umbraco.Core/Sync/ApplicationUrlHelper.cs

@@ -112,12 +112,25 @@ public static string GetApplicationUrlFromCurrentRequest(HttpRequestBase request
         /// <returns></returns>
         public static Uri GetApplicationUriUncached(
             HttpRequestBase request,
-            IUmbracoSettingsSection umbracoSettingsSection)
+            IUmbracoSettingsSection umbracoSettingsSection,
+            IGlobalSettings globalSettings)
         {
             var settingUrl = umbracoSettingsSection.WebRouting.UmbracoApplicationUrl;
-            return string.IsNullOrEmpty(settingUrl)
-                ? new Uri(request.Url, IOHelper.ResolveUrl(SystemDirectories.Umbraco))
-                : new Uri(settingUrl);
+
+
+            if (string.IsNullOrEmpty(settingUrl))
+            {
+                if (!Uri.TryCreate(request.Url, VirtualPathUtility.ToAbsolute(globalSettings.Path), out var result))
+                {
+                    throw new InvalidOperationException(
+                        $"Could not create an url from {request.Url} and {globalSettings.Path}");
+                }
+                return result;
+            }
+            else
+            {
+                return new Uri(settingUrl);
+            }
         }
     }
 }

src/Umbraco.Web.UI/Umbraco.Web.UI.csproj

@@ -348,9 +348,9 @@
         <WebProjectProperties>
           <UseIIS>False</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>8171</DevelopmentServerPort>
+          <DevelopmentServerPort>8172</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:8171</IISUrl>
+          <IISUrl>http://localhost:8172</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>
@@ -433,4 +433,4 @@
     <Message Text="ConfigFile: $(OriginalFileName) -&gt; $(OutputFileName)" Importance="high" Condition="Exists('$(ModifiedFileName)')" />
     <Copy SourceFiles="$(ModifiedFileName)" DestinationFiles="$(OutputFileName)" OverwriteReadOnlyFiles="true" SkipUnchangedFiles="false" Condition="Exists('$(ModifiedFileName)')" />
   </Target>
-</Project>
+</Project>

src/Umbraco.Web/Editors/AuthenticationController.cs

@@ -566,7 +566,7 @@ private string ConstructCallbackUrl(int userId, string code)
                 });
 
             // Construct full URL using configured application URL (which will fall back to current request)
-            var applicationUri = ApplicationUrlHelper.GetApplicationUriUncached(http.Request, _umbracoSettingsSection);
+            var applicationUri = ApplicationUrlHelper.GetApplicationUriUncached(http.Request, _umbracoSettingsSection, GlobalSettings);
             var callbackUri = new Uri(applicationUri, action);
             return callbackUri.ToString();
         }

src/Umbraco.Web/Editors/UsersController.cs

@@ -540,7 +540,7 @@ private async Task SendUserInviteEmailAsync(UserBasic userDisplay, string from,
                 });
 
             // Construct full URL will use the value in settings if specified, otherwise will use the current request URL
-            var requestUrl = ApplicationUrlHelper.GetApplicationUriUncached(http.Request, _umbracoSettingsSection);
+            var requestUrl = ApplicationUrlHelper.GetApplicationUriUncached(http.Request, _umbracoSettingsSection, GlobalSettings);
             var inviteUri = new Uri(requestUrl, action);
 
             var emailSubject = Services.TextService.Localize("user", "inviteEmailCopySubject",