@arcblock/did-connect-react 3.1.30 → 3.1.31

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

@@ -1,93 +1,94 @@
 import { jsx as n, jsxs as F } from "react/jsx-runtime";
 import o from "prop-types";
-import { Box as m } from "@mui/material";
-import { LOGIN_PROVIDER as u, LOGIN_PROVIDER_NAME as S } from "@arcblock/ux/lib/Util/constant";
-import { getWebWalletUrl as ee } from "@arcblock/ux/lib/Util/wallet";
-import f from "lodash/noop";
-import { useMemoizedFn as g } from "ahooks";
-import h from "js-cookie";
-import { getCookieOptions as oe } from "@arcblock/ux/lib/Util";
-import { useRef as y, useEffect as re } from "react";
-import { mergeSx as te } from "@arcblock/ux/lib/Util/style";
-import se from "@arcblock/ux/lib/DIDConnect/provider-icon";
-import ne from "./mobile-login-item.js";
+import { Box as u } from "@mui/material";
+import { LOGIN_PROVIDER as f, LOGIN_PROVIDER_NAME as ee } from "@arcblock/ux/lib/Util/constant";
+import { getWebWalletUrl as oe } from "@arcblock/ux/lib/Util/wallet";
+import d from "lodash/noop";
+import { useMemoizedFn as h } from "ahooks";
+import y from "js-cookie";
+import { getCookieOptions as te } from "@arcblock/ux/lib/Util";
+import { useRef as x, useEffect as re } from "react";
+import { mergeSx as se } from "@arcblock/ux/lib/Util/style";
+import ne from "@arcblock/ux/lib/DIDConnect/provider-icon";
+import { GA_LAST_LOGIN_METHOD as p } from "@arcblock/ux/lib/withTracker/constant";
+import le from "./mobile-login-item.js";
 import ie from "./web-login-item.js";
-import le from "./login-method-item.js";
+import ae from "./login-method-item.js";
 import { useOAuth as ce } from "../../../OAuth/context.js";
-import { useStateContext as ae } from "../../contexts/state.js";
-import { getAppId as pe, logger as me, getApiErrorMessage as ue } from "../../../utils.js";
-import fe from "./passkey-login-item.js";
-import { usePasskey as de } from "../../../Passkey/context.js";
+import { useStateContext as pe } from "../../contexts/state.js";
+import { getAppId as me, logger as ue, getApiErrorMessage as fe } from "../../../utils.js";
+import de from "./passkey-login-item.js";
+import { usePasskey as ge } from "../../../Passkey/context.js";
 import "../../../Passkey/actions.js";
