@use-glyph/sdk-react 1.0.28 → 1.1.0

package/dist/EIP1193Strategy.js

@@ -1,149 +1,148 @@
-import { c as J, W as C, b as q, d as z, j as H, a as Q } from "./index.js";
-import { useState as g, useEffect as p, useCallback as u } from "react";
-import { useAccount as V, useDisconnect as X, useSignMessage as Z, useSendTransaction as L, useAccountEffect as U } from "wagmi";
-const T = "__glyph-widget-token__", k = "__glyph-widget-nonce__", r = J("EIP1193Strategy"), ee = ({
-  children: O,
-  glyphUrl: o,
-  onLogin: E,
-  onLogout: S,
-  askForSignature: A = !0
+import { c as R, W as S, b as Y, d as B, j as J, a as q } from "./index.js";
+import { useState as g, useEffect as y, useCallback as l } from "react";
+import { useAccount as z, useDisconnect as H, useSignMessage as Q, useSendTransaction as V, useAccountEffect as X } from "wagmi";
+const A = "__glyph-widget-token__", I = "__glyph-widget-nonce__", r = R("EIP1193Strategy"), Z = ({
+  children: P,
+  glyphUrl: a,
+  onLogin: j,
+  onLogout: M,
+  askForSignature: h = !0
 }) => {
-  const [$, c] = g(!1), [D, h] = g(null), { address: e, isConnected: s, chainId: b } = V(), { disconnectAsync: x } = X(), { signMessageAsync: m } = Z(), { sendTransactionAsync: N } = L();
-  r.log({ address: e, isConnected: s });
-  const [i, I] = g(() => {
+  const [W, c] = g(!1), [L, d] = g(null), { address: t, isConnected: o, chainId: _ } = z(), { disconnectAsync: v } = H(), { signMessageAsync: f } = Q(), { sendTransactionAsync: C } = V();
+  r.log({ address: t, isConnected: o });
+  const [i, m] = g(() => {
     if (typeof window > "u")
       return null;
     try {
-      return localStorage.getItem(T);
-    } catch (t) {
-      return r.warn("Error reading session token", t), null;
+      return localStorage.getItem(A);
+    } catch (e) {
+      return r.warn("Error reading session token", e), null;
     }
-  }), [d, F] = g(null), [n, _] = g(() => {
+  }), [u, O] = g(null), [n, w] = g(() => {
     if (typeof window > "u")
       return null;
     try {
-      return localStorage.getItem(k);
-    } catch (t) {
-      return r.warn("Error reading session nonce", t), null;
+      return localStorage.getItem(I);
+    } catch (e) {
+      return r.warn("Error reading session nonce", e), null;
     }
   });
-  p(() => {
+  y(() => {
     try {
-      !i || !n ? (localStorage.removeItem(T), localStorage.removeItem(k)) : (localStorage.setItem(T, i), localStorage.setItem(k, n));
-    } catch (t) {
-      r.error("Error saving session token", t);
+      !i || !n ? (localStorage.removeItem(A), localStorage.removeItem(I)) : (localStorage.setItem(A, i), localStorage.setItem(I, n));
+    } catch (e) {
+      r.error("Error saving session token", e);
     }
   }, [n, i]);
-  const P = u(
-    async (t) => {
+  const T = l(
+    async (e) => {
       try {
         return await fetch(
-          `${o || C}/api/widget/auth/message/${t}`
-        ).then((f) => f.json());
-      } catch (a) {
-        throw r.error("Can't fetch message to sign", a), new Error("Failed to fetch the message to sign.");
+          `${a || S}/api/widget/auth/message/${e}`
+        ).then((E) => E.json());
+      } catch (s) {
+        throw r.error("Can't fetch message to sign", s), new Error("Failed to fetch the message to sign.");
       }
     },
-    [o]
-  ), j = u(
-    async (t, a, f) => {
+    [a]
+  ), k = l(
+    async (e, s, E) => {
       try {
-        return await fetch(`${o || C}/api/widget/auth/verify/${t}`, {
+        return await fetch(`${a || S}/api/widget/auth/verify/${e}`, {
           method: "POST",
-          body: JSON.stringify({ signature: a, nonce: f })
-        }).then((w) => w.json());
-      } catch (y) {
-        throw r.error("Can't verify signature", y), new Error("Signature verification failed.");
+          body: JSON.stringify({ signature: s, nonce: E })
+        }).then((G) => G.json());
+      } catch (N) {
+        throw r.error("Can't verify signature", N), new Error("Signature verification failed.");
       }
     },
-    [o]
+    [a]
   );
-  p(() => {
-    !e || !s || n || (c(!0), P(e).then(({ message: t, nonce: a }) => {
-      F(t), _(a), c(!1);
+  y(() => {
+    !t || !o || n || (c(!0), T(t).then(({ message: e, nonce: s }) => {
+      O(e), w(s), c(!1);
     }).finally(() => {
       c(!1);
     }));
-  }, [e, s, P, n]), p(() => {
+  }, [t, o, T, n]), y(() => {
     if (!i || !n) return;
-    const t = q(o || C, async () => i, {
-      "x-evm-address": e,
+    const e = Y(a || S, async () => i, {
+      "x-evm-address": t,
       "x-glyph-nonce": n
     });
-    h(() => t);
-  }, [i, e, o, n]);
-  const K = u(async () => {
-    await x();
-  }, [x]), v = u(async () => {
-    var t, a, f, y, w;
-    if (r.log("authenticate"), !e) {
+    d(() => e);
+  }, [i, t, a, n]);
+  const $ = l(async () => {
+    await v();
+  }, [v]), p = l(async () => {
+    if (r.log("authenticate"), !t) {
       r.error("no wallet connected.");
       return;
     }
     try {
-      if (!e || !s || !d || !n) {
-        h(null), c(!1);
+      if (!t || !o || !u || !n) {
+        d(null), c(!1);
         return;
       }
       c(!0);
-      const l = await m({ account: e, message: d });
-      console.log(n, d, l);
-      const B = (t = await j(e, l, n)) == null ? void 0 : t.token;
-      I(B);
-    } catch (l) {
-      r.error("Authentication failed", l), (w = (f = (a = l == null ? void 0 : l.message) == null ? void 0 : a.toLowerCase) == null ? void 0 : (y = f.call(a)).includes) != null && w.call(y, "user rejected") || await alert(
+      const e = await f({ account: t, message: u });
+      console.log(n, u, e);
+      const s = (await k(t, e, n))?.token;
+      m(s);
+    } catch (e) {
+      r.error("Authentication failed", e), e?.message?.toLowerCase?.().includes?.("user rejected") || await alert(
         "Authentication failed - your browser could be blocking the popups. Allow popups or try to manually click sign in."
-      ), h(null), I(null), _(null);
+      ), d(null), m(null), w(null);
     } finally {
-      c(!1), E == null || E();
+      c(!1), j?.();
     }
-  }, [e, s, d, n, m, j]), G = u(async () => {
-    _(null), I(null), c(!1), h(null), S == null || S();
-  }, []), R = u(
-    async ({ message: t }) => {
-      if (!e || !s)
+  }, [t, o, u, n, f, k]), D = l(async () => {
+    w(null), m(null), c(!1), d(null), M?.();
+  }, []), F = l(
+    async ({ message: e }) => {
+      if (!t || !o)
         throw new Error("Wallet not connected");
-      return m({ account: e, message: t });
+      return f({ account: t, message: e });
     },
-    [e, s, m]
-  ), Y = u(
-    async ({ transaction: t }) => {
-      if (!e || !s) throw new Error("Wallet not connected");
-      return N({ ...t, chainId: b || z.id });
+    [t, o, f]
+  ), K = l(
+    async ({ transaction: e }) => {
+      if (!t || !o) throw new Error("Wallet not connected");
+      return C({ ...e, chainId: _ || B.id });
     },
-    [e, s, N, b]
-  ), [M, W] = g(!1);
-  return U({
+    [t, o, C, _]
+  ), [b, x] = g(!1);
+  return X({
     onConnect: () => {
-      A && W(!0);
+      h && x(!0);
     },
     onDisconnect: () => {
-      G();
+      D();
     }
-  }), p(() => {
-    A && s && e && M && n && d && (v(), W(!1));
-  }, [s, e, v, M, n, d, A]), /* @__PURE__ */ H.jsx(
-    Q.Provider,
+  }), y(() => {
+    h && o && t && b && n && u && (p(), x(!1));
+  }, [o, t, p, b, n, u, h]), /* @__PURE__ */ J.jsx(
+    q.Provider,
     {
       value: {
-        ready: !$ && !!n,
-        authenticated: s && !!e && i !== null,
+        ready: !W && !!n,
+        authenticated: o && !!t && i !== null,
         symbol: "APE",
-        glyphUrl: o,
+        glyphUrl: a,
         // Pass as string to avoid type error (we are passing fallback value in useGlyph hook at a common place)
-        hideWidget: !s || !e,
-        login: v,
-        logout: K,
+        hideWidget: !o || !t,
+        login: p,
+        logout: $,
         // on disconnect, logoutSideEffect is called and clears states
-        signMessage: R,
-        sendTransaction: Y,
-        apiFetch: D
+        signMessage: F,
+        sendTransaction: K,
+        apiFetch: L
       },
-      children: O
+      children: P
     }
   );
 };
-ee.displayName = "EIP1193Strategy";
+Z.displayName = "EIP1193Strategy";
 export {
-  ee as default
+  Z as default
 };

package/dist/PrivyStrategy.js

@@ -1,115 +1,108 @@
-import { c as K, i as O, S as R, G as F, j as Q, a as X, b as Z, W as L } from "./index.js";
-import { usePrivy as ss, useCrossAppAccounts as es, useWallets as ts } from "@privy-io/react-auth";
-import { memo as as, useState as y, useEffect as rs, useCallback as g } from "react";
-import { useChainId as ns } from "wagmi";
-const t = K("PrivyStrategy"), N = ({ children: V, glyphUrl: f, onLogin: i, onLogout: l, useStagingTenant: h }) => {
-  const [Y, A] = y(!0), [j, m] = y(null), [a, U] = y(null), [n, H] = y(!1), w = ns(), {
-    ready: c,
-    authenticated: p,
-    user: o,
-    getAccessToken: b,
-    login: E,
-    logout: v,
-    signMessage: G,
-    sendTransaction: S
-  } = ss(), { signMessage: I, sendTransaction: T } = es();
-  t.debug(c, p, !!o);
-  const { wallets: B } = ts();
-  rs(() => {
-    var M, u, D;
-    if (!c) {
-      m(null), A(!0);
+import { c as B, i as $, S as x, G as C, j as q, a as z, b as J, W as K } from "./index.js";
+import { usePrivy as O, useCrossAppAccounts as Q, useWallets as X } from "@privy-io/react-auth";
+import { memo as Z, useState as d, useEffect as ss, useCallback as l } from "react";
+import { useChainId as es } from "wagmi";
+const t = B("PrivyStrategy"), M = ({ children: D, glyphUrl: p, onLogin: m, onLogout: v, useStagingTenant: u }) => {
+  const [L, y] = d(!0), [R, g] = d(null), [a, F] = d(null), [n, N] = d(!1), P = es(), {
+    ready: o,
+    authenticated: i,
+    user: c,
+    getAccessToken: _,
+    login: w,
+    logout: f,
+    signMessage: b,
+    sendTransaction: E
+  } = O(), { signMessage: G, sendTransaction: S } = Q();
+  t.debug(o, i, !!c);
+  const { wallets: V } = X();
+  ss(() => {
+    if (!o) {
+      g(null), y(!0);
       return;
     }
-    if (!p || !o) {
-      m(null), A(!1);
+    if (!i || !c) {
+      g(null), y(!1);
       return;
     }
     let e;
-    const r = (M = o.linkedAccounts) == null ? void 0 : M.find(
+    const r = c.linkedAccounts?.find(
       (s) => s.type === "wallet" && s.chainType === "ethereum" && s.walletClientType === "privy"
-    ), W = r && O(r.address);
-    W && t.debug("Privy (main) EVM embedded wallet", r.address), t.debug("finding cross-app accounts...");
-    const k = ((D = (u = o.linkedAccounts) == null ? void 0 : u.filter) == null ? void 0 : D.call(u, (s) => s.type === "cross_app")) || [], x = k.filter(
-      (s) => {
-        var d;
-        return ((d = s.providerApp) == null ? void 0 : d.id) !== (h ? R : F);
-      }
+    ), I = r && $(r.address);
+    I && t.debug("Privy (main) EVM embedded wallet", r.address), t.debug("finding cross-app accounts...");
+    const T = c.linkedAccounts?.filter?.((s) => s.type === "cross_app") || [], W = T.filter(
+      (s) => s.providerApp?.id !== (u ? x : C)
     );
-    t.debug("linked accounts - non-Glyph", { accounts: x });
-    const P = x.map((s) => s.embeddedWallets[0].address);
-    P.length > 0 && (e = P[0], t.log("using cross_app (non-Glyph) account"), P.length > 1 && t.warn("too many cross_app accounts"));
-    const C = k.filter(
-      (s) => {
-        var d;
-        return ((d = s.providerApp) == null ? void 0 : d.id) === (h ? R : F);
-      }
+    t.debug("linked accounts - non-Glyph", { accounts: W });
+    const h = W.map((s) => s.embeddedWallets[0].address);
+    h.length > 0 && (e = h[0], t.log("using cross_app (non-Glyph) account"), h.length > 1 && t.warn("too many cross_app accounts"));
+    const k = T.filter(
+      (s) => s.providerApp?.id === (u ? x : C)
     );
-    t.debug("linked accounts - Glyph", { accounts: C });
-    const _ = C.map((s) => s.embeddedWallets[0].address);
-    _.length > 0 && (e = _[0], t.log("using cross_app (Glyph) account"), _.length > 1 && t.warn("too many cross_app accounts")), e ? (H(!0), t.log("using cross_app account", e)) : W && (e = r.address, t.log("using Privy (main) EVM embedded wallet", e)), U(e ?? null), (async () => {
+    t.debug("linked accounts - Glyph", { accounts: k });
+    const A = k.map((s) => s.embeddedWallets[0].address);
+    A.length > 0 && (e = A[0], t.log("using cross_app (Glyph) account"), A.length > 1 && t.warn("too many cross_app accounts")), e ? (N(!0), t.log("using cross_app account", e)) : I && (e = r.address, t.log("using Privy (main) EVM embedded wallet", e)), F(e ?? null), (async () => {
       if (!e) {
         t.error("user has no wallet");
         return;
       }
-      const s = Z(
-        f || L,
-        async () => await b(),
+      const s = J(
+        p || K,
+        async () => await _(),
         { "x-evm-address": e }
       );
-      m(() => s), A(!1);
+      g(() => s), y(!1);
     })();
   }, [
-    f,
     p,
-    c,
+    i,
     o,
-    h,
+    c,
+    u,
     n,
-    B,
+    V,
     a,
-    b,
-    v
+    _,
+    f
   ]);
-  const $ = g(async () => {
-    await E(), i == null || i();
-  }, [i, E]), q = g(async () => {
-    v(), l == null || l();
-  }, [l, v]), z = g(
+  const Y = l(async () => {
+    await w(), m?.();
+  }, [m, w]), j = l(async () => {
+    f(), v?.();
+  }, [v, f]), U = l(
     async ({ message: e }) => {
       if (!a) throw new Error("No wallet address found");
-      return n ? I(e, { address: a }) : G({ message: e });
+      return n ? G(e, { address: a }) : b({ message: e });
     },
-    [a, n, I, G]
-  ), J = g(
+    [a, n, G, b]
+  ), H = l(
     async ({ transaction: e }) => {
       if (!a) throw new Error("No wallet address found");
-      const r = { ...e, chainId: w };
-      return n ? T(r, { address: a }) : S(r, { address: a });
+      const r = { ...e, chainId: P };
+      return n ? S(r, { address: a }) : E(r, { address: a });
     },
-    [w, n, a, T, S]
+    [P, n, a, S, E]
   );
-  return /* @__PURE__ */ Q.jsx(
-    X.Provider,
+  return /* @__PURE__ */ q.jsx(
+    z.Provider,
     {
       value: {
-        ready: c && !Y,
-        authenticated: c && p,
+        ready: o && !L,
+        authenticated: o && i,
         symbol: "APE",
-        glyphUrl: f,
+        glyphUrl: p,
         // Pass as string to avoid type error (we are passing fallback value in useGlyph hook at a common place)
-        login: $,
-        logout: q,
-        signMessage: z,
-        sendTransaction: J,
-        apiFetch: j
+        login: Y,
+        logout: j,
+        signMessage: U,
+        sendTransaction: H,
+        apiFetch: R
       },
-      children: V
+      children: D
     }
   );
 };
-N.displayName = "PrivyStrategy";
-const ps = as(N);
+M.displayName = "PrivyStrategy";
+const cs = Z(M);
 export {
-  ps as default
+  cs as default
 };