@getpara/react-sdk-lite 2.0.0-alpha.67 → 2.0.0-alpha.69

package/dist/provider/hooks/mutations/useVerifyExternalWallet.d.ts

@@ -17,17 +17,13 @@ export declare const VERIFY_EXTERNAL_WALLET_KEY = "VERIFY_EXTERNAL_WALLET";
 export declare const useVerifyExternalWallet: () => {
     status: "idle" | "pending" | "error" | "success";
     error: Error | null;
-    data: Compute<import("@getpara/web-sdk").AuthStateSignup | import("@getpara/web-sdk").AuthStateLogin> | undefined;
+    data: Compute<import("@getpara/web-sdk").AuthStateSignup | import("@getpara/web-sdk").AuthStateLogin | import("@getpara/core-sdk/dist/types/types/methods.js").AuthStateDone> | undefined;
     isSuccess: boolean;
-    variables: {
-        portalTheme?: import("@getpara/web-sdk").Theme | undefined;
-        useShortUrls?: boolean | undefined;
-        externalWallet: import("@getpara/web-sdk").ExternalWalletInfo;
-        signedMessage: string;
-        cosmosPublicKeyHex?: string | undefined;
-        cosmosSigner?: string | undefined;
-        sessionLookupId?: string | undefined;
-    } | undefined;
+    variables: Compute<(import("@getpara/core-sdk/dist/types/types/methods.js").WithCustomTheme & import("@getpara/core-sdk/dist/types/types/methods.js").WithUseShortUrls & {
+        serverAuthState: import("@getpara/shared").ServerAuthStateSignup | import("@getpara/shared").ServerAuthStateLogin | import("@getpara/shared").ServerAuthStateDone;
+    }) | (import("@getpara/core-sdk/dist/types/types/methods.js").WithCustomTheme & import("@getpara/core-sdk/dist/types/types/methods.js").WithUseShortUrls & import("@getpara/web-sdk").VerifyExternalWalletParams & {
+        serverAuthState?: undefined;
+    })> | undefined;
     isError: boolean;
     isIdle: boolean;
     isPending: boolean;
@@ -37,22 +33,14 @@ export declare const useVerifyExternalWallet: () => {
     failureReason: Error | null;
     isPaused: boolean;
     submittedAt: number;
-    verifyExternalWallet: import("@tanstack/react-query").UseMutateFunction<Compute<import("@getpara/web-sdk").AuthStateSignup | import("@getpara/web-sdk").AuthStateLogin>, Error, {
-        portalTheme?: import("@getpara/web-sdk").Theme | undefined;
-        useShortUrls?: boolean | undefined;
-        externalWallet: import("@getpara/web-sdk").ExternalWalletInfo;
-        signedMessage: string;
-        cosmosPublicKeyHex?: string | undefined;
-        cosmosSigner?: string | undefined;
-        sessionLookupId?: string | undefined;
-    }, unknown>;
-    verifyExternalWalletAsync: import("@tanstack/react-query").UseMutateAsyncFunction<Compute<import("@getpara/web-sdk").AuthStateSignup | import("@getpara/web-sdk").AuthStateLogin>, Error, {
-        portalTheme?: import("@getpara/web-sdk").Theme | undefined;
-        useShortUrls?: boolean | undefined;
-        externalWallet: import("@getpara/web-sdk").ExternalWalletInfo;
-        signedMessage: string;
-        cosmosPublicKeyHex?: string | undefined;
-        cosmosSigner?: string | undefined;
-        sessionLookupId?: string | undefined;
-    }, unknown>;
+    verifyExternalWallet: import("@tanstack/react-query").UseMutateFunction<Compute<import("@getpara/web-sdk").AuthStateSignup | import("@getpara/web-sdk").AuthStateLogin | import("@getpara/core-sdk/dist/types/types/methods.js").AuthStateDone>, Error, Compute<(import("@getpara/core-sdk/dist/types/types/methods.js").WithCustomTheme & import("@getpara/core-sdk/dist/types/types/methods.js").WithUseShortUrls & {
+        serverAuthState: import("@getpara/shared").ServerAuthStateSignup | import("@getpara/shared").ServerAuthStateLogin | import("@getpara/shared").ServerAuthStateDone;
+    }) | (import("@getpara/core-sdk/dist/types/types/methods.js").WithCustomTheme & import("@getpara/core-sdk/dist/types/types/methods.js").WithUseShortUrls & import("@getpara/web-sdk").VerifyExternalWalletParams & {
+        serverAuthState?: undefined;
+    })>, unknown>;
+    verifyExternalWalletAsync: import("@tanstack/react-query").UseMutateAsyncFunction<Compute<import("@getpara/web-sdk").AuthStateSignup | import("@getpara/web-sdk").AuthStateLogin | import("@getpara/core-sdk/dist/types/types/methods.js").AuthStateDone>, Error, Compute<(import("@getpara/core-sdk/dist/types/types/methods.js").WithCustomTheme & import("@getpara/core-sdk/dist/types/types/methods.js").WithUseShortUrls & {
+        serverAuthState: import("@getpara/shared").ServerAuthStateSignup | import("@getpara/shared").ServerAuthStateLogin | import("@getpara/shared").ServerAuthStateDone;
+    }) | (import("@getpara/core-sdk/dist/types/types/methods.js").WithCustomTheme & import("@getpara/core-sdk/dist/types/types/methods.js").WithUseShortUrls & import("@getpara/web-sdk").VerifyExternalWalletParams & {
+        serverAuthState?: undefined;
+    })>, unknown>;
 };

package/dist/provider/hooks/utils/useEventListeners.js

@@ -123,6 +123,7 @@ const useEventListeners = ({
     });
   }, [queryClient, refs.balancesInvalidationTime]);
   useEffect(() => {
+    if (typeof window === "undefined") return;
     window.addEventListener(ParaEvent.LOGIN_EVENT, loginListener);
     window.addEventListener(ParaEvent.ACCOUNT_SETUP_EVENT, accountSetupListener);
     window.addEventListener(ParaEvent.ACCOUNT_CREATION_EVENT, accountCreationListener);
@@ -136,6 +137,7 @@ const useEventListeners = ({
     window.addEventListener(ParaEvent.GUEST_WALLETS_CREATED, guestWalletsCreatedListener);
     window.addEventListener(ParaEvent.ASSET_TRANSFERRED, assetTransferListener);
     return () => {
+      if (typeof window === "undefined") return;
       window.removeEventListener(ParaEvent.LOGIN_EVENT, loginListener);
       window.removeEventListener(ParaEvent.ACCOUNT_SETUP_EVENT, accountSetupListener);
       window.removeEventListener(ParaEvent.ACCOUNT_CREATION_EVENT, accountCreationListener);

package/dist/provider/providers/AuthProvider.js

@@ -5,8 +5,8 @@ import {
   __spreadValues
 } from "../../chunk-MMUBH76A.js";
 import { jsx } from "react/jsx-runtime";
-import { useUserAgent } from "@getpara/react-common";
-import { createContext, useCallback, useContext, useEffect, useMemo, useState } from "react";
+import { openMobileUrl, useUserAgent } from "@getpara/react-common";
+import { createContext, useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
 import { useModalStore } from "../../modal/stores/index.js";
 import { ModalStep } from "../../modal/utils/steps.js";
 import {
@@ -29,15 +29,15 @@ import { openPopup } from "../../modal/utils/openPopup.js";
 import {
   AuthMethod,
   entityToWallet,
-  getPortalBaseURL
+  isMobile
 } from "@getpara/web-sdk";
 import { useInternalClient } from "../../provider/hooks/utils/useInternalClient.js";
 import { useGoBack } from "../../modal/hooks/useGoBack.js";
 import { isExternalWallet } from "@getpara/user-management-client";
-import { routeMobileExternalWallet } from "../../modal/utils/routeMobileExternalWallet.js";
 import { useStore } from "../stores/useStore.js";
 import { useFormattedBiometricHints } from "../hooks/utils/useFormattedBiometricHints.js";
 import { useQueryClient } from "@tanstack/react-query";
+import { validatePortalOrigin } from "../../modal/utils/validatePortalOrigin.js";
 const AuthContext = createContext({
   signUpOrLogIn: () => {
   },
@@ -127,6 +127,7 @@ function AuthProvider({
   const { data: biometricHints } = useFormattedBiometricHints();
   const [switchWalletsUrl, setSwitchWalletsUrl] = useState(void 0);
   const [isSwitchWalletsPending, setIsSwitchWalletsPending] = useState(mutateIsSwitchWalletsPending);
+  const messageHandlerRef = useRef(null);
   const goBackIfPopupClosedOnSteps = (steps) => {
     var _a;
     if (((_a = refs.popupWindow.current) == null ? void 0 : _a.closed) && (!refs.currentStep.current || steps.includes(refs.currentStep.current))) {
@@ -139,11 +140,12 @@ function AuthProvider({
     return !!stepNow && !steps.includes(stepNow);
   };
   const setupListener = () => {
-    window.addEventListener("message", function handleMessage(event) {
+    if (messageHandlerRef.current) {
+      window.removeEventListener("message", messageHandlerRef.current);
+    }
+    const handleMessage = (event) => {
       var _a;
-      const portalBase = getPortalBaseURL(para.ctx);
-      const portalLocalBase = getPortalBaseURL(para.ctx, true);
-      if (!event.origin.startsWith(portalBase) && !event.origin.startsWith(portalLocalBase)) {
+      if (!validatePortalOrigin(event, para.ctx)) {
         return;
       }
       if (((_a = event.data) == null ? void 0 : _a.type) === "CLOSE_WINDOW") {
@@ -151,11 +153,16 @@ function AuthProvider({
           setAuthStepRoute();
           setIFrameUrl();
           setIsIFrameReady(false);
-          setStep(ModalStep.AWAITING_ACCOUNT);
+          if (refs.currentStep.current !== ModalStep.LOGIN_DONE && refs.currentStep.current !== ModalStep.AWAITING_ACCOUNT) {
+            setStep(ModalStep.AWAITING_ACCOUNT);
+          }
         }
         window.removeEventListener("message", handleMessage);
+        messageHandlerRef.current = null;
       }
-    });
+    };
+    messageHandlerRef.current = handleMessage;
+    window.addEventListener("message", handleMessage);
   };
   const pollSignup = () => {
     if (typeof window !== "undefined") {
@@ -215,12 +222,14 @@ function AuthProvider({
           if (refs.currentStep.current !== ModalStep.AWAITING_BIOMETRIC_CREATION) {
             setStep(ModalStep.AWAITING_BIOMETRIC_CREATION);
           }
-          refs.popupWindow.current = openPopup({
-            url: authState.passkeyUrl,
-            target: "ParaPasskey",
-            type: "CREATE_PASSKEY",
-            current: refs.popupWindow.current
-          });
+          if (typeof window !== "undefined") {
+            refs.popupWindow.current = openPopup({
+              url: authState.passkeyUrl,
+              target: "ParaPasskey",
+              type: "CREATE_PASSKEY",
+              current: refs.popupWindow.current
+            });
+          }
           break;
         case AuthMethod.PASSWORD:
           setupListener();
@@ -264,13 +273,14 @@ function AuthProvider({
     [isIFrameReady]
   );
   const login = (authState) => {
-    if (authState.isWalletSelectionNeeded || authState.passkeyUrl) {
-      setStep(ModalStep.BIOMETRIC_LOGIN);
-    } else {
+    const hasPasskey = !!authState.passkeyUrl;
+    if (!hasPasskey) {
       setupListener();
       setIFrameUrl(authState.passwordUrl || authState.pinUrl);
       setIsIFrameReady(false);
       setStep(ModalStep.EMBEDDED_PASSWORD_LOGIN);
+    } else {
+      setStep(ModalStep.BIOMETRIC_LOGIN);
     }
     pollLogin();
   };
@@ -341,23 +351,49 @@ function AuthProvider({
         loginOverride();
         return;
       }
-      refs.popupWindow.current = openPopup({
-        url: isPIN ? authState.pinUrl : isPassword ? authState.passwordUrl : authState.passkeyUrl,
-        target: isPIN ? "ParaPIN" : isPassword ? "ParaPassword" : "ParaPasskey",
-        type: isPIN ? "LOGIN_PASSWORD" : isPassword ? "LOGIN_PASSWORD" : "LOGIN_PASSKEY",
-        current: refs.popupWindow.current
-      });
+      if (typeof window !== "undefined") {
+        refs.popupWindow.current = openPopup({
+          url: isPIN ? authState.pinUrl : isPassword ? authState.passwordUrl : authState.passkeyUrl,
+          target: isPIN ? "ParaPIN" : isPassword ? "ParaPassword" : "ParaPasskey",
+          type: isPIN ? "LOGIN_PASSWORD" : isPassword ? "LOGIN_PASSWORD" : "LOGIN_PASSKEY",
+          current: refs.popupWindow.current
+        });
+      }
       setStep(isPassword || isPIN ? ModalStep.AWAITING_PASSWORD_LOGIN : ModalStep.AWAITING_BIOMETRIC_LOGIN);
     },
     [loginState, biometricHints]
   );
   const onNewAuthState = (authState) => __async(this, null, function* () {
-    refs.popupWindow.current = null;
+    var _a, _b, _c;
     setAuthState(authState);
     switch (authState.stage) {
       case "verify":
-        if (isExternalWallet(authState.auth) && authState.signatureVerificationMessage) {
-          setStep(ModalStep.EXTERNAL_WALLET_VERIFICATION);
+        if (isExternalWallet(authState.auth)) {
+          if (authState.loginUrl && ((_a = authState.externalWallet) == null ? void 0 : _a.withFullParaAuth)) {
+            let isBasicLogin = false;
+            if (authState.nextStage === "login") {
+              isBasicLogin = authState.loginAuthMethods.includes(AuthMethod.BASIC_LOGIN);
+            } else {
+              isBasicLogin = authState.signupAuthMethods.includes(AuthMethod.BASIC_LOGIN);
+            }
+            if (authState.nextStage === "login") {
+              setFlow("login");
+              isBasicLogin && pollLogin();
+            } else {
+              setFlow("signup");
+              isBasicLogin && pollSignup();
+            }
+            if (!isMobile() && refs.popupWindow.current) {
+              refs.popupWindow.current.location.href = authState.loginUrl;
+              setStep(ModalStep.AWAITING_ACCOUNT);
+            } else {
+              setIFrameUrl(authState.loginUrl);
+              setStep(ModalStep.OTP);
+              setupListener();
+            }
+          } else {
+            setStep(ModalStep.EXTERNAL_WALLET_VERIFICATION);
+          }
         } else {
           if (authState.nextStage === "login") {
             setFlow("login");
@@ -398,12 +434,14 @@ function AuthProvider({
         }
         break;
       case "done":
-        if (authState.isNewUser) {
-          pollSignup();
-          setFlow("signup");
-        } else {
-          pollLogin();
-          setFlow("login");
+        if (!((_b = authState.externalWallet) == null ? void 0 : _b.withFullParaAuth) && !((_c = authState.externalWallet) == null ? void 0 : _c.withVerification)) {
+          if (authState.isNewUser) {
+            pollSignup();
+            setFlow("signup");
+          } else {
+            pollLogin();
+            setFlow("login");
+          }
         }
         if (!authState.isWalletSelectionNeeded) {
           setStep(ModalStep.AWAITING_ACCOUNT);
@@ -463,7 +501,7 @@ function AuthProvider({
         isCanceled: () => refs.currentStep.current !== ModalStep.FARCASTER_OAUTH,
         onConnectUri: (connectUri) => {
           setFarcasterConnectUri(connectUri);
-          routeMobileExternalWallet(connectUri);
+          openMobileUrl(connectUri);
         },
         useShortUrls: true,
         serverAuthState
@@ -722,6 +760,9 @@ function AuthProvider({
     return () => {
       var _a;
       window == null ? void 0 : window.clearTimeout((_a = refs.poll.current) == null ? void 0 : _a.timeout);
+      if (messageHandlerRef.current) {
+        window.removeEventListener("message", messageHandlerRef.current);
+      }
     };
   }, []);
   return /* @__PURE__ */ jsx(AuthContext.Provider, { value, children });

package/dist/provider/providers/ExternalWalletProvider.d.ts

@@ -51,7 +51,13 @@ type Value = Omit<ExternalWalletContextType<CosmosSignResult>, 'disconnect' | 'd
     };
     username?: string;
     avatar?: string;
-    connectExternalWallet: (wallet: CommonWallet, isMobile?: boolean, isManualWalletConnect?: boolean) => Promise<void>;
+    connectExternalWallet: (_: {
+        wallet: CommonWallet;
+        isMobile?: boolean;
+        isManualWalletConnect?: boolean;
+        isResetAfterManualWalletConnect?: boolean;
+        isRetryConnection?: boolean;
+    }) => Promise<void>;
     addAdditionalExternalWallet: (wallet: CommonWallet) => Promise<void>;
     disconnectExternalWallet: () => Promise<void>;
     setChainIdSwitchingTo: (chainId?: string) => void;