@forge-connect/react 1.0.0 → 1.0.2

package/dist/index.cjs

@@ -1,4 +1,4 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }// src/provider.tsx
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }// src/provider.tsx
 var _react = require('react');
 
 // src/context.ts
@@ -402,33 +402,13 @@ function createApiClient(apiUrl) {
 }
 
 // src/utils.ts
-var TOKEN_KEY = "fc_access_token";
-function getStoredToken() {
-  try {
-    return localStorage.getItem(TOKEN_KEY);
-  } catch (e4) {
-    return null;
-  }
-}
-function setStoredToken(token) {
-  try {
-    localStorage.setItem(TOKEN_KEY, token);
-  } catch (e5) {
-  }
-}
-function removeStoredToken() {
-  try {
-    localStorage.removeItem(TOKEN_KEY);
-  } catch (e6) {
-  }
-}
 function decodeJWT(token) {
   try {
     const parts = token.split(".");
     if (parts.length !== 3) return null;
     const payload = JSON.parse(atob(parts[1].replace(/-/g, "+").replace(/_/g, "/")));
     return payload;
-  } catch (e7) {
+  } catch (e4) {
     return null;
   }
 }
@@ -1253,7 +1233,7 @@ async function startAuthentication(options) {
 }
 
 // src/runtime-imports.ts
-var importSolanaWeb3 = () => new Function('return import("@solana/web3.js")')();
+var importSolanaWeb3 = () => Promise.resolve().then(() => _interopRequireWildcard(require("@solana/web3.js")));
 
 // src/components/tabs/wallet-connect.tsx
 
@@ -1759,7 +1739,7 @@ function SvgIcon({ svg, className }) {
       });
       ref.current.textContent = "";
       ref.current.appendChild(svgEl);
-    } catch (e8) {
+    } catch (e5) {
       ref.current.textContent = "";
     }
   }, [svg]);
