@arcblock/did-connect-react 3.4.3 → 3.4.4

package/lib/Connect/components/login-item/connect-provider-list.js

@@ -1,8 +1,8 @@
 import { jsx as l, jsxs as po } from "react/jsx-runtime";
 import n from "prop-types";
 import { Box as A } from "@mui/material";
-import { LOGIN_PROVIDER as e, LOGIN_PROVIDER_ICON_SIZE as E, LOGIN_PROVIDER_NAME as ho } from "@arcblock/ux/lib/Util/constant";
-import { checkSameProtocol as uo, getWebWalletUrl as go } from "@arcblock/ux/lib/Util/wallet";
+import { LOGIN_PROVIDER as e, LOGIN_PROVIDER_ICON_SIZE as E, LOGIN_PROVIDER_NAME as uo } from "@arcblock/ux/lib/Util/constant";
+import { checkSameProtocol as go, getWebWalletUrl as ho } from "@arcblock/ux/lib/Util/wallet";
 import b from "lodash/noop";
 import { useMemoizedFn as a, useCreation as fo } from "ahooks";
 import O from "js-cookie";
@@ -10,7 +10,7 @@ import { detectWalletExtension as yo, getCookieOptions as Lo } from "@arcblock/u
 import { useRef as w, useEffect as J } from "react";
 import { mergeSx as Io } from "@arcblock/ux/lib/Util/style";
 import Ao from "@arcblock/ux/lib/DIDConnect/provider-icon";
-import { GA_LAST_LOGIN_METHOD as f } from "@arcblock/ux/lib/withTracker/constant";
+import { GA_LAST_LOGIN_METHOD as y } from "@arcblock/ux/lib/withTracker/constant";
 import { translate as Eo } from "@arcblock/ux/lib/Locale/util";
 import bo from "@arcblock/ux/lib/Empty";
 import { useBrowser as xo } from "@arcblock/react-hooks";