-import ge from "../../plugins/email/index.js";
-function he({
-  onSuccess: x = f,
-  onError: b = f,
-  size: i = "small",
-  tokenState: r,
-  webWalletUrl: T = ee(),
-  tokenKey: U,
+import he from "../../plugins/email/index.js";
+function ye({
+  onSuccess: I = d,
+  onError: b = d,
+  size: l = "small",
+  tokenState: t,
+  webWalletUrl: U = oe(),
+  tokenKey: N,
   passkeyBehavior: W = "none",
-  onRest: d = f,
+  onRest: g = d,
   showMobileLogin: j = !0,
   showOAuthLogin: v = !0,
-  showPasskeyLogin: M = !0,
-  showWebLogin: N = !0,
-  showEmailLogin: p = !0,
+  showPasskeyLogin: w = !0,
+  showWebLogin: G = !0,
+  showEmailLogin: m = !0,
   oauthProviderList: q = [],
   slotProps: B = {},
-  disableSwitchApp: w = !1,
-  forceUpdate: G = f,
-  magicToken: I = void 0,
+  disableSwitchApp: L = !1,
+  forceUpdate: S = d,
+  magicToken: M = void 0,
   baseUrl: V = "/",
-  customItems: K = []
+  customItems: H = []
 }) {
-  const L = y(null), P = y(null), A = y(null), { loginOAuth: $, logoutOAuth: H, t: J, oauthState: s } = ce(), { passkeyState: C } = de(), { extraParams: O, locale: Q, connectState: t, plugins: R, setPlugins: X, setSelectedPlugin: Y, getPlugin: E } = ae(), _ = g(async (e) => {
-    r.reset(), s.reset({
+  const A = x(null), P = x(null), O = x(null), { loginOAuth: K, logoutOAuth: $, t: J, oauthState: s } = ce(), { passkeyState: C } = ge(), { extraParams: _, locale: Q, connectState: r, plugins: E, setPlugins: X, setSelectedPlugin: Y, getPlugin: R } = pe(), k = h(async (e) => {
+    localStorage.setItem(p, e.provider), t.reset(), s.reset({
       status: "scanned"
-    }), C.reset(), t.chooseMethod = e.provider;
-    const c = O?.sourceAppPid;
+    }), C.reset(), r.chooseMethod = e.provider;
+    const a = _?.sourceAppPid;
     try {
       s.loading = !0, s.status = "scanned";
-      const a = await $(e, {
-        action: r.action,
-        ...O
-      }), l = oe({ returnDomain: !1 });
-      h.remove("connected_did", l), h.remove("connected_pk", l), h.remove("connected_wallet_os", l), a?.sessionToken && (await x(
+      const c = await K(e, {
+        action: t.action,
+        ..._
+      }), i = te({ returnDomain: !1 });
+      y.remove("connected_did", i), y.remove("connected_pk", i), y.remove("connected_wallet_os", i), c?.sessionToken && (await I(
         {
-          ...a,
+          ...c,
           encrypted: !1
         },
         (z) => z,
         {
-          sourceAppPid: c,
-          connected_app: pe(r.appInfo, r.memberAppInfo)
+          sourceAppPid: a,
+          connected_app: me(t.appInfo, t.memberAppInfo)
         }
       ), s.loading = !1, s.status = "succeed");
-    } catch (a) {
-      me.error(`Failed login OAuth: ${e.provider}`, a);
-      const l = ue(a, J("loginOAuthFailed"));
-      s.loading = !1, s.error = l, s.status = "error", await H({ provider: e.provider }), b(new Error(l));
+    } catch (c) {
+      ue.error(`Failed login OAuth: ${e.provider}`, c);
+      const i = fe(c, J("loginOAuthFailed"));
+      s.loading = !1, s.error = i, s.status = "error", await $({ provider: e.provider }), b(new Error(i));
     }
-  }), k = g(async () => {
-    r.reset(), await d(), r.status = "created", t.chooseMethod = "wallet";
-  }), D = ge({ baseUrl: V }), Z = g(() => {
-    if (I && p && R.some((e) => e.name === u.EMAIL)) {
-      const e = E(u.EMAIL);
-      e.state.status === "idle" && (e.state.reset(), e.state.magicToken = I, t.chooseMethod = u.EMAIL, Y(e), G());
+  }), T = h(async () => {
+    t.reset(), await g(), t.status = "created", r.chooseMethod = "wallet";
+  }), D = he({ baseUrl: V }), Z = h(() => {
+    if (M && m && E.some((e) => e.name === f.EMAIL)) {
+      const e = R(f.EMAIL);
+      e.state.status === "idle" && (localStorage.setItem(p, "email"), e.state.reset(), e.state.magicToken = M, r.chooseMethod = f.EMAIL, Y(e), S());
     }
   });
   return re(() => {
     const e = [];
-    if (p) {
-      const c = E(u.EMAIL);
-      c && c.baseUrl === D.baseUrl ? e.push(c) : e.push(D);
+    if (m) {
+      const a = R(f.EMAIL);
+      a && a.baseUrl === D.baseUrl ? e.push(a) : e.push(D);
     }
-    X(e), t.retryConnect = k, setTimeout(() => {
+    X(e), r.retryConnect = T, setTimeout(() => {
       Z();
     }, 100);
-  }, [p]), /* @__PURE__ */ n(m, { className: "did-connect__choose", sx: te({ flex: 1 }, B?.root?.sx), children: /* @__PURE__ */ n(
-    m,
+  }, [m]), /* @__PURE__ */ n(u, { className: "did-connect__choose", sx: se({ flex: 1 }, B?.root?.sx), children: /* @__PURE__ */ n(
+    u,
     {
       sx: {
         display: "flex",
@@ -95,7 +96,7 @@ function he({
         gap: 2
       },
       children: /* @__PURE__ */ F(
-        m,
+        u,
         {
           sx: [
             {
@@ -105,43 +106,43 @@ function he({
             }
           ],
           children: [
-            j && i !== "small" && /* @__PURE__ */ n(
-              ne,
+            j && l !== "small" && /* @__PURE__ */ n(
+              le,
               {
-                ref: L,
-                tokenState: r,
-                sx: [i === "small" ? { p: 1 } : { p: 2 }],
+                ref: A,
+                tokenState: t,
+                sx: [l === "small" ? { p: 1 } : { p: 2 }],
                 locale: Q,
-                tokenKey: U,
-                disableSwitchApp: w,
+                tokenKey: N,
+                disableSwitchApp: L,
                 onClick: async () => {
-                  r.reset(), await d(), r.status = "created", t.chooseMethod = "wallet";
-                  const e = L.current?.connect;
-                  t.retryConnect = () => {
-                    e(k);
+                  localStorage.setItem(p, "wallet"), t.reset(), await g(), t.status = "created", r.chooseMethod = "wallet";
+                  const e = A.current?.connect;
+                  r.retryConnect = () => {
+                    e(T);
                   };
                 }
               }
             ),
-            N && /* @__PURE__ */ n(
+            G && /* @__PURE__ */ n(
               ie,
               {
                 ref: P,
-                tokenState: r,
-                webWalletUrl: T,
-                sx: [i === "small" ? { p: 1 } : { p: 2 }],
-                disableSwitchApp: w,
+                tokenState: t,
+                webWalletUrl: U,
+                sx: [l === "small" ? { p: 1 } : { p: 2 }],
+                disableSwitchApp: L,
                 onClick: () => {
-                  r.status = "scanned", t.chooseMethod = "wallet-web";
+                  localStorage.setItem(p, "wallet"), t.status = "scanned", r.chooseMethod = "wallet-web";
                   const e = P.current.connect;
-                  t.retryConnect = async () => {
-                    await d(), r.error = "", r.status = "scanned", e();
+                  r.retryConnect = async () => {
+                    await g(), t.error = "", t.status = "scanned", e();
                   };
                 }
               }
             ),
-            v || M || p ? /* @__PURE__ */ F(
-              m,
+            v || w || m ? /* @__PURE__ */ F(
+              u,
               {
                 sx: [
                   {
@@ -151,19 +152,19 @@ function he({
                   }
                 ],
                 children: [
-                  R.map(
+                  E.map(
                     (e) => e.renderListItem({
                       key: e.name,
-                      sx: [i === "small" ? { p: 1 } : { p: 2 }]
+                      sx: [l === "small" ? { p: 1 } : { p: 2 }]
                       // forceUpdate,
                     })
                   ),
                   v ? q.map((e) => /* @__PURE__ */ n(
-                    le,
+                    ae,
                     {
-                      title: S[e.provider],
+                      title: ee[e.provider],
                       icon: /* @__PURE__ */ n(
-                        se,
+                        ne,
                         {
                           provider: e.provider,
                           sx: {
@@ -175,27 +176,28 @@ function he({
                         }
                       ),
                       onClick: () => {
-                        _(e), t.retryConnect = () => {
-                          _(e);
+                        k(e), r.retryConnect = () => {
+                          k(e);
                         };
                       },
-                      sx: [i === "small" ? { p: 1 } : { p: 2 }]
+                      sx: [l === "small" ? { p: 1 } : { p: 2 }]
                     },
                     e.provider
                   )) : null,
-                  M ? /* @__PURE__ */ n(
-                    fe,
+                  w ? /* @__PURE__ */ n(
+                    de,
                     {
-                      ref: A,
-                      onSuccess: x,
+                      ref: O,
+                      onSuccess: I,
                       onError: b,
-                      tokenState: r,
+                      tokenState: t,
                       behavior: W,
-                      sx: [i === "small" ? { p: 1 } : { p: 2 }],
+                      sx: [l === "small" ? { p: 1 } : { p: 2 }],
                       onClick: () => {
-                        const e = A.current.connect;
-                        t.chooseMethod = "passkey", t.retryConnect = () => {
-                          C.verifying = !0, t.chooseMethod = "passkey", e();
+                        localStorage.setItem(p, "passkey");
+                        const e = O.current.connect;
+                        r.chooseMethod = "passkey", r.retryConnect = () => {
+                          C.verifying = !0, r.chooseMethod = "passkey", e();
                         };
                       },
                       slotProps: {
@@ -215,14 +217,14 @@ function he({
                 ]
               }
             ) : null,
-            K.map((e) => e || null)
+            H.map((e) => e || null)
           ]
         }
       )
     }
   ) });
 }
-he.propTypes = {
+ye.propTypes = {
   onSuccess: o.func,
   onError: o.func,
   size: o.oneOf(["small", "normal", "large"]),
@@ -245,5 +247,5 @@ he.propTypes = {
   customItems: o.arrayOf(o.node)
 };
 export {
-  he as default
+  ye as default
 };

package/lib/Connect/plugins/email/list-item.js

@@ -1,28 +1,30 @@
 import { jsx as s } from "react/jsx-runtime";
 import c from "prop-types";
-import { useMemoizedFn as p } from "ahooks";
-import l from "@iconify-icons/material-symbols/mail-outline-rounded";
-import { LOGIN_PROVIDER as o, LOGIN_PROVIDER_NAME as u } from "@arcblock/ux/lib/Util/constant";
-import a from "../../components/login-item/login-method-item.js";
+import { useMemoizedFn as l } from "ahooks";
+import p from "@iconify-icons/material-symbols/mail-outline-rounded";
+import { LOGIN_PROVIDER as o, LOGIN_PROVIDER_NAME as a } from "@arcblock/ux/lib/Util/constant";
+import { GA_LAST_LOGIN_METHOD as u } from "@arcblock/ux/lib/withTracker/constant";
+import I from "../../components/login-item/login-method-item.js";
 import { useStateContext as f } from "../../contexts/state.js";
-function I({ ...e }) {
-  const { setSelectedPlugin: n, getPlugin: i, connectState: r } = f(), m = p(() => {
+function L({ ...e }) {
+  const { setSelectedPlugin: n, getPlugin: i, connectState: r } = f(), m = l(() => {
+    localStorage.setItem(u, "email");
     const t = i(o.EMAIL);
     t.state.reset(), t.state.status = "creating", r.chooseMethod = o.EMAIL, n(t);
   });
   return /* @__PURE__ */ s(
-    a,
+    I,
     {
       ...e,
-      title: u[o.EMAIL],
-      icon: l,
+      title: a[o.EMAIL],
+      icon: p,
       onClick: m
     }
   );
 }
-I.propTypes = {
+L.propTypes = {
   onClick: c.func
 };
 export {
-  I as default
+  L as default
 };