PM-3169 - Per discussion w/ Jake and Justin, rename login-initiated g…

…uard to be tde decryption required guard (more named for functionality vs specific route)
bitwarden · Aug 2, 2023 · 32f0201 · 32f0201
1 parent 268c8fa
commit 32f0201
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/apps/browser/src/popup/app-routing.module.ts b/apps/browser/src/popup/app-routing.module.ts
@@ -3,7 +3,7 @@ import { ActivatedRouteSnapshot, RouteReuseStrategy, RouterModule, Routes } from
 
 import { AuthGuard } from "@bitwarden/angular/auth/guards/auth.guard";
 import { lockGuard } from "@bitwarden/angular/auth/guards/lock.guard";
-import { loginInitiatedGuard } from "@bitwarden/angular/auth/guards/login-initiated.guard";
+import { tdeDecryptionRequiredGuard } from "@bitwarden/angular/auth/guards/tde-decryption-required.guard";
 import { UnauthGuard } from "@bitwarden/angular/auth/guards/unauth.guard";
 import { canAccessFeature } from "@bitwarden/angular/guard/feature-flag.guard";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
@@ -108,7 +108,10 @@ const routes: Routes = [
   {
     path: "login-initiated",
     component: LoginDecryptionOptionsComponent,
-    canActivate: [loginInitiatedGuard(), canAccessFeature(FeatureFlag.TrustedDeviceEncryption)],
+    canActivate: [
+      tdeDecryptionRequiredGuard(),
+      canAccessFeature(FeatureFlag.TrustedDeviceEncryption),
+    ],
   },
   {
     path: "sso",

diff --git a/apps/desktop/src/app/app-routing.module.ts b/apps/desktop/src/app/app-routing.module.ts
@@ -3,8 +3,8 @@ import { RouterModule, Routes } from "@angular/router";
 
 import { AuthGuard } from "@bitwarden/angular/auth/guards/auth.guard";
 import { lockGuard } from "@bitwarden/angular/auth/guards/lock.guard";
-import { loginInitiatedGuard } from "@bitwarden/angular/auth/guards/login-initiated.guard";
 import { redirectGuard } from "@bitwarden/angular/auth/guards/redirect.guard";
+import { tdeDecryptionRequiredGuard } from "@bitwarden/angular/auth/guards/tde-decryption-required.guard";
 import { canAccessFeature } from "@bitwarden/angular/guard/feature-flag.guard";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 
@@ -54,7 +54,10 @@ const routes: Routes = [
   {
     path: "login-initiated",
     component: LoginDecryptionOptionsComponent,
-    canActivate: [loginInitiatedGuard(), canAccessFeature(FeatureFlag.TrustedDeviceEncryption)],
+    canActivate: [
+      tdeDecryptionRequiredGuard(),
+      canAccessFeature(FeatureFlag.TrustedDeviceEncryption),
+    ],
   },
   { path: "register", component: RegisterComponent },
   {

diff --git a/apps/web/src/app/oss-routing.module.ts b/apps/web/src/app/oss-routing.module.ts
@@ -3,8 +3,8 @@ import { Route, RouterModule, Routes } from "@angular/router";
 
 import { AuthGuard } from "@bitwarden/angular/auth/guards/auth.guard";
 import { lockGuard } from "@bitwarden/angular/auth/guards/lock.guard";
-import { loginInitiatedGuard } from "@bitwarden/angular/auth/guards/login-initiated.guard";
 import { redirectGuard } from "@bitwarden/angular/auth/guards/redirect.guard";
+import { tdeDecryptionRequiredGuard } from "@bitwarden/angular/auth/guards/tde-decryption-required.guard";
 import { UnauthGuard } from "@bitwarden/angular/auth/guards/unauth.guard";
 import { canAccessFeature } from "@bitwarden/angular/guard/feature-flag.guard";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
@@ -77,7 +77,10 @@ const routes: Routes = [
       {
         path: "login-initiated",
         component: LoginDecryptionOptionsComponent,
-        canActivate: [loginInitiatedGuard(), canAccessFeature(FeatureFlag.TrustedDeviceEncryption)],
+        canActivate: [
+          tdeDecryptionRequiredGuard(),
+          canAccessFeature(FeatureFlag.TrustedDeviceEncryption),
+        ],
       },
       {
         path: "register",

diff --git a/.../src/auth/guards/login-initiated.guard.ts → ...h/guards/tde-decryption-required.guard.ts b/.../src/auth/guards/login-initiated.guard.ts → ...h/guards/tde-decryption-required.guard.ts
@@ -15,7 +15,7 @@ import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.se
  * Only allow access to this route if the vault is locked and has never been decrypted.
  * Otherwise redirect to root.
  */
-export function loginInitiatedGuard(): CanActivateFn {
+export function tdeDecryptionRequiredGuard(): CanActivateFn {
   return async (_: ActivatedRouteSnapshot, state: RouterStateSnapshot) => {
     const authService = inject(AuthService);
     const cryptoService = inject(CryptoService);