@@ -2164,19 +2144,33 @@ function useWallets() {
     [api, getAccessToken, fetchWallets]
   );
   const linkWallet = _react.useCallback.call(void 0, 
-    async (walletAddress, signMessage, chain = "solana") => {
+    async (walletAddress, signMessage, chain = "solana", signTransaction) => {
       const token = getAccessToken();
       if (!token) throw new Error("Please sign in to continue.");
-      const { challengeId, message: challengeMessage } = await api.walletChallenge(walletAddress, chain);
-      const encoded = new TextEncoder().encode(challengeMessage);
-      const signatureBytes = await signMessage(encoded);
-      const signature = chain === "solana" ? uint8ArrayToBase58(signatureBytes) : Array.from(signatureBytes).map((b) => b.toString(16).padStart(2, "0")).join("");
-      await api.linkAuthMethod(token, {
-        provider: `${chain}_wallet`,
-        challengeId,
-        signature,
-        walletAddress
-      });
+      if (signMessage) {
+        const { challengeId, message: challengeMessage } = await api.walletChallenge(walletAddress, chain);
+        const encoded = new TextEncoder().encode(challengeMessage);
+        const signatureBytes = await signMessage(encoded);
+        const signature = chain === "solana" ? uint8ArrayToBase58(signatureBytes) : Array.from(signatureBytes).map((b) => b.toString(16).padStart(2, "0")).join("");
+        await api.linkAuthMethod(token, {
+          provider: `${chain}_wallet`,
+          challengeId,
+          signature,
+          walletAddress
+        });
+      } else {
+        if (!signTransaction) {
+          throw new Error("Wallet does not support message signing or transaction signing.");
+        }
+        const { challengeId, transaction: txBase64 } = await api.walletChallengeTx(walletAddress, chain);
+        const signedTxBase64 = await signTransaction(txBase64);
+        await api.linkAuthMethod(token, {
+          provider: `${chain}_wallet_tx`,
+          challengeId,
+          signedTransaction: signedTxBase64,
+          walletAddress
+        });
+      }
       await fetchWallets();
     },
     [api, getAccessToken, fetchWallets]
@@ -2519,7 +2513,7 @@ function PasskeysModal({ isOpen, onClose, onCountChange }) {
       const list = await api.getPasskeys(token);
       setPasskeys(list);
       onCountChange(list.length);
-    } catch (e9) {
+    } catch (e6) {
     } finally {
       setLoading(false);
     }
@@ -3568,10 +3562,23 @@ function WalletLinkStep({ onBack, onSuccess, onFatalError }) {
   const [loading, setLoading] = _react.useState.call(void 0, false);
   const [error, setError] = _react.useState.call(void 0, "");
   const [showOther, setShowOther] = _react.useState.call(void 0, false);
+  const [coldWallet, setColdWallet] = _react.useState.call(void 0, false);
   const mobile = _react.useMemo.call(void 0, () => isMobile(), []);
   const walletConfig = config.walletConfig;
   const preferred = _nullishCoalesce(_optionalChain([walletConfig, 'optionalAccess', _111 => _111.preferredWallets]), () => ( []));
   const onlyPreferred = _nullishCoalesce(_optionalChain([walletConfig, 'optionalAccess', _112 => _112.onlyPreferred]), () => ( false));
+  const coldWalletRef = _react.useRef.call(void 0, coldWallet);
+  coldWalletRef.current = coldWallet;
+  const buildSignTxFnForAdapter = _react.useCallback.call(void 0, (adapter) => {
+    if (!adapter.signTransaction) return void 0;
+    return async (txBase64) => {
+      const { Transaction } = await importSolanaWeb3();
+      const bytes = Uint8Array.from(atob(txBase64), (c) => c.charCodeAt(0));
+      const tx = Transaction.from(bytes);
+      const signedTx = await adapter.signTransaction(tx);
+      return btoa(String.fromCharCode(...new Uint8Array(signedTx.serialize())));
+    };
+  }, []);
   const handleConnect = async (w) => {
     if (w.readyState !== "Installed") {
       if (mobile) {
@@ -3591,9 +3598,14 @@ function WalletLinkStep({ onBack, onSuccess, onFatalError }) {
       if (!w.adapter.connected) await w.adapter.connect();
       const pk = w.adapter.publicKey;
       if (!pk) throw new Error("Wallet did not provide a public key.");
+      const useCold = coldWalletRef.current;
       const adapterSignMessage = w.adapter.signMessage ? (msg) => w.adapter.signMessage(msg) : void 0;
-      if (!adapterSignMessage) throw new Error("This wallet does not support message signing.");
-      await linkWallet(pk.toBase58(), adapterSignMessage, "solana");
+      await linkWallet(
+        pk.toBase58(),
+        useCold ? void 0 : adapterSignMessage,
+        "solana",
+        useCold ? buildSignTxFnForAdapter(w.adapter) : void 0
+      );
       onSuccess();
     } catch (err) {
       onFatalError(err instanceof Error ? err.message : "Could not link this wallet. Please try again.");
@@ -3650,7 +3662,7 @@ function WalletLinkStep({ onBack, onSuccess, onFatalError }) {
   return /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "fc-tab", children: [
     loading ? /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { style: { textAlign: "center", padding: "24px 0" }, children: [
       /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "p", { className: "fc-tab-title", children: "Connecting..." }),
-      /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "p", { className: "fc-text", children: "Approve the connection, then sign the verification request in your wallet" }),
+      /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "p", { className: "fc-text", children: coldWallet ? "Confirm the transaction on your device" : "Approve the connection, then sign the verification request in your wallet" }),
       error && /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, _jsxruntime.Fragment, { children: [
         /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "p", { className: "fc-error", children: error }),
         /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
@@ -3708,6 +3720,21 @@ function WalletLinkStep({ onBack, onSuccess, onFatalError }) {
         ] }, w.adapter.name))
       ] }),
       preferredWallets.length === 0 && otherWallets.length === 0 && mobileExtraWallets.length === 0 && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "p", { className: "fc-text", children: "No wallet found. Please install a Solana wallet (like Phantom) to continue." }),
+      /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "label", { className: "fc-cold-wallet-toggle", children: [
+        /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+          "input",
+          {
+            type: "checkbox",
+            checked: coldWallet,
+            onChange: (e) => setColdWallet(e.target.checked)
+          }
+        ),
+        /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "fc-toggle-track" }),
+        /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "span", { className: "fc-cold-wallet-label", children: [
+          /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { children: "Hardware wallet" }),
+          /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { children: "Ledger, Trezor, Keystone..." })
+        ] })
+      ] }),
       error && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "p", { className: "fc-error", children: error })
     ] }),
     !loading && onBack && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "fc-switch", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "button", { type: "button", className: "fc-link", onClick: onBack, children: "Back" }) })
