@arcblock/did-connect-react 3.3.0 → 3.3.1

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/package.json.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/did-connect-react",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "description": "Client side library to work with DID Connect by ArcBlock.",
   "keywords": [
     "react",
@@ -32,10 +32,10 @@
     "url": "https://github.com/ArcBlock/ux/issues"
   },
   "dependencies": {
-    "@arcblock/bridge": "3.3.0",
+    "@arcblock/bridge": "3.3.1",
     "@arcblock/did": "^1.27.16",
-    "@arcblock/icons": "3.3.0",
-    "@arcblock/react-hooks": "3.3.0",
+    "@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",
@@ -81,5 +81,5 @@
     "eslint-plugin-react-hooks": "^4.6.2",
     "jest": "^29.7.0"
   },
-  "gitHead": "d23472b198c0bf05d452976ebefedab5cb6d047f"
+  "gitHead": "39aec3e1aef080ae289918120dc12629940a75b4"
 }

package/src/Passkey/context.jsx

@@ -204,6 +204,7 @@ function PasskeyProvider({
       return result;
     } catch (err) {
       // Check if this is a WebAuthn specific error
+      console.error('passkey.create.error', err);
       if (err.name) {
         throw new Error(getWebAuthnErrorMessage(err, t('createPasskeyFailed'), t));
       }
@@ -232,6 +233,7 @@ function PasskeyProvider({
       return result;
     } catch (err) {
       // Check if this is a WebAuthn specific error
+      console.error('passkey.auth.error', err);
       if (err.name) {
         throw new Error(getWebAuthnErrorMessage(err, t('verifyPasskeyFailed'), t));
       }
@@ -333,6 +335,7 @@ function PasskeyProvider({
       return result;
     } catch (err) {
       // Use the WebAuthn specific error handler if the error has a name property (WebAuthn errors do)
+      console.error('passkey.login.error', err);
       const errMsg = getWebAuthnErrorMessage(err, t('verifyPasskeyFailed'), t);
       state.baseUrl = backupBaseUrl;
       throw new Error(errMsg);