@@ -31,11 +31,11 @@ function No({
   onError: T = b,
   size: m = "small",
   tokenState: t,
-  webWalletUrl: x = go(),
+  webWalletUrl: x = ho(),
   tokenKey: k,
   passkeyBehavior: S = "none",
   onReset: C = b,
-  providerList: d = [],
+  providerList: p = [],
   slotProps: X = {},
   disableSwitchApp: P = !1,
   forceUpdate: z = b,
@@ -43,9 +43,9 @@ function No({
   baseUrl: Q = "/",
   customItems: oo = [],
   qrcode: eo = null,
-  hideQRCode: y = !1
+  hideQRCode: d = !1
 }) {
-  const M = w(null), v = w(null), j = w(null), no = uo(x), N = yo(), p = xo(), { loginOAuth: to, logoutOAuth: ro, t: io, oauthState: s } = _o(), { passkeyState: D } = So(), {
+  const M = w(null), v = w(null), j = w(null), no = go(x), N = yo(), u = xo(), { loginOAuth: to, logoutOAuth: ro, t: io, oauthState: s } = _o(), { passkeyState: D } = So(), {
     extraParams: F,
     locale: B,
     connectState: i,
@@ -53,11 +53,11 @@ function No({
     setPlugins: lo,
     setSelectedPlugin: so,
     getPlugin: U,
-    showWalletOptions: g,
+    showWalletOptions: f,
     setShowWalletOptions: L,
-    lastLoginMethod: h
+    lastLoginMethod: g
   } = Oo(), I = a((o, r = {}) => Eo(jo, o, B, "en", r)), q = a(async (o) => {
-    localStorage.setItem(f, o.provider), t.reset(), s.reset({
+    localStorage.setItem(y, o.provider), t.reset(), s.reset({
       status: "scanned"
     }), D.reset(), i.chooseMethod = o.provider;
     const r = F?.sourceAppPid;
@@ -66,8 +66,8 @@ function No({
       const c = await to(o, {
         action: t.action,
         ...F
-      }), u = Lo({ returnDomain: !1 });
-      O.remove("connected_did", u), O.remove("connected_pk", u), O.remove("connected_wallet_os", u), c?.sessionToken && (await W(
+      }), h = Lo({ returnDomain: !1 });
+      O.remove("connected_did", h), O.remove("connected_pk", h), O.remove("connected_wallet_os", h), c?.sessionToken && (await W(
         {
           ...c,
           encrypted: !1
@@ -80,33 +80,33 @@ function No({
       ), s.loading = !1, s.status = "succeed");
     } catch (c) {
       Wo.error(`Failed login OAuth: ${o.provider}`, c);
-      const u = To(c, io("loginOAuthFailed"));
-      s.loading = !1, s.error = u, s.status = "error", await ro({ provider: o.provider }), T(new Error(u));
+      const h = To(c, io("loginOAuthFailed"));
+      s.loading = !1, s.error = h, s.status = "error", await ro({ provider: o.provider }), T(new Error(h));
     }
   }), K = a(async () => {
     t.reset(), await C(), t.status = "created", i.chooseMethod = "wallet";
   }), V = a(async () => {
-    localStorage.setItem(f, e.WALLET), t.reset(), await C(), t.status = "created", i.chooseMethod = "wallet";
+    localStorage.setItem(y, e.WALLET), t.reset(), await C(), t.status = "created", i.chooseMethod = "wallet";
     const o = M.current?.connect;
     i.retryConnect = () => {
       o(K);
     };
   }), Y = a(() => {
-    localStorage.setItem(f, e.WALLET), t.status = "scanned", i.chooseMethod = "wallet-web";
+    localStorage.setItem(y, e.WALLET), t.status = "scanned", i.chooseMethod = "wallet-web";
     const o = v.current.connect;
     i.retryConnect = async () => {
       await C(), t.error = "", t.status = "scanned", o();
     };
   }), co = a(() => {
     L(!1);
-  }), _ = fo(() => d.length === 1 && d[0].provider === e.WALLET, [d]);
+  }), _ = fo(() => p.length === 1 && p[0].provider === e.WALLET, [p]);
   J(() => {
-    _ && !p.mobile.any && !g && L(!0);
-  }, [_, p.mobile.any, L, g]);
-  const H = d.some((o) => o.provider === e.EMAIL), Z = Ro({ baseUrl: Q }), ao = a(() => {
-    if (R && d.some((o) => o.name === e.EMAIL) && G.some((o) => o.name === e.EMAIL)) {
+    d && _ && !u.mobile.any && !f && L(!0);
+  }, [d, _, u.mobile.any, L, f]);
+  const H = p.some((o) => o.provider === e.EMAIL), Z = Ro({ baseUrl: Q }), ao = a(() => {
+    if (R && p.some((o) => o.name === e.EMAIL) && G.some((o) => o.name === e.EMAIL)) {
       const o = U(e.EMAIL);
-      o.state.status === "idle" && (localStorage.setItem(f, e.EMAIL), o.state.reset(), o.state.magicToken = R, i.chooseMethod = e.EMAIL, so(o), z());
+      o.state.status === "idle" && (localStorage.setItem(y, e.EMAIL), o.state.reset(), o.state.magicToken = R, i.chooseMethod = e.EMAIL, so(o), z());
     }
   });
   J(() => {
@@ -119,13 +119,13 @@ function No({
       ao();
     }, 100);
   }, [H]);
-  const $ = d.map((o) => {
+  const $ = p.map((o) => {
     if (o.provider === e.WALLET)
-      return p.mobile.any && !g ? /* @__PURE__ */ l(
+      return u.mobile.any && !f ? /* @__PURE__ */ l(
         Co,
         {
           t: I,
-          isLatest: h && h === e.WALLET,
+          isLatest: g && g === e.WALLET,
           ref: M,
           tokenState: t,
           sx: [m === "small" ? { p: 1 } : { p: 2 }],
@@ -135,19 +135,19 @@ function No({
           onClick: V
         },
         e.WALLET
-      ) : y || !y && (no || N) && (!p.mobile.any || N) ? /* @__PURE__ */ l(
+      ) : d || !d && (no || N) && (!u.mobile.any || N) ? /* @__PURE__ */ l(
         Po,
         {
           t: I,
-          isLatest: h && h === e.WALLET,
+          isLatest: g && g === e.WALLET,
           ref: v,
           tokenState: t,
           webWalletUrl: x,
           sx: [m === "small" ? { p: 1 } : { p: 2 }],
           disableSwitchApp: P,
-          autoConnect: !y,
+          autoConnect: !d,
           onClick: () => {
-            y ? L(!0) : Y();
+            d ? L(!0) : Y();
           }
         },
         e.WALLET
@@ -163,7 +163,7 @@ function No({
           behavior: S,
           sx: [m === "small" ? { p: 1 } : { p: 2 }],
           onClick: () => {
-            localStorage.setItem(f, e.PASSKEY);
+            localStorage.setItem(y, e.PASSKEY);
             const r = j.current.connect;
             i.chooseMethod = "passkey", i.retryConnect = () => {
               D.verifying = !0, i.chooseMethod = "passkey", r();
@@ -196,8 +196,8 @@ function No({
       Mo,
       {
         t: I,
-        isLatest: h && h === o.provider,
-        title: ho[o.provider],
+        isLatest: g && g === o.provider,
+        title: uo[o.provider],
         icon: /* @__PURE__ */ l(
           Ao,
           {
@@ -235,11 +235,11 @@ function No({
             {
               display: "flex",
               flexDirection: "column",
-              ...g && !p.mobile.any ? { alignItems: "center", gap: 0 } : { gap: 1.5 }
+              ...f && !u.mobile.any ? { alignItems: "center", gap: 0 } : { gap: 1.5 }
             }
           ],
           children: [
-            g && !p.mobile.any ? /* @__PURE__ */ l(
+            f && !u.mobile.any ? /* @__PURE__ */ l(
               vo,
               {
                 qrcode: eo,

package/lib/Connect/hooks/provider-list.js

@@ -1,10 +1,10 @@
 import { useBrowser as k } from "@arcblock/react-hooks";
-import { useRequest as y, useCreation as L } from "ahooks";
-import n from "lodash/isNil";
+import { useRequest as y, useCreation as p } from "ahooks";
+import i from "lodash/isNil";
 import { LOGIN_PROVIDER as s } from "@arcblock/ux/lib/Util/constant";
-import { getFederatedEnabled as A, getMaster as C, getBlockletData as T } from "@arcblock/ux/lib/Util/federated";
-import { useState as I } from "react";
-const S = async ({ sourceAppPid: a }) => {
+import { getFederatedEnabled as C, getMaster as T, getBlockletData as I } from "@arcblock/ux/lib/Util/federated";
+import { useState as S } from "react";
+const B = async ({ sourceAppPid: d }) => {
   const t = globalThis?.blocklet;
   if (!t)
     return {
@@ -18,49 +18,49 @@ const S = async ({ sourceAppPid: a }) => {
         enabled: !0
       }
     };
-  const l = A(t), e = C(t);
-  return l && e?.appPid && a === e?.appPid ? (await T(e.appUrl))?.settings?.authentication || {} : t?.settings?.authentication || {};
-}, B = async ({ sourceAppPid: a } = {}) => {
-  const t = await S({ sourceAppPid: a });
-  return Object.entries(t).map(([e, o]) => ({ ...o, provider: e })).filter((e) => e.enabled).sort((e, o) => !n(e?.order) && !n(o?.order) ? e.order - o.order : n(e?.order) ? 1 : -1);
+  const a = C(t), e = T(t);
+  return a && e?.appPid && d === e?.appPid ? (await I(e.appUrl))?.settings?.authentication || {} : t?.settings?.authentication || {};
+}, R = async ({ sourceAppPid: d } = {}) => {
+  const t = await B({ sourceAppPid: d });
+  return Object.entries(t).map(([e, o]) => ({ ...o, provider: e })).filter((e) => e.enabled).sort((e, o) => !i(e?.order) && !i(o?.order) ? e.order - o.order : i(e?.order) ? 1 : -1);
 };
-function Y({
-  allowWallet: a = !0,
+function j({
+  allowWallet: d = !0,
   passkeyBehavior: t = "none",
-  action: l,
+  action: a,
   sourceAppPid: e,
   mode: o = "dialog",
   blocklet: b = globalThis.blocklet,
-  isSmallView: p = !1,
+  isSmallView: L = !1,
   lastLoginMethod: u = ""
 }) {
-  const [P, g] = I(!1), w = ["login", "invite", "connect-to-did-space", "connect-to-did-domain", "destroy-self"], c = k(), { data: h = [] } = y(
+  const [P, g] = S(!1), w = ["login", "invite", "connect-to-did-space", "connect-to-did-domain", "destroy-self"], E = ["login", "invite", "connect-to-did-space", "connect-to-did-domain", "destroy-self"], c = k(), { data: v = [] } = y(
     async () => {
       g(!0);
-      const d = await B({ sourceAppPid: e });
-      return g(!1), d;
+      const l = await R({ sourceAppPid: e });
+      return g(!1), l;
     },
     { refreshDeps: [e] }
-  ), f = L(() => h.filter((r) => r.name === s.WALLET ? a : r.name === s.PASSKEY ? t !== "none" && !c.wallet && !c.arcSphere : r.name === s.EMAIL ? b?.settings?.notification?.email?.enabled ?? !1 : !(r.type === "oauth" && !w.includes(l))).sort((r, i) => {
+  ), f = p(() => v.filter((r) => r.provider === s.WALLET ? d : r.provider === s.PASSKEY ? t !== "none" && !c.wallet && !c.arcSphere : r.provider === s.EMAIL ? E.includes(a) && (b?.settings?.notification?.email?.enabled ?? !1) : !(r.type === "oauth" && !w.includes(a))).sort((r, n) => {
     if (u) {
-      const m = r.provider === u, v = i.provider === u;
-      if (m && !v)
+      const h = r.provider === u, m = n.provider === u;
+      if (h && !m)
         return -1;
-      if (!m && v)
+      if (!h && m)
         return 1;
     }
-    return !n(r?.order) && !n(i?.order) ? r.order - i.order : n(r?.order) ? n(i?.order) ? 0 : 1 : -1;
-  }), [h, u]), E = L(() => {
-    const d = o === "drawer" || p && c.mobile.any;
-    return globalThis?.blocklet ? !!(f.find((i) => i.provider === s.WALLET)?.showQrcode !== !0 || d) : !!d;
-  }, [o, p, f]);
+    return !i(r?.order) && !i(n?.order) ? r.order - n.order : i(r?.order) ? i(n?.order) ? 0 : 1 : -1;
+  }), [v, u]), A = p(() => {
+    const l = o === "drawer" || L && c.mobile.any;
+    return globalThis?.blocklet ? !!(f.find((n) => n.provider === s.WALLET)?.showQrcode !== !0 || l) : !!l;
+  }, [o, L, f]);
   return {
-    hideChooseList: L(() => !1),
-    hideQRCode: E,
+    hideChooseList: p(() => !1),
+    hideQRCode: A,
     providerList: f,
     loadingProviderList: P
   };
 }
 export {
-  Y as default
+  j as default
 };

package/lib/Passkey/context.js

@@ -1,19 +1,21 @@
-import { jsxs as V, jsx as O } from "react/jsx-runtime";
-import p from "prop-types";
-import z from "lodash/isUndefined";
-import { use as J, createContext as K } from "react";
+import { jsxs as z, jsx as O } from "react/jsx-runtime";
+import y from "prop-types";
+import J from "lodash/isUndefined";
+import { use as K, createContext as W } from "react";
 import u from "@arcblock/ux/lib/Toast";
-import { useReactive as g, useMemoizedFn as i, useCreation as W } from "ahooks";
+import { useReactive as g, useMemoizedFn as i, useCreation as q } from "ahooks";
 import w from "lodash/noop";
 import { joinURL as S } from "ufo";
-import { translate as q } from "@arcblock/ux/lib/Locale/util";
-import { BLOCKLET_SERVICE_PATH_PREFIX as G } from "@arcblock/ux/lib/Util/constant";
-import { getBlockletData as H, getFederatedEnabled as X, getMaster as Q } from "@arcblock/ux/lib/Util/federated";
+import { translate as G } from "@arcblock/ux/lib/Locale/util";
+import { BLOCKLET_SERVICE_PATH_PREFIX as H } from "@arcblock/ux/lib/Util/constant";
+import { getBlockletData as X, getFederatedEnabled as $, getMaster as Q } from "@arcblock/ux/lib/Util/federated";
 import { startRegistration as Y, startAuthentication as Z } from "@simplewebauthn/browser";
-import { createAxios as $, getWebAuthnErrorMessage as h, logger as U, getApiErrorMessage as A } from "../utils.js";
-import { parseResponse as ee, PassportSwitcher as se } from "../components/PassportSwitcher.js";
-const F = K({}), { Provider: te, Consumer: he } = F, re = {
+import { createAxios as ee, getWebAuthnErrorMessage as h, logger as U, getApiErrorMessage as A } from "../utils.js";
+import { parseResponse as se, PassportSwitcher as te } from "../components/PassportSwitcher.js";
+import F from "../Connect/assets/locale.js";
+const E = W({}), { Provider: re, Consumer: ve } = E, ae = {
   zh: {
+    ...F.zh,
     cancel: "取消",
     usePasskey: "使用 Passkey",
     createPasskey: "新建 Passkey",
@@ -45,6 +47,7 @@ const F = K({}), { Provider: te, Consumer: he } = F, re = {
     }
   },
   en: {
+    ...F.en,
     cancel: "Cancel",
     usePasskey: "Use Existing Passkey",
     createPasskey: "Create New Passkey",
@@ -76,15 +79,15 @@ const F = K({}), { Provider: te, Consumer: he } = F, re = {
     }
   }
 };
-function ae({
+function ne({
   children: m,
   locale: l = "en",
-  onAddPasskey: E = w,
-  onRemovePasskey: C = w,
-  onSwitchPassport: I = w,
-  session: R = null
+  onAddPasskey: C = w,
+  onRemovePasskey: I = w,
+  onSwitchPassport: R = w,
+  session: x = null
 }) {
-  const v = S(window.env?.apiPrefix || G, "/api/passkey"), r = g({
+  const v = S(window.env?.apiPrefix || H, "/api/passkey"), r = g({
     baseUrl: "/",
     session: void 0,
     connecting: !1,
@@ -117,7 +120,7 @@ function ae({
     reset() {
       d.creating = !1, d.verifying = !1, d.creatingStatus = "", d.verifyingStatus = "", d.error = "";
     }
-  }), n = i((t, e = {}) => q(re, t, l, "en", e)), c = W(() => $({ baseURL: S(r.baseUrl, v), sessionTokenKey: "__sst", timeout: 60 * 1e3 }), [r.baseUrl, v]), x = i(async () => {
+  }), n = i((t, e = {}) => G(ae, t, l, "en", e)), c = q(() => ee({ baseURL: S(r.baseUrl, v), sessionTokenKey: "__sst", timeout: 60 * 1e3 }), [r.baseUrl, v]), B = i(async () => {
     if (r.baseUrl === "/")
       return window.blocklet;
     try {
@@ -125,10 +128,10 @@ function ae({
         return window.blocklet;
     } catch {
     }
-    return await H(r.baseUrl);
-  }), P = window?.blocklet?.componentId, B = (t) => {
+    return await X(r.baseUrl);
+  }), P = window?.blocklet?.componentId, T = (t) => {
     r.baseUrl = t || "/";
-  }, T = (t) => {
+  }, M = (t) => {
     r.targetAppPid = t;
   }, b = i(async (t) => {
     const { data: e } = await c.get("/register", { params: t });
@@ -158,7 +161,7 @@ function ae({
     } catch (s) {
       throw console.error("passkey.auth.error", s), s.name ? new Error(h(s, n("verifyPasskeyFailed"), n)) : s;
     }
-  }), M = async (t) => {
+  }), D = async (t) => {
     r.connecting = !0;
     try {
       const e = await b({
@@ -166,13 +169,13 @@ function ae({
         locale: l,
         componentId: P
       });
-      return u.success(n("connectPasskeySucceed")), E(e), e;
+      return u.success(n("connectPasskeySucceed")), C(e), e;
     } catch (e) {
       U.error("Failed to connect passkey", e), u.error(A(e, n("connectPasskeyFailed")));
     } finally {
       r.connecting = !1;
     }
-  }, D = async ({ session: t, connectedAccount: e }) => {
+  }, N = async ({ session: t, connectedAccount: e }) => {
     r.session = t, r.disconnecting = !0;
     try {
       const s = await k({
@@ -182,28 +185,28 @@ function ae({
         sourceAppPid: t?.user?.sourceAppPid,
         credentialId: e.id
       });
-      u.success(n("disconnectPasskeySucceed")), C(s);
+      u.success(n("disconnectPasskeySucceed")), I(s);
     } catch (s) {
       U.error("Failed to disconnect passkey", s), u.error(A(s, n("disconnectPasskeyFailed")));
     } finally {
       r.disconnecting = !1;
     }
-  }, N = async (t = {}) => {
+  }, j = async (t = {}) => {
     try {
       const { data: e } = await c.get("/passports");
       e.length ? (o.open = !0, o.currentUser = t, o.passports = e || []) : u.error(n("noPassports"));
     } catch (e) {
       u.error(e.message || n("getPassportFailed"));
     }
-  }, j = i((...t) => {
-    o.reset(), I(...t);
-  }), L = i(async ({ action: t = "login", ...e } = {}) => {
+  }, L = i((...t) => {
+    o.reset(), R(...t);
+  }), _ = i(async ({ action: t = "login", ...e } = {}) => {
     const s = r.baseUrl;
     if (e?.sourceAppPid === window.blocklet?.appPid)
       r.baseUrl = window.blocklet?.appUrl || "/";
     else if (e?.sourceAppPid) {
-      const a = await x(), y = X(a), f = Q(a);
-      y && f?.appPid && e?.sourceAppPid === f?.appPid && (r.baseUrl = f.appUrl);
+      const a = await B(), p = $(a), f = Q(a);
+      p && f?.appPid && e?.sourceAppPid === f?.appPid && (r.baseUrl = f.appUrl);
     }
     try {
       const a = {
@@ -212,32 +215,32 @@ function ae({
         locale: l,
         componentId: P
       };
-      z(a.inviter) && window.localStorage.getItem("inviter") && (a.inviter = window.localStorage.getItem("inviter"));
-      const y = ee(await k(a));
-      return y.provider = "passkey", y;
+      J(a.inviter) && window.localStorage.getItem("inviter") && (a.inviter = window.localStorage.getItem("inviter"));
+      const p = se(await k(a));
+      return p.provider = "passkey", p;
     } catch (a) {
       console.error("passkey.login.error", a);
-      const y = h(a, n("verifyPasskeyFailed"), n);
-      throw r.baseUrl = s, new Error(y);
+      const p = h(a, n("verifyPasskeyFailed"), n);
+      throw r.baseUrl = s, new Error(p);
     }
-  }), _ = i(() => {
+  }), V = i(() => {
   });
-  return /* @__PURE__ */ V(
-    te,
+  return /* @__PURE__ */ z(
+    re,
     {
       value: {
         api: c,
         locale: l,
-        connectPasskey: M,
-        disconnectPasskey: D,
+        connectPasskey: D,
+        disconnectPasskey: N,
         createPasskey: b,
         verifyPasskey: k,
-        loginPasskey: L,
-        logoutPasskey: _,
-        switchPassport: N,
+        loginPasskey: _,
+        logoutPasskey: V,
+        switchPassport: j,
         baseUrl: r.baseUrl,
-        setBaseUrl: B,
-        setTargetAppPid: T,
+        setBaseUrl: T,
+        setTargetAppPid: M,
         passkeyState: d,
         disconnecting: r.disconnecting,
         connecting: r.connecting,
@@ -246,33 +249,33 @@ function ae({
       children: [
         m,
         /* @__PURE__ */ O(
-          se,
+          te,
           {
             api: c,
             locale: l,
             switchState: o,
-            onSwitchPassport: j,
-            session: R
+            onSwitchPassport: L,
+            session: x
           }
         )
       ]
     }
   );
 }
-function me() {
-  return J(F);
+function be() {
+  return K(E);
 }
-ae.propTypes = {
-  children: p.node.isRequired,
-  locale: p.string,
-  onAddPasskey: p.func,
-  onRemovePasskey: p.func,
-  onSwitchPassport: p.func,
-  session: p.object
+ne.propTypes = {
+  children: y.node.isRequired,
+  locale: y.string,
+  onAddPasskey: y.func,
+  onRemovePasskey: y.func,
+  onSwitchPassport: y.func,
+  session: y.object
 };
 export {
-  he as PasskeyConsumer,
-  F as PasskeyContext,
-  ae as PasskeyProvider,
-  me as usePasskey
+  ve as PasskeyConsumer,
+  E as PasskeyContext,
+  ne as PasskeyProvider,
+  be as usePasskey
 };