Refactor canactivate guards (#401)

* Refactor route guards to allow for subclassing * fix linting
bitwarden · Jun 8, 2021 · fdc6f7b · fdc6f7b
1 parent ea90aea
commit fdc6f7b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/angular/src/services/lock-guard.service.ts b/angular/src/services/lock-guard.service.ts
@@ -9,6 +9,8 @@ import { VaultTimeoutService } from 'jslib-common/abstractions/vaultTimeout.serv
 
 @Injectable()
 export class LockGuardService implements CanActivate {
+
+    protected homepage = 'vault';
     constructor(private vaultTimeoutService: VaultTimeoutService, private userService: UserService,
         private router: Router) { }
 
@@ -19,7 +21,7 @@ export class LockGuardService implements CanActivate {
             if (locked) {
                 return true;
             } else {
-                this.router.navigate(['vault']);
+                this.router.navigate([this.homepage]);
                 return false;
             }
         }

diff --git a/angular/src/services/unauth-guard.service.ts b/angular/src/services/unauth-guard.service.ts
@@ -1,5 +1,6 @@
 import { Injectable } from '@angular/core';
 import {
+    ActivatedRouteSnapshot,
     CanActivate,
     Router,
 } from '@angular/router';
@@ -9,6 +10,8 @@ import { VaultTimeoutService } from 'jslib-common/abstractions/vaultTimeout.serv
 
 @Injectable()
 export class UnauthGuardService implements CanActivate {
+
+    protected homepage = 'vault';
     constructor(private vaultTimeoutService: VaultTimeoutService, private userService: UserService,
         private router: Router) { }
 
@@ -19,7 +22,7 @@ export class UnauthGuardService implements CanActivate {
             if (locked) {
                 this.router.navigate(['lock']);
             } else {
-                this.router.navigate(['vault']);
+                this.router.navigate([this.homepage]);
             }
             return false;
         }