@arcblock/did-connect-react 3.5.1 → 3.5.2

package/lib/Session/index.js

@@ -23,7 +23,7 @@ import _e from "@arcblock/ux/lib/DID";
 import Ee from "@arcblock/ux/lib/Avatar";
 import { getCurrentAppPid as dt } from "@arcblock/ux/lib/SessionUser/libs/utils";
 import { translate as pt } from "@arcblock/ux/lib/Locale/util";
-import { getBlockletSDK as ft } from "@blocklet/js-sdk";
+import { getBlockletSDK as ft } from "../node_modules/@blocklet/js-sdk/dist/index.js";
 import b from "@arcblock/bridge";
 import { getFederatedEnabled as ut } from "@arcblock/ux/lib/Util/federated";
 import wt from "lodash/noop";

package/lib/node_modules/@blocklet/js-sdk/dist/index.js

@@ -0,0 +1,512 @@
+import { SESSION_TOKEN_STORAGE_KEY as g, REFRESH_TOKEN_STORAGE_KEY as y, WELLKNOWN_SERVICE_PATH_PREFIX as w } from "@abtnode/constant";
+import { joinURL as k, withQuery as S } from "ufo";
+import p from "js-cookie";
+import L from "quick-lru";
+import B from "lodash/isEmpty";
+import C from "axios";
+import x from "keyv";
+import { KeyvLocalStorage as A } from "keyv-browser";
+import F from "lodash/isNumber";
+import j from "lodash/omit";
+import N from "lodash/isObject";
+import $ from "json-stable-stringify";
+import "is-url";
+var K = class {
+  constructor({ api: e, token: t }) {
+    this.api = e, this.token = t;
+  }
+  async getUserPublicInfo({ did: e, name: t }) {
+    const { data: o } = await this.api.get("/api/user", { params: {
+      did: e,
+      name: t
+    } });
+    return o;
+  }
+  async getUserPrivacyConfig({ did: e, name: t }) {
+    const { data: o } = await this.api.get("/api/user/privacy/config", { params: {
+      did: e,
+      name: t
+    } });
+    return o;
+  }
+  async saveUserPrivacyConfig(e) {
+    const { data: t } = await this.api.post("/api/user/privacy/config", e);
+    return t;
+  }
+  async getUserNotificationConfig() {
+    const { data: e } = await this.api.get("/api/user/notification/config");
+    return e;
+  }
+  async saveUserNotificationConfig(e) {
+    const { data: t } = await this.api.post("/api/user/notification/config", e);
+    return t;
+  }
+  async testNotificationWebhook(e) {
+    const { data: t } = await this.api.put("/api/user/notification/webhook", e);
+    return t;
+  }
+  async getProfileUrl({ did: e, locale: t }) {
+    return S(`${w}/user`, {
+      did: e,
+      locale: t
+    });
+  }
+  async getProfile() {
+    const { data: e } = await this.api.get("/api/user/profile");
+    return e;
+  }
+  async refreshProfile() {
+    await this.api.put("/api/user/refreshProfile");
+  }
+  async followUser({ userDid: e }) {
+    await this.api.post(`/api/user/follow/${e}`);
+  }
+  async unfollowUser({ userDid: e }) {
+    await this.api.delete(`/api/user/follow/${e}`);
+  }
+  async isFollowingUser({ userDid: e }) {
+    const { data: t } = await this.api.get(`/api/user/follow/${e}`);
+    return t.isFollowing;
+  }
+  async saveProfile({ locale: e, inviter: t, metadata: o, address: n }) {
+    const { data: r } = await this.api.put("/api/user/profile", {
+      locale: e,
+      inviter: t,
+      metadata: o,
+      address: n
+    });
+    return r;
+  }
+  async updateDidSpace({ spaceGateway: e }) {
+    await this.api.put("/api/user/updateDidSpace", { spaceGateway: e });
+  }
+  /**
+  * 指定要退出登录的设备 id
+  * 指定要退出登录的会话状态
+  * @param {{ visitorId: string, status: string }} { visitorId, status }
+  * @return {Promise<void>}
+  */
+  async logout({ visitorId: e, status: t, includeFederated: o }) {
+    const n = this.token.getRefreshToken(), { data: r } = await this.api.post("/api/user/logout", {
+      visitorId: e,
+      status: t,
+      includeFederated: o,
+      refreshToken: n
+    });
+    return r;
+  }
+  /**
+  * 删除当前登录用户
+  * @return {Promise<{did: string}>}
+  */
+  async destroyMyself() {
+    const { data: e } = await this.api.delete("/api/user");
+    return e;
+  }
+  /**
+  * org 相关
+  */
+  async getOrgs({ search: e = "", type: t = "", page: o = 1, pageSize: n = 20 }) {
+    const { data: r } = await this.api.get("/api/user/orgs", { params: {
+      search: e,
+      page: o,
+      pageSize: n,
+      type: t
+    } });
+    return r;
+  }
+  async getOrg(e) {
+    const { data: t } = await this.api.get(`/api/user/orgs/${e}`);
+    return t;
+  }
+  async createOrg(e) {
+    const { data: t } = await this.api.post("/api/user/orgs", { org: e });
+    return t;
+  }
+  async getRole(e) {
+    const { data: t } = await this.api.get("/api/user/role", { params: { name: e } });
+    return t;
+  }
+  async addResourceToOrg({ orgId: e, resourceId: t, type: o, metadata: n }) {
+    const { data: r } = await this.api.post(`/api/user/orgs/${e}/resources`, {
+      resourceId: t,
+      type: o,
+      metadata: n
+    });
+    return r;
+  }
+  async migrateResourceToOrg({ form: e, to: t, resourceId: o }) {
+    const { data: n } = await this.api.put(`/api/user/orgs/${e}/resources`, {
+      to: t,
+      resourceId: o
+    });
+    return n;
+  }
+}, D = class {
+  getSessionToken(e) {
+    return p.get(g) ? p.get(g) : e.sessionTokenKey ? window.localStorage.getItem(e.sessionTokenKey) : "";
+  }
+  setSessionToken(e) {
+    p.set(g, e);
+  }
+  removeSessionToken() {
+    p.remove(g);
+  }
+  getRefreshToken() {
+    return localStorage.getItem(y);
+  }
+  setRefreshToken(e) {
+    localStorage.setItem(y, e);
+  }
+  removeRefreshToken() {
+    localStorage.removeItem(y);
+  }
+};
+let T;
+function O() {
+  return T || (T = new L({
+    maxSize: 30,
+    maxAge: 60 * 1e3
+  })), T;
+}
+var b = class {
+  getBlocklet(e, t = !1) {
+    if (!e) {
+      if (typeof window > "u" || typeof document > "u") throw new Error("Cannot get blocklet in server side without baseUrl");
+      return window.blocklet;
+    }
+    const o = O();
+    if (!t && o.has(e)) return o.get(e);
+    const n = S(k(e, "__blocklet__.js"), {
+      type: "json",
+      t: Date.now()
+    });
+    return new Promise(async (r) => {
+      const s = await (await fetch(n)).json();
+      o.set(e, s), r(s);
+    });
+  }
+  loadBlocklet() {
+    return new Promise((e, t) => {
+      if (typeof window > "u" || typeof document > "u") {
+        t();
+        return;
+      }
+      const o = document.createElement("script");
+      let n = "/";
+      window.blocklet && window.blocklet.prefix && (n = window.blocklet.prefix), o.src = S(k(n, "__blocklet__.js"), { t: Date.now() }), o.onload = () => {
+        e();
+      }, o.onerror = () => {
+        t();
+      }, document.head.append(o);
+    });
+  }
+  getPrefix(e) {
+    return e ? e?.prefix || "/" : typeof window > "u" || typeof document > "u" ? null : window.blocklet?.prefix || "/";
+  }
+}, M = class {
+  constructor({ api: e, blocklet: t }) {
+    this.api = e, this.blocklet = t || new b();
+  }
+  getBaseUrl(e) {
+    return e ? k(e, w) : void 0;
+  }
+  async getUserSessions({ did: e, appUrl: t }) {
+    const o = this.getBaseUrl(t), n = await this.blocklet.getBlocklet(), { data: r } = await this.api.get("/api/user-session", {
+      baseURL: o,
+      params: {
+        userDid: e,
+        appPid: n.appPid
+      }
+    });
+    return r;
+  }
+  /**
+  * 获取个人的所有登录会话
+  */
+  async getMyLoginSessions({ appUrl: e } = {}, t = {
+    page: 1,
+    pageSize: 10
+  }) {
+    const o = this.getBaseUrl(e), { data: n } = await this.api.get("/api/user-session/myself", {
+      baseURL: o,
+      params: t
+    });
+    return n;
+  }
+  async loginByUserSession({ id: e, appPid: t, userDid: o, passportId: n, appUrl: r }) {
+    const s = this.getBaseUrl(r), { data: d } = await this.api.post("/api/user-session/login", {
+      id: e,
+      appPid: t,
+      userDid: o,
+      passportId: n
+    }, { baseURL: s });
+    return d;
+  }
+}, z = class {
+  constructor({ blocklet: e = window?.blocklet } = {}) {
+    this.blocklet = e;
+  }
+  getComponent(e) {
+    return (this.blocklet?.componentMountPoints || []).find((t) => [
+      t.title,
+      t.name,
+      t.did
+    ].includes(e));
+  }
+  getComponentMountPoint(e) {
+    return this.getComponent(e)?.mountPoint || "";
+  }
+  getUrl(e, ...t) {
+    const o = this.getComponentMountPoint(e);
+    return k(this.blocklet?.appUrl || "", o, ...t);
+  }
+}, W = class {
+  constructor({ api: e, blocklet: t }) {
+    this.blockletDataCache = {}, this.api = e, this.blocklet = t || new b();
+  }
+  async getTrustedDomains() {
+    const { data: e } = await this.api.get("/api/federated/getTrustedDomains");
+    return e;
+  }
+  getMaster(e = this.blocklet.getBlocklet()) {
+    return e?.settings?.federated?.master;
+  }
+  getConfig(e = this.blocklet.getBlocklet()) {
+    return e?.settings?.federated?.config;
+  }
+  getFederatedEnabled(e = this.blocklet.getBlocklet()) {
+    return this.getConfig(e)?.status === "approved";
+  }
+  getSourceAppPid(e = this.blocklet.getBlocklet()) {
+    return this.getMaster(e)?.appPid;
+  }
+  getFederatedApp(e = this.blocklet.getBlocklet()) {
+    const t = this.getMaster(e);
+    return B(t) ? null : {
+      appId: t.appId,
+      appName: t.appName,
+      appDescription: t.appDescription,
+      appLogo: t.appLogo,
+      appPid: t.appPid,
+      appUrl: t.appUrl,
+      version: t.version,
+      sourceAppPid: t.appPid,
+      provider: "wallet"
+    };
+  }
+  getCurrentApp(e = this.blocklet.getBlocklet()) {
+    if (e) return {
+      appId: e.appId,
+      appName: e.appName,
+      appDescription: e.appDescription,
+      appLogo: e.appLogo,
+      appPid: e.appPid,
+      appUrl: e.appUrl,
+      version: e.version,
+      sourceAppPid: null,
+      provider: "wallet"
+    };
+    if (window.env) {
+      const t = window.env;
+      return {
+        appId: t.appId,
+        appName: t.appName,
+        appDescription: t.appDescription,
+        appUrl: t.baseUrl,
+        sourceAppPid: null,
+        provider: "wallet",
+        type: "server"
+      };
+    }
+    return null;
+  }
+  getApps(e = this.blocklet.getBlocklet()) {
+    const t = [], o = this.getFederatedApp(e), n = this.getCurrentApp(e), r = this.getFederatedEnabled(e);
+    return n && t.push(n), o && o?.appId !== n?.appId && r && t.push(o), t.reverse();
+  }
+  async getBlockletData(e, t = !1) {
+    if (!t && this.blockletDataCache[e]) return this.blockletDataCache[e];
+    try {
+      const o = new URL("__blocklet__.js", e);
+      o.searchParams.set("type", "json");
+      const n = await (await fetch(o.href)).json();
+      return this.blockletDataCache[e] = n, n;
+    } catch (o) {
+      return console.error(`Failed to get blocklet data: ${e}`, o), null;
+    }
+  }
+}, q = "1.17.8";
+const G = (e = 0) => new Promise((t) => {
+  setTimeout(() => {
+    t();
+  }, e);
+}), U = (e) => `Bearer ${encodeURIComponent(e)}`, H = "vid", Q = "__visitor_id", V = () => p.get(H) || localStorage.getItem(Q), Y = async (e, t, o) => {
+  if (N(e.data) && e.status >= 200 && e.status < 300 && typeof window < "u" && window.blocklet?.appId && window.blocklet?.appPk) {
+    if (!o) return e;
+    if (!e.data.$signature)
+      throw t(), new Error("Invalid response");
+    const { appId: n, appPk: r } = window.blocklet;
+    if (await o($(j(e.data, ["$signature"])), e.data.$signature, r, n) === !1)
+      throw t(), new Error("Invalid response");
+  }
+  return e;
+};
+function R() {
+  return p.get("x-csrf-token");
+}
+function _() {
+  return p.get("login_token");
+}
+async function X() {
+  const e = R();
+  try {
+    const t = k(window.location.origin, w, "/api/did/csrfToken"), { data: o } = await C.get(t, { headers: { "x-csrf-token": e } });
+    return o;
+  } catch (t) {
+    return console.error(t), {
+      loginToken: _(),
+      csrfToken: null
+    };
+  }
+}
+let v;
+function J() {
+  if (!v) {
+    const e = window?.blocklet?.settings?.session?.cacheTtl;
+    v = new x({
+      store: new A(),
+      ttl: F(e) ? e * 1e3 : 1e3 * 60 * 60
+    });
+  }
+  return v;
+}
+async function P(e, t = 300) {
+  e.metaData.endTime = +/* @__PURE__ */ new Date();
+  const { startTime: o, endTime: n } = e.metaData, r = n - o;
+  r < t && await G(t - r), delete e.metaData;
+}
+const I = (e, t) => {
+  const o = {
+    ...e?.headers,
+    "x-blocklet-js-sdk-version": q
+  }, n = new z(), r = C.create({
+    ...e,
+    headers: o
+  });
+  return t?.lazy && (r.interceptors.request.use((s) => (s.metaData = { startTime: +/* @__PURE__ */ new Date() }, s), (s) => Promise.reject(s)), r.interceptors.response.use(async (s) => (s.config && await P(s.config, t?.lazyTime), s), async (s) => (s.response && await P(s.response.config, t?.lazyTime), Promise.reject(s)))), r.interceptors.request.use(async (s) => {
+    const d = t?.componentDid ?? window.blocklet?.componentId?.split("/").pop();
+    s.baseURL = s.baseURL || n.getComponentMountPoint(d), s.timeout = s.timeout || 20 * 1e3;
+    const f = _(), m = R();
+    if (f && m) {
+      const l = f.slice(-32), u = J(), i = await u.get(l);
+      if (i) s.headers["x-csrf-token"] = i;
+      else {
+        const { loginToken: a, csrfToken: c } = await X();
+        c ? (await u.set(a.slice(-32), c), s.headers["x-csrf-token"] = c) : s.headers["x-csrf-token"] = m;
+      }
+      s.headers["x-csrf-token"] && s.headers["x-csrf-token"] !== R() && p.set("x-csrf-token", s.headers["x-csrf-token"], {
+        sameSite: "strict",
+        secure: !0
+      });
+    }
+    const h = V();
+    return [void 0, null].includes(h) || (s.headers["x-blocklet-visitor-id"] = h), s;
+  }, (s) => Promise.reject(s)), r;
+};
+async function Z(e) {
+  if (!e) throw new Error("Refresh token not found");
+  const { data: t } = await I({
+    baseURL: w,
+    timeout: 10 * 1e3,
+    secure: !0,
+    headers: { authorization: U(e) }
+  }).post("/api/did/refreshSession");
+  return t;
+}
+function E({ getSessionToken: e, setSessionToken: t, removeSessionToken: o, getRefreshToken: n, setRefreshToken: r, removeRefreshToken: s, onRefreshTokenError: d, onRefreshTokenSuccess: f }, m, h) {
+  let l = null;
+  const u = I({
+    timeout: 30 * 1e3,
+    ...m
+  }, h);
+  return u.interceptors.request.use(async (i) => {
+    if (!p.get(g)) {
+      const a = e(i);
+      a && (i.headers.authorization = U(a));
+    }
+    return l && await l, i;
+  }, (i) => Promise.reject(i)), u.interceptors.response.use(async (i) => i.config?.secure ? await Y(i, () => {
+    o(), s();
+  }, h?.verifyFn) : i, async (i) => {
+    const a = i.config;
+    if (a && (a.headers = a?.headers ? { ...a.headers } : {}, i?.response?.status === 401 && !a._retry)) {
+      a._retry = !0;
+      try {
+        l || (l = Z(n()));
+        const c = await l;
+        return t(c.nextToken), r(c.nextRefreshToken), typeof f == "function" && f(c), u(a);
+      } catch (c) {
+        return o(), s(), typeof d == "function" && d(c), Promise.reject(i);
+      } finally {
+        l = null;
+      }
+    }
+    return Promise.reject(i);
+  }), u;
+}
+var ee = class {
+  constructor(e) {
+    const t = new D(), o = E({
+      getSessionToken: t.getSessionToken,
+      setSessionToken: t.setSessionToken,
+      removeSessionToken: t.removeSessionToken,
+      getRefreshToken: t.getRefreshToken,
+      setRefreshToken: t.setRefreshToken,
+      removeRefreshToken: t.removeRefreshToken,
+      onRefreshTokenError: () => {
+        console.error("Failed to refresh token");
+      },
+      onRefreshTokenSuccess: () => {
+      }
+    }, { baseURL: w }, { verifyFn: e?.verifyFn }), n = new b();
+    this.user = new K({
+      api: o,
+      token: t
+    }), this.federated = new W({
+      api: o,
+      blocklet: n
+    }), this.userSession = new M({
+      api: o,
+      blocklet: n
+    }), this.token = t, this.blocklet = n, this.api = o;
+  }
+};
+function he(e = {}, t = {}) {
+  const o = new D();
+  return E({
+    getSessionToken: o.getSessionToken,
+    setSessionToken: o.setSessionToken,
+    removeSessionToken: o.removeSessionToken,
+    getRefreshToken: o.getRefreshToken,
+    setRefreshToken: o.setRefreshToken,
+    removeRefreshToken: o.removeRefreshToken,
+    onRefreshTokenError: () => {
+      console.error("Failed to refresh token");
+    },
+    onRefreshTokenSuccess: () => {
+    }
+  }, e, t);
+}
+const ge = /* @__PURE__ */ (() => {
+  let e;
+  return (t) => (e || (e = new ee(t)), e);
+})();
+export {
+  ee as BlockletSDK,
+  he as createAxios,
+  ge as getBlockletSDK,
+  R as getCSRFToken,
+  X as getCSRFTokenByLoginToken,
+  _ as getLoginToken
+};

