@arcblock/did-connect-react 3.1.30 → 3.1.31

package/lib/Session/handler.js

@@ -0,0 +1,55 @@
+import { ReactGA as t } from "@arcblock/ux/lib/withTracker";
+import { GA_LAST_LOGIN_METHOD as n, GA_LAST_ROLE as l, GA_LAST_SOURCE_PROVIDER as i } from "@arcblock/ux/lib/withTracker/constant";
+const S = () => {
+  const e = {
+    action: "loginSuccess",
+    provider: localStorage.getItem(n),
+    success: !0
+  };
+  t.event(e.action, e);
+}, v = (e) => {
+  const s = {
+    action: "loginFailed",
+    provider: localStorage.getItem(n),
+    success: !1,
+    errorMessage: e.message
+  };
+  t.event(s.action, s);
+}, p = (e, s, o) => {
+  const c = localStorage.getItem(l), r = o?.user?.role, a = {
+    action: "switchPassportSuccess",
+    change: `${c} -> ${r}`,
+    success: !0
+  };
+  t.event(a.action, a);
+}, m = (e) => {
+  const s = {
+    action: "switchPassportFailed",
+    success: !1,
+    errorMessage: e.message
+  };
+  t.event(s.action, s);
+}, _ = (e, s, o) => {
+  const c = {
+    action: "bindWalletSuccess",
+    provider: o?.user?.sourceProvider,
+    success: !0
+  };
+  t.event(c.action, c);
+}, E = (e) => {
+  const s = {
+    action: "bindWalletFailed",
+    provider: localStorage.getItem(i),
+    success: !1,
+    errorMessage: e.message
+  };
+  t.event(s.action, s);
+};
+export {
+  E as gaBindWalletFailedHandler,
+  _ as gaBindWalletSuccessHandler,
+  v as gaLoginFailedHandler,
+  S as gaLoginSuccessHandler,
+  m as gaSwitchPassportFailedHandler,
+  p as gaSwitchPassportSuccessHandler
+};

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

@@ -1,169 +1,173 @@
-import { useState as V } from "react";
-import { useCreation as b, useMemoizedFn as c, useInterval as Z } from "ahooks";
-import { joinURL as S, withQuery as H } from "ufo";
-import h from "js-cookie";
+import { useState as K } from "react";
+import { useCreation as M, useMemoizedFn as c, useInterval as Z } from "ahooks";
+import { joinURL as U, withQuery as H } from "ufo";
+import k from "js-cookie";
 import { setVisitorId as ee, getCookieOptions as re } from "@arcblock/ux/lib/Util";
-import ne from "jwt-decode";
-import oe from "@arcblock/ux/lib/Toast";
+import oe from "jwt-decode";
+import ne from "@arcblock/ux/lib/Toast";
 import se from "p-retry";
 import te from "lodash/noop";
