@swype-org/react-sdk 0.1.86 → 0.1.88

package/dist/index.cjs

@@ -728,10 +728,10 @@ function isSafari() {
 var POPUP_RESULT_TIMEOUT_MS = 12e4;
 var POPUP_CLOSED_POLL_MS = 500;
 var POPUP_CLOSED_GRACE_MS = 1e3;
-function createPasskeyViaPopup(options, existingCredentialIds = []) {
+function createPasskeyViaPopup(options) {
   return new Promise((resolve, reject) => {
-    const channelId = `swype-pk-${Date.now()}-${Math.random().toString(36).slice(2)}`;
-    const payload = { ...options, channelId };
+    const verificationToken = crypto.randomUUID();
+    const payload = { ...options, verificationToken };
     const encoded = btoa(JSON.stringify(payload));
     const popupUrl = `${window.location.origin}/passkey-register#${encoded}`;
     const popup = window.open(popupUrl, "swype-passkey");
@@ -740,22 +740,21 @@ function createPasskeyViaPopup(options, existingCredentialIds = []) {
       return;
     }
     let settled = false;
-    const channel = typeof BroadcastChannel !== "undefined" ? new BroadcastChannel(channelId) : null;
     const timer = setTimeout(() => {
       cleanup();
       reject(new Error("Passkey creation timed out. Please try again."));
     }, POPUP_RESULT_TIMEOUT_MS);
-    let closedGraceTimer = null;
     const closedPoll = setInterval(() => {
       if (popup.closed) {
         clearInterval(closedPoll);
-        closedGraceTimer = setTimeout(() => {
+        setTimeout(() => {
           if (!settled) {
+            settled = true;
             cleanup();
-            checkServerForNewPasskey(
+            checkServerForPasskeyByToken(
               options.authToken,
               options.apiBaseUrl,
-              existingCredentialIds
+              verificationToken
             ).then((result) => {
               if (result) {
                 resolve(result);
@@ -769,42 +768,20 @@ function createPasskeyViaPopup(options, existingCredentialIds = []) {
         }, POPUP_CLOSED_GRACE_MS);
       }
     }, POPUP_CLOSED_POLL_MS);
-    function handleResult(data) {
-      if (settled) return;
-      if (!data || typeof data !== "object") return;
-      if (data.type !== "swype:passkey-popup-result") return;
-      settled = true;
-      cleanup();
-      if (data.error) {
-        reject(new Error(data.error));
-      } else if (data.result) {
-        resolve(data.result);
-      } else {
-        reject(new Error("Invalid passkey popup response."));
-      }
-    }
-    if (channel) {
-      channel.onmessage = (event) => handleResult(event.data);
-    }
-    const postMessageHandler = (event) => {
-      if (event.source !== popup) return;
-      handleResult(event.data);
-    };
-    window.addEventListener("message", postMessageHandler);
     function cleanup() {
       clearTimeout(timer);
       clearInterval(closedPoll);
-      if (closedGraceTimer) clearTimeout(closedGraceTimer);
-      window.removeEventListener("message", postMessageHandler);
-      channel?.close();
     }
   });
 }
 var VERIFY_POPUP_TIMEOUT_MS = 6e4;
 function findDevicePasskeyViaPopup(options) {
   return new Promise((resolve, reject) => {
-    const channelId = `swype-pv-${Date.now()}-${Math.random().toString(36).slice(2)}`;
-    const payload = { ...options, channelId };
+    const verificationToken = crypto.randomUUID();
+    const payload = {
+      ...options,
+      verificationToken
+    };
     const encoded = btoa(JSON.stringify(payload));
     const popupUrl = `${window.location.origin}/passkey-verify#${encoded}`;
     const popup = window.open(popupUrl, "swype-passkey-verify");
@@ -813,7 +790,6 @@ function findDevicePasskeyViaPopup(options) {
       return;
     }
     let settled = false;
-    const channel = typeof BroadcastChannel !== "undefined" ? new BroadcastChannel(channelId) : null;
     const timer = setTimeout(() => {
       cleanup();
       resolve(null);
@@ -823,44 +799,28 @@ function findDevicePasskeyViaPopup(options) {
         clearInterval(closedPoll);
         setTimeout(() => {
           if (!settled) {
+            settled = true;
             cleanup();
-            resolve(null);
+            checkServerForPasskeyByToken(
+              options.authToken,
+              options.apiBaseUrl,
+              verificationToken
+            ).then((result) => {
+              resolve(result?.credentialId ?? null);
+            }).catch(() => {
+              resolve(null);
+            });
           }
         }, POPUP_CLOSED_GRACE_MS);
       }
     }, POPUP_CLOSED_POLL_MS);
-    function handleResult(data) {
-      if (settled) return;
-      if (!data || typeof data !== "object") return;
-      if (data.type !== "swype:passkey-verify-result") return;
-      settled = true;
-      cleanup();
-      if (data.error) {
-        resolve(null);
-      } else if (data.result && typeof data.result === "object") {
-        const result = data.result;
-        resolve(result.credentialId ?? null);
-      } else {
-        resolve(null);
-      }
-    }
-    if (channel) {
-      channel.onmessage = (event) => handleResult(event.data);
-    }
-    const postMessageHandler = (event) => {
-      if (event.source !== popup) return;
-      handleResult(event.data);
-    };
-    window.addEventListener("message", postMessageHandler);
     function cleanup() {
       clearTimeout(timer);
       clearInterval(closedPoll);
-      window.removeEventListener("message", postMessageHandler);
-      channel?.close();
     }
   });
 }
-async function checkServerForNewPasskey(authToken, apiBaseUrl, existingCredentialIds) {
+async function checkServerForPasskeyByToken(authToken, apiBaseUrl, verificationToken) {
   if (!authToken || !apiBaseUrl) return null;
   const res = await fetch(`${apiBaseUrl}/v1/users/config`, {
     headers: { Authorization: `Bearer ${authToken}` }
@@ -868,9 +828,8 @@ async function checkServerForNewPasskey(authToken, apiBaseUrl, existingCredentia
   if (!res.ok) return null;
   const body = await res.json();
   const passkeys = body.config.passkeys ?? [];
-  const existingSet = new Set(existingCredentialIds);
-  const newPasskey = passkeys.find((p) => !existingSet.has(p.credentialId));
-  return newPasskey ?? null;
+  const matched = passkeys.find((p) => p.lastVerificationToken === verificationToken);
+  return matched ? { credentialId: matched.credentialId, publicKey: matched.publicKey } : null;
 }
 
 // src/hooks.ts
@@ -5575,30 +5534,42 @@ function SwypePaymentInner({
         authToken: token ?? void 0,
         apiBaseUrl
       });
-      const { credentialId, publicKey } = await createPasskeyViaPopup(
-        popupOptions,
-        knownCredentialIds
-      );
-      await completePasskeyRegistration(credentialId, publicKey);
+      const { credentialId } = await createPasskeyViaPopup(popupOptions);
+      setActiveCredentialId(credentialId);
+      localStorage.setItem(ACTIVE_CREDENTIAL_STORAGE_KEY, credentialId);
+      setPasskeyPopupNeeded(false);
+      const resolved = resolvePostAuthStep({
+        hasPasskey: true,
+        accounts,
+        persistedMobileFlow: loadMobileFlowState(),
+        mobileSetupInProgress: mobileSetupFlowRef.current,
+        connectingNewAccount
+      });
+      if (resolved.clearPersistedFlow) {
+        clearMobileFlowState();
+      }
+      setStep(resolved.step);
     } catch (err) {
       captureException(err);
       setError(err instanceof Error ? err.message : "Failed to register passkey");
     } finally {
       setRegisteringPasskey(false);
     }
-  }, [user, completePasskeyRegistration, getAccessToken, apiBaseUrl, knownCredentialIds]);
+  }, [user, getAccessToken, apiBaseUrl, accounts, connectingNewAccount]);
   const handleVerifyPasskeyViaPopup = react.useCallback(async () => {
     setVerifyingPasskeyPopup(true);
     setError(null);
     try {
+      const token = await getAccessToken();
       const matched = await findDevicePasskeyViaPopup({
         credentialIds: knownCredentialIds,
-        rpId: resolvePasskeyRpId()
+        rpId: resolvePasskeyRpId(),
+        authToken: token ?? void 0,
+        apiBaseUrl
       });
       if (matched) {
         setActiveCredentialId(matched);
         window.localStorage.setItem(ACTIVE_CREDENTIAL_STORAGE_KEY, matched);
-        const token = await getAccessToken();
         if (token) {
           reportPasskeyActivity(apiBaseUrl, token, matched).catch(() => {
           });