fix(recovery-code-login): [PM-18474] Fix for Recovery Code Login (#13497)

* fix(recovery-code-login): [PM-18474] Fix for Recovery Code Login - Fixed the recovery code login to work with the new device verification notice flow.

* test(recovery-code-login): [PM-18474] Fix for Recovery Code Login - Tests added.

libs/angular/src/vault/guards/new-device-verification-notice.guard.spec.ts

@@ -36,6 +36,7 @@ describe("NewDeviceVerificationNoticeGuard", () => {
   const isSelfHost = jest.fn().mockReturnValue(false);
   const getProfileTwoFactorEnabled = jest.fn().mockResolvedValue(false);
   const noticeState$ = jest.fn().mockReturnValue(new BehaviorSubject(null));
+  const skipState$ = jest.fn().mockReturnValue(new BehaviorSubject(null));
   const getProfileCreationDate = jest.fn().mockResolvedValue(eightDaysAgo);
   const hasMasterPasswordAndMasterKeyHash = jest.fn().mockResolvedValue(true);
   const getUserSSOBound = jest.fn().mockResolvedValue(false);
@@ -50,12 +51,13 @@ describe("NewDeviceVerificationNoticeGuard", () => {
     hasMasterPasswordAndMasterKeyHash.mockClear();
     getUserSSOBound.mockClear();
     getUserSSOBoundAdminOwner.mockClear();
+    skipState$.mockClear();
 
     TestBed.configureTestingModule({
       providers: [
         { provide: Router, useValue: { createUrlTree } },
         { provide: ConfigService, useValue: { getFeatureFlag } },
-        { provide: NewDeviceVerificationNoticeService, useValue: { noticeState$ } },
+        { provide: NewDeviceVerificationNoticeService, useValue: { noticeState$, skipState$ } },
         { provide: AccountService, useValue: { activeAccount$ } },
         { provide: PlatformUtilsService, useValue: { isSelfHost } },
         { provide: UserVerificationService, useValue: { hasMasterPasswordAndMasterKeyHash } },
@@ -144,6 +146,14 @@ describe("NewDeviceVerificationNoticeGuard", () => {
     expect(await newDeviceGuard()).toBe(true);
   });
 
+  it("returns `true` when the skip state value is set to true", async () => {
+    skipState$.mockReturnValueOnce(new BehaviorSubject(true));
+
+    expect(await newDeviceGuard()).toBe(true);
+    expect(skipState$.mock.calls[0][0]).toBe("account-id");
+    expect(skipState$.mock.calls.length).toBe(1);
+  });
+
   describe("SSO bound", () => {
     beforeEach(() => {
       getFeatureFlag.mockImplementation((key) => {

libs/angular/src/vault/guards/new-device-verification-notice.guard.ts

@@ -44,6 +44,11 @@ export const NewDeviceVerificationNoticeGuard: CanActivateFn = async (
     return router.createUrlTree(["/login"]);
   }
 
+  // Currently used by the auth recovery login flow and will get cleaned up in PM-18485.
+  if (await firstValueFrom(newDeviceVerificationNoticeService.skipState$(currentAcct.id))) {
+    return true;
+  }
+
   try {
     const isSelfHosted = platformUtilsService.isSelfHost();
     const userIsSSOUser = await ssoAppliesToUser(

libs/vault/src/services/new-device-verification-notice.service.spec.ts

@@ -14,6 +14,7 @@ import {
   NewDeviceVerificationNoticeService,
   NewDeviceVerificationNotice,
   NEW_DEVICE_VERIFICATION_NOTICE_KEY,
+  SKIP_NEW_DEVICE_VERIFICATION_NOTICE,
 } from "./new-device-verification-notice.service";
 
 describe("New Device Verification Notice", () => {
@@ -21,6 +22,7 @@ describe("New Device Verification Notice", () => {
   const userId = Utils.newGuid() as UserId;
   let newDeviceVerificationService: NewDeviceVerificationNoticeService;
   let mockNoticeState: FakeSingleUserState<NewDeviceVerificationNotice>;
+  let mockSkipState: FakeSingleUserState<boolean>;
   let stateProvider: FakeStateProvider;
   let accountService: FakeAccountService;
 
@@ -28,6 +30,7 @@ describe("New Device Verification Notice", () => {
     accountService = mockAccountServiceWith(userId);
     stateProvider = new FakeStateProvider(accountService);
     mockNoticeState = stateProvider.singleUser.getFake(userId, NEW_DEVICE_VERIFICATION_NOTICE_KEY);
+    mockSkipState = stateProvider.singleUser.getFake(userId, SKIP_NEW_DEVICE_VERIFICATION_NOTICE);
     newDeviceVerificationService = new NewDeviceVerificationNoticeService(stateProvider);
   });
 
@@ -82,4 +85,28 @@ describe("New Device Verification Notice", () => {
       expect(result).toEqual(newState);
     });
   });
+
+  describe("skipNotice state", () => {
+    it("emits skip notice state", async () => {
+      const shouldSkip = true;
+      await stateProvider.setUserState(SKIP_NEW_DEVICE_VERIFICATION_NOTICE, shouldSkip, userId);
+
+      const result = await firstValueFrom(newDeviceVerificationService.skipState$(userId));
+
+      expect(result).toBe(shouldSkip);
+    });
+
+    it("should update the skip notice state", async () => {
+      const initialSkipState = false;
+      const updatedSkipState = true;
+      mockSkipState.nextState(initialSkipState);
+      await newDeviceVerificationService.updateNewDeviceVerificationSkipNoticeState(
+        userId,
+        updatedSkipState,
+      );
+
+      const result = await firstValueFrom(newDeviceVerificationService.skipState$(userId));
+      expect(result).toBe(updatedSkipState);
+    });
+  });
 });

libs/vault/src/services/new-device-verification-notice.service.ts

@@ -42,6 +42,15 @@ export const NEW_DEVICE_VERIFICATION_NOTICE_KEY =
     },
   );
 
+export const SKIP_NEW_DEVICE_VERIFICATION_NOTICE = new UserKeyDefinition<boolean>(
+  NEW_DEVICE_VERIFICATION_NOTICE,
+  "shouldSkip",
+  {
+    deserializer: (data: boolean) => data,
+    clearOn: ["logout"],
+  },
+);
+
 @Injectable()
 export class NewDeviceVerificationNoticeService {
   constructor(private stateProvider: StateProvider) {}
@@ -62,4 +71,19 @@ export class NewDeviceVerificationNoticeService {
       return { ...newState };
     });
   }
+
+  private skipState(userId: UserId): SingleUserState<boolean> {
+    return this.stateProvider.getUser(userId, SKIP_NEW_DEVICE_VERIFICATION_NOTICE);
+  }
+
+  skipState$(userId: UserId): Observable<boolean | null> {
+    return this.skipState(userId).state$;
+  }
+
+  async updateNewDeviceVerificationSkipNoticeState(
+    userId: UserId,
+    shouldSkip: boolean,
+  ): Promise<void> {
+    await this.skipState(userId).update(() => shouldSkip);
+  }
 }