@forge-connect/react 1.0.1 → 1.0.2

package/dist/index.d.cts

@@ -320,6 +320,7 @@ declare function createApiClient(apiUrl: string): {
         password?: string;
         challengeId?: string;
         signature?: string;
+        signedTransaction?: string;
         walletAddress?: string;
     }): Promise<{
         success: true;
@@ -648,7 +649,7 @@ declare function useWallets(): {
         label?: string;
         isPrimary?: boolean;
     }) => Promise<void>;
-    linkWallet: (walletAddress: string, signMessage: (message: Uint8Array) => Promise<Uint8Array>, chain?: string) => Promise<void>;
+    linkWallet: (walletAddress: string, signMessage: ((message: Uint8Array) => Promise<Uint8Array>) | undefined, chain?: string, signTransaction?: (txBase64: string) => Promise<string>) => Promise<void>;
 };
 
 declare function useSessions(): {

package/dist/index.d.ts

@@ -320,6 +320,7 @@ declare function createApiClient(apiUrl: string): {
         password?: string;
         challengeId?: string;
         signature?: string;
+        signedTransaction?: string;
         walletAddress?: string;
     }): Promise<{
         success: true;
@@ -648,7 +649,7 @@ declare function useWallets(): {
         label?: string;
         isPrimary?: boolean;
     }) => Promise<void>;
