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

Create Image from PR if request (#6705)

Browse Source 
* [create docker image]
fix
fix e2e
[MNT-21636] Use URLTree for redirect (#6691)

* use URLTree for redirect

* use always urltree

* fix e2e

* fix

* fix

* Update release-docker.sh

* update js-api

* update lock
This commit is contained in:
Eugenio Romano
2021-02-23 21:52:26 +00:00
committed by GitHub
parent 63969d65e7
commit 819921deec
11 changed files with 776 additions and 751 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,8 +79,9 @@ export abstract class AuthGuardBase implements CanActivate, CanActivateChild {
const redirectFragment = this.storageService.getItem('loginFragment');
if (redirectFragment && this.getLoginRoute() !== redirectFragment) {
await this.navigate(redirectFragment);
this.storageService.removeItem('loginFragment');
return this.router.parseUrl(redirectFragment);
return false;
}
return true;
@@ -110,9 +111,10 @@ export abstract class AuthGuardBase implements CanActivate, CanActivateChild {
return false;
}
protected navigate(url: string): UrlTree {
protected async navigate(url: string): Promise<boolean> {
this.dialog.closeAll();
return this.router.parseUrl(url);
await this.router.navigateByUrl(this.router.parseUrl(url));
return false;
}
protected getOauthConfig(): OauthConfigModel {