Merge branch 'refs/heads/v14/dev' into release/14.0

iOvergaard · iOvergaard · commit caebf37f51dd · 2024-05-02T13:50:24.000+02:00
diff --git a/src/Umbraco.Cms.Api.Management/Routing/BackOfficeAreaRoutes.cs b/src/Umbraco.Cms.Api.Management/Routing/BackOfficeAreaRoutes.cs
@@ -82,6 +82,6 @@ private void MapMinimalBackOffice(IEndpointRouteBuilder endpoints)
                 Controller = ControllerExtensions.GetControllerName<BackOfficeDefaultController>(),
                 Action = nameof(BackOfficeDefaultController.Index),
             },
-            constraints: new { slug = @"^(section.*|upgrade|install|logout|error)$" });
+            constraints: new { slug = @"^(section.*|upgrade|install|oauth_complete|logout|error)$" });
     }
 }
diff --git a/src/Umbraco.Web.UI.Client b/src/Umbraco.Web.UI.Client
@@ -1 +1 @@
-Subproject commit 2b259e9a4fcde03fc5a6dcdb469da7621e6e3be8
+Subproject commit b04739e5702fb3cfa8bccf1673c29ce24f0f7390

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,6 @@ private void MapMinimalBackOffice(IEndpointRouteBuilder endpoints)`
`82`	`82`	`Controller = ControllerExtensions.GetControllerName<BackOfficeDefaultController>(),`
`83`	`83`	`Action = nameof(BackOfficeDefaultController.Index),`
`84`	`84`	`},`
`85`		`- constraints: new { slug = @"^(section.*\|upgrade\|install\|logout\|error)$" });`
	`85`	`+ constraints: new { slug = @"^(section.*\|upgrade\|install\|oauth_complete\|logout\|error)$" });`
`86`	`86`	`}`
`87`	`87`	`}`