@arcblock/did-connect-react 3.1.34 → 3.1.35

package/lib/constant.js

@@ -1,22 +1,23 @@
-const _ = 300, o = 1800, n = "/.well-known/service", E = "login_token", c = "refresh_token", t = "/.well-known/service", e = "/api/did", s = "DID Connect", d = "__did-connect__", T = ["scanned", "succeed", "error", "busy"], A = {
+const _ = 300, o = 1800, n = "/.well-known/service", E = "login_token", c = "x-csrf-token", t = "refresh_token", e = "/.well-known/service", s = "/api/did", T = "DID Connect", d = "__did-connect__", A = ["scanned", "succeed", "error", "busy"], S = {
   chrome: "https://chromewebstore.google.com/detail/did-wallet/ibjflpbmadchofnbpppegdbnifdgincp",
   edge: "https://microsoftedge.microsoft.com/addons/detail/did-wallet/hjgoblidjnnnamdkinbichnfbmghmafd"
-}, i = 2 * 1e3, S = 6, I = "nf_lang", l = 1e3, D = window?.blocklet?.DID_SPACES_BASE_URL || "https://www.didspaces.com/app";
+}, i = 2 * 1e3, I = 6, R = "nf_lang", O = 1e3, l = window?.blocklet?.DID_SPACES_BASE_URL || "https://www.didspaces.com/app";
 export {
-  e as API_DID_PREFIX,
+  s as API_DID_PREFIX,
   n as BLOCKLET_SERVICE_PATH_PREFIX,
-  T as BUSY_STATUS,
-  l as CHECK_INTERVAL_TIME,
+  A as BUSY_STATUS,
+  O as CHECK_INTERVAL_TIME,
   i as CHECK_STATUS_INTERVAL,
-  s as DEFAULT_NAME,
+  c as CSRF_TOKEN_STORAGE_KEY,
+  T as DEFAULT_NAME,
   _ as DEFAULT_TIMEOUT,
   o as DEFAULT_WINDOW_TIMEOUT,
   d as DID_CONNECT_URL_PARAMS_NAME,
-  D as DID_SPACES_BASE_URL,
-  A as EXT_DOWNLOAD_URL,
-  I as LANG_COOKIE_NAME,
-  c as REFRESH_TOKEN_STORAGE_KEY,
-  t as RELAY_SOCKET_PREFIX,
+  l as DID_SPACES_BASE_URL,
+  S as EXT_DOWNLOAD_URL,
+  R as LANG_COOKIE_NAME,
+  t as REFRESH_TOKEN_STORAGE_KEY,
+  e as RELAY_SOCKET_PREFIX,
   E as SESSION_TOKEN_STORAGE_KEY,
-  S as VERIFY_CODE_LENGTH
+  I as VERIFY_CODE_LENGTH
 };

package/lib/index.js

@@ -1,107 +1,108 @@
 import { default as t, default as r, default as s } from "./Connect/index.js";
 import { default as n, default as d } from "./Button/index.js";
-import { default as E, default as p } from "@arcblock/ux/lib/DIDLogo";
-import { createSessionContext as x, createAuthServiceSessionContext as _, createSessionContext as A } from "./Session/index.js";
-import { OAuthConsumer as C, OAuthContext as i, OAuthProvider as I, useOAuth as l } from "./OAuth/context.js";
-import { PasskeyConsumer as c, PasskeyContext as S, PasskeyProvider as D, usePasskey as O } from "./Passkey/context.js";
-import { default as L } from "./Passkey/actions.js";
+import { default as f, default as p } from "@arcblock/ux/lib/DIDLogo";
+import { createSessionContext as _, createAuthServiceSessionContext as x, createSessionContext as A } from "./Session/index.js";
+import { OAuthConsumer as m, OAuthContext as i, OAuthProvider as T, useOAuth as I } from "./OAuth/context.js";
+import { PasskeyConsumer as l, PasskeyContext as c, PasskeyProvider as O, usePasskey as D } from "./Passkey/context.js";
+import { default as R } from "./Passkey/actions.js";
 import { default as N } from "./User/use-did.js";
 import { default as F } from "./User/wrap-did.js";
