Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

Merge branch 'documine-prod-fix' into 'master'

Browse Source 
impersonate fix

See merge request redactmanager/red-ui!117
This commit is contained in:
Timo Bejan 2023-09-28 11:14:30 +02:00
commit 1d6915c850
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/red-ui/src/app/guards/if-logged-in.guard.ts
View File

@ -10,6 +10,7 @@ import jwt_decode from 'jwt-decode';
export interface JwtToken { export interface JwtToken {
auth_time: number; auth_time: number;
iat: number;
} }
export function ifLoggedIn(): AsyncGuard { export function ifLoggedIn(): AsyncGuard {
@ -42,7 +43,8 @@ export function ifLoggedIn(): AsyncGuard {
await licenseService.loadLicenses(); await licenseService.loadLicenses();
const token = await keycloakService.getToken(); 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); localStorage.setItem('authTime', authTime);
} }

3
apps/red-ui/src/app/services/router-history.service.ts
View File

@ -33,7 +33,8 @@ export class RouterHistoryService {
} }
const token = await this._keycloakService.getToken(); 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'); const localStorageAuthTime = localStorage.getItem('authTime');
if (authTime.toString() !== localStorageAuthTime) { if (authTime.toString() !== localStorageAuthTime) {