cargdev/angular
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(router): child CanActivate guard should wait for parent to complete (#18110)

Browse Source 
Closes #15670

PR Close #18110
This commit is contained in:
Dzmitry Shylovich
2017-03-31 20:05:19 +03:00
committed by Miško Hevery
parent 82923a381d
commit 086f4aa72c
2 changed files with 54 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/router/src/router.ts
View File

@ -930,7 +930,7 @@ export class PreActivation {
private runCanActivateChecks(): Observable<boolean> {
const checks$ = from(this.canActivateChecks);
const runningChecks$ = mergeMap.call(
const runningChecks$ = concatMap.call(
checks$, (check: CanActivate) => andObservables(from(
[this.runCanActivateChild(check.path), this.runCanActivate(check.route)])));
return every.call(runningChecks$, (result: boolean) => result === true);