-import { FederatedConsumer as M, FederatedContext as K, FederatedProvider as y, useFederatedContext as h } from "./Federated/context.js";
-import { API_DID_PREFIX as V, BLOCKLET_SERVICE_PATH_PREFIX as v, BUSY_STATUS as B, CHECK_INTERVAL_TIME as W, CHECK_STATUS_INTERVAL as H, DEFAULT_NAME as Y, DEFAULT_TIMEOUT as b, DEFAULT_WINDOW_TIMEOUT as G, DID_CONNECT_URL_PARAMS_NAME as X, DID_SPACES_BASE_URL as w, EXT_DOWNLOAD_URL as q, LANG_COOKIE_NAME as j, REFRESH_TOKEN_STORAGE_KEY as z, RELAY_SOCKET_PREFIX as J, SESSION_TOKEN_STORAGE_KEY as Q, VERIFY_CODE_LENGTH as Z } from "./constant.js";
-import { createAxios as ee, debug as oe, decodeConnectUrl as te, decodeKey as re, decodeUrlParams as se, decrypt as ae, encodeConnectUrl as ne, encodeKey as de, encrypt as fe, formatCacheTtl as Ee, getApiErrorMessage as pe, getAppId as ue, getBrowserLang as xe, getConnectedInfo as _e, getWebAuthnErrorMessage as Ae, logger as me, openPopup as Ce, parseNextWorkflow as ie, parseTokenFromConnectUrl as Ie, runPopup as le, sleep as Te, updateConnectedInfo as ce, version as Se } from "./utils.js";
-import { NotOpenError as Oe } from "./error.js";
+import { FederatedConsumer as K, FederatedContext as M, FederatedProvider as y, useFederatedContext as h } from "./Federated/context.js";
+import { API_DID_PREFIX as V, BLOCKLET_SERVICE_PATH_PREFIX as v, BUSY_STATUS as B, CHECK_INTERVAL_TIME as W, CHECK_STATUS_INTERVAL as Y, CSRF_TOKEN_STORAGE_KEY as G, DEFAULT_NAME as H, DEFAULT_TIMEOUT as b, DEFAULT_WINDOW_TIMEOUT as X, DID_CONNECT_URL_PARAMS_NAME as w, DID_SPACES_BASE_URL as q, EXT_DOWNLOAD_URL as j, LANG_COOKIE_NAME as z, REFRESH_TOKEN_STORAGE_KEY as J, RELAY_SOCKET_PREFIX as Q, SESSION_TOKEN_STORAGE_KEY as Z, VERIFY_CODE_LENGTH as $ } from "./constant.js";
+import { createAxios as oe, debug as te, decodeConnectUrl as re, decodeKey as se, decodeUrlParams as ae, decrypt as ne, encodeConnectUrl as de, encodeKey as Ee, encrypt as fe, formatCacheTtl as pe, getApiErrorMessage as ue, getAppId as _e, getBrowserLang as xe, getConnectedInfo as Ae, getWebAuthnErrorMessage as Ce, logger as me, openPopup as ie, parseNextWorkflow as Te, parseTokenFromConnectUrl as Ie, runPopup as Se, sleep as le, updateConnectedInfo as ce, version as Oe } from "./utils.js";
+import { NotOpenError as ge } from "./error.js";
 import { default as Le } from "@arcblock/ux/lib/SessionManager";
-import { default as Ne } from "@arcblock/ux/lib/Address";
-import { default as Fe } from "@arcblock/ux/lib/Avatar";
+import { default as Pe } from "@arcblock/ux/lib/Address";
+import { default as Ue } from "@arcblock/ux/lib/Avatar";
 import { default as Me } from "./Connect/use-connect.js";
