From c91f923bfa7f138fc865b6576fb8398ae0ac2e8f Mon Sep 17 00:00:00 2001
From: Timo Bejan <timo@devplant.ro>
Date: Sun, 15 Jan 2023 14:40:41 +0800
Subject: [PATCH] RED-5950 logout error on session expired

---
 src/lib/users/services/iqser-user.service.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/lib/users/services/iqser-user.service.ts b/src/lib/users/services/iqser-user.service.ts
index 6d7b545..651c10a 100644
--- a/src/lib/users/services/iqser-user.service.ts
+++ b/src/lib/users/services/iqser-user.service.ts
@@ -58,13 +58,13 @@ export abstract class IqserUserService<
     }
 
     async logout() {
-        await this._cacheApiService.wipeCaches();
-        if (await this._keycloakService.isLoggedIn()) {
+        try {
+            await this._keycloakService.loadUserProfile(true);
+            await this._cacheApiService.wipeCaches();
             await this._keycloakService.logout();
+        } catch (e) {
+            await this.redirectToLogin();
         }
-        window.location.href = this._keycloakService.getKeycloakInstance().createLoginUrl({
-            redirectUri: window.location.origin + this._baseHref,
-        });
     }
 
     async redirectToLogin() {