Merge branch 'v14/dev' into release/14.0

iOvergaard · iOvergaard · commit 3f20abf767de · 2024-05-22T14:32:10.000+02:00
diff --git a/src/Umbraco.Web.UI.Client b/src/Umbraco.Web.UI.Client
@@ -1 +1 @@
-Subproject commit c58bd30068b101390b3455996799834c3fd30ad2
+Subproject commit 54264f20cbd6ece0bc187682d3ad2fecdbdb6370
diff --git a/src/Umbraco.Web.Website/Middleware/BasicAuthenticationMiddleware.cs b/src/Umbraco.Web.Website/Middleware/BasicAuthenticationMiddleware.cs
@@ -103,7 +103,7 @@ private void HandleUnauthorized(HttpContext context)
     {
         if (_basicAuthService.IsRedirectToLoginPageEnabled())
         {
-            context.Response.Redirect($"{_backOfficePath}/login/?status=false&returnPath={WebUtility.UrlEncode(context.Request.GetEncodedPathAndQuery())}", false);
+            context.Response.Redirect($"{_backOfficePath}/?status=false&returnPath={WebUtility.UrlEncode(context.Request.GetEncodedPathAndQuery())}", false);
         }
         else
         {

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ private void HandleUnauthorized(HttpContext context)`
`103`	`103`	`{`
`104`	`104`	`if (_basicAuthService.IsRedirectToLoginPageEnabled())`
`105`	`105`	`{`
`106`		`- context.Response.Redirect($"{_backOfficePath}/login/?status=false&returnPath={WebUtility.UrlEncode(context.Request.GetEncodedPathAndQuery())}", false);`
	`106`	`+ context.Response.Redirect($"{_backOfficePath}/?status=false&returnPath={WebUtility.UrlEncode(context.Request.GetEncodedPathAndQuery())}", false);`
`107`	`107`	`}`
`108`	`108`	`else`
`109`	`109`	`{`