-import { EVENTS as ye } from "./Session/libs/constants.js";
-import { didSpacesIsRequired as ke } from "./Session/libs/did-spaces.js";
-import { loginFederatedMaster as ve, mountFederatedIframe as Be } from "./Session/libs/federated.js";
-import { translations as He } from "./Session/libs/locales.js";
-import { checkEnableAutoLogin as be, getMobileVisitorId as Ge, login as Xe } from "./Session/libs/login-mobile.js";
-import { SessionContext as qe } from "./Session/context.js";
+import { EVENTS as he } from "./Session/libs/constants.js";
+import { didSpacesIsRequired as Ve } from "./Session/libs/did-spaces.js";
+import { loginFederatedMaster as Be, mountFederatedIframe as We } from "./Session/libs/federated.js";
+import { translations as Ge } from "./Session/libs/locales.js";
+import { checkEnableAutoLogin as be, getMobileVisitorId as Xe, login as we } from "./Session/libs/login-mobile.js";
+import { SessionContext as je } from "./Session/context.js";
 export * from "@arcblock/ux/lib/Util/wallet";
-import { getVisitorId as Je, setVisitorId as Qe } from "@arcblock/ux/lib/Util";
+import { getVisitorId as Qe, setVisitorId as Ze } from "@arcblock/ux/lib/Util";
 export {
   V as API_DID_PREFIX,
-  Ne as Address,
-  Fe as Avatar,
+  Pe as Address,
+  Ue as Avatar,
   v as BLOCKLET_SERVICE_PATH_PREFIX,
   B as BUSY_STATUS,
   n as Button,
   W as CHECK_INTERVAL_TIME,
-  H as CHECK_STATUS_INTERVAL,
+  Y as CHECK_STATUS_INTERVAL,
+  G as CSRF_TOKEN_STORAGE_KEY,
   t as Connect,
-  Y as DEFAULT_NAME,
+  H as DEFAULT_NAME,
   b as DEFAULT_TIMEOUT,
-  G as DEFAULT_WINDOW_TIMEOUT,
+  X as DEFAULT_WINDOW_TIMEOUT,
   d as DIDButton,
   r as DIDConnect,
-  E as DIDLogo,
-  X as DID_CONNECT_URL_PARAMS_NAME,
-  w as DID_SPACES_BASE_URL,
+  f as DIDLogo,
+  w as DID_CONNECT_URL_PARAMS_NAME,
+  q as DID_SPACES_BASE_URL,
   s as DidConnect,
-  ye as EVENTS,
-  q as EXT_DOWNLOAD_URL,
-  M as FederatedConsumer,
-  K as FederatedContext,
+  he as EVENTS,
+  j as EXT_DOWNLOAD_URL,
+  K as FederatedConsumer,
+  M as FederatedContext,
   y as FederatedProvider,
-  j as LANG_COOKIE_NAME,
+  z as LANG_COOKIE_NAME,
   p as Logo,
-  Oe as NotOpenError,
-  C as OAuthConsumer,
+  ge as NotOpenError,
+  m as OAuthConsumer,
   i as OAuthContext,
-  I as OAuthProvider,
-  L as PasskeyActions,
-  c as PasskeyConsumer,
-  S as PasskeyContext,
-  D as PasskeyProvider,
-  z as REFRESH_TOKEN_STORAGE_KEY,
-  J as RELAY_SOCKET_PREFIX,
-  Q as SESSION_TOKEN_STORAGE_KEY,
-  x as Session,
-  qe as SessionContext,
+  T as OAuthProvider,
+  R as PasskeyActions,
+  l as PasskeyConsumer,
+  c as PasskeyContext,
+  O as PasskeyProvider,
+  J as REFRESH_TOKEN_STORAGE_KEY,
+  Q as RELAY_SOCKET_PREFIX,
+  Z as SESSION_TOKEN_STORAGE_KEY,
+  _ as Session,
+  je as SessionContext,
   Le as SessionManager,
-  Z as VERIFY_CODE_LENGTH,
+  $ as VERIFY_CODE_LENGTH,
   F as WrapDid,
   be as checkEnableAutoLogin,
-  _ as createAuthServiceSessionContext,
-  ee as createAxios,
+  x as createAuthServiceSessionContext,
+  oe as createAxios,
   A as createSessionContext,
-  oe as debug,
-  te as decodeConnectUrl,
-  re as decodeKey,
-  se as decodeUrlParams,
-  ae as decrypt,
-  ke as didSpacesIsRequired,
-  ne as encodeConnectUrl,
-  de as encodeKey,
+  te as debug,
+  re as decodeConnectUrl,
+  se as decodeKey,
+  ae as decodeUrlParams,
+  ne as decrypt,
+  Ve as didSpacesIsRequired,
+  de as encodeConnectUrl,
+  Ee as encodeKey,
   fe as encrypt,
-  Ee as formatCacheTtl,
-  pe as getApiErrorMessage,
-  ue as getAppId,
+  pe as formatCacheTtl,
+  ue as getApiErrorMessage,
+  _e as getAppId,
   xe as getBrowserLang,
-  _e as getConnectedInfo,
-  Ge as getMobileVisitorId,
-  Je as getVisitorId,
-  Ae as getWebAuthnErrorMessage,
+  Ae as getConnectedInfo,
+  Xe as getMobileVisitorId,
+  Qe as getVisitorId,
+  Ce as getWebAuthnErrorMessage,
   me as logger,
-  Xe as login,
-  ve as loginFederatedMaster,
-  Be as mountFederatedIframe,
-  Ce as openPopup,
-  ie as parseNextWorkflow,
+  we as login,
+  Be as loginFederatedMaster,
+  We as mountFederatedIframe,
+  ie as openPopup,
+  Te as parseNextWorkflow,
   Ie as parseTokenFromConnectUrl,
-  le as runPopup,
-  Qe as setVisitorId,
-  Te as sleep,
-  He as translations,
+  Se as runPopup,
+  Ze as setVisitorId,
+  le as sleep,
+  Ge as translations,
   ce as updateConnectedInfo,
   Me as useConnect,
   N as useDid,
   h as useFederatedContext,
-  l as useOAuth,
-  O as usePasskey,
-  Se as version
+  I as useOAuth,
+  D as usePasskey,
+  Oe as version
 };

