From f4b03c03feb32355bdf59ed8773eca5e98424522 Mon Sep 17 00:00:00 2001
From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
Date: Thu, 24 Nov 2022 12:10:18 +0100
Subject: [PATCH] use api baseurl for login redirect

---
 src/Umbraco.Web.UI.Client/src/app.ts | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/app.ts b/src/Umbraco.Web.UI.Client/src/app.ts
index d166ed5ebd..8de2b9e0f0 100644
--- a/src/Umbraco.Web.UI.Client/src/app.ts
+++ b/src/Umbraco.Web.UI.Client/src/app.ts
@@ -11,7 +11,7 @@ import type { Guard, IRoute } from 'router-slot/model';
 
 import { UUIIconRegistryEssential } from '@umbraco-ui/uui';
 import { css, html, LitElement } from 'lit';
-import { customElement, state } from 'lit/decorators.js';
+import {customElement, property, state} from 'lit/decorators.js';
 
 import { OpenAPI, RuntimeLevel, ServerResource } from '@umbraco-cms/backend-api';
 import { UmbContextProviderMixin } from '@umbraco-cms/context-api';
@@ -31,6 +31,9 @@ export class UmbApp extends UmbContextProviderMixin(LitElement) {
 		}
 	`;
 
+	@property({ type: String })
+	private umbracoUrl?: string;
+
 	@state()
 	private _routes: IRoute[] = [
 		{
@@ -65,9 +68,11 @@ export class UmbApp extends UmbContextProviderMixin(LitElement) {
 	async connectedCallback() {
 		super.connectedCallback();
 
-		OpenAPI.BASE = import.meta.env.VITE_UMBRACO_USE_MSW === 'on' ? '' : import.meta.env.VITE_UMBRACO_API_URL;
+		OpenAPI.BASE = import.meta.env.VITE_UMBRACO_USE_MSW === 'on' ? '' : this.umbracoUrl ?? import.meta.env.VITE_UMBRACO_API_URL ?? '';
 		OpenAPI.WITH_CREDENTIALS = true;
 
+		this.provideContext('UMBRACOBASE', OpenAPI.BASE);
+
 		await this._setInitStatus();
 		await this._registerExtensionManifestsFromServer();
 		this._redirect();
@@ -122,13 +127,14 @@ export class UmbApp extends UmbContextProviderMixin(LitElement) {
 				return true;
 			}
 
-			let returnPath = 'login';
+			let returnPath = `${OpenAPI.BASE}/umbraco/login`;
 
 			if (redirectTo) {
 				returnPath += `?redirectTo=${redirectTo}`;
 			}
 
-			history.replaceState(null, '', returnPath);
+			// Redirect user completely to login page
+			location.href = returnPath;
 			return false;
 		};
 	}