@arcblock/did-connect-react 3.1.57 → 3.1.59

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

@@ -1,6 +1,6 @@
 import { useState as M } from "react";
 import { useCreation as N, useMemoizedFn as c, useInterval as se } from "ahooks";
-import { joinURL as A, withQuery as te } from "ufo";
+import { joinURL as O, withQuery as te } from "ufo";
 import T from "js-cookie";
 import { setVisitorId as ie, getCookieOptions as ce } from "@arcblock/ux/lib/Util";
 import fe from "jwt-decode";
@@ -10,7 +10,7 @@ import ae from "lodash/noop";
 import { ReactGA as de } from "@arcblock/ux/lib/withTracker";
 import { GA_LAST_SOURCE_PROVIDER as ke } from "@arcblock/ux/lib/withTracker/constant";
 import Te from "../../Service/index.js";
-import { createAxios as he, debugTmp as O, getBrowserLang as me, logger as b, debug as u, sleep as pe, debugTmpInterval as z, decrypt as Re } from "../../utils.js";
+import { createAxios as he, debugTmp as C, getBrowserLang as me, logger as b, debug as u, sleep as pe, debugTmpInterval as z, decrypt as Re } from "../../utils.js";
 import { CHECK_INTERVAL_TIME as h, LANG_COOKIE_NAME as ye } from "../../constant.js";
 class m extends Error {
 }
