@blocklet/ui-react 3.0.9 → 3.0.10

package/lib/UserCenter/components/third-party-login/index.js

@@ -1,60 +1,60 @@
 import { jsx as s, jsxs as L, Fragment as O } from "react/jsx-runtime";
-import a from "lodash/noop";
+import p from "lodash/noop";
 import { use as k, useState as H } from "react";
 import { Box as U } from "@mui/material";
-import { useAsyncEffect as B, useCreation as f } from "ahooks";
-import { getConnectedAccounts as l, getSourceProvider as G } from "@arcblock/ux/lib/SessionUser/libs/utils";
-import { LOGIN_PROVIDER as t } from "@arcblock/ux/lib/Util/constant";
-import { SessionContext as I } from "@arcblock/did-connect/lib/Session";
+import { useAsyncEffect as b, useCreation as u } from "ahooks";
+import { getConnectedAccounts as v, getSourceProvider as B } from "@arcblock/ux/lib/SessionUser/libs/utils";
+import { LOGIN_PROVIDER as o } from "@arcblock/ux/lib/Util/constant";
+import { SessionContext as G } from "@arcblock/did-connect/lib/Session";
 import { PasskeyActions as T } from "@arcblock/did-connect/lib/Passkey";
-import { useBrowser as S } from "@arcblock/react-hooks";
-import u from "./third-party-item.js";
-function q({ user: r }) {
-  const { session: C } = k(I), [m, w] = H({}), { getOAuthConfigs: E } = C.useOAuth(), A = S();
-  B(async () => {
-    const e = await E({
-      sourceAppPid: r == null ? void 0 : r.sourceAppPid
+import { useBrowser as I } from "@arcblock/react-hooks";
+import l from "./third-party-item.js";
+function q({ user: i }) {
+  const { session: C } = k(G), [f, w] = H({}), { getOAuthConfigs: E } = C.useOAuth(), A = I();
+  b(async () => {
+    const r = await E({
+      sourceAppPid: i?.sourceAppPid
     });
-    w(e);
-  }, [r == null ? void 0 : r.sourceAppPid]);
-  const P = f(() => Object.keys(m).map((i) => ({
-    ...m[i],
-    provider: i
-  })).filter((i) => i.enabled), [m]), h = f(() => {
-    const e = l(r);
-    let i = !1, n = "", c = G(r);
-    const p = e.find((o) => o.provider === t.AUTH0);
-    return p && (p.id.startsWith("google-oauth2|") && (e.some((o) => o.provider === "google") || (i = !0, n = t.GOOGLE, c === t.AUTH0 && (c = t.GOOGLE))), p.id.startsWith("appleid|") && (e.some((o) => o.provider === t.APPLE) || (i = !0, n = t.APPLE, c === t.AUTH0 && (c = t.APPLE))), p.id.startsWith("github|") && (e.some((o) => o.provider === t.GITHUB) || (i = !0, n = t.GITHUB, c === t.AUTH0 && (c = t.GITHUB)))), P.map((o) => {
-      if (o.provider === t.AUTH0 && i)
+    w(r);
+  }, [i?.sourceAppPid]);
+  const P = u(() => Object.keys(f).map((n) => ({
+    ...f[n],
+    provider: n
+  })).filter((n) => n.enabled), [f]), h = u(() => {
+    const r = v(i);
+    let n = !1, t = "", d = B(i);
+    const a = r.find((e) => e.provider === o.AUTH0);
+    return a && (a.id.startsWith("google-oauth2|") && (r.some((e) => e.provider === "google") || (n = !0, t = o.GOOGLE, d === o.AUTH0 && (d = o.GOOGLE))), a.id.startsWith("appleid|") && (r.some((e) => e.provider === o.APPLE) || (n = !0, t = o.APPLE, d === o.AUTH0 && (d = o.APPLE))), a.id.startsWith("github|") && (r.some((e) => e.provider === o.GITHUB) || (n = !0, t = o.GITHUB, d === o.AUTH0 && (d = o.GITHUB)))), P.map((e) => {
+      if (e.provider === o.AUTH0 && n)
         return null;
-      const d = i && o.provider === n ? e.find((v) => v.provider === t.AUTH0) : e.find((v) => v.provider === o.provider);
-      return d ? {
-        ...o,
-        provider: o.provider,
-        did: d.did,
-        pk: d.pk,
-        userInfo: d.userInfo,
+      const c = n && e.provider === t ? r.find((m) => m.provider === o.AUTH0) : r.find((m) => m.provider === e.provider);
+      return c ? {
+        ...e,
+        provider: e.provider,
+        did: c.did,
+        pk: c.pk,
+        userInfo: c.userInfo,
         _bind: !0,
-        _rawProvider: d.provider,
-        _mainProvider: o.provider === c
+        _rawProvider: c.provider,
+        _mainProvider: e.provider === d
       } : {
-        ...o,
-        provider: o.provider,
-        _rawProvider: o.provider,
-        _mainProvider: o.provider === c
+        ...e,
+        provider: e.provider,
+        _rawProvider: e.provider,
+        _mainProvider: e.provider === d
       };
-    }).filter(Boolean).sort((o, d) => (o == null ? void 0 : o.order) !== void 0 && (d == null ? void 0 : d.order) !== void 0 ? o.order - d.order : (o == null ? void 0 : o.order) !== void 0 ? -1 : 1);
-  }, [r == null ? void 0 : r.connectedAccounts, P]), g = f(() => l(r).filter(
-    (n) => n.provider === t.PASSKEY && n.did !== (r == null ? void 0 : r.did)
-  ).map((n) => ({
-    ...n,
+    }).filter(Boolean).sort((e, c) => e?.order !== void 0 && c?.order !== void 0 ? e.order - c.order : e?.order !== void 0 ? -1 : 1);
+  }, [i?.connectedAccounts, P]), g = u(() => v(i).filter(
+    (t) => t.provider === o.PASSKEY && t.did !== i?.did
+  ).map((t) => ({
+    ...t,
     _bind: !0
-  })), [r]), y = f(() => l(r).filter(
-    (n) => n.provider === t.WALLET && n.did !== (r == null ? void 0 : r.did)
-  ).map((n) => ({
-    ...n,
+  })), [i]), y = u(() => v(i).filter(
+    (t) => t.provider === o.WALLET && t.did !== i?.did
+  ).map((t) => ({
+    ...t,
     _mainProvider: !0
-  })), [r]);
+  })), [i]);
   return /* @__PURE__ */ s(
     U,
     {
@@ -70,14 +70,14 @@ function q({ user: r }) {
           action: "connect",
           createMode: "connect",
           createButtonText: "Add Passkey",
-          onSuccess: a,
-          onError: a,
+          onSuccess: p,
+          onError: p,
           dense: !0
         }
       ) : /* @__PURE__ */ L(O, { children: [
-        h.map((e) => /* @__PURE__ */ s(u, { item: e }, e == null ? void 0 : e.provider)),
-        g.map((e) => /* @__PURE__ */ s(u, { item: e }, e.id)),
-        y.map((e) => /* @__PURE__ */ s(u, { item: e }, e.id)),
+        h.map((r) => /* @__PURE__ */ s(l, { item: r }, r?.provider)),
+        g.map((r) => /* @__PURE__ */ s(l, { item: r }, r.id)),
+        y.map((r) => /* @__PURE__ */ s(l, { item: r }, r.id)),
         A.wallet || A.arcSphere ? null : /* @__PURE__ */ s(
           T,
           {
@@ -85,8 +85,8 @@ function q({ user: r }) {
             action: "connect",
             createMode: "connect",
             createButtonText: "Add New Passkey",
-            onSuccess: a,
-            onError: a,
+            onSuccess: p,
+            onError: p,
             dense: !0,
             sx: {
               px: 1.5,

package/lib/UserCenter/components/third-party-login/third-party-item.js

@@ -1,45 +1,44 @@
-import { jsxs as s, Fragment as S, jsx as n } from "react/jsx-runtime";
-import { Icon as g } from "@iconify/react";
-import { Box as t, Tooltip as A, Typography as B } from "@mui/material";
-import F from "@iconify-icons/material-symbols/link-rounded";
-import W from "@arcblock/ux/lib/Button";
-import N from "@arcblock/ux/lib/Avatar";
-import { useReactive as K, useMemoizedFn as L, useCreation as _ } from "ahooks";
-import { translate as V } from "@arcblock/ux/lib/Locale/util";
-import { useConfirm as Y } from "@arcblock/ux/lib/Dialog";
-import { useLocaleContext as j } from "@arcblock/ux/lib/Locale/context";
-import $ from "@iconify-icons/material-symbols/mail-outline-rounded";
-import q from "@iconify-icons/material-symbols/info-outline-rounded";
-import J from "@iconify-icons/material-symbols/passkey";
-import Q from "@iconify-icons/material-symbols/wallet-sharp";
-import X from "@iconify-icons/logos/apple";
-import Z from "@iconify-icons/logos/github-icon";
-import oo from "@iconify-icons/logos/google-icon";
-import { SessionContext as ro } from "@arcblock/did-connect/lib/Session";
-import { use as no } from "react";
-import eo from "lodash/pick";
-import { getFederatedEnabled as co, getMaster as to } from "@arcblock/ux/lib/Util/federated";
-import { LOGIN_PROVIDER as l, LOGIN_PROVIDER_NAME as ao } from "@arcblock/ux/lib/Util/constant";
-import { useStateContext as io } from "@arcblock/did-connect/lib/Connect/contexts/state";
-import { translations as lo } from "../../libs/locales.js";
-function Uo({
+import { jsxs as s, Fragment as P, jsx as n } from "react/jsx-runtime";
+import { Icon as m } from "@iconify/react";
+import { Box as c, Tooltip as y, Typography as I } from "@mui/material";
+import E from "@iconify-icons/material-symbols/link-rounded";
+import z from "@arcblock/ux/lib/Button";
+import G from "@arcblock/ux/lib/Avatar";
+import { useReactive as H, useMemoizedFn as k, useCreation as v } from "ahooks";
+import { translate as M } from "@arcblock/ux/lib/Locale/util";
+import { useConfirm as D } from "@arcblock/ux/lib/Dialog";
+import { useLocaleContext as F } from "@arcblock/ux/lib/Locale/context";
+import W from "@iconify-icons/material-symbols/mail-outline-rounded";
+import N from "@iconify-icons/material-symbols/info-outline-rounded";
+import K from "@iconify-icons/material-symbols/passkey";
+import V from "@iconify-icons/material-symbols/wallet-sharp";
+import Y from "@iconify-icons/logos/apple";
+import j from "@iconify-icons/logos/github-icon";
+import $ from "@iconify-icons/logos/google-icon";
+import { SessionContext as q } from "@arcblock/did-connect/lib/Session";
+import { use as J } from "react";
+import Q from "lodash/pick";
+import { getFederatedEnabled as X, getMaster as Z } from "@arcblock/ux/lib/Util/federated";
+import { LOGIN_PROVIDER as a, LOGIN_PROVIDER_NAME as oo } from "@arcblock/ux/lib/Util/constant";
+import { useStateContext as ro } from "@arcblock/did-connect/lib/Connect/contexts/state";
+import { translations as no } from "../../libs/locales.js";
+function Ao({
   item: o
 }) {
-  var m, y, I, k, v;
-  const { blocklet: u } = io(), { confirmApi: x, confirmHolder: O } = Y(), p = K({
+  const { blocklet: w } = ro(), { confirmApi: f, confirmHolder: C } = D(), p = H({
     loading: !1
-  }), { locale: R } = j(), e = L((r, c = {}) => V(lo, r, R, "en", c)), { session: a } = no(ro), { bindOAuth: T, unbindOAuth: U, setBaseUrl: b, baseUrl: E } = a.useOAuth(), { disconnectPasskey: z, setTargetAppPid: P } = a.usePasskey(), G = {
+  }), { locale: B } = F(), e = k((r, t = {}) => M(no, r, B, "en", t)), { session: l } = J(q), { bindOAuth: S, unbindOAuth: A, setBaseUrl: u, baseUrl: L } = l.useOAuth(), { disconnectPasskey: _, setTargetAppPid: h } = l.usePasskey(), O = {
     // email: MailOutlineRoundedIcon,
-    [l.AUTH0]: $,
-    [l.APPLE]: X,
-    [l.GITHUB]: Z,
-    [l.GOOGLE]: oo,
-    [l.PASSKEY]: J,
-    [l.WALLET]: Q
-  }, H = _(() => G[o == null ? void 0 : o.provider], [o == null ? void 0 : o.provider]), d = _(() => ao[o == null ? void 0 : o.provider] || "unknown", [o == null ? void 0 : o.provider]), M = L(async () => {
-    if ((o == null ? void 0 : o.provider) === l.PASSKEY) {
-      await new Promise((r, c) => {
-        x.open({
+    [a.AUTH0]: W,
+    [a.APPLE]: Y,
+    [a.GITHUB]: j,
+    [a.GOOGLE]: $,
+    [a.PASSKEY]: K,
+    [a.WALLET]: V
+  }, R = v(() => O[o?.provider], [o?.provider]), d = v(() => oo[o?.provider] || "unknown", [o?.provider]), T = k(async () => {
+    if (o?.provider === a.PASSKEY) {
+      await new Promise((r, t) => {
+        f.open({
           title: e("thirdPartyLogin.disconnectPasskey", { name: d }),
           content: e("thirdPartyLogin.disconnectPasskeyDescription", { name: d }),
           confirmButtonText: e("common.confirm"),
@@ -48,7 +47,7 @@ function Uo({
           },
           cancelButtonText: e("common.cancel"),
           onConfirm(i) {
-            z({ session: a, connectedAccount: o }).then(r).catch(c), i();
+            _({ session: l, connectedAccount: o }).then(r).catch(t), i();
           },
           // @ts-ignore
           onCancel: r
@@ -57,10 +56,9 @@ function Uo({
       return;
     }
     try {
-      p.loading = !0, await new Promise((r, c) => {
-        var i;
-        if (o != null && o._bind)
-          x.open({
+      p.loading = !0, await new Promise((r, t) => {
+        if (o?._bind)
+          f.open({
             title: e("thirdPartyLogin.confirmUnbind", { name: d }),
             content: e("thirdPartyLogin.confirmUnbindDescription", { name: d }),
             confirmButtonText: e("common.confirm"),
@@ -68,43 +66,43 @@ function Uo({
               color: "error"
             },
             cancelButtonText: e("common.cancel"),
-            onConfirm(h) {
-              U({
-                session: a,
+            onConfirm(i) {
+              A({
+                session: l,
                 connectedAccount: {
-                  ...eo(o, ["did", "pk"]),
+                  ...Q(o, ["did", "pk"]),
                   showProvider: o.provider,
                   provider: o._rawProvider
                 }
-              }).then(r).catch(c), h();
+              }).then(r).catch(t), i();
             },
             // @ts-ignore
             onCancel: r
           });
         else {
-          const h = E, w = window == null ? void 0 : window.blocklet;
-          let C = "/";
-          const D = co(w), f = to(w);
-          D && (f != null && f.appPid) && ((i = a == null ? void 0 : a.user) != null && i.sourceAppPid) && (C = f.appUrl), b(C), P(u == null ? void 0 : u.appPid), T({
-            session: a,
+          const i = L, g = window?.blocklet;
+          let x = "/";
+          const U = X(g), b = Z(g);
+          U && b?.appPid && l?.user?.sourceAppPid && (x = b.appUrl), u(x), h(w?.appPid), S({
+            session: l,
             oauthItem: {
               ...o,
               provider: o._rawProvider
             }
-          }).then(r).catch(c).finally(() => {
-            b(h), P();
+          }).then(r).catch(t).finally(() => {
+            u(i), h();
           });
         }
       });
     } catch (r) {
-      console.error(`Failed to ${o != null && o._bind ? "unbind" : "bind"} oauth account`, r);
+      console.error(`Failed to ${o?._bind ? "unbind" : "bind"} oauth account`, r);
     } finally {
       p.loading = !1;
     }
   });
-  return /* @__PURE__ */ s(S, { children: [
+  return /* @__PURE__ */ s(P, { children: [
     /* @__PURE__ */ s(
-      t,
+      c,
       {
         sx: {
           borderRadius: 1,
@@ -122,10 +120,10 @@ function Uo({
         },
         children: [
           /* @__PURE__ */ n(
-            t,
+            c,
             {
-              component: g,
-              icon: H,
+              component: m,
+              icon: R,
               fill: "currentColor",
               sx: {
                 width: "1em",
@@ -133,12 +131,12 @@ function Uo({
                 flexShrink: 0,
                 fontSize: 16,
                 // githubIcon 不支持变色，dark 模式做一个反色处理
-                filter: ({ palette: r }) => (o == null ? void 0 : o.provider) === l.GITHUB && r.mode === "dark" ? "invert(1)" : "none"
+                filter: ({ palette: r }) => o?.provider === a.GITHUB && r.mode === "dark" ? "invert(1)" : "none"
               }
             }
           ),
           /* @__PURE__ */ n(
-            t,
+            c,
             {
               sx: {
                 flex: 1
@@ -147,7 +145,7 @@ function Uo({
             }
           ),
           /* @__PURE__ */ s(
-            t,
+            c,
             {
               sx: {
                 display: "flex",
@@ -156,7 +154,7 @@ function Uo({
               },
               children: [
                 /* @__PURE__ */ n(
-                  t,
+                  c,
                   {
                     sx: {
                       flex: 1,
@@ -164,44 +162,44 @@ function Uo({
                       overflow: "hidden",
                       lineHeight: "normal"
                     },
-                    children: ((m = o.userInfo) == null ? void 0 : m.email) || o.did
+                    children: o.userInfo?.email || o.did
                   }
                 ),
-                (y = o.userInfo) != null && y.name ? /* @__PURE__ */ n(
-                  A,
+                o.userInfo?.name ? /* @__PURE__ */ n(
+                  y,
                   {
-                    title: /* @__PURE__ */ n(S, { children: /* @__PURE__ */ s(t, { sx: { display: "flex", alignItems: "center", gap: 1 }, children: [
-                      /* @__PURE__ */ n(N, { size: 36, variant: "circle", shape: "circle", src: (I = o.userInfo) == null ? void 0 : I.picture, did: o.did }),
-                      /* @__PURE__ */ s(t, { children: [
+                    title: /* @__PURE__ */ n(P, { children: /* @__PURE__ */ s(c, { sx: { display: "flex", alignItems: "center", gap: 1 }, children: [
+                      /* @__PURE__ */ n(G, { size: 36, variant: "circle", shape: "circle", src: o.userInfo?.picture, did: o.did }),
+                      /* @__PURE__ */ s(c, { children: [
                         /* @__PURE__ */ n(
-                          B,
+                          I,
                           {
                             sx: {
                               whiteSpace: "normal",
                               wordBreak: "break-all",
                               fontSize: "0.9rem"
                             },
-                            children: (k = o.userInfo) == null ? void 0 : k.name
+                            children: o.userInfo?.name
                           }
                         ),
                         /* @__PURE__ */ n(
-                          B,
+                          I,
                           {
                             sx: {
                               whiteSpace: "normal",
                               wordBreak: "break-all",
                               fontSize: "0.9rem"
                             },
-                            children: (v = o.userInfo) == null ? void 0 : v.email
+                            children: o.userInfo?.email
                           }
                         )
                       ] })
                     ] }) }),
                     children: /* @__PURE__ */ n(
-                      t,
+                      c,
                       {
-                        component: g,
-                        icon: q,
+                        component: m,
+                        icon: N,
                         sx: {
                           color: "text.secondary",
                           fontSize: 16,
@@ -218,19 +216,19 @@ function Uo({
         ]
       }
     ),
-    /* @__PURE__ */ n(A, { title: o._mainProvider ? e("thirdPartyLogin.mainProviderCantRemove") : "", children: /* @__PURE__ */ n(t, { children: /* @__PURE__ */ n(
-      W,
+    /* @__PURE__ */ n(y, { title: o._mainProvider ? e("thirdPartyLogin.mainProviderCantRemove") : "", children: /* @__PURE__ */ n(c, { children: /* @__PURE__ */ n(
+      z,
       {
         variant: "outlined",
         size: "small",
         sx: (r) => {
-          const c = r.palette.error.main, i = r.palette.primary.main;
+          const t = r.palette.error.main, i = r.palette.primary.main;
           return {
-            color: o != null && o._bind ? c : i,
-            borderColor: o != null && o._bind ? c : i,
+            color: o?._bind ? t : i,
+            borderColor: o?._bind ? t : i,
             backgroundColor: "background.default",
             "&:hover": {
-              borderColor: o != null && o._bind ? c : i,
+              borderColor: o?._bind ? t : i,
               backgroundColor: "action.hover"
             },
             py: 0.5,
@@ -240,16 +238,16 @@ function Uo({
           };
         },
         fullWidth: !0,
-        startIcon: p.loading ? null : /* @__PURE__ */ n(g, { icon: F }),
-        onClick: M,
+        startIcon: p.loading ? null : /* @__PURE__ */ n(m, { icon: E }),
+        onClick: T,
         disabled: o._mainProvider,
         loading: p.loading,
-        children: o != null && o._bind ? e("thirdPartyLogin.disconnect") : e("thirdPartyLogin.connect")
+        children: o?._bind ? e("thirdPartyLogin.disconnect") : e("thirdPartyLogin.connect")
       }
     ) }) }),
-    O
+    C
   ] });
 }
 export {
-  Uo as default
+  Ao as default
 };