@arcblock/did-connect-react 3.2.9 → 3.2.11

package/lib/Session/index.js

@@ -844,7 +844,7 @@ function qe(q = Qe, X = "ls", oe = {}, T = {}) {
       return /* @__PURE__ */ g(oi, { children: Go ? null : /* @__PURE__ */ g(Jo, {}) });
     const be = {
       locale: b,
-      onSwitchPassport: ({ sessionToken: e, refreshToken: o }) => se({ sessionToken: e, refreshToken: o, encrypted: !1 }),
+      onSwitchPassport: ({ sessionToken: e, refreshToken: o, csrfToken: i }) => se({ sessionToken: e, refreshToken: o, csrfToken: i, encrypted: !1 }),
       onUnbindOAuth: () => C(),
       onBindOAuth: () => C(),
       onAddPasskey: () => C(),

package/lib/components/PassportSwitcher.js

@@ -1,15 +1,15 @@
 import { jsxs as m, jsx as p } from "react/jsx-runtime";
-import y from "lodash/pick";
-import { Confirm as F } from "@arcblock/ux/lib/Dialog";
-import { Box as h } from "@mui/material";
-import f from "@arcblock/ux/lib/Toast";
-import C from "@arcblock/ux/lib/CardSelector";
-import { translate as R } from "@arcblock/ux/lib/Locale/util";
-import { useMemoizedFn as T, useCreation as k } from "ahooks";
-import { createPassportSvg as I } from "@arcblock/ux/lib/Util/passport";
+import T from "lodash/pick";
+import { Confirm as k } from "@arcblock/ux/lib/Dialog";
+import { Box as f } from "@mui/material";
+import h from "@arcblock/ux/lib/Toast";
+import F from "@arcblock/ux/lib/CardSelector";
+import { translate as C } from "@arcblock/ux/lib/Locale/util";
+import { useMemoizedFn as R, useCreation as I } from "ahooks";
+import { createPassportSvg as x } from "@arcblock/ux/lib/Util/passport";
 import { ReactGA as P } from "@arcblock/ux/lib/withTracker";
-import x from "../OAuth/guest.svg.js";
-const B = (e) => e ? typeof e == "string" ? { sessionToken: e } : y(e, ["sessionToken", "refreshToken", "visitorId", "destroySessionId"]) : {}, G = {
+import B from "../OAuth/guest.svg.js";
+const G = (e) => e ? typeof e == "string" ? { sessionToken: e } : T(e, ["sessionToken", "refreshToken", "visitorId", "destroySessionId", "csrfToken"]) : {}, M = {
   zh: {
     switchPassport: "切换通行证",
     switchPassportFailed: "切换通行证失败",
@@ -33,12 +33,12 @@ const B = (e) => e ? typeof e == "string" ? { sessionToken: e } : y(e, ["session
     getPassportFailed: "Get passports failed"
   }
 };
-function q({ api: e, locale: w, switchState: r, onSwitchPassport: g, session: a }) {
-  const t = T((s, i = {}) => R(G, s, w, "en", i)), l = k(() => r.passports.filter((s) => s.role !== r.currentUser?.role), [r.passports, r.currentUser?.role]), S = async () => {
+function D({ api: e, locale: w, switchState: r, onSwitchPassport: g, session: a }) {
+  const t = R((s, i = {}) => C(M, s, w, "en", i)), l = I(() => r.passports.filter((s) => s.role !== r.currentUser?.role), [r.passports, r.currentUser?.role]), S = async () => {
     const s = r.selectedPassport, i = a?.user?.role, v = a?.user?.passports?.find((o) => o.id === s)?.role ?? "guest", d = `${i} -> ${v}`;
     try {
-      const { data: o } = await e.post("/switch", { passportId: s }), { sessionToken: c, refreshToken: n } = B(o);
-      g({ sessionToken: c, refreshToken: n }), f.success(t("switchPassportSucceed"));
+      const { data: o } = await e.post("/switch", { passportId: s }), { sessionToken: c, refreshToken: n, csrfToken: y } = G(o);
+      g({ sessionToken: c, refreshToken: n, csrfToken: y }), h.success(t("switchPassportSucceed"));
       const u = {
         action: "switchPassportSuccess",
         change: d,
@@ -52,11 +52,11 @@ function q({ api: e, locale: w, switchState: r, onSwitchPassport: g, session: a
         change: d,
         errorMessage: c
       };
-      P.event(n.action, n), f.error(c);
+      P.event(n.action, n), h.error(c);
     }
   };
   return /* @__PURE__ */ m(
-    F,
+    k,
     {
       open: r.open,
       title: t("switchPassport"),
@@ -78,7 +78,7 @@ function q({ api: e, locale: w, switchState: r, onSwitchPassport: g, session: a
       PaperProps: { style: { width: 600 } },
       children: [
         /* @__PURE__ */ m(
-          h,
+          f,
           {
             sx: {
               mb: 2
@@ -90,23 +90,23 @@ function q({ api: e, locale: w, switchState: r, onSwitchPassport: g, session: a
           }
         ),
         /* @__PURE__ */ p(
-          C,
+          F,
           {
             width: 160,
             height: 240,
             cardSpace: 24,
             list: [
               // eslint-disable-next-line react/no-unstable-nested-components
-              () => /* @__PURE__ */ p(x, {}),
+              () => /* @__PURE__ */ p(B, {}),
               ...l.map((s) => s.display ? {
                 src: s.display,
                 name: s.title
               } : () => /* @__PURE__ */ p(
-                h,
+                f,
                 {
                   sx: { width: "100%" },
                   dangerouslySetInnerHTML: {
-                    __html: I(s)
+                    __html: x(s)
                   }
                 },
                 s.id
@@ -123,6 +123,6 @@ function q({ api: e, locale: w, switchState: r, onSwitchPassport: g, session: a
   );
 }
 export {
-  q as PassportSwitcher,
-  B as parseResponse
+  D as PassportSwitcher,
+  G as parseResponse
 };

package/lib/package.json.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/did-connect-react",
-  "version": "3.2.9",
+  "version": "3.2.11",
   "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.2.9",
+    "@arcblock/bridge": "3.2.11",
     "@arcblock/did": "^1.27.6",
-    "@arcblock/icons": "3.2.9",
-    "@arcblock/react-hooks": "3.2.9",
+    "@arcblock/icons": "3.2.11",
+    "@arcblock/react-hooks": "3.2.11",
     "@arcblock/ws": "^1.27.6",
     "@fontsource/lexend": "^5.2.9",
     "@iconify-icons/logos": "^1.2.36",
@@ -80,5 +80,5 @@
     "eslint-plugin-react-hooks": "^4.6.2",
     "jest": "^29.7.0"
   },
-  "gitHead": "7c86d6e21382221358cce41033802d35b1bbd6bf"
+  "gitHead": "dec9054be54c799898978686b5d030ed74cae431"
 }

package/src/Session/index.jsx

@@ -1642,8 +1642,8 @@ function createSessionContext(
 
     const providerProps = {
       locale: currentLocale,
-      onSwitchPassport: ({ sessionToken, refreshToken }) =>
-        onSwitchPassport({ sessionToken, refreshToken, encrypted: false }),
+      onSwitchPassport: ({ sessionToken, refreshToken, csrfToken }) =>
+        onSwitchPassport({ sessionToken, refreshToken, csrfToken, encrypted: false }),
       onUnbindOAuth: () => handleRefreshUser(),
       onBindOAuth: () => handleRefreshUser(),
       onAddPasskey: () => handleRefreshUser(),

package/src/components/PassportSwitcher.jsx

@@ -23,7 +23,7 @@ export const parseResponse = (data) => {
     return { sessionToken: data };
   }
 
-  return pick(data, ['sessionToken', 'refreshToken', 'visitorId', 'destroySessionId']);
+  return pick(data, ['sessionToken', 'refreshToken', 'visitorId', 'destroySessionId', 'csrfToken']);
 };
 
 const translations = {
@@ -67,8 +67,8 @@ export function PassportSwitcher({ api, locale, switchState, onSwitchPassport, s
     const change = `${fromRole} -> ${toRole}`;
     try {
       const { data } = await api.post('/switch', { passportId });
-      const { sessionToken, refreshToken } = parseResponse(data);
-      onSwitchPassport({ sessionToken, refreshToken });
+      const { sessionToken, refreshToken, csrfToken } = parseResponse(data);
+      onSwitchPassport({ sessionToken, refreshToken, csrfToken });
       Toast.success(t('switchPassportSucceed'));
 
       /**