package/lib/package.json.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/did-connect-react",
-  "version": "3.1.34",
+  "version": "3.1.35",
   "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.1.34",
+    "@arcblock/bridge": "3.1.35",
     "@arcblock/did": "^1.21.3",
-    "@arcblock/icons": "3.1.34",
-    "@arcblock/react-hooks": "3.1.34",
+    "@arcblock/icons": "3.1.35",
+    "@arcblock/react-hooks": "3.1.35",
     "@arcblock/ws": "^1.21.3",
     "@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": "c4810edc1f51b25c0e9bd55b2021f284d378ecb1"
+  "gitHead": "52c5cb7cbc7f22fe05f9c1d85559199fb3166d72"
 }

package/src/Session/hooks/use-session-token.js

@@ -25,6 +25,7 @@ export default function useSessionToken({
   pageState,
   serviceHost,
   sessionTokenStorage,
+  csrfTokenStorage,
   refreshTokenStorage,
   lazyRefreshToken,
   apiOptions = {},
@@ -33,6 +34,7 @@ export default function useSessionToken({
   const [retryCount, setRetryCount] = useState(0);
   const [intervalTime, setIntervalTime] = useState(CHECK_INTERVAL_TIME);
   const { getToken: getSessionToken, setToken: setSessionToken, removeToken: removeSessionToken } = sessionTokenStorage;
+  const { setToken: setCsrfToken } = csrfTokenStorage;
   const { getToken: getRefreshToken, setToken: setRefreshToken, removeToken: removeRefreshToken } = refreshTokenStorage;
   const request = useCreation(() => {
     return createAxios({
@@ -326,7 +328,7 @@ export default function useSessionToken({
   const handleLoginResult = useMemoizedFn((result) => {
     const loginResult = Array.isArray(result) ? result[0] : result;
     debug('handleLoginResult', { loginResult, result });
-    const { loginToken, sessionToken, refreshToken, visitorId, encrypted = true } = loginResult;
+    const { loginToken, csrfToken, sessionToken, refreshToken, visitorId, encrypted = true } = loginResult;
     const token = loginToken || sessionToken;
     let decryptSessionToken;
     let decryptRefreshToken;
@@ -336,6 +338,9 @@ export default function useSessionToken({
       debug('handleLoginResult: setSessionToken', { decryptSessionToken });
       setSessionToken(decryptSessionToken);
 
+      const decryptCsrfToken = encrypted ? decrypt(csrfToken) : csrfToken;
+      setCsrfToken(decryptCsrfToken);
+
       if (refreshToken) {
         decryptRefreshToken = encrypted ? decrypt(refreshToken) : refreshToken;
         debug('handleLoginResult: setRefreshToken', { decryptRefreshToken });

package/src/Session/index.jsx

@@ -61,6 +61,7 @@ import {
   REFRESH_TOKEN_STORAGE_KEY,
   SESSION_TOKEN_STORAGE_KEY,
   DID_SPACES_BASE_URL,
+  CSRF_TOKEN_STORAGE_KEY,
 } from '../constant';
 import { checkEnableAutoLogin, getMobileVisitorId, login as loginInMobile } from './libs/login-mobile';
 import useQuickConnect from '../Connect/hooks/use-quick-connect';
@@ -141,6 +142,10 @@ function createSessionContext(
   }
 
   const sessionTokenStorage = createStorage(storageKey, storageEngine, storageOptions);
+  const csrfTokenStorage = createStorage(CSRF_TOKEN_STORAGE_KEY, 'cookie', {
+    secure: true,
+    sameSite: 'strict',
+  });
 
   const refreshTokenStorage = createStorage(opts.refreshTokenStorageKey, 'ls');
 
@@ -359,6 +364,7 @@ function createSessionContext(
       pageState,
       sessionTokenStorage,
       refreshTokenStorage,
+      csrfTokenStorage,
       serviceHost: props.serviceHost,
       apiOptions: props.apiOptions,
       lazyRefreshToken: props.lazyRefreshToken,
@@ -1516,6 +1522,7 @@ function createSessionContext(
                 await onLogin({
                   sessionToken: result.sessionToken,
                   refreshToken: result.refreshToken,
+                  csrfToken: result.csrfToken,
                   visitorId: result.visitorId,
                   encrypted: false,
                 });
@@ -1605,6 +1612,7 @@ function createSessionContext(
               await onLogin({
                 sessionToken: result.sessionToken,
                 refreshToken: result.refreshToken,
+                csrfToken: result.csrfToken,
                 visitorId: result.visitorId,
                 encrypted: false,
               });

package/src/constant.js

@@ -2,6 +2,7 @@ export const DEFAULT_TIMEOUT = 5 * 60;
 export const DEFAULT_WINDOW_TIMEOUT = 30 * 60;
 export const BLOCKLET_SERVICE_PATH_PREFIX = '/.well-known/service';
 export const SESSION_TOKEN_STORAGE_KEY = 'login_token';
+export const CSRF_TOKEN_STORAGE_KEY = 'x-csrf-token';
 export const REFRESH_TOKEN_STORAGE_KEY = 'refresh_token';
 
 export const RELAY_SOCKET_PREFIX = '/.well-known/service';