update component and guard for null check

bitwarden · Dec 12, 2024 · 847911c · 847911c
1 parent 6e6228a
commit 847911c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 9 deletions.
diff --git a/libs/angular/src/vault/guards/new-device-verification-notice.guard.ts b/libs/angular/src/vault/guards/new-device-verification-notice.guard.ts
@@ -1,11 +1,10 @@
 import { inject } from "@angular/core";
 import { CanActivateFn, Router } from "@angular/router";
-import { firstValueFrom, map } from "rxjs";
+import { Observable, firstValueFrom, map } from "rxjs";
 
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { Account, AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-import { UserId } from "@bitwarden/common/types/guid";
 
 import { NewDeviceVerificationNoticeService } from "../../../../vault/src/services/new-device-verification-notice.service";
 
@@ -22,10 +21,16 @@ export const NewDeviceVerificationNoticeGuard: CanActivateFn = async () => {
     FeatureFlag.NewDeviceVerificationPermanentDismiss,
   );
 
-  const currentAcctId: UserId = await firstValueFrom(
-    accountService.activeAccount$.pipe(map((acct) => acct?.id)),
+  const currentAcct$: Observable<Account | null> = accountService.activeAccount$.pipe(
+    map((acct) => acct),
   );
-  const userItems$ = newDeviceVerificationNoticeService.noticeState$(currentAcctId);
+  const currentAcct = await firstValueFrom(currentAcct$);
+
+  if (!currentAcct) {
+    return false;
+  }
+
+  const userItems$ = newDeviceVerificationNoticeService.noticeState$(currentAcct.id);
   const userItems = await firstValueFrom(userItems$);
 
   if (

diff --git a/...nents/new-device-verification-notice/new-device-verification-notice-page-one.component.ts b/...nents/new-device-verification-notice/new-device-verification-notice-page-one.component.ts
@@ -61,8 +61,12 @@ export class NewDeviceVerificationNoticePageOneComponent implements OnInit {
   }
 
   async ngOnInit() {
-    this.currentEmail = (await firstValueFrom(this.currentAcct$)).email;
-    this.currentUserId = (await firstValueFrom(this.currentAcct$)).id;
+    const currentAcct = await firstValueFrom(this.currentAcct$);
+    if (!currentAcct) {
+      return;
+    }
+    this.currentEmail = currentAcct.email;
+    this.currentUserId = currentAcct.id;
     this.formMessage = this.i18nService.t(
       "newDeviceVerificationNoticePageOneFormContent",
       this.currentEmail,

diff --git a/...nents/new-device-verification-notice/new-device-verification-notice-page-two.component.ts b/...nents/new-device-verification-notice/new-device-verification-notice-page-two.component.ts
@@ -35,7 +35,11 @@ export class NewDeviceVerificationNoticePageTwoComponent implements OnInit {
   }
 
   async ngOnInit() {
-    this.currentUserId = (await firstValueFrom(this.currentAcct$)).id;
+    const currentAcct = await firstValueFrom(this.currentAcct$);
+    if (!currentAcct) {
+      return;
+    }
+    this.currentUserId = currentAcct.id;
   }
   async remindMeLaterSelect() {
     await this.newDeviceVerificationNoticeService.updateNewDeviceVerificationNoticeState(