@swype-org/react-sdk 0.1.82 → 0.1.84

package/dist/index.cjs

@@ -715,7 +715,8 @@ function isSafari() {
 }
 var POPUP_RESULT_TIMEOUT_MS = 12e4;
 var POPUP_CLOSED_POLL_MS = 500;
-function createPasskeyViaPopup(options) {
+var POPUP_CLOSED_GRACE_MS = 1e3;
+function createPasskeyViaPopup(options, existingCredentialIds = []) {
   return new Promise((resolve, reject) => {
     const channelId = `swype-pk-${Date.now()}-${Math.random().toString(36).slice(2)}`;
     const payload = { ...options, channelId };
@@ -732,10 +733,28 @@ function createPasskeyViaPopup(options) {
       cleanup();
       reject(new Error("Passkey creation timed out. Please try again."));
     }, POPUP_RESULT_TIMEOUT_MS);
+    let closedGraceTimer = null;
     const closedPoll = setInterval(() => {
       if (popup.closed) {
-        cleanup();
-        reject(new Error("Passkey setup window was closed before completing."));
+        clearInterval(closedPoll);
+        closedGraceTimer = setTimeout(() => {
+          if (!settled) {
+            cleanup();
+            checkServerForNewPasskey(
+              options.authToken,
+              options.apiBaseUrl,
+              existingCredentialIds
+            ).then((result) => {
+              if (result) {
+                resolve(result);
+              } else {
+                reject(new Error("Passkey setup window was closed before completing."));
+              }
+            }).catch(() => {
+              reject(new Error("Passkey setup window was closed before completing."));
+            });
+          }
+        }, POPUP_CLOSED_GRACE_MS);
       }
     }, POPUP_CLOSED_POLL_MS);
     function handleResult(data) {
@@ -763,11 +782,24 @@ function createPasskeyViaPopup(options) {
     function cleanup() {
       clearTimeout(timer);
       clearInterval(closedPoll);
+      if (closedGraceTimer) clearTimeout(closedGraceTimer);
       window.removeEventListener("message", postMessageHandler);
       channel?.close();
     }
   });
 }
+async function checkServerForNewPasskey(authToken, apiBaseUrl, existingCredentialIds) {
+  if (!authToken || !apiBaseUrl) return null;
+  const res = await fetch(`${apiBaseUrl}/v1/users/config`, {
+    headers: { Authorization: `Bearer ${authToken}` }
+  });
+  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;
+}
 
 // src/hooks.ts
 var WALLET_CLIENT_MAX_ATTEMPTS = 15;
@@ -962,7 +994,9 @@ function buildPasskeyPopupOptions(params) {
       residentKey: "preferred",
       userVerification: "required"
     },
-    timeout: 6e4
+    timeout: 6e4,
+    authToken: params.authToken,
+    apiBaseUrl: params.apiBaseUrl
   };
 }
 async function deviceHasPasskey(credentialId) {
@@ -4581,6 +4615,7 @@ function SwypePaymentInner({
     if (typeof window === "undefined") return null;
     return window.localStorage.getItem(ACTIVE_CREDENTIAL_STORAGE_KEY);
   });
+  const [knownCredentialIds, setKnownCredentialIds] = react.useState([]);
   const [authInput, setAuthInput] = react.useState("");
   const [verificationTarget, setVerificationTarget] = react.useState(null);
   const [otpCode, setOtpCode] = react.useState("");
@@ -4870,6 +4905,7 @@ function SwypePaymentInner({
           setOneTapLimit(config.defaultAllowance);
         }
         const allPasskeys = config.passkeys ?? (config.passkey ? [config.passkey] : []);
+        setKnownCredentialIds(allPasskeys.map((p) => p.credentialId));
         if (allPasskeys.length === 0) {
           setStep("create-passkey");
           return;
@@ -5386,12 +5422,18 @@ function SwypePaymentInner({
     setRegisteringPasskey(true);
     setError(null);
     try {
+      const token = await getAccessToken();
       const passkeyDisplayName = user?.email?.address ?? user?.google?.name ?? user?.id ?? "Swype User";
       const popupOptions = buildPasskeyPopupOptions({
         userId: user?.id ?? "unknown",
-        displayName: passkeyDisplayName
+        displayName: passkeyDisplayName,
+        authToken: token ?? void 0,
+        apiBaseUrl
       });
-      const { credentialId, publicKey } = await createPasskeyViaPopup(popupOptions);
+      const { credentialId, publicKey } = await createPasskeyViaPopup(
+        popupOptions,
+        knownCredentialIds
+      );
       await completePasskeyRegistration(credentialId, publicKey);
     } catch (err) {
       captureException(err);
@@ -5399,7 +5441,7 @@ function SwypePaymentInner({
     } finally {
       setRegisteringPasskey(false);
     }
-  }, [user, completePasskeyRegistration]);
+  }, [user, completePasskeyRegistration, getAccessToken, apiBaseUrl, knownCredentialIds]);
   const handleSelectProvider = react.useCallback((providerId) => {
     setSelectedProviderId(providerId);
     setSelectedAccountId(null);