From a1228b6b7e69d405f6af3937f2baa117c4dd30ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20=C3=85berg?= <anders@andersaberg.com>
Date: Fri, 15 Aug 2025 15:28:36 +0200
Subject: [PATCH] Add feature flag to short-circuit the passkey provider
 (#16003)

* Add feature flag to short-circuit the passkey provider

* Check FF in renderer instead
---
 .../services/desktop-autofill.service.ts      | 33 ++++++++++++++++++-
 .../main/autofill/native-autofill.main.ts     |  2 +-
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/apps/desktop/src/autofill/services/desktop-autofill.service.ts b/apps/desktop/src/autofill/services/desktop-autofill.service.ts
index ef86a26b56f..aec09f03021 100644
--- a/apps/desktop/src/autofill/services/desktop-autofill.service.ts
+++ b/apps/desktop/src/autofill/services/desktop-autofill.service.ts
@@ -65,7 +65,7 @@ export class DesktopAutofillService implements OnDestroy {
       .getFeatureFlag$(FeatureFlag.MacOsNativeCredentialSync)
       .pipe(
         distinctUntilChanged(),
-        //filter((enabled) => enabled === true), // Only proceed if feature is enabled
+        filter((enabled) => enabled === true), // Only proceed if feature is enabled
         switchMap(() => {
           return combineLatest([
             this.accountService.activeAccount$.pipe(
@@ -191,6 +191,14 @@ export class DesktopAutofillService implements OnDestroy {
 
   listenIpc() {
     ipc.autofill.listenPasskeyRegistration(async (clientId, sequenceNumber, request, callback) => {
+      if (!(await this.configService.getFeatureFlag(FeatureFlag.MacOsNativeCredentialSync))) {
+        this.logService.debug(
+          "listenPasskeyRegistration: MacOsNativeCredentialSync feature flag is disabled",
+        );
+        callback(new Error("MacOsNativeCredentialSync feature flag is disabled"), null);
+        return;
+      }
+
       this.registrationRequest = request;
 
       this.logService.warning("listenPasskeyRegistration", clientId, sequenceNumber, request);
@@ -217,6 +225,14 @@ export class DesktopAutofillService implements OnDestroy {
 
     ipc.autofill.listenPasskeyAssertionWithoutUserInterface(
       async (clientId, sequenceNumber, request, callback) => {
+        if (!(await this.configService.getFeatureFlag(FeatureFlag.MacOsNativeCredentialSync))) {
+          this.logService.debug(
+            "listenPasskeyAssertionWithoutUserInterface: MacOsNativeCredentialSync feature flag is disabled",
+          );
+          callback(new Error("MacOsNativeCredentialSync feature flag is disabled"), null);
+          return;
+        }
+
         this.logService.warning(
           "listenPasskeyAssertion without user interface",
           clientId,
@@ -276,6 +292,14 @@ export class DesktopAutofillService implements OnDestroy {
     );
 
     ipc.autofill.listenPasskeyAssertion(async (clientId, sequenceNumber, request, callback) => {
+      if (!(await this.configService.getFeatureFlag(FeatureFlag.MacOsNativeCredentialSync))) {
+        this.logService.debug(
+          "listenPasskeyAssertion: MacOsNativeCredentialSync feature flag is disabled",
+        );
+        callback(new Error("MacOsNativeCredentialSync feature flag is disabled"), null);
+        return;
+      }
+
       this.logService.warning("listenPasskeyAssertion", clientId, sequenceNumber, request);
 
       const controller = new AbortController();
@@ -295,6 +319,13 @@ export class DesktopAutofillService implements OnDestroy {
 
     // Listen for native status messages
     ipc.autofill.listenNativeStatus(async (clientId, sequenceNumber, status) => {
+      if (!(await this.configService.getFeatureFlag(FeatureFlag.MacOsNativeCredentialSync))) {
+        this.logService.debug(
+          "listenNativeStatus: MacOsNativeCredentialSync feature flag is disabled",
+        );
+        return;
+      }
+
       this.logService.info("Received native status", status.key, status.value);
       if (status.key === "request-sync") {
         // perform ad-hoc sync
diff --git a/apps/desktop/src/platform/main/autofill/native-autofill.main.ts b/apps/desktop/src/platform/main/autofill/native-autofill.main.ts
index d14efefa81f..61b3bc5f48b 100644
--- a/apps/desktop/src/platform/main/autofill/native-autofill.main.ts
+++ b/apps/desktop/src/platform/main/autofill/native-autofill.main.ts
@@ -129,7 +129,7 @@ export class NativeAutofillMain {
       },
     );
 
-    ipcMain.on("autofill.listenerReady", async () => {
+    ipcMain.on("autofill.listenerReady", () => {
       this.listenerReady = true;
       this.logService.info(
         `Listener is ready, flushing ${this.messageBuffer.length} buffered messages`,