@arcblock/did-connect-react 3.2.4 → 3.2.5

package/lib/Connect/hooks/use-quick-connect.js

@@ -1,97 +1,86 @@
-import { useCreation as l, useMemoizedFn as E, useReactive as L, useRequest as T } from "ahooks";
-import { joinURL as u } from "ufo";
+import { useCreation as i, useMemoizedFn as R, useReactive as L, useRequest as T } from "ahooks";
+import { joinURL as d } from "ufo";
 import k from "lodash/pick";
-import A from "lodash/unionBy";
-import D from "lodash/sortBy";
+import D from "lodash/unionBy";
+import E from "lodash/sortBy";
 import x from "@arcblock/ux/lib/Toast";
-import { getFederatedEnabled as B, getMaster as C } from "@arcblock/ux/lib/Util/federated";
-import { BLOCKLET_SERVICE_PATH_PREFIX as P } from "../../constant.js";
-import { createAxios as _, logger as m } from "../../utils.js";
-const f = u(P, "/api/user-session");
-function O({
-  appPid: y,
-  sourceAppPid: U,
-  loginAppPid: S,
-  autoFetch: w = !0,
-  baseUrl: a = "/",
+import { BLOCKLET_SERVICE_PATH_PREFIX as A } from "../../constant.js";
+import { createAxios as B, logger as c } from "../../utils.js";
+const p = d(A, "/api/user-session");
+function M({
+  appPid: m,
+  sourceAppPid: f,
+  loginAppPid: g,
+  autoFetch: y = !0,
+  baseUrl: o = "/",
   fetchAll: I = !1
 } = {}) {
-  const p = l(() => _(
+  const u = i(() => B(
     {
-      baseURL: u(a, f)
+      baseURL: d(o, p)
     },
     { lazy: !0, lazyTime: 500 }
-  ), [a]), h = E(async () => {
+  ), [o]), S = R(async () => {
     if (!window.blocklet)
       return [];
     let r = [];
     try {
-      ({ data: r = [] } = await p.get(""));
-    } catch (t) {
-      m.error("Failed to get user-sessions", t);
-    }
-    const s = r.map((t) => ({
-      ...t,
-      appUrl: a
-    })), e = B(), n = C();
-    if (I && e && n) {
-      let t = [];
-      try {
-        ({ data: t = [] } = await p.get(u(n.appUrl, f)));
-      } catch (c) {
-        m.error("Failed to get master user-sessions", c);
-      }
-      return s.concat(t.map((c) => ({ ...c, appUrl: n.appUrl })));
+      ({ data: r = [] } = await u.get(""));
+    } catch (e) {
+      c.error("Failed to get user-sessions", e);
     }
-    return !e || !n ? s.filter((t) => t?.user?.sourceAppPid === null) : s;
-  }), i = L({
+    return r.filter((e) => I ? !0 : !e.appUrl).map((e) => ({
+      appUrl: o,
+      ...e
+    }));
+  }), s = L({
     loaded: !1,
     loadingId: null
-  }), o = T(h, {
-    manual: !w,
+  }), t = T(S, {
+    manual: !y,
     onFinally() {
-      i.loaded = !0;
+      s.loaded = !0;
     },
-    refreshDeps: [a]
-  }), F = async (r) => {
-    const s = k(r, ["userDid", "visitorId", "passportId", "id"]);
+    refreshDeps: [o]
+  }), w = async (r) => {
+    const a = k(r, ["userDid", "visitorId", "passportId", "id"]);
     try {
-      i.loadingId = r.id;
-      const { data: e } = await p.post(
+      s.loadingId = r.id;
+      const { data: e } = await u.post(
         "login",
-        { ...s, appPid: S },
+        { ...a, appPid: g },
         {
-          baseURL: u(r.appUrl || "/", f)
+          baseURL: d(r.appUrl || "/", p)
         }
       );
       return e;
     } catch (e) {
-      const n = e.response ? e.response?.data?.error || e.response?.data : e.message;
-      throw x.error(n), m.error("Quick login error", e), e;
+      const h = e.response ? e.response?.data?.error || e.response?.data : e.message;
+      throw x.error(h), c.error("Quick login error", e), e;
     } finally {
-      i.loadingId = null;
+      s.loadingId = null;
     }
-  }, g = l(() => o.data ? o.data.filter((r) => r.status !== "expired") : [], [o.data]), d = l(() => {
-    const r = (/* @__PURE__ */ new Date()).getTime(), s = D(g, (e) => r - new Date(e.updatedAt).getTime());
-    return A(
-      s,
+  }, l = i(() => t.data ? t.data.filter((r) => r.status !== "expired") : [], [t.data]), n = i(() => {
+    const r = (/* @__PURE__ */ new Date()).getTime(), a = E(l, (e) => r - new Date(e.updatedAt).getTime());
+    return D(
+      a,
       (e) => [
         e.userDid
         // 暂不以用户角色来做去重的因子
         // x.user.role
       ].join("_")
     );
-  }, [g, U, y]), R = l(() => !!(d && d.length > 0), [d]);
+  }, [l, f, m]), U = i(() => !!(n && n.length > 0), [n]);
   return {
-    loadingId: i.loadingId,
-    userSessions: d,
-    quickLoginEnabled: R,
-    loginUserSession: F,
-    loading: o.loading,
-    loaded: o.loaded,
-    refresh: o.refreshAsync
+    loadingId: s.loadingId,
+    userSessions: n,
+    quickLoginEnabled: U,
+    loginUserSession: w,
+    loading: t.loading,
+    loaded: t.loaded,
+    refresh: t.refreshAsync
   };
 }
 export {
-  O as default
+  M as default
 };

package/lib/package.json.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/did-connect-react",
-  "version": "3.2.4",
+  "version": "3.2.5",
   "description": "Client side library to work with DID Connect by ArcBlock.",
   "keywords": [
     "react",
@@ -32,16 +32,16 @@
     "url": "https://github.com/ArcBlock/ux/issues"
   },
   "dependencies": {
-    "@arcblock/bridge": "3.2.4",
-    "@arcblock/did": "^1.27.3",
-    "@arcblock/icons": "3.2.4",
-    "@arcblock/react-hooks": "3.2.4",
-    "@arcblock/ws": "^1.27.3",
+    "@arcblock/bridge": "3.2.5",
+    "@arcblock/did": "^1.27.6",
+    "@arcblock/icons": "3.2.5",
+    "@arcblock/react-hooks": "3.2.5",
+    "@arcblock/ws": "^1.27.6",
     "@fontsource/lexend": "^5.2.9",
     "@iconify-icons/logos": "^1.2.36",
     "@iconify-icons/material-symbols": "^1.2.58",
     "@iconify/react": "^5.2.1",
-    "@ocap/util": "^1.27.3",
+    "@ocap/util": "^1.27.6",
     "@simplewebauthn/browser": "^13.1.0",
     "ahooks": "^3.8.5",
     "axios": "^1.10.0",
@@ -80,5 +80,5 @@
     "eslint-plugin-react-hooks": "^4.6.2",
     "jest": "^29.7.0"
   },
-  "gitHead": "75c7e540161356c3b4d7a35322b85cd5d09c872e"
+  "gitHead": "8fe09067fd88bc4fd7fe300c984b2b4775fcd128"
 }

package/src/Connect/hooks/use-quick-connect.js

@@ -4,7 +4,6 @@ import pick from 'lodash/pick';
 import unionBy from 'lodash/unionBy';
 import sortBy from 'lodash/sortBy';
 import Toast from '@arcblock/ux/lib/Toast';
-import { getFederatedEnabled, getMaster } from '@arcblock/ux/lib/Util/federated';
 
 import { BLOCKLET_SERVICE_PATH_PREFIX } from '../../constant';
 import { createAxios, logger } from '../../utils';
@@ -33,34 +32,24 @@ export default function useQuickConnect({
       return [];
     }
 
-    let selfUserSessions = [];
+    let userSessions = [];
     try {
-      ({ data: selfUserSessions = [] } = await api.get(''));
+      ({ data: userSessions = [] } = await api.get(''));
     } catch (err) {
       logger.error('Failed to get user-sessions', err);
     }
-    const result = selfUserSessions.map((x) => ({
-      ...x,
-      appUrl: baseUrl,
-    }));
-    const enabledFederated = getFederatedEnabled();
-    const master = getMaster();
-    // NOTICE: 联合查询 master 中的会话列表
-    if (fetchAll && enabledFederated) {
-      if (master) {
-        let masterUserSessions = [];
-        try {
-          ({ data: masterUserSessions = [] } = await api.get(joinURL(master.appUrl, prefix)));
-        } catch (err) {
-          logger.error('Failed to get master user-sessions', err);
+    // NOTICE: 已经包含了 federated master userSessions
+    const result = userSessions
+      .filter((x) => {
+        if (!fetchAll) {
+          return !x.appUrl;
         }
-
-        return result.concat(masterUserSessions.map((x) => ({ ...x, appUrl: master.appUrl })));
-      }
-    }
-    if (!enabledFederated || !master) {
-      return result.filter((x) => x?.user?.sourceAppPid === null);
-    }
+        return true;
+      })
+      .map((x) => ({
+        appUrl: baseUrl,
+        ...x,
+      }));
     return result;
   });
   const currentState = useReactive({