Merge pull request #1174 from marklagendijk/can-activate-child

Implemented CanActivateChild interface for auto-login guards

Author: FabianGosebrink

projects/angular-auth-oidc-client/src/lib/auto-login/auto-login-all-routes.guard.spec.ts

@@ -105,6 +105,40 @@ describe(`AutoLoginAllRoutesGuard`, () => {
     );
   });
 
+  describe('canActivateChild', () => {
+    it(
+      'should save current route and call `login` if not authenticated already',
+      waitForAsync(() => {
+        spyOn(checkAuthService, 'checkAuth').and.returnValue(of({ isAuthenticated: false } as LoginResponse));
+        const checkSavedRedirectRouteAndNavigateSpy = spyOn(autoLoginService, 'checkSavedRedirectRouteAndNavigate');
+        const saveRedirectRouteSpy = spyOn(autoLoginService, 'saveRedirectRoute');
+        const loginSpy = spyOn(loginService, 'login');
+
+        autoLoginAllRoutesGuard.canActivateChild(null, { url: 'some-url1' } as RouterStateSnapshot).subscribe(() => {
+          expect(saveRedirectRouteSpy).toHaveBeenCalledOnceWith('configId', 'some-url1');
+          expect(loginSpy).toHaveBeenCalledOnceWith('configId');
+          expect(checkSavedRedirectRouteAndNavigateSpy).not.toHaveBeenCalled();
+        });
+      })
+    );
+
+    it(
+      'should call `checkSavedRedirectRouteAndNavigate` if authenticated already',
+      waitForAsync(() => {
+        spyOn(checkAuthService, 'checkAuth').and.returnValue(of({ isAuthenticated: true } as LoginResponse));
+        const checkSavedRedirectRouteAndNavigateSpy = spyOn(autoLoginService, 'checkSavedRedirectRouteAndNavigate');
+        const saveRedirectRouteSpy = spyOn(autoLoginService, 'saveRedirectRoute');
+        const loginSpy = spyOn(loginService, 'login');
+
+        autoLoginAllRoutesGuard.canActivateChild(null, { url: 'some-url1' } as RouterStateSnapshot).subscribe(() => {
+          expect(saveRedirectRouteSpy).not.toHaveBeenCalled();
+          expect(loginSpy).not.toHaveBeenCalled();
+          expect(checkSavedRedirectRouteAndNavigateSpy).toHaveBeenCalledOnceWith('configId');
+        });
+      })
+    );
+  });
+
   describe('canLoad', () => {
     it(
       'should save current route (empty) and call `login` if not authenticated already',

projects/angular-auth-oidc-client/src/lib/auto-login/auto-login-all-routes.guard.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, CanActivate, CanLoad, Route, RouterStateSnapshot, UrlSegment } from '@angular/router';
+import { ActivatedRouteSnapshot, CanActivate, CanActivateChild, CanLoad, Route, RouterStateSnapshot, UrlSegment } from '@angular/router';
 import { Observable } from 'rxjs';
 import { map, take } from 'rxjs/operators';
 import { CheckAuthService } from '../check-auth.service';
@@ -8,7 +8,7 @@ import { LoginService } from '../login/login.service';
 import { AutoLoginService } from './auto-login.service';
 
 @Injectable({ providedIn: 'root' })
-export class AutoLoginAllRoutesGuard implements CanActivate, CanLoad {
+export class AutoLoginAllRoutesGuard implements CanActivate, CanActivateChild, CanLoad {
   constructor(
     private autoLoginService: AutoLoginService,
     private checkAuthService: CheckAuthService,
@@ -26,6 +26,10 @@ export class AutoLoginAllRoutesGuard implements CanActivate, CanLoad {
     return this.checkAuth(state.url);
   }
 
+  canActivateChild(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> {
+    return this.checkAuth(state.url);
+  }
+
   private checkAuth(url: string): Observable<boolean> {
     const configId = this.getId();
 

projects/angular-auth-oidc-client/src/lib/auto-login/auto-login-partial-routes.guard.spec.ts

@@ -102,6 +102,40 @@ describe(`AutoLoginPartialRoutesGuard`, () => {
     );
   });
 
+  describe('canActivateChild', () => {
+    it(
+      'should save current route and call `login` if not authenticated already',
+      waitForAsync(() => {
+        spyOn(authStateService, 'areAuthStorageTokensValid').and.returnValue(false);
+        const checkSavedRedirectRouteAndNavigateSpy = spyOn(autoLoginService, 'checkSavedRedirectRouteAndNavigate');
+        const saveRedirectRouteSpy = spyOn(autoLoginService, 'saveRedirectRoute');
+        const loginSpy = spyOn(loginService, 'login');
+
+        autoLoginPartialRoutesGuard.canActivateChild(null, { url: 'some-url1' } as RouterStateSnapshot);
+
+        expect(saveRedirectRouteSpy).toHaveBeenCalledOnceWith('configId', 'some-url1');
+        expect(loginSpy).toHaveBeenCalledOnceWith('configId');
+        expect(checkSavedRedirectRouteAndNavigateSpy).not.toHaveBeenCalled();
+      })
+    );
+
+    it(
+      'should call `checkSavedRedirectRouteAndNavigate` if authenticated already',
+      waitForAsync(() => {
+        spyOn(authStateService, 'areAuthStorageTokensValid').and.returnValue(true);
+        const checkSavedRedirectRouteAndNavigateSpy = spyOn(autoLoginService, 'checkSavedRedirectRouteAndNavigate');
+        const saveRedirectRouteSpy = spyOn(autoLoginService, 'saveRedirectRoute');
+        const loginSpy = spyOn(loginService, 'login');
+
+        autoLoginPartialRoutesGuard.canActivateChild(null, { url: 'some-url1' } as RouterStateSnapshot);
+
+        expect(saveRedirectRouteSpy).not.toHaveBeenCalled();
+        expect(loginSpy).not.toHaveBeenCalled();
+        expect(checkSavedRedirectRouteAndNavigateSpy).toHaveBeenCalledOnceWith('configId');
+      })
+    );
+  });
+
   describe('canLoad', () => {
     it(
       'should save current route (empty) and call `login` if not authenticated already',

projects/angular-auth-oidc-client/src/lib/auto-login/auto-login-partial-routes.guard.ts

@@ -1,12 +1,12 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, CanActivate, CanLoad, Route, RouterStateSnapshot, UrlSegment } from '@angular/router';
+import { ActivatedRouteSnapshot, CanActivate, CanActivateChild, CanLoad, Route, RouterStateSnapshot, UrlSegment } from '@angular/router';
 import { AuthStateService } from '../auth-state/auth-state.service';
 import { ConfigurationProvider } from '../config/provider/config.provider';
 import { LoginService } from '../login/login.service';
 import { AutoLoginService } from './auto-login.service';
 
 @Injectable({ providedIn: 'root' })
-export class AutoLoginPartialRoutesGuard implements CanActivate, CanLoad {
+export class AutoLoginPartialRoutesGuard implements CanActivate, CanActivateChild, CanLoad {
   constructor(
     private autoLoginService: AutoLoginService,
     private authStateService: AuthStateService,
@@ -24,6 +24,10 @@ export class AutoLoginPartialRoutesGuard implements CanActivate, CanLoad {
     return this.checkAuth(state.url);
   }
 
+  canActivateChild(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean {
+    return this.checkAuth(state.url);
+  }
+
   private checkAuth(url: string): boolean {
     const configId = this.getId();