package/lib/{package.json.js → packages/did-connect/package.json.js}

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

package/lib/utils.js

@@ -6,12 +6,12 @@ import c from "js-cookie";
 import l from "lodash/isNil";
 import T from "lodash/isString";
 import m from "lodash/isUndefined";
-import { createAxios as P, getBlockletSDK as x } from "@blocklet/js-sdk";
+import { createAxios as P, getBlockletSDK as x } from "./node_modules/@blocklet/js-sdk/dist/index.js";
 import { withQuery as L } from "ufo";
 import { isValid as w, isFromPublicKey as S } from "@arcblock/did";
 import { getSafeUrl as C } from "@arcblock/ux/lib/Util/security";
 import { createDebug as u, createLogger as I } from "@arcblock/ux/lib/Util/logger";
-import N from "./package.json.js";
+import N from "./packages/did-connect/package.json.js";
 import { DID_CONNECT_URL_PARAMS_NAME as f, DEFAULT_WINDOW_TIMEOUT as D } from "./constant.js";
 import { NotOpenError as W } from "./error.js";
 export * from "@arcblock/ux/lib/Util/wallet";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/did-connect-react",
-  "version": "3.5.1",
+  "version": "3.5.2",
   "description": "Client side library to work with DID Connect by ArcBlock.",
   "keywords": [
     "react",
@@ -33,17 +33,17 @@
     "url": "https://github.com/ArcBlock/ux/issues"
   },
   "dependencies": {
-    "@arcblock/bridge": "3.5.1",
-    "@arcblock/did": "^1.29.4",
-    "@arcblock/icons": "3.5.1",
-    "@arcblock/react-hooks": "3.5.1",
-    "@arcblock/ws": "^1.29.4",
-    "@blocklet/constant": "^1.17.7",
+    "@arcblock/bridge": "3.5.2",
+    "@arcblock/did": "^1.29.8",
+    "@arcblock/icons": "3.5.2",
+    "@arcblock/react-hooks": "3.5.2",
+    "@arcblock/ws": "^1.29.8",
+    "@blocklet/constant": "^1.17.9",
     "@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.29.4",
+    "@ocap/util": "^1.29.8",
     "@simplewebauthn/browser": "^13.1.0",
     "ahooks": "^3.8.5",
     "axios": "^1.10.0",
@@ -90,5 +90,5 @@
     "eslint-plugin-react-hooks": "^4.6.2",
     "jest": "^29.7.0"
   },
-  "gitHead": "78fdd8a869a60672e8b66d4eefc172c8a716acd8"
+  "gitHead": "2f6a2770fb95e0b8202de2973d9753be080260af"
 }