@phantom/react-native-sdk 1.0.0-beta.2 → 1.0.0-beta.21

package/dist/index.mjs

@@ -1,12 +1,14 @@
 // src/PhantomProvider.tsx
 import { createContext, useContext, useState, useEffect, useMemo } from "react";
 import { EmbeddedProvider } from "@phantom/embedded-provider-core";
+import { ANALYTICS_HEADERS, DEFAULT_WALLET_API_URL, DEFAULT_EMBEDDED_WALLET_TYPE, DEFAULT_AUTH_URL as DEFAULT_AUTH_URL2 } from "@phantom/constants";
 
 // src/providers/embedded/storage.ts
 import * as SecureStore from "expo-secure-store";
 var ExpoSecureStorage = class {
   constructor(requireAuth = false) {
     this.sessionKey = "phantom_session";
+    this.logoutFlagKey = "phantom_should_clear_previous_session";
     this.requireAuth = requireAuth;
   }
   async saveSession(session) {
@@ -41,6 +43,36 @@ var ExpoSecureStorage = class {
       console.error("[ExpoSecureStorage] Failed to clear session", { error: error.message });
     }
   }
+  async getShouldClearPreviousSession() {
+    try {
+      const flagData = await SecureStore.getItemAsync(this.logoutFlagKey, {
+        requireAuthentication: false
+        // Don't require auth for this flag
+      });
+      if (!flagData) {
+        return false;
+      }
+      return flagData === "true";
+    } catch (error) {
+      console.error("[ExpoSecureStorage] Failed to get shouldClearPreviousSession flag", {
+        error: error.message
+      });
+      return false;
+    }
+  }
+  async setShouldClearPreviousSession(should) {
+    try {
+      await SecureStore.setItemAsync(this.logoutFlagKey, should.toString(), {
+        requireAuthentication: false,
+        // Don't require auth for this flag
+        keychainAccessible: SecureStore.WHEN_UNLOCKED_THIS_DEVICE_ONLY
+      });
+    } catch (error) {
+      console.error("[ExpoSecureStorage] Failed to set shouldClearPreviousSession flag", {
+        error: error.message
+      });
+    }
+  }
   async isAvailable() {
     return await SecureStore.isAvailableAsync();
   }
@@ -52,29 +84,34 @@ var ExpoSecureStorage = class {
 
 // src/providers/embedded/auth.ts
 import * as WebBrowser from "expo-web-browser";
-var DEFAULT_AUTH_URL = "https://auth.phantom.app";
+import { Platform } from "react-native";
+import { DEFAULT_AUTH_URL } from "@phantom/constants";
 var ExpoAuthProvider = class {
   async authenticate(options) {
     if ("jwtToken" in options) {
       return;
     }
     const phantomOptions = options;
-    const { authUrl, redirectUrl, organizationId, parentOrganizationId, sessionId, provider, customAuthData, appId } = phantomOptions;
+    const { authUrl, redirectUrl, publicKey, sessionId, provider, appId } = phantomOptions;
     if (!redirectUrl) {
       throw new Error("redirectUrl is required for web browser authentication");
     }
-    if (!organizationId || !sessionId || !appId) {
-      throw new Error("organizationId, sessionId and appId are required for authentication");
+    if (!publicKey || !sessionId || !appId) {
+      throw new Error("publicKey, sessionId and appId are required for authentication");
     }
     try {
       const baseUrl = authUrl || DEFAULT_AUTH_URL;
       const params = new URLSearchParams({
-        organization_id: organizationId,
-        parent_organization_id: parentOrganizationId,
+        public_key: publicKey,
         app_id: appId,
         redirect_uri: redirectUrl,
         session_id: sessionId,
-        clear_previous_session: "true"
+        // OAuth session management - defaults to allow refresh unless explicitly clearing after logout
+        clear_previous_session: (phantomOptions.clearPreviousSession ?? false).toString(),
+        allow_refresh: (phantomOptions.allowRefresh ?? true).toString(),
+        sdk_version: "1.0.0-beta.21",
+        sdk_type: "react-native",
+        platform: Platform.OS
       });
       if (provider) {
         console.log("[ExpoAuthProvider] Provider specified, will skip selection", { provider });
@@ -83,19 +120,13 @@ var ExpoAuthProvider = class {
         console.log("[ExpoAuthProvider] No provider specified, defaulting to Google");
         params.append("provider", "google");
       }
-      if (customAuthData) {
-        console.log("[ExpoAuthProvider] Adding custom auth data");
-        params.append("authData", JSON.stringify(customAuthData));
-      }
       const fullAuthUrl = `${baseUrl}?${params.toString()}`;
       console.log("[ExpoAuthProvider] Starting authentication", {
         baseUrl,
         redirectUrl,
-        organizationId,
-        parentOrganizationId,
+        publicKey,
         sessionId,
-        provider,
-        hasCustomData: !!customAuthData
+        provider
       });
       await WebBrowser.warmUpAsync();
       const result = await WebBrowser.openAuthSessionAsync(fullAuthUrl, redirectUrl, {
@@ -109,15 +140,33 @@ var ExpoAuthProvider = class {
       if (result.type === "success" && result.url) {
         const url = new URL(result.url);
         const walletId = url.searchParams.get("wallet_id");
+        const organizationId = url.searchParams.get("organization_id");
         const provider2 = url.searchParams.get("provider");
         const accountDerivationIndex = url.searchParams.get("selected_account_index");
+        const expiresInMs = url.searchParams.get("expires_in_ms");
+        const authUserId = url.searchParams.get("auth_user_id");
         if (!walletId) {
           throw new Error("Authentication failed: no walletId in redirect URL");
         }
+        if (!organizationId) {
+          console.error("[ExpoAuthProvider] Missing organizationId in redirect URL", { url: result.url });
+          throw new Error("Authentication failed: no organizationId in redirect URL");
+        }
+        console.log("[ExpoAuthProvider] Auth redirect parameters", {
+          walletId,
+          organizationId,
+          provider: provider2,
+          accountDerivationIndex,
+          expiresInMs,
+          authUserId
+        });
         return {
           walletId,
+          organizationId,
           provider: provider2 || void 0,
-          accountDerivationIndex: accountDerivationIndex ? parseInt(accountDerivationIndex) : void 0
+          accountDerivationIndex: accountDerivationIndex ? parseInt(accountDerivationIndex) : 0,
+          expiresInMs: expiresInMs ? parseInt(expiresInMs) : 0,
+          authUserId: authUserId || void 0
         };
       } else if (result.type === "cancel") {
         throw new Error("User cancelled authentication");
@@ -218,7 +267,7 @@ var ReactNativeStamper = class {
     this.algorithm = Algorithm.ed25519;
     this.type = "PKI";
     this.keyPrefix = config.keyPrefix || "phantom-rn-stamper";
-    this.organizationId = config.organizationId || "default";
+    this.appId = config.appId || "default";
   }
   /**
    * Initialize the stamper and generate/load cryptographic keys
@@ -371,10 +420,10 @@ var ReactNativeStamper = class {
     return null;
   }
   getActiveKeyName() {
-    return `${this.keyPrefix}-${this.organizationId}-active`;
+    return `${this.keyPrefix}-${this.appId}-active`;
   }
   getPendingKeyName() {
-    return `${this.keyPrefix}-${this.organizationId}-pending`;
+    return `${this.keyPrefix}-${this.appId}-pending`;
   }
 };
 
@@ -405,8 +454,22 @@ var ExpoLogger = class {
   }
 };
 
+// src/providers/embedded/phantom-app.ts
+var ReactNativePhantomAppProvider = class {
+  isAvailable() {
+    return false;
+  }
+  authenticate(_options) {
+    return Promise.reject(
+      new Error(
+        "Phantom app authentication is not available in React Native. Please use other authentication methods like Google, Apple, or JWT."
+      )
+    );
+  }
+};
+
 // src/PhantomProvider.tsx
-import { Platform } from "react-native";
+import { Platform as Platform2 } from "react-native";
 import { jsx } from "react/jsx-runtime";
 var PhantomContext = createContext(void 0);
 function PhantomProvider({ children, config, debugConfig }) {
@@ -415,48 +478,65 @@ function PhantomProvider({ children, config, debugConfig }) {
   const [connectError, setConnectError] = useState(null);
   const [addresses, setAddresses] = useState([]);
   const [walletId, setWalletId] = useState(null);
-  const [sdk, setSdk] = useState(null);
+  const [user, setUser] = useState(null);
   const memoizedConfig = useMemo(() => {
     const redirectUrl = config.authOptions?.redirectUrl || `${config.scheme}://phantom-auth-callback`;
     return {
       ...config,
+      apiBaseUrl: config.apiBaseUrl || DEFAULT_WALLET_API_URL,
+      embeddedWalletType: config.embeddedWalletType || DEFAULT_EMBEDDED_WALLET_TYPE,
       authOptions: {
         ...config.authOptions || {},
-        redirectUrl
+        redirectUrl,
+        authUrl: config.authOptions?.authUrl || DEFAULT_AUTH_URL2
       }
     };
   }, [config]);
-  useEffect(() => {
+  const sdk = useMemo(() => {
     const storage = new ExpoSecureStorage();
     const authProvider = new ExpoAuthProvider();
     const urlParamsAccessor = new ExpoURLParamsAccessor();
     const logger = new ExpoLogger(debugConfig?.enabled || false);
     const stamper = new ReactNativeStamper({
-      keyPrefix: `phantom-rn-${memoizedConfig.organizationId}`,
-      organizationId: memoizedConfig.organizationId
+      keyPrefix: `phantom-rn-${memoizedConfig.appId}`,
+      appId: memoizedConfig.appId
     });
+    const platformName = `${Platform2.OS}-${Platform2.Version}`;
     const platform = {
       storage,
       authProvider,
       urlParamsAccessor,
       stamper,
-      name: `${Platform.OS}-${Platform.Version}`
+      phantomAppProvider: new ReactNativePhantomAppProvider(),
+      name: platformName,
+      analyticsHeaders: {
+        [ANALYTICS_HEADERS.SDK_TYPE]: "react-native",
+        [ANALYTICS_HEADERS.PLATFORM]: Platform2.OS,
+        [ANALYTICS_HEADERS.PLATFORM_VERSION]: `${Platform2.Version}`,
+        [ANALYTICS_HEADERS.APP_ID]: config.appId,
+        [ANALYTICS_HEADERS.WALLET_TYPE]: config.embeddedWalletType,
+        [ANALYTICS_HEADERS.SDK_VERSION]: "1.0.0-beta.21"
+        // Replaced at build time
+      }
     };
-    const sdkInstance = new EmbeddedProvider(memoizedConfig, platform, logger);
+    return new EmbeddedProvider(memoizedConfig, platform, logger);
+  }, [memoizedConfig, debugConfig, config.appId, config.embeddedWalletType]);
+  useEffect(() => {
     const handleConnectStart = () => {
       setIsConnecting(true);
       setConnectError(null);
     };
-    const handleConnect = async () => {
+    const handleConnect = async (data) => {
       try {
         setIsConnected(true);
         setIsConnecting(false);
-        const addrs = await sdkInstance.getAddresses();
+        setUser(data);
+        const addrs = await sdk.getAddresses();
         setAddresses(addrs);
       } catch (err) {
         console.error("Error connecting:", err);
         try {
-          await sdkInstance.disconnect();
+          await sdk.disconnect();
         } catch (err2) {
           console.error("Error disconnecting:", err2);
         }
@@ -465,6 +545,7 @@ function PhantomProvider({ children, config, debugConfig }) {
     const handleConnectError = (errorData) => {
       setIsConnecting(false);
       setConnectError(new Error(errorData.error || "Connection failed"));
+      setAddresses([]);
     };
     const handleDisconnect = () => {
       setIsConnected(false);
@@ -472,22 +553,20 @@ function PhantomProvider({ children, config, debugConfig }) {
       setConnectError(null);
       setAddresses([]);
       setWalletId(null);
+      setUser(null);
     };
-    sdkInstance.on("connect_start", handleConnectStart);
-    sdkInstance.on("connect", handleConnect);
-    sdkInstance.on("connect_error", handleConnectError);
-    sdkInstance.on("disconnect", handleDisconnect);
-    setSdk(sdkInstance);
+    sdk.on("connect_start", handleConnectStart);
+    sdk.on("connect", handleConnect);
+    sdk.on("connect_error", handleConnectError);
+    sdk.on("disconnect", handleDisconnect);
     return () => {
-      sdkInstance.off("connect_start", handleConnectStart);
-      sdkInstance.off("connect", handleConnect);
-      sdkInstance.off("connect_error", handleConnectError);
-      sdkInstance.off("disconnect", handleDisconnect);
+      sdk.off("connect_start", handleConnectStart);
+      sdk.off("connect", handleConnect);
+      sdk.off("connect_error", handleConnectError);
+      sdk.off("disconnect", handleDisconnect);
     };
-  }, [memoizedConfig, debugConfig]);
+  }, [sdk]);
   useEffect(() => {
-    if (!sdk)
-      return;
     if (config.autoConnect !== false) {
       sdk.autoConnect().catch(() => {
       });
@@ -501,9 +580,10 @@ function PhantomProvider({ children, config, debugConfig }) {
       connectError,
       addresses,
       walletId,
-      setWalletId
+      setWalletId,
+      user
     }),
-    [sdk, isConnected, isConnecting, connectError, addresses, walletId, setWalletId]
+    [sdk, isConnected, isConnecting, connectError, addresses, walletId, setWalletId, user]
   );
   return /* @__PURE__ */ jsx(PhantomContext.Provider, { value, children });
 }
@@ -520,12 +600,12 @@ import { useCallback } from "react";
 function useConnect() {
   const { sdk, isConnecting, connectError, setWalletId } = usePhantom();
   const connect = useCallback(
-    async (_options) => {
+    async (options) => {
       if (!sdk) {
         throw new Error("SDK not initialized");
       }
       try {
-        const result = await sdk.connect();
+        const result = await sdk.connect(options);
         if (result.status === "completed" && result.walletId) {
           setWalletId(result.walletId);
         }
@@ -584,184 +664,24 @@ function useAccounts() {
 }
 
 // src/hooks/useSolana.ts
-import { useCallback as useCallback3, useMemo as useMemo2 } from "react";
 function useSolana() {
   const { sdk, isConnected } = usePhantom();
-  const getSolanaChain = useCallback3(() => {
-    if (!sdk)
-      throw new Error("Phantom SDK not initialized.");
-    if (!sdk.isConnected())
-      throw new Error("Phantom SDK not connected. Call connect() first.");
-    return sdk.solana;
-  }, [sdk]);
-  const solanaChain = useMemo2(() => {
-    if (!sdk || !isConnected)
-      return null;
-    try {
-      return sdk.solana;
-    } catch {
-      return null;
-    }
-  }, [sdk, isConnected]);
-  const signMessage = useCallback3(
-    async (message) => {
-      const chain = getSolanaChain();
-      return await chain.signMessage(message);
-    },
-    [getSolanaChain]
-  );
-  const signTransaction = useCallback3(
-    async (transaction) => {
-      const chain = getSolanaChain();
-      return await chain.signTransaction(transaction);
-    },
-    [getSolanaChain]
-  );
-  const signAndSendTransaction = useCallback3(
-    async (transaction) => {
-      const chain = getSolanaChain();
-      return await chain.signAndSendTransaction(transaction);
-    },
-    [getSolanaChain]
-  );
-  const connect = useCallback3(
-    async (options) => {
-      const chain = getSolanaChain();
-      return await chain.connect(options);
-    },
-    [getSolanaChain]
-  );
-  const disconnect = useCallback3(async () => {
-    const chain = getSolanaChain();
-    return await chain.disconnect();
-  }, [getSolanaChain]);
-  const switchNetwork = useCallback3(
-    async (network) => {
-      const chain = getSolanaChain();
-      return await chain.switchNetwork?.(network);
-    },
-    [getSolanaChain]
-  );
-  const getPublicKey = useCallback3(async () => {
-    if (!sdk || !sdk.isConnected())
-      return null;
-    return await sdk.solana.getPublicKey();
-  }, [sdk]);
   return {
-    // Chain instance for advanced usage
-    solana: solanaChain,
-    // Convenient methods
-    signMessage,
-    signTransaction,
-    signAndSendTransaction,
-    connect,
-    disconnect,
-    switchNetwork,
-    getPublicKey,
+    // Chain instance with connection enforcement for signing methods
+    solana: sdk.solana,
     // State
-    isAvailable: !!solanaChain,
-    isConnected: solanaChain?.isConnected() ?? false
+    isAvailable: !!isConnected
   };
 }
 
 // src/hooks/useEthereum.ts
-import { useCallback as useCallback4, useMemo as useMemo3 } from "react";
 function useEthereum() {
   const { sdk, isConnected } = usePhantom();
-  const getEthereumChain = useCallback4(() => {
-    if (!sdk)
-      throw new Error("Phantom SDK not initialized.");
-    if (!sdk.isConnected())
-      throw new Error("Phantom SDK not connected. Call connect() first.");
-    return sdk.ethereum;
-  }, [sdk]);
-  const ethereumChain = useMemo3(() => {
-    if (!sdk || !isConnected)
-      return null;
-    try {
-      return sdk.ethereum;
-    } catch {
-      return null;
-    }
-  }, [sdk, isConnected]);
-  const request = useCallback4(
-    async (args) => {
-      const chain = getEthereumChain();
-      return await chain.request(args);
-    },
-    [getEthereumChain]
-  );
-  const signPersonalMessage = useCallback4(
-    async (message, address) => {
-      const chain = getEthereumChain();
-      return await chain.signPersonalMessage(message, address);
-    },
-    [getEthereumChain]
-  );
-  const signTransaction = useCallback4(
-    async (transaction) => {
-      const chain = getEthereumChain();
-      return await chain.signTransaction(transaction);
-    },
-    [getEthereumChain]
-  );
-  const sendTransaction = useCallback4(
-    async (transaction) => {
-      const chain = getEthereumChain();
-      return await chain.sendTransaction(transaction);
-    },
-    [getEthereumChain]
-  );
-  const switchChain = useCallback4(
-    async (chainId) => {
-      const chain = getEthereumChain();
-      return await chain.switchChain(chainId);
-    },
-    [getEthereumChain]
-  );
-  const getChainId = useCallback4(async () => {
-    const chain = getEthereumChain();
-    return await chain.getChainId();
-  }, [getEthereumChain]);
-  const getAccounts = useCallback4(async () => {
-    const chain = getEthereumChain();
-    return await chain.getAccounts();
-  }, [getEthereumChain]);
-  const signMessage = useCallback4(
-    async (message) => {
-      const accounts = await getAccounts();
-      return await request({
-        method: "eth_sign",
-        params: [accounts[0], message]
-      });
-    },
-    [request, getAccounts]
-  );
-  const signTypedData = useCallback4(
-    async (typedData) => {
-      const chain = getEthereumChain();
-      const accounts = await getAccounts();
-      return await chain.signTypedData(typedData, accounts[0]);
-    },
-    [getEthereumChain, getAccounts]
-  );
   return {
-    // Chain instance for advanced usage
-    ethereum: ethereumChain,
-    // Standard EIP-1193 interface
-    request,
-    // Convenient methods
-    signPersonalMessage,
-    signMessage,
-    signTransaction,
-    signTypedData,
-    sendTransaction,
-    switchChain,
-    getChainId,
-    getAccounts,
+    // Chain instance with connection enforcement for signing methods
+    ethereum: sdk.ethereum,
     // State
-    isAvailable: !!ethereumChain,
-    isConnected: ethereumChain?.isConnected() ?? false
+    isAvailable: !!isConnected
   };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phantom/react-native-sdk",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.21",
   "description": "Phantom Wallet SDK for React Native and Expo applications",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -45,14 +45,14 @@
     "directory": "packages/react-native-sdk"
   },
   "dependencies": {
-    "@phantom/api-key-stamper": "^1.0.0-beta.2",
-    "@phantom/base64url": "^1.0.0-beta.2",
-    "@phantom/chains": "^1.0.0-beta.2",
-    "@phantom/client": "^1.0.0-beta.2",
-    "@phantom/constants": "^1.0.0-beta.2",
-    "@phantom/crypto": "^1.0.0-beta.2",
-    "@phantom/embedded-provider-core": "^1.0.0-beta.2",
-    "@phantom/sdk-types": "^1.0.0-beta.2",
+    "@phantom/api-key-stamper": "^1.0.0-beta.9",
+    "@phantom/base64url": "^1.0.0-beta.9",
+    "@phantom/chain-interfaces": "^1.0.0-beta.9",
+    "@phantom/client": "^1.0.0-beta.21",
+    "@phantom/constants": "^1.0.0-beta.9",
+    "@phantom/crypto": "^1.0.0-beta.9",
+    "@phantom/embedded-provider-core": "^1.0.0-beta.21",
+    "@phantom/sdk-types": "^1.0.0-beta.9",
     "@types/bs58": "^5.0.0",
     "bs58": "^6.0.0",
     "buffer": "^6.0.3"