-    linkWallet: (walletAddress: string, signMessage: (message: Uint8Array) => Promise<Uint8Array>, chain?: string) => Promise<void>;
+    linkWallet: (walletAddress: string, signMessage: ((message: Uint8Array) => Promise<Uint8Array>) | undefined, chain?: string, signTransaction?: (txBase64: string) => Promise<string>) => Promise<void>;
 };
 
 declare function useSessions(): {

package/dist/index.js

@@ -1,5 +1,5 @@
 // src/provider.tsx
-import { useState as useState16, useCallback as useCallback8, useEffect as useEffect12, useRef as useRef8, useMemo as useMemo3 } from "react";
+import { useState as useState16, useCallback as useCallback9, useEffect as useEffect12, useRef as useRef9, useMemo as useMemo3 } from "react";
 
 // src/context.ts
 import { createContext } from "react";
@@ -1233,7 +1233,7 @@ async function startAuthentication(options) {
 }
 
 // src/runtime-imports.ts
-var importSolanaWeb3 = () => new Function('return import("@solana/web3.js")')();
+var importSolanaWeb3 = () => import("@solana/web3.js");
 
 // src/components/tabs/wallet-connect.tsx
 import { Fragment, jsx as jsx4, jsxs as jsxs4 } from "react/jsx-runtime";
@@ -2144,19 +2144,33 @@ function useWallets() {
     [api, getAccessToken, fetchWallets]
   );
   const linkWallet = useCallback4(
-    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]
@@ -3264,7 +3278,7 @@ function SecurityTab() {
 }
 
 // src/components/link-auth-modal.tsx
-import { useState as useState15, useEffect as useEffect11, useMemo as useMemo2 } from "react";
+import { useState as useState15, useEffect as useEffect11, useMemo as useMemo2, useRef as useRef8, useCallback as useCallback8 } from "react";
 import { Fragment as Fragment6, jsx as jsx16, jsxs as jsxs15 } from "react/jsx-runtime";
 function LinkAuthModal() {
   const { linkModal, closeLinkModal, config } = useForgeConnect();
@@ -3548,10 +3562,23 @@ function WalletLinkStep({ onBack, onSuccess, onFatalError }) {
   const [loading, setLoading] = useState15(false);
   const [error, setError] = useState15("");
   const [showOther, setShowOther] = useState15(false);
+  const [coldWallet, setColdWallet] = useState15(false);
   const mobile = useMemo2(() => isMobile(), []);
   const walletConfig = config.walletConfig;
   const preferred = walletConfig?.preferredWallets ?? [];
   const onlyPreferred = walletConfig?.onlyPreferred ?? false;
+  const coldWalletRef = useRef8(coldWallet);
+  coldWalletRef.current = coldWallet;
+  const buildSignTxFnForAdapter = useCallback8((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) {
@@ -3571,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.");
@@ -3630,7 +3662,7 @@ function WalletLinkStep({ onBack, onSuccess, onFatalError }) {
   return /* @__PURE__ */ jsxs15("div", { className: "fc-tab", children: [
     loading ? /* @__PURE__ */ jsxs15("div", { style: { textAlign: "center", padding: "24px 0" }, children: [
       /* @__PURE__ */ jsx16("p", { className: "fc-tab-title", children: "Connecting..." }),
-      /* @__PURE__ */ jsx16("p", { className: "fc-text", children: "Approve the connection, then sign the verification request in your wallet" }),
+      /* @__PURE__ */ jsx16("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__ */ jsxs15(Fragment6, { children: [
         /* @__PURE__ */ jsx16("p", { className: "fc-error", children: error }),
         /* @__PURE__ */ jsx16(
@@ -3688,6 +3720,21 @@ function WalletLinkStep({ onBack, onSuccess, onFatalError }) {
         ] }, w.adapter.name))
       ] }),
       preferredWallets.length === 0 && otherWallets.length === 0 && mobileExtraWallets.length === 0 && /* @__PURE__ */ jsx16("p", { className: "fc-text", children: "No wallet found. Please install a Solana wallet (like Phantom) to continue." }),
+      /* @__PURE__ */ jsxs15("label", { className: "fc-cold-wallet-toggle", children: [
+        /* @__PURE__ */ jsx16(
+          "input",
+          {
+            type: "checkbox",
+            checked: coldWallet,
+            onChange: (e) => setColdWallet(e.target.checked)
+          }
+        ),
+        /* @__PURE__ */ jsx16("span", { className: "fc-toggle-track" }),
+        /* @__PURE__ */ jsxs15("span", { className: "fc-cold-wallet-label", children: [
+          /* @__PURE__ */ jsx16("span", { children: "Hardware wallet" }),
+          /* @__PURE__ */ jsx16("span", { children: "Ledger, Trezor, Keystone..." })
+        ] })
+      ] }),
       error && /* @__PURE__ */ jsx16("p", { className: "fc-error", children: error })
     ] }),
     !loading && onBack && /* @__PURE__ */ jsx16("div", { className: "fc-switch", children: /* @__PURE__ */ jsx16("button", { type: "button", className: "fc-link", onClick: onBack, children: "Back" }) })
@@ -3718,10 +3765,10 @@ function ForgeConnectProvider({ config, children, onLogin, onLogout, walletAdapt
   const [accountModal, setAccountModal] = useState16({ isOpen: false });
   const [linkModal, setLinkModal] = useState16({ isOpen: false });
   const [challengeToken, setChallengeToken] = useState16(null);
-  const apiRef = useRef8(createApiClient(config.apiUrl));
-  const refreshTimerRef = useRef8(null);
+  const apiRef = useRef9(createApiClient(config.apiUrl));
+  const refreshTimerRef = useRef9(null);
   const api = apiRef.current;
-  const scheduleRefresh = useCallback8((token) => {
+  const scheduleRefresh = useCallback9((token) => {
     if (refreshTimerRef.current) clearTimeout(refreshTimerRef.current);
     const delay = getRefreshDelay(token);
     if (delay === null) return;
@@ -3810,7 +3857,7 @@ function ForgeConnectProvider({ config, children, onLogin, onLogout, walletAdapt
       }
     }
   }, []);
-  const handleAuthSuccess = useCallback8(
+  const handleAuthSuccess = useCallback9(
     async (token) => {
       const user = await api.getMe(token);
       setAuth({ status: "authenticated", user, accessToken: token });
@@ -3823,7 +3870,7 @@ function ForgeConnectProvider({ config, children, onLogin, onLogout, walletAdapt
     },
     [api, scheduleRefresh, onLogin]
   );
-  const loginWithEmail = useCallback8(
+  const loginWithEmail = useCallback9(
     async (email, password) => {
       const res = await api.login(email, password);
       if (res.requires2FA) {
@@ -3835,19 +3882,19 @@ function ForgeConnectProvider({ config, children, onLogin, onLogout, walletAdapt
     },
     [api, handleAuthSuccess]
   );
-  const register = useCallback8(
+  const register = useCallback9(
     async (email, password, displayName) => {
       await api.register(email, password, displayName);
     },
     [api]
   );
-  const sendOtp = useCallback8(
+  const sendOtp = useCallback9(
     async (email) => {
       await api.sendOtp(email);
     },
     [api]
   );
-  const verifyOtp = useCallback8(
+  const verifyOtp = useCallback9(
     async (email, code) => {
       const res = await api.verifyOtp(email, code);
       if (res.requires2FA) {
@@ -3859,7 +3906,7 @@ function ForgeConnectProvider({ config, children, onLogin, onLogout, walletAdapt
     },
     [api, handleAuthSuccess]
   );
-  const loginWithWallet = useCallback8(
+  const loginWithWallet = useCallback9(
     async (walletAddress, signMessage, chain = "solana", signTransaction) => {
       if (signMessage) {
         const { challengeId: challengeId2, message: challengeMessage } = await api.walletChallenge(walletAddress, chain);
@@ -3890,7 +3937,7 @@ function ForgeConnectProvider({ config, children, onLogin, onLogout, walletAdapt
     },
     [api, handleAuthSuccess]
   );
-  const loginWithOAuth = useCallback8(
+  const loginWithOAuth = useCallback9(
     (provider) => {
       const callbackUrl = `${config.apiUrl}/auth/oauth/${provider}`;
       const redirectUri = encodeURIComponent(window.location.origin + "/fc-oauth-callback");
@@ -3912,7 +3959,7 @@ function ForgeConnectProvider({ config, children, onLogin, onLogout, walletAdapt
     },
     [config.apiUrl]
   );
-  const logout = useCallback8(async () => {
+  const logout = useCallback9(async () => {
     const token = auth.accessToken;
     if (refreshTimerRef.current) clearTimeout(refreshTimerRef.current);
     setAuth({ status: "unauthenticated", user: null, accessToken: null });
@@ -3924,19 +3971,19 @@ function ForgeConnectProvider({ config, children, onLogin, onLogout, walletAdapt
       }
     }
   }, [auth.accessToken, api, onLogout]);
-  const forgotPassword = useCallback8(
+  const forgotPassword = useCallback9(
     async (email) => {
       await api.forgotPassword(email);
     },
     [api]
   );
-  const resetPassword = useCallback8(
+  const resetPassword = useCallback9(
     async (token, password) => {
       await api.resetPassword(token, password);
     },
     [api]
   );
-  const verifyEmailToken = useCallback8(
+  const verifyEmailToken = useCallback9(
     async (token) => {
       const res = await api.verifyEmailToken(token);
       if (res.requires2FA) {
@@ -3948,25 +3995,25 @@ function ForgeConnectProvider({ config, children, onLogin, onLogout, walletAdapt
     },
     [api, handleAuthSuccess]
   );
-  const loginWithPasskey = useCallback8(async () => {
+  const loginWithPasskey = useCallback9(async () => {
     const { options, challengeKey } = await api.getPasskeyLoginOptions(config.webauthnRpId);
     const authResponse = await startAuthentication({ optionsJSON: options });
     const { accessToken } = await api.verifyPasskeyLogin(challengeKey, authResponse, config.webauthnRpId, config.webauthnOrigin);
     await handleAuthSuccess(accessToken);
   }, [api, handleAuthSuccess, config.webauthnRpId, config.webauthnOrigin]);
-  const verify2FA = useCallback8(async (code) => {
+  const verify2FA = useCallback9(async (code) => {
     if (!challengeToken) throw new Error("No 2FA challenge active");
     const { accessToken } = await api.verify2FA(challengeToken, code);
     setChallengeToken(null);
     await handleAuthSuccess(accessToken);
   }, [api, challengeToken, handleAuthSuccess]);
-  const verifyRecoveryCode = useCallback8(async (code) => {
+  const verifyRecoveryCode = useCallback9(async (code) => {
     if (!challengeToken) throw new Error("No 2FA challenge active");
     const { accessToken } = await api.verifyRecoveryCode(challengeToken, code);
     setChallengeToken(null);
     await handleAuthSuccess(accessToken);
   }, [api, challengeToken, handleAuthSuccess]);
-  const logoutAll = useCallback8(async () => {
+  const logoutAll = useCallback9(async () => {
     const token = auth.accessToken;
     if (refreshTimerRef.current) clearTimeout(refreshTimerRef.current);
     setAuth({ status: "unauthenticated", user: null, accessToken: null });
@@ -3978,7 +4025,7 @@ function ForgeConnectProvider({ config, children, onLogin, onLogout, walletAdapt
       }
     }
   }, [auth.accessToken, api, onLogout]);
-  const openModal = useCallback8(() => {
+  const openModal = useCallback9(() => {
     const methods = resolveLoginMethods(config);
     if (methods.length === 1 && isOAuthMethod(methods[0])) {
       loginWithOAuth(methods[0]);
@@ -3991,25 +4038,25 @@ function ForgeConnectProvider({ config, children, onLogin, onLogout, walletAdapt
     const step = resolveInitialStep(config, methods);
     setModal({ isOpen: true, step });
   }, [config, loginWithOAuth]);
-  const closeModal = useCallback8(() => {
+  const closeModal = useCallback9(() => {
     setModal({ isOpen: false, step: "method-select" });
   }, []);
-  const setModalStep = useCallback8((step) => {
+  const setModalStep = useCallback9((step) => {
     setModal((prev) => ({ ...prev, step }));
   }, []);
-  const openAccountModal = useCallback8(() => {
+  const openAccountModal = useCallback9(() => {
     setAccountModal({ isOpen: true });
   }, []);
-  const closeAccountModal = useCallback8(() => {
+  const closeAccountModal = useCallback9(() => {
     setAccountModal({ isOpen: false });
   }, []);
-  const openLinkModal = useCallback8((mode) => {
+  const openLinkModal = useCallback9((mode) => {
     setLinkModal({ isOpen: true, mode: mode ?? "auth" });
   }, []);
-  const closeLinkModal = useCallback8(() => {
+  const closeLinkModal = useCallback9(() => {
     setLinkModal({ isOpen: false });
   }, []);
-  const getAccessToken = useCallback8(() => auth.accessToken, [auth.accessToken]);
+  const getAccessToken = useCallback9(() => auth.accessToken, [auth.accessToken]);
   const value = useMemo3(() => ({
     auth,
     modal,
@@ -4113,14 +4160,14 @@ function AccountButton({ className, loginLabel, compact }) {
 }
 
 // src/hooks/use-admin.ts
-import { useState as useState17, useCallback as useCallback9 } from "react";
+import { useState as useState17, useCallback as useCallback10 } from "react";
 function useAdmin() {
   const { api, getAccessToken } = useForgeConnect();
   const [users, setUsers] = useState17(null);
   const [selectedUser, setSelectedUser] = useState17(null);
   const [userSessions, setUserSessions] = useState17(null);
   const [loading, setLoading] = useState17(false);
-  const listUsers = useCallback9(
+  const listUsers = useCallback10(
     async (params) => {
       const token = getAccessToken();
       if (!token) throw new Error("Please sign in to continue.");
@@ -4135,7 +4182,7 @@ function useAdmin() {
     },
     [api, getAccessToken]
   );
-  const getUser = useCallback9(
+  const getUser = useCallback10(
     async (id) => {
       const token = getAccessToken();
       if (!token) throw new Error("Please sign in to continue.");
@@ -4150,7 +4197,7 @@ function useAdmin() {
     },
     [api, getAccessToken]
   );
-  const updateUserStatus = useCallback9(
+  const updateUserStatus = useCallback10(
     async (id, status) => {
       const token = getAccessToken();
       if (!token) throw new Error("Please sign in to continue.");
@@ -4161,7 +4208,7 @@ function useAdmin() {
     },
     [api, getAccessToken, selectedUser?.id, getUser]
   );
-  const getUserSessions = useCallback9(
+  const getUserSessions = useCallback10(
     async (id) => {
       const token = getAccessToken();
       if (!token) throw new Error("Please sign in to continue.");
@@ -4176,7 +4223,7 @@ function useAdmin() {
     },
     [api, getAccessToken]
   );
-  const revokeUserSessions = useCallback9(
+  const revokeUserSessions = useCallback10(
     async (id) => {
       const token = getAccessToken();
       if (!token) throw new Error("Please sign in to continue.");
@@ -4199,7 +4246,7 @@ function useAdmin() {
 }
 
 // src/hooks/use-roles.ts
-import { useState as useState18, useCallback as useCallback10 } from "react";
+import { useState as useState18, useCallback as useCallback11 } from "react";
 function useRoles() {
   const { api, getAccessToken } = useForgeConnect();
   const [roles, setRoles] = useState18(null);
@@ -4208,7 +4255,7 @@ function useRoles() {
   const [roleUsers, setRoleUsers] = useState18(null);
   const [permissionDomains, setPermissionDomains] = useState18(null);
   const [loading, setLoading] = useState18(false);
-  const listRoles = useCallback10(
+  const listRoles = useCallback11(
     async (tenantId) => {
       const token = getAccessToken();
       if (!token) throw new Error("Please sign in to continue.");
@@ -4223,7 +4270,7 @@ function useRoles() {
     },
     [api, getAccessToken]
   );
-  const getRoleUsers = useCallback10(
+  const getRoleUsers = useCallback11(
     async (id) => {
       const token = getAccessToken();
       if (!token) throw new Error("Please sign in to continue.");
@@ -4233,7 +4280,7 @@ function useRoles() {
     },
     [api, getAccessToken]
   );
-  const getRole = useCallback10(
+  const getRole = useCallback11(
     async (id) => {
       const token = getAccessToken();
       if (!token) throw new Error("Please sign in to continue.");
@@ -4250,7 +4297,7 @@ function useRoles() {
     },
     [api, getAccessToken, getRoleUsers]
   );
-  const createRole = useCallback10(
+  const createRole = useCallback11(
     async (data) => {
       const token = getAccessToken();
       if (!token) throw new Error("Please sign in to continue.");
@@ -4260,7 +4307,7 @@ function useRoles() {
     },
     [api, getAccessToken, listRoles]
   );
-  const updateRole = useCallback10(
+  const updateRole = useCallback11(
     async (id, data) => {
       const token = getAccessToken();
       if (!token) throw new Error("Please sign in to continue.");
@@ -4270,7 +4317,7 @@ function useRoles() {
     },
     [api, getAccessToken]
   );
-  const deleteRole = useCallback10(
+  const deleteRole = useCallback11(
     async (id) => {
       const token = getAccessToken();
       if (!token) throw new Error("Please sign in to continue.");
@@ -4279,7 +4326,7 @@ function useRoles() {
     },
     [api, getAccessToken, selectedRole?.id]
   );
-  const getPermissions = useCallback10(
+  const getPermissions = useCallback11(
     async () => {
       const token = getAccessToken();
       if (!token) throw new Error("Please sign in to continue.");
@@ -4289,7 +4336,7 @@ function useRoles() {
     },
     [api, getAccessToken]
   );
-  const getUserRoles = useCallback10(
+  const getUserRoles = useCallback11(
     async (userId, tenantId) => {
       const token = getAccessToken();
       if (!token) throw new Error("Please sign in to continue.");
@@ -4304,7 +4351,7 @@ function useRoles() {
     },
     [api, getAccessToken]
   );
-  const assignRole = useCallback10(
+  const assignRole = useCallback11(
     async (userId, roleId, tenantId) => {
       const token = getAccessToken();
       if (!token) throw new Error("Please sign in to continue.");
@@ -4312,7 +4359,7 @@ function useRoles() {
     },
     [api, getAccessToken]
   );
-  const revokeRole = useCallback10(
+  const revokeRole = useCallback11(
     async (userId, roleId, tenantId) => {
       const token = getAccessToken();
       if (!token) throw new Error("Please sign in to continue.");