diff --git a/src/service/sso.ts b/src/service/sso.ts index 5852f9a..7e9ffc1 100644 --- a/src/service/sso.ts +++ b/src/service/sso.ts @@ -47,7 +47,7 @@ export class SSOService { ) { return this.utf8_to_b64(data); } - const pathName = getApplicationLocation(); + const pathName = getApplicationLocation(this.environment); if (isInArray(pathName, ['sso', '/sso', '/sso/'])) { return this.utf8_to_b64('home'); } diff --git a/src/service/user.ts b/src/service/user.ts index e330bbc..439b4f3 100644 --- a/src/service/user.ts +++ b/src/service/user.ts @@ -13,6 +13,7 @@ import { SSOService } from './sso'; import { getApplicationLocation, isNullOrUndefined, sha512 } from '../utils'; import { HttpWrapperService, HTTPRequestModel, HTTPMimeType, ModelResponseHttp } from './http-wrapper_kjdhqslkjf'; import { Environment } from '../model/environment'; +import { APP_BASE_HREF } from '@angular/common'; @Injectable() @@ -76,7 +77,7 @@ export class UserService { * Check if the system can be connected */ checkAutoConnect(): Promise { - let locationOrigin = getApplicationLocation(); + let locationOrigin = getApplicationLocation(this.environment); const self = this; return new Promise((resolve, reject) => { // Need to use the windows global route to prevent the log in cycle ... @@ -91,7 +92,7 @@ export class UserService { } console.log(' ==> Check if need reconnect?'); let rememberMe = self.getRememberMe(); - // TODO: in case of jest reload ==> no need to manage the SSO ==> just keep the token ... it in enought... + // TODO: in case of jest reload ==> no need to manage the SSO ==> just keep the token ... it in enough... let token: undefined | string = undefined; if ( isNullOrUndefined(this.environment.tokenStoredInPermanentStorage) || @@ -109,7 +110,7 @@ export class UserService { self.startSession(token ?? '', rememberMe) .then(() => { self.router.navigateByUrl(locationOrigin); - console.log(`update global URL = ${locationOrigin}`); + console.log(`update global URL = ${locationOrigin} APP_BASE_HREF=${APP_BASE_HREF}`); resolve(); }) .catch(() => { diff --git a/src/utils/applPath.ts b/src/utils/applPath.ts index 15f3910..4e0804b 100644 --- a/src/utils/applPath.ts +++ b/src/utils/applPath.ts @@ -1,12 +1,11 @@ //import { environment } from 'environments/environment'; -export function getApplicationLocation(): string { +import { Environment } from "../model"; + +export function getApplicationLocation(environment: Environment): string { let pathName = location.pathname; - return pathName; //console.log("start Path-name: '" + pathName + "'"); //console.log("check with: '" + environment.applName + "/sso/" + "'"); - /* - if (pathName.startsWith('/' + environment.applName + '/')) { pathName = pathName.substring(environment.applName.length + 2); } else if (pathName.startsWith('/' + environment.applName)) { @@ -17,5 +16,4 @@ export function getApplicationLocation(): string { pathName = pathName.substring(environment.applName.length); } return pathName; - */ }