From 3a1b5bf9a0fcea7f8fd46d480eb0468cc0ee77c9 Mon Sep 17 00:00:00 2001
From: Addison Beck <addisonbeck1@gmail.com>
Date: Fri, 11 Feb 2022 12:45:48 -0500
Subject: [PATCH] Use getAccount when scaffolding + pass in the correct userId
 (#676)

---
 common/src/services/state.service.ts | 52 +++++++++++++++++++++-------
 1 file changed, 40 insertions(+), 12 deletions(-)

diff --git a/common/src/services/state.service.ts b/common/src/services/state.service.ts
index d149d577f7..23c77a8474 100644
--- a/common/src/services/state.service.ts
+++ b/common/src/services/state.service.ts
@@ -2227,9 +2227,11 @@ export class StateService<
   // TODO: There is a tech debt item for splitting up these methods - only Web uses multiple storage locations in its storageService.
   // For now these methods exist with some redundancy to facilitate this special web requirement.
   protected async scaffoldNewAccountLocalStorage(account: TAccount): Promise<void> {
-    const storedAccount = await this.storageService.get<TAccount>(
-      account.profile.userId,
-      await this.defaultOnDiskLocalOptions()
+    const storedAccount = await this.getAccount(
+      this.reconcileOptions(
+        { userId: account.profile.userId },
+        await this.defaultOnDiskLocalOptions()
+      )
     );
     // EnvironmentUrls are set before authenticating and should override whatever is stored from any previous session
     const environmentUrls = account.settings.environmentUrls;
@@ -2246,31 +2248,57 @@ export class StateService<
       account.profile.apiKeyClientId = null;
       account.keys.apiKeyClientSecret = null;
     }
-    await this.saveAccount(account, await this.defaultOnDiskLocalOptions());
+    await this.saveAccount(
+      account,
+      this.reconcileOptions(
+        { userId: account.profile.userId },
+        await this.defaultOnDiskLocalOptions()
+      )
+    );
   }
 
   protected async scaffoldNewAccountMemoryStorage(account: TAccount): Promise<void> {
-    const storedAccount = await this.storageService.get<TAccount>(
-      account.profile.userId,
-      await this.defaultOnDiskMemoryOptions()
+    const storedAccount = await this.getAccount(
+      this.reconcileOptions(
+        { userId: account.profile.userId },
+        await this.defaultOnDiskMemoryOptions()
+      )
     );
     if (storedAccount?.settings != null) {
       storedAccount.settings.environmentUrls = account.settings.environmentUrls;
       account.settings = storedAccount.settings;
     }
-    await this.saveAccount(account, await this.defaultOnDiskLocalOptions());
+    await this.storageService.save(
+      account.profile.userId,
+      account,
+      await this.defaultOnDiskMemoryOptions()
+    );
+    await this.saveAccount(
+      account,
+      this.reconcileOptions(
+        { userId: account.profile.userId },
+        await this.defaultOnDiskMemoryOptions()
+      )
+    );
   }
 
   protected async scaffoldNewAccountSessionStorage(account: TAccount): Promise<void> {
-    const storedAccount = await this.storageService.get<TAccount>(
-      account.profile.userId,
-      await this.defaultOnDiskOptions()
+    const storedAccount = await this.getAccount(
+      this.reconcileOptions({ userId: account.profile.userId }, await this.defaultOnDiskOptions())
     );
     if (storedAccount?.settings != null) {
       storedAccount.settings.environmentUrls = account.settings.environmentUrls;
       account.settings = storedAccount.settings;
     }
-    await this.saveAccount(account, await this.defaultOnDiskLocalOptions());
+    await this.storageService.save(
+      account.profile.userId,
+      account,
+      await this.defaultOnDiskMemoryOptions()
+    );
+    await this.saveAccount(
+      account,
+      this.reconcileOptions({ userId: account.profile.userId }, await this.defaultOnDiskOptions())
+    );
   }
   //