@arcblock/did-connect-react 3.4.0 → 3.4.1

package/lib/Connect/assets/locale.js

@@ -67,7 +67,8 @@ const e = {
     passkeyPreviewDescription: "Sign in with Passkey - More secure and convenient authentication. No passwords to remember, easily access apps and websites.",
     didConnectTitle: "DID Connect",
     didConnectDescription: "Decentralized identities and apps, W3C DID-based, future-ready.",
-    noAuthenticationProvider: "No authentication provider configured"
+    noAuthenticationProvider: "No authentication provider configured",
+    lastUsed: "Last Used"
   },
   zh: {
     generateError: "二维码生成失败",
@@ -137,7 +138,8 @@ const e = {
     passkeyPreviewDescription: "使用 Passkey 账户登录 - 更安全、更便捷的身份验证方式。无需记忆密码，轻松登录各类应用和网站",
     didConnectTitle: "DID Connect",
     didConnectDescription: "面向未来的基于 W3C DID 去中心化身份和应用",
-    noAuthenticationProvider: "未配置任何身份验证提供者"
+    noAuthenticationProvider: "未配置任何身份验证提供者",
+    lastUsed: "上次使用"
   }
 };
 export {

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

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