Expand helper to handle new authenticated accounts location

libs/common/src/state-migrations/migration-helper.spec.ts

@@ -25,6 +25,14 @@ const exampleJSON = {
   },
   global_serviceName_key: "global_serviceName_key",
   user_userId_serviceName_key: "user_userId_serviceName_key",
+  global_account_accounts: {
+    "c493ed01-4e08-4e88-abc7-332f380ca760": {
+      otherStuff: "otherStuff3",
+    },
+    "23e61a5f-2ece-4f5e-b499-f0bc489482a9": {
+      otherStuff: "otherStuff4",
+    },
+  },
 };
 
 describe("RemoveLegacyEtmKeyMigrator", () => {
@@ -70,6 +78,35 @@ describe("RemoveLegacyEtmKeyMigrator", () => {
       const accounts = await sut.getAccounts();
       expect(accounts).toEqual([]);
     });
+
+    it("handles global scoped known accounts for version 60 and after", async () => {
+      sut.currentVersion = 60;
+      const accounts = await sut.getAccounts();
+      expect(accounts).toEqual([
+        // Note, still gets values stored in state service objects, just grabs user ids from global
+        { userId: "c493ed01-4e08-4e88-abc7-332f380ca760", account: { otherStuff: "otherStuff1" } },
+        { userId: "23e61a5f-2ece-4f5e-b499-f0bc489482a9", account: { otherStuff: "otherStuff2" } },
+      ]);
+    });
+  });
+
+  describe("getKnownUserIds", () => {
+    it("returns all user ids", async () => {
+      const userIds = await sut.getKnownUserIds();
+      expect(userIds).toEqual([
+        "c493ed01-4e08-4e88-abc7-332f380ca760",
+        "23e61a5f-2ece-4f5e-b499-f0bc489482a9",
+      ]);
+    });
+
+    it("returns all user ids when version is 60 or greater", async () => {
+      sut.currentVersion = 60;
+      const userIds = await sut.getKnownUserIds();
+      expect(userIds).toEqual([
+        "c493ed01-4e08-4e88-abc7-332f380ca760",
+        "23e61a5f-2ece-4f5e-b499-f0bc489482a9",
+      ]);
+    });
   });
 
   describe("getFromGlobal", () => {

libs/common/src/state-migrations/migration-helper.ts

@@ -159,7 +159,12 @@ export class MigrationHelper {
   async getAccounts<ExpectedAccountType>(): Promise<
     { userId: string; account: ExpectedAccountType }[]
   > {
-    const userIds = (await this.get<string[]>("authenticatedAccounts")) ?? [];
+    let userIds;
+    if (this.currentVersion < 60) {
+      userIds = await knownAccountUserIdsBuilderPre60(this.storageService);
+    } else {
+      userIds = await knownAccountUserIdsBuilder(this.storageService);
+    }
     return Promise.all(
       userIds.map(async (userId) => ({
         userId,
@@ -168,6 +173,17 @@ export class MigrationHelper {
     );
   }
 
+  /**
+   * Helper method to read known users ids.
+   */
+  async getKnownUserIds(): Promise<string[]> {
+    if (this.currentVersion < 60) {
+      return knownAccountUserIdsBuilderPre60(this.storageService);
+    } else {
+      return knownAccountUserIdsBuilder(this.storageService);
+    }
+  }
+
   /**
    * Builds a user storage key appropriate for the current version.
    *
@@ -230,3 +246,18 @@ function globalKeyBuilder(keyDefinition: KeyDefinitionLike): string {
 function globalKeyBuilderPre9(): string {
   throw Error("No key builder should be used for versions prior to 9.");
 }
+
+async function knownAccountUserIdsBuilderPre60(
+  storageService: AbstractStorageService,
+): Promise<string[]> {
+  return (await storageService.get<string[]>("authenticatedAccounts")) ?? [];
+}
+
+async function knownAccountUserIdsBuilder(
+  storageService: AbstractStorageService,
+): Promise<string[]> {
+  const accounts = await storageService.get<Record<string, unknown>>(
+    globalKeyBuilder({ stateDefinition: { name: "account" }, key: "accounts" }),
+  );
+  return Object.keys(accounts ?? {});
+}