From c11d1915a28a449711e7c33f34cc7e58df9faeb5 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Thu, 28 Sep 2023 12:00:04 +0300 Subject: [PATCH] impersonate fix --- apps/red-ui/src/app/guards/if-logged-in.guard.ts | 4 +++- apps/red-ui/src/app/services/router-history.service.ts | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/red-ui/src/app/guards/if-logged-in.guard.ts b/apps/red-ui/src/app/guards/if-logged-in.guard.ts index 39a127622..86651e9fe 100644 --- a/apps/red-ui/src/app/guards/if-logged-in.guard.ts +++ b/apps/red-ui/src/app/guards/if-logged-in.guard.ts @@ -10,6 +10,7 @@ import jwt_decode from 'jwt-decode'; export interface JwtToken { auth_time: number; + iat: number; } export function ifLoggedIn(): AsyncGuard { @@ -42,7 +43,8 @@ export function ifLoggedIn(): AsyncGuard { await licenseService.loadLicenses(); const token = await keycloakService.getToken(); - const authTime = (jwt_decode(token) as JwtToken).auth_time.toString(); + const jwtToken = jwt_decode(token) as JwtToken; + const authTime = (jwtToken.auth_time || jwtToken.iat).toString(); localStorage.setItem('authTime', authTime); } diff --git a/apps/red-ui/src/app/services/router-history.service.ts b/apps/red-ui/src/app/services/router-history.service.ts index 23c4007db..938ff679b 100644 --- a/apps/red-ui/src/app/services/router-history.service.ts +++ b/apps/red-ui/src/app/services/router-history.service.ts @@ -33,7 +33,8 @@ export class RouterHistoryService { } const token = await this._keycloakService.getToken(); - const authTime = (jwt_decode(token) as JwtToken).auth_time; + const jwtToken = jwt_decode(token) as JwtToken; + const authTime = (jwtToken.auth_time || jwtToken.iat).toString(); const localStorageAuthTime = localStorage.getItem('authTime'); if (authTime.toString() !== localStorageAuthTime) {