@swype-org/react-sdk 0.1.266 → 0.1.268

package/dist/index.js

@@ -8263,7 +8263,6 @@ function usePasskeyCheckEffect(deps) {
             const existingTransfer = await fetchTransfer(apiBaseUrl, token, persisted.transferId);
             if (cancelled) return;
             if (existingTransfer.status === "COMPLETED") {
-              clearMobileFlowState();
               if (persisted.isGuestPreauth && persisted.guestSessionToken) {
                 let guestLookup = null;
                 try {
@@ -8272,19 +8271,32 @@ function usePasskeyCheckEffect(deps) {
                     persisted.guestSessionToken
                   );
                 } catch {
-                  dispatch({ type: "MOBILE_RESUME_SUCCESS", transfer: existingTransfer });
-                  onCompleteRef.current?.(existingTransfer);
+                  persistMobileFlowState({
+                    deeplinkUri: persisted.deeplinkUri,
+                    providerId: persisted.providerId ?? null,
+                    isSetup: persisted.isSetup ?? true,
+                    guestSessionToken: persisted.guestSessionToken,
+                    transferId: persisted.transferId,
+                    isGuestPreauth: true,
+                    accountId: persisted.accountId,
+                    sessionId: persisted.sessionId
+                  });
                   return;
                 }
                 if (guestLookup == null) {
-                  dispatch({
-                    type: "MOBILE_RESUME_SUCCESS",
-                    transfer: existingTransfer,
-                    guestCheckoutResume: { guestSessionToken: persisted.guestSessionToken }
+                  persistMobileFlowState({
+                    deeplinkUri: persisted.deeplinkUri,
+                    providerId: persisted.providerId ?? null,
+                    isSetup: persisted.isSetup ?? true,
+                    guestSessionToken: persisted.guestSessionToken,
+                    transferId: persisted.transferId,
+                    isGuestPreauth: true,
+                    accountId: persisted.accountId,
+                    sessionId: persisted.sessionId
                   });
-                  onCompleteRef.current?.(existingTransfer);
                   return;
                 }
+                clearMobileFlowState();
                 dispatch({
                   type: "GUEST_PREAUTH_RESUME_WITH_TRANSFER",
                   transfer: existingTransfer,
@@ -8296,6 +8308,7 @@ function usePasskeyCheckEffect(deps) {
                 onCompleteRef.current?.(existingTransfer);
                 return;
               }
+              clearMobileFlowState();
               dispatch({ type: "MOBILE_RESUME_SUCCESS", transfer: existingTransfer });
               onCompleteRef.current?.(existingTransfer);
               return;
@@ -8583,6 +8596,7 @@ function useProcessingEffect(deps) {
     if (!state.transfer && (polling.transfer.status === "COMPLETED" || polling.transfer.status === "FAILED")) {
       return;
     }
+    if (state.isGuestFlow) return;
     if (polling.transfer.status === "COMPLETED") {
       clearMobileFlowState();
       dispatch({ type: "TRANSFER_COMPLETED", transfer: polling.transfer });
@@ -8597,6 +8611,7 @@ function useProcessingEffect(deps) {
     state.transfer,
     state.loginRequested,
     state.verificationTarget,
+    state.isGuestFlow,
     onComplete,
     dispatch,
     reloadAccounts
@@ -8680,7 +8695,7 @@ function useMobilePollingEffect(deps) {
     if (!state.mobileFlow || !mobileSetupFlowRef.current) return;
     if (!setupAccountIdRef.current) return;
     if (!state.guestPreauthSessionId || !state.isGuestFlow) return;
-    const guestToken = state.guestSessionToken;
+    const guestToken = state.guestSessionToken ?? loadMobileFlowState()?.guestSessionToken ?? null;
     const preauthAccountId = state.guestPreauthAccountId;
     const preauthSessionId = state.guestPreauthSessionId;
     let cancelled = false;
@@ -8689,7 +8704,6 @@ function useMobilePollingEffect(deps) {
     const finishMobileAndDispatch = async () => {
       mobileSetupFlowRef.current = false;
       setupAccountIdRef.current = null;
-      clearMobileFlowState();
       try {
         await reloadAccounts();
       } catch {
@@ -8700,6 +8714,7 @@ function useMobilePollingEffect(deps) {
       completedGuestPreauth = true;
       cancelled = true;
       await finishMobileAndDispatch();
+      clearMobileFlowState();
       dispatch({ type: "MOBILE_SETUP_COMPLETE" });
     };
     const completeGuestPreauthWithAccount = async (guestLookup) => {
@@ -8727,6 +8742,18 @@ function useMobilePollingEffect(deps) {
         const guestLookup = await fetchGuestAccount(apiBaseUrl, guestToken);
         if (cancelled) return;
         if (guestLookup != null) {
+          if (preauthSessionId) {
+            try {
+              const session = await fetchAuthorizationSession(
+                apiBaseUrl,
+                preauthSessionId
+              );
+              if (cancelled) return;
+              if (session.status !== "AUTHORIZED") return;
+            } catch {
+              return;
+            }
+          }
           await completeGuestPreauthWithAccount(guestLookup);
         }
       } catch {
@@ -8900,63 +8927,97 @@ function guestPreauthRestoreKey(guestToken) {
 function useGuestPreauthMobileRestoreEffect(deps) {
   const { dispatch, apiBaseUrl, privyReady, mobileSetupFlowRef, setupAccountIdRef } = deps;
   const completedRef = useRef(false);
+  const pollingCleanupRef = useRef(null);
   useEffect(() => {
     if (!privyReady) return;
-    const persisted = loadMobileFlowState();
-    if (!persisted?.isGuestPreauth || !persisted.guestSessionToken) {
-      return;
-    }
-    const guestToken = persisted.guestSessionToken;
-    const key = guestPreauthRestoreKey(guestToken);
-    if (guestPreauthRestoreAttemptedKeys.has(key)) return;
-    guestPreauthRestoreAttemptedKeys.add(key);
-    if (completedRef.current) return;
-    let cancelled = false;
-    const POLL_INTERVAL_MS = 3e3;
-    const handleAccountFound = async (guestLookup) => {
+    const tryStart = () => {
       if (completedRef.current) return;
-      completedRef.current = true;
-      cancelled = true;
-      clearMobileFlowState();
-      mobileSetupFlowRef.current = false;
-      setupAccountIdRef.current = null;
-      dispatch({
-        type: "GUEST_PREAUTH_DETECTED",
-        accountId: guestLookup.accountId,
-        sessionId: persisted.sessionId ?? void 0
-      });
-      dispatch({ type: "REQUEST_LOGIN" });
-      dispatch({ type: "MOBILE_SETUP_COMPLETE" });
-    };
-    const pollGuestAccount = async () => {
-      try {
-        if (cancelled) return;
-        const guestLookup = await fetchGuestAccount(apiBaseUrl, guestToken);
-        if (cancelled) return;
-        if (guestLookup != null) {
-          await handleAccountFound(guestLookup);
-        }
-      } catch {
+      const persisted = loadMobileFlowState();
+      if (!persisted?.isGuestPreauth || !persisted.guestSessionToken) {
+        return;
       }
+      const guestToken = persisted.guestSessionToken;
+      const key = guestPreauthRestoreKey(guestToken);
+      if (guestPreauthRestoreAttemptedKeys.has(key)) return;
+      guestPreauthRestoreAttemptedKeys.add(key);
+      let cancelled = false;
+      const POLL_INTERVAL_MS = 3e3;
+      mobileSetupFlowRef.current = true;
+      if (persisted.accountId) {
+        setupAccountIdRef.current = persisted.accountId;
+      }
+      const handleAccountFound = async (guestLookup) => {
+        if (completedRef.current) return;
+        completedRef.current = true;
+        cancelled = true;
+        clearMobileFlowState();
+        mobileSetupFlowRef.current = false;
+        setupAccountIdRef.current = null;
+        dispatch({
+          type: "GUEST_PREAUTH_DETECTED",
+          accountId: guestLookup.accountId,
+          sessionId: persisted.sessionId ?? void 0
+        });
+        dispatch({ type: "REQUEST_LOGIN" });
+        dispatch({ type: "MOBILE_SETUP_COMPLETE" });
+      };
+      const pollGuestAccount = async () => {
+        try {
+          if (cancelled) return;
+          const guestLookup = await fetchGuestAccount(apiBaseUrl, guestToken);
+          if (cancelled) return;
+          if (guestLookup != null) {
+            if (persisted.sessionId) {
+              try {
+                const session = await fetchAuthorizationSession(
+                  apiBaseUrl,
+                  persisted.sessionId
+                );
+                if (cancelled) return;
+                if (session.status !== "AUTHORIZED") return;
+              } catch {
+                return;
+              }
+            }
+            await handleAccountFound(guestLookup);
+          }
+        } catch {
+        }
+      };
+      pollGuestAccount();
+      const intervalId = window.setInterval(pollGuestAccount, POLL_INTERVAL_MS);
+      const handlePollVisibility = () => {
+        if (document.visibilityState === "visible" && !cancelled) void pollGuestAccount();
+      };
+      const handlePollPageShow = (e) => {
+        if (e.persisted && !cancelled) void pollGuestAccount();
+      };
+      document.addEventListener("visibilitychange", handlePollVisibility);
+      window.addEventListener("pageshow", handlePollPageShow);
+      pollingCleanupRef.current = () => {
+        cancelled = true;
+        window.clearInterval(intervalId);
+        document.removeEventListener("visibilitychange", handlePollVisibility);
+        window.removeEventListener("pageshow", handlePollPageShow);
+        if (!completedRef.current) {
+          guestPreauthRestoreAttemptedKeys.delete(key);
+        }
+        pollingCleanupRef.current = null;
+      };
     };
-    pollGuestAccount();
-    const intervalId = window.setInterval(pollGuestAccount, POLL_INTERVAL_MS);
-    const handleVisibility = () => {
-      if (document.visibilityState === "visible" && !cancelled) void pollGuestAccount();
+    const onOuterVisibility = () => {
+      if (document.visibilityState === "visible") tryStart();
     };
-    const handlePageShow = (e) => {
-      if (e.persisted && !cancelled) void pollGuestAccount();
+    const onOuterPageShow = (e) => {
+      if (e.persisted) tryStart();
     };
-    document.addEventListener("visibilitychange", handleVisibility);
-    window.addEventListener("pageshow", handlePageShow);
+    tryStart();
+    document.addEventListener("visibilitychange", onOuterVisibility);
+    window.addEventListener("pageshow", onOuterPageShow);
     return () => {
-      cancelled = true;
-      window.clearInterval(intervalId);
-      document.removeEventListener("visibilitychange", handleVisibility);
-      window.removeEventListener("pageshow", handlePageShow);
-      if (!completedRef.current) {
-        guestPreauthRestoreAttemptedKeys.delete(key);
-      }
+      document.removeEventListener("visibilitychange", onOuterVisibility);
+      window.removeEventListener("pageshow", onOuterPageShow);
+      pollingCleanupRef.current?.();
     };
   }, [privyReady, apiBaseUrl, dispatch, mobileSetupFlowRef, setupAccountIdRef]);
 }