-import ie from "../../Service/index.js";
-import { createAxios as ce, getBrowserLang as le, logger as O, debug as u, sleep as fe, decrypt as ue } from "../../utils.js";
-import { CHECK_INTERVAL_TIME as k, LANG_COOKIE_NAME as ae } from "../../constant.js";
-class m extends Error {
+import { ReactGA as ie } from "@arcblock/ux/lib/withTracker";
+import { GA_LAST_SOURCE_PROVIDER as ce } from "@arcblock/ux/lib/withTracker/constant";
+import fe from "../../Service/index.js";
+import { createAxios as le, getBrowserLang as ue, logger as A, debug as u, sleep as ae, decrypt as de } from "../../utils.js";
+import { CHECK_INTERVAL_TIME as m, LANG_COOKIE_NAME as he } from "../../constant.js";
+class T extends Error {
 }
-const de = 10, w = (e) => ue(e, localStorage.getItem("__encKey"), localStorage.getItem("__decKey"));
-function _e({
+const ke = 10, v = (e) => de(e, localStorage.getItem("__encKey"), localStorage.getItem("__decKey"));
+function Ee({
   state: e,
   pageState: i,
-  serviceHost: T,
-  sessionTokenStorage: A,
-  refreshTokenStorage: q,
-  lazyRefreshToken: z,
-  apiOptions: D = {},
-  onRefresh: j = te
+  serviceHost: p,
+  sessionTokenStorage: O,
+  refreshTokenStorage: V,
+  lazyRefreshToken: N,
+  apiOptions: b = {},
+  onRefresh: z = te
 }) {
-  const [F, p] = V(0), [B, a] = V(k), { getToken: y, setToken: C, removeToken: G } = A, { getToken: R, setToken: g, removeToken: $ } = q, Q = b(() => ce({
-    baseURL: T,
+  const [q, R] = K(0), [P, d] = K(m), { getToken: y, setToken: C, removeToken: j } = O, { getToken: w, setToken: g, removeToken: B } = V, $ = M(() => le({
+    baseURL: p,
     timeout: 10 * 1e3,
     secure: !0
-  }), [T]), d = () => {
-    G(), $();
-  }, v = b(() => ie(
+  }), [p]), h = () => {
+    j(), B();
+  }, _ = M(() => fe(
     {
-      sessionTokenStorage: A,
-      refreshTokenStorage: q,
-      serviceHost: T,
+      sessionTokenStorage: O,
+      refreshTokenStorage: V,
+      serviceHost: p,
       authServicePrefix: i.prefix,
       onRefreshTokenError() {
-        d(), e.user && (e.user = null);
+        h(), e.user && (e.user = null);
       }
     },
-    D
-  ), [T, i.prefix]), x = () => {
-    const r = re({ returnDomain: !1 });
-    h.remove("connected_did", r), h.remove("connected_pk", r), h.remove("connected_app", r), h.remove("connected_wallet_os", r), d();
-  }, X = c(() => {
-    const r = h.get(ae) || le();
-    r !== i.currentLocale && (i.currentLocale = r);
-  }), Y = c(async () => {
-    const r = () => v.get(S(i.notificationPrefix, "/unread-count"));
+    b
+  ), [p, i.prefix]), x = () => {
+    const o = re({ returnDomain: !1 });
+    k.remove("connected_did", o), k.remove("connected_pk", o), k.remove("connected_app", o), k.remove("connected_wallet_os", o), h();
+  }, Q = c(() => {
+    const o = k.get(he) || ue();
+    o !== i.currentLocale && (i.currentLocale = o);
+  }), X = c(async () => {
+    const o = () => _.get(U(i.notificationPrefix, "/unread-count"));
     try {
-      const { data: o } = await r();
-      return o.unReadCount;
-    } catch (o) {
-      return console.error("getUnreadCount error", o), 0;
+      const { data: n } = await o();
+      return n.unReadCount;
+    } catch (n) {
+      return console.error("getUnreadCount error", n), 0;
     }
-  }), K = c(
-    async ({ showProgress: r = !1, requestFn: o = null, onlyRefreshToken: s = !1, type: t = "refreshToken" }) => {
+  }), D = c(
+    async ({ showProgress: o = !1, requestFn: n = null, onlyRefreshToken: s = !1, type: t = "refreshToken" }) => {
       try {
         if (e.loading)
           return console.warn("SessionProvider.refresh is currently in progress, call it will be noop"), { loading: !0 };
-        r && (e.loading = !0);
-        const { data: n, status: l } = await o();
-        if (l === 400 && (d(), e.user = null, e.error = ""), n.error)
-          throw e.error = n.error, e.open = !1, e.unReadCount = 0, new Error(n.error);
-        if (n.user) {
+        o && (e.loading = !0);
+        const { data: r, status: f } = await n(), a = r?.user?.did;
+        if (a && ie.set({
+          user_id: a
+        }), r?.user?.sourceProvider && localStorage.setItem(ce, r.user.sourceProvider), f === 400 && (h(), e.user = null, e.error = ""), r.error)
+          throw e.error = r.error, e.open = !1, e.unReadCount = 0, new Error(r.error);
+        if (r.user) {
           try {
-            const f = await Y();
-            e.unReadCount = f || 0;
-          } catch (f) {
-            O.error("getUnreadCount error", f), e.unReadCount = 0;
+            const l = await X();
+            e.unReadCount = l || 0;
+          } catch (l) {
+            A.error("getUnreadCount error", l), e.unReadCount = 0;
           }
-          n.nextToken && (C(n.nextToken), j({
+          r.nextToken && (C(r.nextToken), z({
             type: t,
-            sessionToken: n.nextToken,
-            refreshToken: n.nextRefreshToken,
-            user: n.user
-          }), n.nextRefreshToken && g(n.nextRefreshToken)), s || (e.open = !1, e.user = n.user, e.provider = n.provider, e.walletOS = n.walletOS), y() || oe.error("Can't write session token, please use https url to access this page");
+            sessionToken: r.nextToken,
+            refreshToken: r.nextRefreshToken,
+            user: r.user
+          }), r.nextRefreshToken && g(r.nextRefreshToken)), s || (e.open = !1, e.user = r.user, e.provider = r.provider, e.walletOS = r.walletOS), y() || ne.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: n, status: l };
-      } catch (n) {
-        throw O.error("SessionProvider.refresh error", n), e.open = !1, e.error = n.message, n?.response?.status === 400 ? new m("Invalid token") : n;
+          throw o && (e.loading = i.autoConnect), e.open = i.autoConnect, e.user = null, e.provider = "", e.walletOS = "", e.unReadCount = 0, new T("Invalid token");
+        return { data: r, status: f };
+      } catch (r) {
+        throw A.error("SessionProvider.refresh error", r), e.open = !1, e.error = r.message, r?.response?.status === 400 ? new T("Invalid token") : r;
       } finally {
-        r && (e.loading = !1);
+        o && (e.loading = !1);
       }
     }
-  ), _ = c(async (r = !1, o = !1) => {
-    u("handleRefreshToken", { showProgress: r, onlyRefreshToken: o });
-    const s = () => Q.post(H(S(i.prefix, "/refreshSession")), null, {
+  ), I = c(async (o = !1, n = !1) => {
+    u("handleRefreshToken", { showProgress: o, onlyRefreshToken: n });
+    const s = () => $.post(H(U(i.prefix, "/refreshSession")), null, {
       headers: {
-        authorization: `Bearer ${encodeURIComponent(R())}`
+        authorization: `Bearer ${encodeURIComponent(w())}`
       }
     });
-    a(void 0);
+    d(void 0);
     try {
-      await K({ showProgress: r, requestFn: s, onlyRefreshToken: o, type: "refreshToken" }), p(0), a(k);
+      await D({ showProgress: o, requestFn: s, onlyRefreshToken: n, type: "refreshToken" }), R(0), d(m);
     } catch (t) {
-      t instanceof m ? (console.warn("refresh token failed, remove all tokens"), p(0), d(), a(k)) : (O.error("refresh token failed, unexpected error:", t), p(F + 1), await fe(k), F >= de ? (p(0), a(void 0)) : a(k));
+      t instanceof T ? (console.warn("refresh token failed, remove all tokens"), R(0), h(), d(m)) : (A.error("refresh token failed, unexpected error:", t), R(q + 1), await ae(m), q >= ke ? (R(0), d(void 0)) : d(m));
     }
-  }), M = c((r = !1) => {
-    if (z)
+  }), F = c((o = !1) => {
+    if (N)
       return;
-    const o = y();
-    let s = r;
+    const n = y();
+    let s = o;
     const t = (/* @__PURE__ */ new Date()).getTime();
-    if (o)
+    if (n)
       try {
-        const { exp: n, iat: l } = ne(o);
-        n * 1e3 - t < t - l * 1e3 && (s = !0);
+        const { exp: r, iat: f } = oe(n);
+        r * 1e3 - t < t - f * 1e3 && (s = !0);
       } catch {
         s = !0;
       }
     else
       s = !0;
-    s && (R() ? _(!1, !0) : (x(), e.user && (e.user = null)));
-  }), N = c(async ({ showProgress: r = !1, forceRefreshToken: o = !1 } = {}) => {
-    const s = () => se(() => v.get(S(i.prefix, "/session"), { secure: !0 }), {
+    s && (w() ? I(!1, !0) : (x(), e.user && (e.user = null)));
+  }), G = c(async ({ showProgress: o = !1, forceRefreshToken: n = !1 } = {}) => {
+    const s = () => se(() => _.get(U(i.prefix, "/session"), { secure: !0 }), {
       retries: 2
     });
-    u("handleRefreshUser", { showProgress: r, forceRefreshToken: o });
+    u("handleRefreshUser", { showProgress: o, forceRefreshToken: n });
     try {
-      if (o)
-        throw new m("need force refresh token");
-      await K({ showProgress: r, requestFn: s, type: "refreshUser" });
+      if (n)
+        throw new T("need force refresh token");
+      await D({ showProgress: o, requestFn: s, type: "refreshUser" });
     } catch (t) {
-      t instanceof m && (u("handleRefreshUser failed, try to refresh token", { err: t }), await _());
+      t instanceof T && (u("handleRefreshUser failed, try to refresh token", { err: t }), await I());
     }
-  }), J = c(async () => {
-    const r = y(), o = R();
-    e.user || (r || o ? await N() : (x(), e.user && (e.user = null)));
-  }), P = c(() => {
+  }), Y = c(async () => {
+    const o = y(), n = w();
+    e.user || (o || n ? await G() : (x(), e.user && (e.user = null)));
+  }), J = c(() => {
     if (e.initialized && e.user)
       try {
-        M();
+        F();
       } catch {
       }
-  }), W = c((r) => {
-    const o = Array.isArray(r) ? r[0] : r;
-    u("handleLoginResult", { loginResult: o, result: r });
-    const { loginToken: s, sessionToken: t, refreshToken: n, visitorId: l, encrypted: f = !0 } = o, I = s || t;
-    let L, U, E;
-    I && (L = f ? w(I) : I, u("handleLoginResult: setSessionToken", { decryptSessionToken: L }), C(L), n && (U = f ? w(n) : n, u("handleLoginResult: setRefreshToken", { decryptRefreshToken: U }), g(U))), l && (E = f ? w(l) : l, u("handleLoginResult: setVisitorId", { decryptVisitorId: E }), ee(E));
+  }), W = c((o) => {
+    const n = Array.isArray(o) ? o[0] : o;
+    u("handleLoginResult", { loginResult: n, result: o });
+    const { loginToken: s, sessionToken: t, refreshToken: r, visitorId: f, encrypted: a = !0 } = n, l = s || t;
+    let L, S, E;
+    l && (L = a ? v(l) : l, u("handleLoginResult: setSessionToken", { decryptSessionToken: L }), C(L), r && (S = a ? v(r) : r, u("handleLoginResult: setRefreshToken", { decryptRefreshToken: S }), g(S))), f && (E = a ? v(f) : f, u("handleLoginResult: setVisitorId", { decryptVisitorId: E }), ee(E));
   });
   return Z(
     () => {
-      X(), M();
+      Q(), F();
     },
-    B,
+    P,
     { immediate: !0 }
   ), {
-    renewToken: P,
-    handleRefreshUser: N,
-    handleRefreshToken: _,
-    syncSessionSate: J,
+    renewToken: J,
+    handleRefreshUser: G,
+    handleRefreshToken: I,
+    syncSessionSate: Y,
     handleLoginResult: W,
-    decrypt: w,
-    removeToken: d,
+    decrypt: v,
+    removeToken: h,
     clearSession: x,
     getSessionToken: y,
-    getRefreshToken: R,
+    getRefreshToken: w,
     setRefreshToken: g,
     setSessionToken: C,
-    service: v
+    service: _
   };
 }
 export {
-  _e as default
+  Ee as default
 };