MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

ui unauth fix

This commit is contained in:
CITE\spapacharalampous 2024-07-16 12:09:13 +03:00
parent 6173f088ed
commit 2283f95a5f
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/app/app.module.ts
View File

@ -111,6 +111,8 @@ export function InstallationConfigurationFactory(appConfig: ConfigurationService
const tenantCode = tenantHandlingService.extractTenantCodeFromUrlPath(window.location.pathname) ?? authService.selectedTenant() ?? 'default'; const tenantCode = tenantHandlingService.extractTenantCodeFromUrlPath(window.location.pathname) ?? authService.selectedTenant() ?? 'default';
const token = keycloak.getToken(); const token = keycloak.getToken();
return authService.prepareAuthRequest(from(token), tenantCode, { params }).toPromise().catch(error => { return authService.prepareAuthRequest(from(token), tenantCode, { params }).toPromise().catch(error => {
if (!authService.isKeycloakLoggedIn()) return;
authService.onAuthenticateError(error); authService.onAuthenticateError(error);
router.navigate(['/']); router.navigate(['/']);
}); });

3
frontend/src/app/core/services/auth/auth.service.ts
View File

@ -167,6 +167,9 @@ export class AuthService extends BaseService {
public isLoggedIn(): boolean { public isLoggedIn(): boolean {
return this.authState(); return this.authState();
} }
public isKeycloakLoggedIn(): boolean {
return this.keycloakService.isLoggedIn();
}
public prepareAuthRequest(observable: Observable<string>, tenantCode: string, httpParams?: Object): Observable<boolean> { public prepareAuthRequest(observable: Observable<string>, tenantCode: string, httpParams?: Object): Observable<boolean> {
return observable.pipe( return observable.pipe(
map((x) => this.currentAuthenticationToken(x)), map((x) => this.currentAuthenticationToken(x)),