@@ -26,31 +26,31 @@ function qe({
   apiOptions: B = {},
   onRefresh: $ = ae
 }) {
-  const [D, y] = M(0), [Q, d] = M(h), { getToken: v, setToken: C, removeToken: X } = V, { setToken: Y } = P, { getToken: w, setToken: g, removeToken: J } = q, W = N(() => he({
+  const [D, y] = M(0), [Q, d] = M(h), { getToken: v, setToken: g, removeToken: X } = V, { setToken: Y } = P, { getToken: w, setToken: S, removeToken: J } = q, W = N(() => he({
     baseURL: R,
     timeout: 10 * 1e3,
     secure: !0
   }), [R]), k = () => {
-    X(), J();
-  }, S = N(() => Te(
+    C("[removeToken] useSessionToken -> removeToken"), X(), J();
+  }, _ = N(() => Te(
     {
       sessionTokenStorage: V,
       refreshTokenStorage: q,
       serviceHost: R,
       authServicePrefix: i.prefix,
       onRefreshTokenError() {
-        O("[removeToken] useSessionToken -> createService: onRefreshTokenError"), k(), e.user && (e.user = null);
+        C("[removeToken] useSessionToken -> createService: onRefreshTokenError"), k(), e.user && (e.user = null);
       }
     },
     B
-  ), [R, i.prefix]), _ = () => {
+  ), [R, i.prefix]), I = () => {
     const r = ce({ returnDomain: !1 });
     T.remove("connected_did", r), T.remove("connected_pk", r), T.remove("connected_app", r), T.remove("connected_wallet_os", r), z("[removeToken] clearSession-interval"), k();
   }, Z = c(() => {
     const r = T.get(ye) || me();
     r !== i.currentLocale && (i.currentLocale = r);
   }), H = c(async () => {
-    const r = () => S.get(A(i.notificationPrefix, "/unread-count"));
+    const r = () => _.get(O(i.notificationPrefix, "/unread-count"));
     try {
       const { data: n } = await r();
       return n.unReadCount;
@@ -66,7 +66,7 @@ function qe({
         const { data: o, status: f } = await n(), a = o?.user?.did;
         if (a && de.set({
           user_id: a
-        }), o?.user?.sourceProvider && localStorage.setItem(ke, o.user.sourceProvider), f === 400 && (O("[removeToken] useSessionToken -> _refresh: status 400"), k(), e.user = null, e.error = ""), o.error)
+        }), o?.user?.sourceProvider && localStorage.setItem(ke, o.user.sourceProvider), f === 400 && (C("[removeToken] useSessionToken -> _refresh: status 400"), k(), e.user = null, e.error = ""), o.error)
           throw e.error = o.error, e.open = !1, e.unReadCount = 0, new Error(o.error);
         if (o.user) {
           try {
@@ -75,12 +75,12 @@ function qe({
           } catch (l) {
             b.error("getUnreadCount error", l), e.unReadCount = 0;
           }
-          o.nextToken && (C(o.nextToken), $({
+          o.nextToken && (g(o.nextToken), $({
             type: s,
             sessionToken: o.nextToken,
             refreshToken: o.nextRefreshToken,
             user: o.user
-          }), o.nextRefreshToken && g(o.nextRefreshToken)), t || (e.open = !1, e.user = o.user, e.provider = o.provider, e.walletOS = o.walletOS), v() || le.error("Can't write session token, please use https url to access this page");
+          }), o.nextRefreshToken && S(o.nextRefreshToken)), t || (e.open = !1, e.user = o.user, e.provider = o.provider, e.walletOS = o.walletOS), v() || le.error("Can't write session token, please use https url to access this page");
         } else
           throw r && (e.loading = i.autoConnect), e.open = i.autoConnect, e.user = null, e.provider = "", e.walletOS = "", e.unReadCount = 0, new m("Invalid token");
         return { data: o, status: f };
@@ -90,9 +90,9 @@ function qe({
         r && (e.loading = !1);
       }
     }
-  ), I = c(async (r = !1, n = !1) => {
+  ), x = c(async (r = !1, n = !1) => {
     u("handleRefreshToken", { showProgress: r, onlyRefreshToken: n });
-    const t = () => W.post(te(A(i.prefix, "/refreshSession")), null, {
+    const t = () => W.post(te(O(i.prefix, "/refreshSession")), null, {
       headers: {
         authorization: `Bearer ${encodeURIComponent(w())}`
       }
@@ -101,7 +101,7 @@ function qe({
     try {
       await F({ showProgress: r, requestFn: t, onlyRefreshToken: n, type: "refreshToken" }), y(0), d(h);
     } catch (s) {
-      s instanceof m ? (console.warn("refresh token failed, remove all tokens"), y(0), O("[removeToken] useSessionToken -> handleRefreshToken: refresh token failed, remove all tokens"), k(), d(h)) : (b.error("refresh token failed, unexpected error:", s), y(D + 1), await pe(h), D >= ve ? (y(0), d(void 0)) : d(h));
+      s instanceof m ? (console.warn("refresh token failed, remove all tokens"), y(0), C("[removeToken] useSessionToken -> handleRefreshToken: refresh token failed, remove all tokens"), k(), d(h)) : (b.error("refresh token failed, unexpected error:", s), y(D + 1), await pe(h), D >= ve ? (y(0), d(void 0)) : d(h));
     }
   }), G = c((r = !1) => {
     if (j)
@@ -118,9 +118,9 @@ function qe({
       }
     else
       t = !0;
-    t && (w() ? I(!1, !0) : (z("[clearSession-interval] useSessionToken -> checkToken: empty refreshToken"), _(), e.user && (e.user = null)));
+    t && (w() ? x(!1, !0) : (z("[clearSession-interval] useSessionToken -> checkToken: empty refreshToken"), I(), e.user && (e.user = null)));
   }), K = c(async ({ showProgress: r = !1, forceRefreshToken: n = !1 } = {}) => {
-    const t = () => ue(() => S.get(A(i.prefix, "/session"), { secure: !0 }), {
+    const t = () => ue(() => _.get(O(i.prefix, "/session"), { secure: !0 }), {
       retries: 2
     });
     u("handleRefreshUser", { showProgress: r, forceRefreshToken: n });
@@ -129,11 +129,11 @@ function qe({
         throw new m("need force refresh token");
       await F({ showProgress: r, requestFn: t, type: "refreshUser" });
     } catch (s) {
-      s instanceof m && (u("handleRefreshUser failed, try to refresh token", { err: s }), await I());
+      s instanceof m && (u("handleRefreshUser failed, try to refresh token", { err: s }), await x());
     }
   }), ee = c(async () => {
     const r = v(), n = w();
-    e.user || (r || n ? await K() : (u("[clearSession] syncSessionSate: empty sessionToken and refreshToken"), _(), e.user && (e.user = null)));
+    e.user || (r || n ? await K() : (u("[clearSession] syncSessionSate: empty sessionToken and refreshToken"), I(), e.user && (e.user = null)));
   }), re = c(() => {
     if (e.initialized && e.user)
       try {
@@ -143,16 +143,16 @@ function qe({
   }), oe = c((r) => {
     const n = Array.isArray(r) ? r[0] : r;
     u("handleLoginResult", { loginResult: n, result: r });
-    const { loginToken: t, csrfToken: s, sessionToken: o, refreshToken: f, visitorId: a, encrypted: l = !0 } = n, x = t || o;
-    let L, E, U;
-    if (x) {
-      if (L = l ? p(x) : x, u("handleLoginResult: setSessionToken", { decryptSessionToken: L }), C(L), s) {
+    const { loginToken: t, csrfToken: s, sessionToken: o, refreshToken: f, visitorId: a, encrypted: l = !0 } = n, L = t || o;
+    let E, U, A;
+    if (L) {
+      if (E = l ? p(L) : L, u("handleLoginResult: setSessionToken", { decryptSessionToken: E }), g(E), s) {
         const ne = l ? p(s) : s;
         Y(ne);
       }
-      f && (E = l ? p(f) : f, u("handleLoginResult: setRefreshToken", { decryptRefreshToken: E }), g(E));
+      f && (U = l ? p(f) : f, u("handleLoginResult: setRefreshToken", { decryptRefreshToken: U }), S(U));
     }
-    a && (U = l ? p(a) : a, u("handleLoginResult: setVisitorId", { decryptVisitorId: U }), ie(U));
+    a && (A = l ? p(a) : a, u("handleLoginResult: setVisitorId", { decryptVisitorId: A }), ie(A));
   });
   return se(
     () => {
@@ -163,17 +163,17 @@ function qe({
   ), {
     renewToken: re,
     handleRefreshUser: K,
-    handleRefreshToken: I,
+    handleRefreshToken: x,
     syncSessionSate: ee,
     handleLoginResult: oe,
     decrypt: p,
     removeToken: k,
-    clearSession: _,
+    clearSession: I,
     getSessionToken: v,
     getRefreshToken: w,
-    setRefreshToken: g,
-    setSessionToken: C,
-    service: S
+    setRefreshToken: S,
+    setSessionToken: g,
+    service: _
   };
 }
 export {

package/lib/Storage/engine/cookie.js

@@ -1,8 +1,9 @@
 import o from "js-cookie";
 import { getCookieOptions as t } from "@arcblock/ux/lib/Util";
-class g {
-  constructor(e, s) {
-    this.storageKey = e, this.options = s || {};
+import { debugTmp as s } from "../../utils.js";
+class a {
+  constructor(e, r) {
+    this.storageKey = e, this.options = r || {};
   }
   setToken(e) {
     return o.set(this.storageKey, e, {
@@ -13,9 +14,9 @@ class g {
     return o.get(this.storageKey);
   }
   removeToken() {
-    return o.remove(this.storageKey, t(this.options));
+    return s("[CookieStorageEngine] removeToken"), o.remove(this.storageKey, t(this.options));
   }
 }
 export {
-  g as default
+  a as default
 };

package/lib/Storage/engine/local-storage.js

@@ -1,5 +1,6 @@
 import o from "jwt-decode";
-class a {
+import { debugTmp as r } from "../../utils.js";
+class f {
   constructor(e) {
     this.storageKey = e;
   }
@@ -27,10 +28,10 @@ class a {
       return t;
   }
   removeToken() {
-    if (!(typeof window > "u" || typeof window.localStorage > "u"))
+    if (r("[LocalStorageEngine] removeToken"), !(typeof window > "u" || typeof window.localStorage > "u"))
       return localStorage.removeItem(this.storageKey);
   }
 }
 export {
-  a as default
+  f as default
 };

package/lib/package.json.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/did-connect-react",
-  "version": "3.1.57",
+  "version": "3.1.59",
   "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.57",
+    "@arcblock/bridge": "3.1.59",
     "@arcblock/did": "^1.27.2",
-    "@arcblock/icons": "3.1.57",
-    "@arcblock/react-hooks": "3.1.57",
+    "@arcblock/icons": "3.1.59",
+    "@arcblock/react-hooks": "3.1.59",
     "@arcblock/ws": "^1.27.2",
     "@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": "ff0e37a8ddeb14f0ebd4e1d55a308b17041e4d70"
+  "gitHead": "40bce7b0f6ed43f138bdd0c0d73f365533e66c80"
 }

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

@@ -53,6 +53,7 @@ export default function useSessionToken({
     });
   }, [serviceHost]);
   const removeToken = () => {
+    debugTmp('[removeToken] useSessionToken -> removeToken');
     removeSessionToken();
     removeRefreshToken();
   };

package/src/Storage/engine/cookie.js

@@ -1,5 +1,6 @@
 import Cookie from 'js-cookie';
 import { getCookieOptions } from '@arcblock/ux/lib/Util';
+import { debugTmp } from '../../utils';
 
 export default class CookieStorageEngine {
   constructor(storageKey, options) {
@@ -18,6 +19,7 @@ export default class CookieStorageEngine {
   }
 
   removeToken() {
+    debugTmp('[CookieStorageEngine] removeToken');
     return Cookie.remove(this.storageKey, getCookieOptions(this.options));
   }
 }

package/src/Storage/engine/local-storage.js

@@ -1,4 +1,5 @@
 import jwtDecode from 'jwt-decode';
+import { debugTmp } from '../../utils';
 
 export default class LocalStorageEngine {
   constructor(storageKey) {
@@ -46,6 +47,7 @@ export default class LocalStorageEngine {
   }
 
   removeToken() {
+    debugTmp('[LocalStorageEngine] removeToken');
     if (typeof window === 'undefined' || typeof window.localStorage === 'undefined') {
       return undefined;
     }