From 200b0f75341dd38186f1ea05dab399ab12c4d771 Mon Sep 17 00:00:00 2001
From: Matt Gibson <mgibson@bitwarden.com>
Date: Tue, 30 Apr 2024 12:46:01 -0400
Subject: [PATCH] Correct and test changeover point for userId source in
 storage migration (#8990)

---
 .../src/state-migrations/migration-helper.spec.ts  |  5 +++++
 .../src/state-migrations/migration-helper.ts       |  6 +++---
 .../migrations/60-known-accounts.spec.ts           | 14 +++++---------
 .../migrations/60-known-accounts.ts                |  4 ++--
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/libs/common/src/state-migrations/migration-helper.spec.ts b/libs/common/src/state-migrations/migration-helper.spec.ts
index 162fac2fab..21c5c72a18 100644
--- a/libs/common/src/state-migrations/migration-helper.spec.ts
+++ b/libs/common/src/state-migrations/migration-helper.spec.ts
@@ -235,6 +235,11 @@ export function mockMigrationHelper(
     helper.setToUser(userId, keyDefinition, value),
   );
   mockHelper.getAccounts.mockImplementation(() => helper.getAccounts());
+  mockHelper.getKnownUserIds.mockImplementation(() => helper.getKnownUserIds());
+  mockHelper.removeFromGlobal.mockImplementation((keyDefinition) =>
+    helper.removeFromGlobal(keyDefinition),
+  );
+  mockHelper.remove.mockImplementation((key) => helper.remove(key));
 
   mockHelper.type = helper.type;
 
diff --git a/libs/common/src/state-migrations/migration-helper.ts b/libs/common/src/state-migrations/migration-helper.ts
index 5d1de8dd49..b377df8ef9 100644
--- a/libs/common/src/state-migrations/migration-helper.ts
+++ b/libs/common/src/state-migrations/migration-helper.ts
@@ -175,8 +175,8 @@ export class MigrationHelper {
    * Helper method to read known users ids.
    */
   async getKnownUserIds(): Promise<string[]> {
-    if (this.currentVersion < 61) {
-      return knownAccountUserIdsBuilderPre61(this.storageService);
+    if (this.currentVersion < 60) {
+      return knownAccountUserIdsBuilderPre60(this.storageService);
     } else {
       return knownAccountUserIdsBuilder(this.storageService);
     }
@@ -245,7 +245,7 @@ function globalKeyBuilderPre9(): string {
   throw Error("No key builder should be used for versions prior to 9.");
 }
 
-async function knownAccountUserIdsBuilderPre61(
+async function knownAccountUserIdsBuilderPre60(
   storageService: AbstractStorageService,
 ): Promise<string[]> {
   return (await storageService.get<string[]>("authenticatedAccounts")) ?? [];
diff --git a/libs/common/src/state-migrations/migrations/60-known-accounts.spec.ts b/libs/common/src/state-migrations/migrations/60-known-accounts.spec.ts
index 28dedb3c39..01be4adb6a 100644
--- a/libs/common/src/state-migrations/migrations/60-known-accounts.spec.ts
+++ b/libs/common/src/state-migrations/migrations/60-known-accounts.spec.ts
@@ -51,17 +51,13 @@ const rollbackJson = () => {
     },
     global_account_accounts: {
       user1: {
-        profile: {
-          email: "user1",
-          name: "User 1",
-          emailVerified: true,
-        },
+        email: "user1",
+        name: "User 1",
+        emailVerified: true,
       },
       user2: {
-        profile: {
-          email: "",
-          emailVerified: false,
-        },
+        email: "",
+        emailVerified: false,
       },
     },
     global_account_activeAccountId: "user1",
diff --git a/libs/common/src/state-migrations/migrations/60-known-accounts.ts b/libs/common/src/state-migrations/migrations/60-known-accounts.ts
index 75117da5b4..3b02a5acc4 100644
--- a/libs/common/src/state-migrations/migrations/60-known-accounts.ts
+++ b/libs/common/src/state-migrations/migrations/60-known-accounts.ts
@@ -38,8 +38,8 @@ export class KnownAccountsMigrator extends Migrator<59, 60> {
   }
   async rollback(helper: MigrationHelper): Promise<void> {
     // authenticated account are removed, but the accounts record also contains logged out accounts. Best we can do is to add them all back
-    const accounts = (await helper.getFromGlobal<Record<string, unknown>>(ACCOUNT_ACCOUNTS)) ?? {};
-    await helper.set("authenticatedAccounts", Object.keys(accounts));
+    const userIds = (await helper.getKnownUserIds()) ?? [];
+    await helper.set("authenticatedAccounts", userIds);
     await helper.removeFromGlobal(ACCOUNT_ACCOUNTS);
 
     // Active Account Id