From e5cc3de46d4bd628279977a3073efda895f3d2dd Mon Sep 17 00:00:00 2001
From: Addison Beck <abeck@bitwarden.com>
Date: Mon, 24 Jan 2022 10:47:41 -0500
Subject: [PATCH] [bug] Move enableBrowserIntegration to global state (#630)

---
 common/src/models/domain/account.ts           |  2 --
 common/src/models/domain/globalState.ts       |  2 ++
 common/src/services/state.service.ts          | 24 +++++++++----------
 common/src/services/stateMigration.service.ts | 14 +++++------
 4 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/common/src/models/domain/account.ts b/common/src/models/domain/account.ts
index bfad62ac43..2ca63686f6 100644
--- a/common/src/models/domain/account.ts
+++ b/common/src/models/domain/account.ts
@@ -122,8 +122,6 @@ export class AccountSettings {
   enableAlwaysOnTop?: boolean;
   enableAutoFillOnPageLoad?: boolean;
   enableBiometric?: boolean;
-  enableBrowserIntegration?: boolean;
-  enableBrowserIntegrationFingerprint?: boolean;
   enableFullWidth?: boolean;
   enableGravitars?: boolean;
   environmentUrls: EnvironmentUrls = new EnvironmentUrls();
diff --git a/common/src/models/domain/globalState.ts b/common/src/models/domain/globalState.ts
index e7036fa2a4..90d53d7f90 100644
--- a/common/src/models/domain/globalState.ts
+++ b/common/src/models/domain/globalState.ts
@@ -32,4 +32,6 @@ export class GlobalState {
   enableStartToTray?: boolean;
   openAtLogin?: boolean;
   alwaysShowDock?: boolean;
+  enableBrowserIntegration?: boolean;
+  enableBrowserIntegrationFingerprint?: boolean;
 }
diff --git a/common/src/services/state.service.ts b/common/src/services/state.service.ts
index a703fe6bba..f97c36f140 100644
--- a/common/src/services/state.service.ts
+++ b/common/src/services/state.service.ts
@@ -988,26 +988,26 @@ export class StateService<TAccount extends Account = Account>
 
   async getEnableBrowserIntegration(options?: StorageOptions): Promise<boolean> {
     return (
-      (await this.getAccount(this.reconcileOptions(options, await this.defaultOnDiskOptions())))
-        ?.settings?.enableBrowserIntegration ?? false
+      (await this.getGlobals(this.reconcileOptions(options, await this.defaultOnDiskOptions())))
+        ?.enableBrowserIntegration ?? false
     );
   }
 
   async setEnableBrowserIntegration(value: boolean, options?: StorageOptions): Promise<void> {
-    const account = await this.getAccount(
+    const globals = await this.getGlobals(
       this.reconcileOptions(options, await this.defaultOnDiskOptions())
     );
-    account.settings.enableBrowserIntegration = value;
-    await this.saveAccount(
-      account,
+    globals.enableBrowserIntegration = value;
+    await this.saveGlobals(
+      globals,
       this.reconcileOptions(options, await this.defaultOnDiskOptions())
     );
   }
 
   async getEnableBrowserIntegrationFingerprint(options?: StorageOptions): Promise<boolean> {
     return (
-      (await this.getAccount(this.reconcileOptions(options, await this.defaultOnDiskOptions())))
-        ?.settings?.enableBrowserIntegrationFingerprint ?? false
+      (await this.getGlobals(this.reconcileOptions(options, await this.defaultOnDiskOptions())))
+        ?.enableBrowserIntegrationFingerprint ?? false
     );
   }
 
@@ -1015,12 +1015,12 @@ export class StateService<TAccount extends Account = Account>
     value: boolean,
     options?: StorageOptions
   ): Promise<void> {
-    const account = await this.getAccount(
+    const globals = await this.getGlobals(
       this.reconcileOptions(options, await this.defaultOnDiskOptions())
     );
-    account.settings.enableBrowserIntegrationFingerprint = value;
-    await this.saveAccount(
-      account,
+    globals.enableBrowserIntegrationFingerprint = value;
+    await this.saveGlobals(
+      globals,
       this.reconcileOptions(options, await this.defaultOnDiskOptions())
     );
   }
diff --git a/common/src/services/stateMigration.service.ts b/common/src/services/stateMigration.service.ts
index d9038b3a86..f6c0882fd3 100644
--- a/common/src/services/stateMigration.service.ts
+++ b/common/src/services/stateMigration.service.ts
@@ -206,6 +206,12 @@ export class StateMigrationService {
     globals.openAtLogin = (await this.get<boolean>(v1Keys.openAtLogin)) ?? globals.openAtLogin;
     globals.alwaysShowDock =
       (await this.get<boolean>(v1Keys.alwaysShowDock)) ?? globals.alwaysShowDock;
+    globals.enableBrowserIntegration =
+      (await this.get<boolean>(v1Keys.enableBrowserIntegration)) ??
+      globals.enableBrowserIntegration;
+    globals.enableBrowserIntegrationFingerprint =
+      (await this.get<boolean>(v1Keys.enableBrowserIntegrationFingerprint)) ??
+      globals.enableBrowserIntegrationFingerprint;
 
     const userId =
       (await this.get<string>(v1Keys.userId)) ?? (await this.get<string>(v1Keys.entityId));
@@ -234,10 +240,6 @@ export class StateMigrationService {
         enableAlwaysOnTop: await this.get<boolean>(v1Keys.enableAlwaysOnTop),
         enableAutoFillOnPageLoad: await this.get<boolean>(v1Keys.enableAutoFillOnPageLoad),
         enableBiometric: await this.get<boolean>(v1Keys.enableBiometric),
-        enableBrowserIntegration: await this.get<boolean>(v1Keys.enableBrowserIntegration),
-        enableBrowserIntegrationFingerprint: await this.get<boolean>(
-          v1Keys.enableBrowserIntegrationFingerprint
-        ),
         enableFullWidth: await this.get<boolean>(v1Keys.enableFullWidth),
         enableGravitars: await this.get<boolean>(v1Keys.enableGravatars),
         environmentUrls: globals.environmentUrls,
@@ -365,10 +367,6 @@ export class StateMigrationService {
         enableAlwaysOnTop: await this.get<boolean>(v1Keys.enableAlwaysOnTop),
         enableAutoFillOnPageLoad: await this.get<boolean>(v1Keys.enableAutoFillOnPageLoad),
         enableBiometric: await this.get<boolean>(v1Keys.enableBiometric),
-        enableBrowserIntegration: await this.get<boolean>(v1Keys.enableBrowserIntegration),
-        enableBrowserIntegrationFingerprint: await this.get<boolean>(
-          v1Keys.enableBrowserIntegrationFingerprint
-        ),
         enableFullWidth: await this.get<boolean>(v1Keys.enableFullWidth),
         enableGravitars: await this.get<boolean>(v1Keys.enableGravatars),
         environmentUrls: globals.environmentUrls,