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

handled tenant change across open tabs.

This commit is contained in:
Diamantis Tziotzios 2024-06-07 16:25:28 +03:00
parent 8940394aa5
commit 050a72e8c7
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dmp-frontend/src/app/core/services/auth/auth.service.ts
View File

@ -16,6 +16,7 @@ import { ConfigurationService } from '../configuration/configuration.service';
import { PrincipalService } from '../http/principal.service'; import { PrincipalService } from '../http/principal.service';
import { BaseHttpParams } from '@common/http/base-http-params'; import { BaseHttpParams } from '@common/http/base-http-params';
import { InterceptorType } from '@common/http/interceptors/interceptor-type'; import { InterceptorType } from '@common/http/interceptors/interceptor-type';
import { TenantHandlingService } from '../tenant/tenant-handling.service';
export interface ResolutionContext { export interface ResolutionContext {
roles: AppRole[]; roles: AppRole[];
@ -48,7 +49,8 @@ export class AuthService extends BaseService {
private zone: NgZone, private zone: NgZone,
private keycloakService: KeycloakService, private keycloakService: KeycloakService,
private uiNotificationService: UiNotificationService, private uiNotificationService: UiNotificationService,
private principalService: PrincipalService private principalService: PrincipalService,
private tenantHandlingService: TenantHandlingService,
) { ) {
super(); super();
@ -67,6 +69,13 @@ export class AuthService extends BaseService {
this.router.navigate(['/unauthorized'], { this.router.navigate(['/unauthorized'], {
queryParams: { returnUrl: this.router.url }, queryParams: { returnUrl: this.router.url },
}); });
} else if (
event.key &&
event.key === 'selectedTenant' &&
event.newValue != this.selectedTenant()
) {
this.selectedTenant(event.newValue);
window.location.href = this.tenantHandlingService.getCurrentUrlEnrichedWithTenantCode(event.newValue, true);
} }
}); });
} }