@arcblock/did-connect-react 3.2.19 → 3.3.1

package/lib/OAuth/context.js

@@ -9,13 +9,13 @@ import B from "lodash/omit";
 import { joinURL as re } from "ufo";
 import { translate as ne } from "@arcblock/ux/lib/Locale/util";
 import ie from "@arcblock/ux/lib/Dialog/use-confirm";
-import { getBlockletData as S, getFederatedEnabled as C, getMaster as R } from "@arcblock/ux/lib/Util/federated";
+import { getBlockletData as S, getFederatedEnabled as C, getMaster as k } from "@arcblock/ux/lib/Util/federated";
 import { BLOCKLET_SERVICE_PATH_PREFIX as F, LOGIN_PROVIDER_NAME as f } from "@arcblock/ux/lib/Util/constant";
 import { createAxios as se, openPopup as ae, runPopup as de, sleep as ce, getApiErrorMessage as m } from "../utils.js";
 import { parseResponse as ue, PassportSwitcher as le } from "../components/PassportSwitcher.js";
 import pe from "../Session/hooks/use-mobile.js";
 import he from "./bind-conflict-alert.js";
-const D = Z({}), { Provider: fe, Consumer: Te } = D, k = `${F}/api/oauth`, be = {
+const D = Z({}), { Provider: fe, Consumer: Te } = D, R = `${F}/api/oauth`, be = {
   zh: {
     bindOAuth: "绑定第三方登录",
     bind: "绑定",
@@ -57,7 +57,7 @@ function Ae({
   onSwitchPassport: I = O,
   session: Y = null
 }) {
-  const x = pe(), { confirmApi: M, confirmHolder: N } = ie({
+  const x = pe(), { confirmApi: M, confirmHolder: j } = ie({
     maxWidth: !1,
     PaperProps: {
       style: {
@@ -88,10 +88,10 @@ function Ae({
     reset({ status: t = "" } = {}) {
       b.loading = !!t, b.checking = !1, b.error = "", b.status = t;
     }
-  }), i = u((t, e = {}) => ne(be, t, p, "en", e)), j = te(() => se({
+  }), d = u((t, e = {}) => ne(be, t, p, "en", e)), N = te(() => se({
     // NOTICE: 请求必须向当前站点发起
-    baseURL: k
-  }), [r.baseUrl, k]), A = oe(j), P = u(async () => {
+    baseURL: R
+  }), [r.baseUrl, R]), A = oe(N), P = u(async () => {
     if (r.baseUrl === "/")
       return window.blocklet;
     try {
@@ -101,11 +101,12 @@ function Ae({
     }
     return await S(r.baseUrl);
   }), U = u(async ({ sourceAppPid: t } = {}) => {
-    const e = await P(), o = C(e), n = R(e);
-    return o && n?.appPid && t === n?.appPid ? (await S(n.appUrl))?.settings?.oauth || {} : e?.settings?.oauth || {};
+    const e = await P(), o = C(e), n = k(e);
+    let i = {};
+    return o && n?.appPid && t === n?.appPid ? i = (await S(n.appUrl))?.settings?.authentication || {} : i = e?.settings?.authentication || {}, Object.keys(i).reduce((a, s) => (i[s]?.type === "oauth" && (a[s] = i[s]), a), {});
   }), X = u(async ({ sourceAppPid: t } = {}) => {
     const e = await U({ sourceAppPid: t });
-    return Object.entries(e).map(([n, a]) => ({ ...a, provider: n })).filter((n) => n.enabled).sort((n, a) => n?.order !== void 0 && a?.order !== void 0 ? n.order - a.order : n?.order !== void 0 ? -1 : 1);
+    return Object.entries(e).map(([n, i]) => ({ ...i, provider: n })).filter((n) => n.enabled).sort((n, i) => n?.order !== void 0 && i?.order !== void 0 ? n.order - i.order : n?.order !== void 0 ? -1 : 1);
   }), L = u(async ({ provider: t } = {}) => {
     const e = ae(re(r.baseUrl, F, "/oauth/login", t), {
       name: "oauth-login:popup",
@@ -120,7 +121,7 @@ function Ae({
       });
       return o?.response ? o.response?.code : null;
     } catch (o) {
-      throw o?.message === "Popup closed" ? new Error(i("cancelAuth")) : o;
+      throw o?.message === "Popup closed" ? new Error(d("cancelAuth")) : o;
     }
   }), q = async ({ session: t, oauthItem: e } = {}) => {
     r.bindFnSession = t, r.bindAuthLoading = !0;
@@ -131,24 +132,24 @@ function Ae({
         provider: e.provider,
         code: o,
         sourceAppPid: n
-      }), l.success(i("bindOAuthSucceed", { provider: f[e.provider] })), T(e);
+      }), l.success(d("bindOAuthSucceed", { provider: f[e.provider] })), T(e);
     } catch (o) {
       if (o.response?.status === 409) {
-        const { data: a = {} } = o.response || {}, { code: d } = a || {};
-        ["ALREADY_EXIST", "ALREADY_BIND"].includes(d) ? M.open({
-          title: i(d, { provider: e.provider }),
+        const { data: i = {} } = o.response || {}, { code: a } = i || {};
+        ["ALREADY_EXIST", "ALREADY_BIND"].includes(a) ? M.open({
+          title: d(a, { provider: e.provider }),
           showCancelButton: !1,
-          confirmButtonText: i("confirm"),
-          content: /* @__PURE__ */ E(he, { data: a }),
+          confirmButtonText: d("confirm"),
+          content: /* @__PURE__ */ E(he, { data: i }),
           onConfirm(s) {
             s();
           }
         }) : l.error(
-          m(o, i("bindOAuthFailed", { provider: f[e.provider] }))
+          m(o, d("bindOAuthFailed", { provider: f[e.provider] }))
         );
       } else
         l.error(
-          m(o, i("bindOAuthFailed", { provider: f[e.provider] }))
+          m(o, d("bindOAuthFailed", { provider: f[e.provider] }))
         );
     } finally {
       r.bindAuthLoading = !1;
@@ -162,7 +163,7 @@ function Ae({
         connectedAccount: B(e, ["showProvider"]),
         sourceAppPid: o
       }), l.success(
-        i("unbindOAuthSucceed", {
+        d("unbindOAuthSucceed", {
           provider: f[e.showProvider || e.provider]
         })
       ), _(e);
@@ -170,7 +171,7 @@ function Ae({
       l.error(
         m(
           o,
-          i("unbindOAuthFailed", {
+          d("unbindOAuthFailed", {
             provider: f[e.showProvider || e.provider]
           })
         )
@@ -181,9 +182,9 @@ function Ae({
   }, z = async (t = {}) => {
     try {
       const { data: e } = await A.current.get("/passports");
-      e.length > 0 ? (c.open = !0, c.currentUser = t, c.passports = e || []) : l.error(i("noPassports"));
+      e.length > 0 ? (c.open = !0, c.currentUser = t, c.passports = e || []) : l.error(d("noPassports"));
     } catch (e) {
-      l.error(e.message || i("getPassportFailed"));
+      l.error(e.message || d("getPassportFailed"));
     }
   }, H = u((...t) => {
     c.reset(), I(...t);
@@ -194,28 +195,28 @@ function Ae({
     if (o?.sourceAppPid === window.blocklet?.appPid)
       r.baseUrl = window.blocklet?.appUrl || "/";
     else if (o?.sourceAppPid) {
-      const d = await P(), s = C(d), g = R(d);
+      const a = await P(), s = C(a), g = k(a);
       s && g?.appPid && o?.sourceAppPid === g?.appPid && (r.baseUrl = g.appUrl);
     }
-    const a = window?.blocklet?.componentId;
+    const i = window?.blocklet?.componentId;
     try {
-      const d = await L({ provider: t });
-      if (r.baseUrl = n, await ce(100), d) {
+      const a = await L({ provider: t });
+      if (r.baseUrl = n, await ce(100), a) {
         const s = {
           ...o,
           action: e,
           locale: p,
-          code: d,
+          code: a,
           provider: t,
-          componentId: a
+          componentId: i
         };
         Q(s.inviter) && window.localStorage.getItem("inviter") && (s.inviter = window.localStorage.getItem("inviter"));
         const g = ["connect-to-did-space", "connect-to-did-domain"].includes(s.action) ? "login" : s.action, { data: $ } = await A.current.post("/login", { ...s, action: g }), y = ue($);
         return y.provider = t, y;
       }
       return r.baseUrl = n, null;
-    } catch (d) {
-      const s = m(d, i("loginOAuthFailed", { provider: f[t] }));
+    } catch (a) {
+      const s = m(a, d("loginOAuthFailed", { provider: f[t] }));
       throw r.baseUrl = n, new Error(s);
     }
   }), K = u(() => {
@@ -237,11 +238,11 @@ function Ae({
         oauthState: b,
         unbindAuthLoading: r.unbindAuthLoading,
         bindAuthLoading: r.bindAuthLoading,
-        t: i
+        t: d
       },
       children: [
         w,
-        N,
+        j,
         /* @__PURE__ */ E(
           le,
           {

package/lib/Passkey/context.js

@@ -12,7 +12,7 @@ import { getBlockletData as H, getFederatedEnabled as X, getMaster as Q } from "
 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 = J({}), { Provider: te, Consumer: he } = F, ae = {
+const F = J({}), { Provider: te, Consumer: he } = F, re = {
   zh: {
     cancel: "取消",
     usePasskey: "使用 Passkey",
@@ -76,7 +76,7 @@ const F = J({}), { Provider: te, Consumer: he } = F, ae = {
     }
   }
 };
-function re({
+function ae({
   children: m,
   locale: l = "en",
   onAddPasskey: E = w,
@@ -84,7 +84,7 @@ function re({
   onSwitchPassport: I = w,
   session: R = null
 }) {
-  const v = S(window.env?.apiPrefix || G, "/api/passkey"), t = g({
+  const v = S(window.env?.apiPrefix || G, "/api/passkey"), r = g({
     baseUrl: "/",
     session: void 0,
     connecting: !1,
@@ -117,52 +117,52 @@ function re({
     reset() {
       d.creating = !1, d.verifying = !1, d.creatingStatus = "", d.verifyingStatus = "", d.error = "";
     }
-  }), n = i((s, e = {}) => q(ae, s, l, "en", e)), c = W(() => $({ baseURL: S(t.baseUrl, v), sessionTokenKey: "__sst", timeout: 60 * 1e3 }), [t.baseUrl, v]), x = i(async () => {
-    if (t.baseUrl === "/")
+  }), 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 () => {
+    if (r.baseUrl === "/")
       return window.blocklet;
     try {
-      if (new URL(t.baseUrl).host === window.location.host)
+      if (new URL(r.baseUrl).host === window.location.host)
         return window.blocklet;
     } catch {
     }
-    return await H(t.baseUrl);
-  }), P = window?.blocklet?.componentId, B = (s) => {
-    t.baseUrl = s || "/";
-  }, T = (s) => {
-    t.targetAppPid = s;
-  }, b = i(async (s) => {
-    const { data: e } = await c.get("/register", { params: s });
+    return await H(r.baseUrl);
+  }), P = window?.blocklet?.componentId, B = (t) => {
+    r.baseUrl = t || "/";
+  }, T = (t) => {
+    r.targetAppPid = t;
+  }, b = i(async (t) => {
+    const { data: e } = await c.get("/register", { params: t });
     console.warn("passkey.create.options", e);
     try {
-      const a = await Y({ optionsJSON: e, useAutoRegister: !1 });
-      console.warn("passkey.create.response", a);
-      const { data: r } = await c.post("/register", a, { params: { challenge: e.challenge } });
-      if (console.warn("passkey.create.result", r), !r.verified)
+      const s = await Y({ optionsJSON: e, useAutoRegister: !1 });
+      console.warn("passkey.create.response", s);
+      const { data: a } = await c.post("/register", s, { params: { challenge: e.challenge } });
+      if (console.warn("passkey.create.result", a), !a.verified)
         throw new Error(n("createPasskeyFailed"));
-      return r;
-    } catch (a) {
-      throw a.name ? new Error(h(a, n("createPasskeyFailed"), n)) : a;
+      return a;
+    } catch (s) {
+      throw console.error("passkey.create.error", s), s.name ? new Error(h(s, n("createPasskeyFailed"), n)) : s;
     }
-  }), k = i(async (s) => {
-    const { data: e } = await c.get("/auth", { params: s });
+  }), k = i(async (t) => {
+    const { data: e } = await c.get("/auth", { params: t });
     console.warn("passkey.auth.options", e);
     try {
-      const a = await Z({ optionsJSON: e });
-      console.warn("passkey.auth.response", a);
-      const { data: r } = await c.post("/auth", a, {
-        params: { challenge: e.challenge, targetAppPid: t.targetAppPid }
+      const s = await Z({ optionsJSON: e });
+      console.warn("passkey.auth.response", s);
+      const { data: a } = await c.post("/auth", s, {
+        params: { challenge: e.challenge, targetAppPid: r.targetAppPid }
       });
-      if (console.warn("passkey.auth.result", r), !r.verified)
+      if (console.warn("passkey.auth.result", a), !a.verified)
         throw new Error(n("verifyPasskeyFailed"));
-      return r;
-    } catch (a) {
-      throw a.name ? new Error(h(a, n("verifyPasskeyFailed"), n)) : a;
+      return a;
+    } catch (s) {
+      throw console.error("passkey.auth.error", s), s.name ? new Error(h(s, n("verifyPasskeyFailed"), n)) : s;
     }
-  }), M = async (s) => {
-    t.connecting = !0;
+  }), M = async (t) => {
+    r.connecting = !0;
     try {
       const e = await b({
-        ...s,
+        ...t,
         locale: l,
         componentId: P
       });
@@ -170,54 +170,55 @@ function re({
     } catch (e) {
       U.error("Failed to connect passkey", e), u.error(A(e, n("connectPasskeyFailed")));
     } finally {
-      t.connecting = !1;
+      r.connecting = !1;
     }
-  }, D = async ({ session: s, connectedAccount: e }) => {
-    t.session = s, t.disconnecting = !0;
+  }, D = async ({ session: t, connectedAccount: e }) => {
+    r.session = t, r.disconnecting = !0;
     try {
-      const a = await k({
+      const s = await k({
         action: "disconnect",
         locale: l,
         componentId: P,
-        sourceAppPid: s?.user?.sourceAppPid,
+        sourceAppPid: t?.user?.sourceAppPid,
         credentialId: e.id
       });
-      u.success(n("disconnectPasskeySucceed")), C(a);
-    } catch (a) {
-      U.error("Failed to disconnect passkey", a), u.error(A(a, n("disconnectPasskeyFailed")));
+      u.success(n("disconnectPasskeySucceed")), C(s);
+    } catch (s) {
+      U.error("Failed to disconnect passkey", s), u.error(A(s, n("disconnectPasskeyFailed")));
     } finally {
-      t.disconnecting = !1;
+      r.disconnecting = !1;
     }
-  }, N = async (s = {}) => {
+  }, N = async (t = {}) => {
     try {
       const { data: e } = await c.get("/passports");
-      e.length ? (o.open = !0, o.currentUser = s, o.passports = e || []) : u.error(n("noPassports"));
+      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((...s) => {
-    o.reset(), I(...s);
-  }), L = i(async ({ action: s = "login", ...e } = {}) => {
-    const a = t.baseUrl;
+  }, j = i((...t) => {
+    o.reset(), I(...t);
+  }), L = i(async ({ action: t = "login", ...e } = {}) => {
+    const s = r.baseUrl;
     if (e?.sourceAppPid === window.blocklet?.appPid)
-      t.baseUrl = window.blocklet?.appUrl || "/";
+      r.baseUrl = window.blocklet?.appUrl || "/";
     else if (e?.sourceAppPid) {
-      const r = await x(), y = X(r), f = Q(r);
-      y && f?.appPid && e?.sourceAppPid === f?.appPid && (t.baseUrl = f.appUrl);
+      const a = await x(), y = X(a), f = Q(a);
+      y && f?.appPid && e?.sourceAppPid === f?.appPid && (r.baseUrl = f.appUrl);
     }
     try {
-      const r = {
+      const a = {
         ...e,
-        action: s,
+        action: t,
         locale: l,
         componentId: P
       };
-      z(r.inviter) && window.localStorage.getItem("inviter") && (r.inviter = window.localStorage.getItem("inviter"));
-      const y = ee(await k(r));
+      z(a.inviter) && window.localStorage.getItem("inviter") && (a.inviter = window.localStorage.getItem("inviter"));
+      const y = ee(await k(a));
       return y.provider = "passkey", y;
-    } catch (r) {
-      const y = h(r, n("verifyPasskeyFailed"), n);
-      throw t.baseUrl = a, new Error(y);
+    } catch (a) {
+      console.error("passkey.login.error", a);
+      const y = h(a, n("verifyPasskeyFailed"), n);
+      throw r.baseUrl = s, new Error(y);
     }
   }), _ = i(() => {
   });
@@ -234,12 +235,12 @@ function re({
         loginPasskey: L,
         logoutPasskey: _,
         switchPassport: N,
-        baseUrl: t.baseUrl,
+        baseUrl: r.baseUrl,
         setBaseUrl: B,
         setTargetAppPid: T,
         passkeyState: d,
-        disconnecting: t.disconnecting,
-        connecting: t.connecting,
+        disconnecting: r.disconnecting,
+        connecting: r.connecting,
         t: n
       },
       children: [
@@ -261,7 +262,7 @@ function re({
 function me() {
   return K(F);
 }
-re.propTypes = {
+ae.propTypes = {
   children: p.node.isRequired,
   locale: p.string,
   onAddPasskey: p.func,
@@ -272,6 +273,6 @@ re.propTypes = {
 export {
   he as PasskeyConsumer,
   F as PasskeyContext,
-  re as PasskeyProvider,
+  ae as PasskeyProvider,
   me as usePasskey
 };

package/lib/Session/hooks/use-verify.js

@@ -1,5 +1,5 @@
 import { translate as I } from "@arcblock/ux/lib/Locale/util";
-import { LOGIN_PROVIDER as n } from "@blocklet/constant";
+import { LOGIN_PROVIDER as n } from "@arcblock/ux/lib/Util/constant";
 import { toBase64 as A } from "@ocap/util";
 import { translations as C } from "../libs/locales.js";
 function k({ state: p, locale: a, connectApi: c }) {

package/lib/Session/libs/locales.js

@@ -1,10 +1,10 @@
 const e = {
   login: {
     en: {
-      title: "Connect",
-      scan: "Please use the following methods to complete the connection",
+      title: "Login",
+      scan: "Login with one of the following methods",
       confirm: "Confirm connection in your DID Wallet",
-      success: "Successfully connected"
+      success: "Successfully logged in"
     },
     zh: {
       title: "登录",

package/lib/package.json.js

@@ -1,4 +1,4 @@
-const o = "3.2.19", s = {
+const o = "3.3.1", s = {
   version: o
 };
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/did-connect-react",
-  "version": "3.2.19",
+  "version": "3.3.1",
   "description": "Client side library to work with DID Connect by ArcBlock.",
   "keywords": [
     "react",
@@ -32,17 +32,17 @@
     "url": "https://github.com/ArcBlock/ux/issues"
   },
   "dependencies": {
-    "@arcblock/bridge": "3.2.19",
-    "@arcblock/did": "^1.27.15",
-    "@arcblock/icons": "3.2.19",
-    "@arcblock/react-hooks": "3.2.19",
-    "@arcblock/ws": "^1.27.15",
-    "@blocklet/constant": "^1.17.5",
+    "@arcblock/bridge": "3.3.1",
+    "@arcblock/did": "^1.27.16",
+    "@arcblock/icons": "3.3.1",
+    "@arcblock/react-hooks": "3.3.1",
+    "@arcblock/ws": "^1.27.16",
+    "@blocklet/constant": "^1.17.6",
     "@fontsource/lexend": "^5.2.9",
     "@iconify-icons/logos": "^1.2.36",
     "@iconify-icons/material-symbols": "^1.2.58",
     "@iconify/react": "^5.2.1",
-    "@ocap/util": "^1.27.15",
+    "@ocap/util": "^1.27.16",
     "@simplewebauthn/browser": "^13.1.0",
     "ahooks": "^3.8.5",
     "axios": "^1.10.0",
@@ -81,5 +81,5 @@
     "eslint-plugin-react-hooks": "^4.6.2",
     "jest": "^29.7.0"
   },
-  "gitHead": "8439c6a0c022c3fab219191ff035d737c422f3ff"
+  "gitHead": "39aec3e1aef080ae289918120dc12629940a75b4"
 }

package/src/Connect/assets/locale.js

@@ -70,6 +70,7 @@ export default {
       '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',
   },
   zh: {
     generateError: '二维码生成失败',
@@ -141,5 +142,6 @@ export default {
       '使用 Passkey 账户登录 - 更安全、更便捷的身份验证方式。无需记忆密码，轻松登录各类应用和网站',
     didConnectTitle: 'DID Connect',
     didConnectDescription: '面向未来的基于 W3C DID 去中心化身份和应用',
+    noAuthenticationProvider: '未配置任何身份验证提供者',
   },
 };

package/src/Connect/components/login-item/connect-choose-list.jsx

@@ -29,7 +29,7 @@ export default function ConnectChooseList({
   webWalletUrl = getWebWalletUrl(),
   tokenKey,
   passkeyBehavior = 'none',
-  onRest = noop,
+  onReset = noop,
   showMobileLogin = true,
   showOAuthLogin = true,
   showPasskeyLogin = true,
@@ -100,7 +100,7 @@ export default function ConnectChooseList({
 
   const defaultRetryConnect = useMemoizedFn(async () => {
     tokenState.reset();
-    await onRest();
+    await onReset();
     tokenState.status = 'created';
     connectState.chooseMethod = 'wallet';
   });
@@ -169,7 +169,7 @@ export default function ConnectChooseList({
               onClick={async () => {
                 localStorage.setItem(GA_LAST_LOGIN_METHOD, 'wallet');
                 tokenState.reset();
-                await onRest();
+                await onReset();
                 tokenState.status = 'created';
                 connectState.chooseMethod = 'wallet';
                 const connectFn = walletLoginRef.current?.connect;
@@ -193,7 +193,7 @@ export default function ConnectChooseList({
                 connectState.chooseMethod = 'wallet-web';
                 const connectFn = webLoginRef.current.connect;
                 connectState.retryConnect = async () => {
-                  await onRest();
+                  await onReset();
                   tokenState.error = '';
                   tokenState.status = 'scanned';
                   connectFn();
@@ -294,7 +294,7 @@ ConnectChooseList.propTypes = {
   webWalletUrl: PropTypes.string,
   tokenKey: PropTypes.string.isRequired,
   passkeyBehavior: PropTypes.oneOf(['none', 'both', 'only-existing', 'only-new']),
-  onRest: PropTypes.func,
+  onReset: PropTypes.func,
   showMobileLogin: PropTypes.bool,
   showOAuthLogin: PropTypes.bool,
   showPasskeyLogin: PropTypes.bool,