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

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

Browse Source
This commit is contained in:
Valentin Mihai 2023-10-13 20:00:10 +03:00
parent 99701c7cd2
commit ebac60b314
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(); await licenseService.loadLicenses();
const token = await keycloakService.getToken(); const token = await keycloakService.getToken();
const jwtToken = jwt_decode(token) as JwtToken; if (token) {
const authTime = (jwtToken.auth_time || jwtToken.iat).toString(); const jwtToken = jwt_decode(token) as JwtToken;
localStorage.setItem('authTime', authTime); const authTime = (jwtToken.auth_time || jwtToken.iat).toString();
localStorage.setItem('authTime', authTime);
}
} }
const isLoggedIn = await keycloakService.isLoggedIn(); 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 () => { const ref = effect(async () => {
if (this._tenantsService.activeTenantId.length === 0) { const token = await this._keycloakService.getToken();
if (this._tenantsService.activeTenantId.length === 0 || !token) {
return; return;
} }
const token = await this._keycloakService.getToken();
const jwtToken = jwt_decode(token) as JwtToken; const jwtToken = jwt_decode(token) as JwtToken;
const authTime = (jwtToken.auth_time || jwtToken.iat).toString(); const authTime = (jwtToken.auth_time || jwtToken.iat).toString();
const localStorageAuthTime = localStorage.getItem('authTime'); const localStorageAuthTime = localStorage.getItem('authTime');