Waiting for the focus to return from KeePassXC-desktop back to the page

Author: a2kolbasov

keepassxc-browser/content/passkeys.js

@@ -185,6 +185,33 @@
         throw new DOMException(errorMessage, 'UnknownError');
     };
 
+    /**
+     * @template T
+     * @param {() => T} callback
+     * @returns {Promise<T>}
+     */
+    const callOnFocus = function (callback) {
+        return new Promise((resolve) => {
+            // TODO: maybe need `window.top.document` -- for iframes?
+
+            if (document.hasFocus()) {
+                return resolve(callback());
+            }
+
+            const controller = new AbortController();
+
+            /** @param {Event} e */
+            function listener(e) {
+                if (!e.isTrusted) return;
+
+                controller.abort();
+                resolve(callback());
+            }
+
+            window.addEventListener('focus', listener, { capture: true, passive: true, signal: controller.signal });
+        });
+    };
+
     const originalCredentials = navigator.credentials;
 
     const passkeysCredentials = {
@@ -205,7 +232,7 @@
                     throwError(response?.errorCode, response?.errorMessage);
                     return null;
                 }
-                return originalCredentials.create(options);
+                return callOnFocus(() => originalCredentials.create(options));
             }
 
             return createPublicKeyCredential(response.publicKey);
@@ -231,7 +258,7 @@
                     throwError(response?.errorCode, response?.errorMessage);
                     return null;
                 }
-                return originalCredentials.get(options);
+                return callOnFocus(() => originalCredentials.get(options));
             }
 
             return createPublicKeyCredential(response.publicKey);