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

Merge branch 'VM/RED-7756' into 'master'

Browse Source 
RED-7756 - Missing redirect to login page when trying to access tenant without being logged-in

Closes RED-7756

See merge request redactmanager/red-ui!141
This commit is contained in:
Dan Percic 2023-10-13 19:02:11 +02:00
commit a1b1111c0c
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,9 +43,11 @@ export function ifLoggedIn(): AsyncGuard {
await licenseService.loadLicenses();
const token = await keycloakService.getToken();
const jwtToken = jwt_decode(token) as JwtToken;
const authTime = (jwtToken.auth_time || jwtToken.iat).toString();
localStorage.setItem('authTime', authTime);
if (token) {
const jwtToken = jwt_decode(token) as JwtToken;
const authTime = (jwtToken.auth_time || jwtToken.iat).toString();
localStorage.setItem('authTime', authTime);
}
}
const isLoggedIn = await keycloakService.isLoggedIn();

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

@ -28,11 +28,11 @@ export class RouterHistoryService {
}
});
const ref = effect(async () => {
if (this._tenantsService.activeTenantId.length === 0) {
const token = await this._keycloakService.getToken();
if (this._tenantsService.activeTenantId.length === 0 || !token) {
return;
}
const token = await this._keycloakService.getToken();
const jwtToken = jwt_decode(token) as JwtToken;
const authTime = (jwtToken.auth_time || jwtToken.iat).toString();
const localStorageAuthTime = localStorage.getItem('authTime');