@@ -3748,42 +3775,22 @@ function ForgeConnectProvider({ config, children, onLogin, onLogout, walletAdapt
     refreshTimerRef.current = setTimeout(async () => {
       try {
         const { accessToken } = await api.refresh();
-        setStoredToken(accessToken);
         setAuth((prev) => ({ ...prev, accessToken }));
         scheduleRefresh(accessToken);
-      } catch (e10) {
-        removeStoredToken();
+      } catch (e7) {
         setAuth({ status: "unauthenticated", user: null, accessToken: null });
       }
     }, delay);
   }, [api]);
   _react.useEffect.call(void 0, () => {
     const init = async () => {
-      const token = getStoredToken();
-      if (!token) {
-        setAuth({ status: "unauthenticated", user: null, accessToken: null });
-        return;
-      }
       try {
-        const user = await api.getMe(token);
-        setAuth({ status: "authenticated", user, accessToken: token });
-        scheduleRefresh(token);
-      } catch (err) {
-        if (err instanceof ForgeConnectApiError && err.status === 401) {
-          try {
-            const { accessToken } = await api.refresh();
-            const user = await api.getMe(accessToken);
-            setStoredToken(accessToken);
-            setAuth({ status: "authenticated", user, accessToken });
-            scheduleRefresh(accessToken);
-          } catch (e11) {
-            removeStoredToken();
-            setAuth({ status: "unauthenticated", user: null, accessToken: null });
-          }
-        } else {
-          removeStoredToken();
-          setAuth({ status: "unauthenticated", user: null, accessToken: null });
-        }
+        const { accessToken } = await api.refresh();
+        const user = await api.getMe(accessToken);
+        setAuth({ status: "authenticated", user, accessToken });
+        scheduleRefresh(accessToken);
+      } catch (e8) {
+        setAuth({ status: "unauthenticated", user: null, accessToken: null });
       }
     };
     init();
@@ -3826,7 +3833,6 @@ function ForgeConnectProvider({ config, children, onLogin, onLogout, walletAdapt
         }
         const token = result.accessToken;
         if (!token) return;
-        setStoredToken(token);
         setModal({ isOpen: true, step: "success" });
         const user = await api.getMe(token);
         setAuth({ status: "authenticated", user, accessToken: token });
@@ -3835,8 +3841,7 @@ function ForgeConnectProvider({ config, children, onLogin, onLogout, walletAdapt
         setTimeout(() => {
           setModal({ isOpen: false, step: "method-select" });
         }, 1500);
-      } catch (e12) {
-        removeStoredToken();
+      } catch (e9) {
       }
     };
     window.addEventListener("message", handleMessage);
@@ -3854,7 +3859,6 @@ function ForgeConnectProvider({ config, children, onLogin, onLogout, walletAdapt
   }, []);
   const handleAuthSuccess = _react.useCallback.call(void 0, 
     async (token) => {
-      setStoredToken(token);
       const user = await api.getMe(token);
       setAuth({ status: "authenticated", user, accessToken: token });
       scheduleRefresh(token);
@@ -3957,14 +3961,13 @@ function ForgeConnectProvider({ config, children, onLogin, onLogout, walletAdapt
   );
   const logout = _react.useCallback.call(void 0, async () => {
     const token = auth.accessToken;
-    removeStoredToken();
     if (refreshTimerRef.current) clearTimeout(refreshTimerRef.current);
     setAuth({ status: "unauthenticated", user: null, accessToken: null });
     _optionalChain([onLogout, 'optionalCall', _119 => _119()]);
     if (token) {
       try {
         await api.logout(token);
-      } catch (e13) {
+      } catch (e10) {
       }
     }
   }, [auth.accessToken, api, onLogout]);
@@ -4012,14 +4015,13 @@ function ForgeConnectProvider({ config, children, onLogin, onLogout, walletAdapt
   }, [api, challengeToken, handleAuthSuccess]);
   const logoutAll = _react.useCallback.call(void 0, async () => {
     const token = auth.accessToken;
-    removeStoredToken();
     if (refreshTimerRef.current) clearTimeout(refreshTimerRef.current);
     setAuth({ status: "unauthenticated", user: null, accessToken: null });
     _optionalChain([onLogout, 'optionalCall', _120 => _120()]);
     if (token) {
       try {
         await api.logoutAll(token);
-      } catch (e14) {
+      } catch (e11) {
       }
     }
   }, [auth.accessToken, api, onLogout]);