yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use api baseurl for login redirect

Browse Source
This commit is contained in:
Jacob Overgaard
2022-11-24 12:10:18 +01:00
parent 9e4f9ef86c
commit f4b03c03fe
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Umbraco.Web.UI.Client/src/app.ts
View File

@@ -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;
};
}