From 8fb0dc5f7be13c3c8a557d67a6f37cdd08e219f3 Mon Sep 17 00:00:00 2001 From: Nicoleta Panaghiu Date: Thu, 25 Aug 2022 14:00:36 +0300 Subject: [PATCH] RED-5016: Removed 'login' placeholder. --- src/lib/error/server-error-interceptor.ts | 4 +--- src/lib/users/iqser-users.module.ts | 4 +--- src/lib/users/services/iqser-user.service.ts | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/lib/error/server-error-interceptor.ts b/src/lib/error/server-error-interceptor.ts index b0589f9..ecbabb0 100644 --- a/src/lib/error/server-error-interceptor.ts +++ b/src/lib/error/server-error-interceptor.ts @@ -56,11 +56,9 @@ export class ServerErrorInterceptor implements HttpInterceptor { catchError((error: HttpErrorResponse) => { // token expired if (error.status === HttpStatusCode.Unauthorized) { - const url = this._keycloakService.getKeycloakInstance().createLoginUrl({ - loginHint: 'login', + window.location.href = this._keycloakService.getKeycloakInstance().createLoginUrl({ redirectUri: window.location.href, }); - window.location.href = url; } // server error diff --git a/src/lib/users/iqser-users.module.ts b/src/lib/users/iqser-users.module.ts index 13a7b21..f45c106 100644 --- a/src/lib/users/iqser-users.module.ts +++ b/src/lib/users/iqser-users.module.ts @@ -41,11 +41,9 @@ function getKeycloakOptions(baseUrl: string, configService: IqserConfigService): function configureAutomaticRedirectToLoginScreen(keyCloakService: KeycloakService) { keyCloakService.getKeycloakInstance().onAuthRefreshError = () => { - const url = keyCloakService.getKeycloakInstance().createLoginUrl({ - loginHint: 'login', + window.location.href = keyCloakService.getKeycloakInstance().createLoginUrl({ redirectUri: window.location.href, }); - window.location.href = url; }; } diff --git a/src/lib/users/services/iqser-user.service.ts b/src/lib/users/services/iqser-user.service.ts index 883865a..44640b5 100644 --- a/src/lib/users/services/iqser-user.service.ts +++ b/src/lib/users/services/iqser-user.service.ts @@ -52,11 +52,9 @@ export abstract class IqserUserService< async logout() { await this._cacheApiService.wipeCaches(); await this._keycloakService.logout(); - const url = this._keycloakService.getKeycloakInstance().createLoginUrl({ - loginHint: 'login', + window.location.href = this._keycloakService.getKeycloakInstance().createLoginUrl({ redirectUri: window.location.origin + this._baseHref, }); - window.location.href = url; } loadAll() {