inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-5009] close all the dialogs after false canActivate event (#5312)

Browse Source 
* close all the dialogs after false canActivate event

* Update auth-guard-bpm.service.spec.ts

* sso fix

* fix lint
This commit is contained in:
Eugenio Romano
2020-01-02 11:21:10 +01:00
committed by Denys Vuika
parent d7e56b641e
commit 9c83c35e61
8 changed files with 86 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/core/services/auth-guard-base.ts
View File

@@ -29,6 +29,7 @@ import {
AppConfigValues
} from '../app-config/app-config.service';
import { OauthConfigModel } from '../models/oauth-config.model';
import { MatDialog } from '@angular/material';
export abstract class AuthGuardBase implements CanActivate, CanActivateChild {
abstract checkLogin(
@@ -46,14 +47,21 @@ export abstract class AuthGuardBase implements CanActivate, CanActivateChild {
constructor(
protected authenticationService: AuthenticationService,
protected router: Router,
protected appConfigService: AppConfigService
protected appConfigService: AppConfigService,
protected dialog: MatDialog
) {}
canActivate(
route: ActivatedRouteSnapshot,
state: RouterStateSnapshot
): Observable<boolean> | Promise<boolean> | boolean {
return this.checkLogin(route, state.url);
const checkLogin = this.checkLogin(route, state.url);
if (!checkLogin) {
this.dialog.closeAll();
}
return checkLogin;
}
canActivateChild(