[fix] Fix merge issue

I used createUrlTree when merging guards because I knew that was the angular standard, didn't notice that redirect was a helper method from us
bitwarden · May 3, 2022 · f83e26b · f83e26b
1 parent 5bdf7dd
commit f83e26b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/angular/src/guards/auth.guard.ts b/angular/src/guards/auth.guard.ts
@@ -31,14 +31,14 @@ export class AuthGuard extends BaseGuard implements CanActivate {
       if (routerState != null) {
         this.messagingService.send("lockedUrl", { url: routerState.url });
       }
-      return this.router.createUrlTree(["lock"], { queryParams: { promptBiometric: true } });
+      return this.redirect("lock", { queryParams: { promptBiometric: true } });
     }
 
     if (
       !routerState.url.includes("remove-password") &&
       (await this.keyConnectorService.getConvertAccountRequired())
     ) {
-      return this.router.createUrlTree(["/remove-password"]);
+      return this.redirect("/remove-password");
     }
 
     return true;

diff --git a/angular/src/guards/unauth.guard.ts b/angular/src/guards/unauth.guard.ts
@@ -21,9 +21,9 @@ export class UnauthGuard extends BaseGuard implements CanActivate {
     }
 
     if (authStatus === AuthenticationStatus.Locked) {
-      return this.router.createUrlTree(["lock"]);
+      return this.redirect("lock");
     }
 
-    return this.router.createUrlTree([this.homepage]);
+    return this.redirect(this.homepage);
   }
 }