[SG-569] Native Messaging settings bug (#3285)

* Fix bug where updating setting wasn't starting the native messaging listener * Update test runner error message
bitwarden · Aug 15, 2022 · 0b7c93d · 0b7c93d
1 parent 77fa364
commit 0b7c93d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/apps/desktop/native-messaging-test-runner/src/test-ipc.ts b/apps/desktop/native-messaging-test-runner/src/test-ipc.ts
@@ -24,7 +24,9 @@ export default class TestIPC {
 
         ipc.of.bitwarden.on("error", (err: any) => {
           console.error("error", err);
-          console.log("\x1b[33m Please make sure the desktop app is running locally \x1b[0m");
+          console.log(
+            "\x1b[33m Please make sure the desktop app is running locally and 'Allow DuckDuckGo browser integration' setting is enabled \x1b[0m"
+          );
         });
 
         ipc.of.bitwarden.on("disconnect", () => {

diff --git a/apps/desktop/src/app/accounts/settings.component.ts b/apps/desktop/src/app/accounts/settings.component.ts
@@ -444,7 +444,7 @@ export class SettingsComponent implements OnInit {
       this.enableDuckDuckGoBrowserIntegration
     );
     this.messagingService.send(
-      this.enableBrowserIntegration
+      this.enableDuckDuckGoBrowserIntegration
         ? "enableDuckDuckGoBrowserIntegration"
         : "disableDuckDuckGoBrowserIntegration"
     );

diff --git a/apps/desktop/src/main.ts b/apps/desktop/src/main.ts
@@ -173,7 +173,7 @@ export class Main {
 
         if (
           (await this.stateService.getEnableBrowserIntegration()) ||
-          this.stateService.getEnableDuckDuckGoBrowserIntegration()
+          (await this.stateService.getEnableDuckDuckGoBrowserIntegration())
         ) {
           this.nativeMessagingMain.listen();
         }