@das-fed/utils 7.0.5-beta.8 → 7.0.5-beta.8.2

package/create-api-service/unauthorized-recovery/index.d.ts

@@ -0,0 +1,30 @@
+import { CurringConfig } from '../../curring-http/type';
+
+/** 401 恢复成功后的结果。 */
+export interface UnauthorizedRecoveryResult {
+    /** 恢复后用于重试原请求的平台访问令牌。 */
+    accessToken: string;
+}
+/** 401 恢复处理器接收的上下文。 */
+export interface UnauthorizedRecoveryContext {
+    /** Axios 返回的原始错误。 */
+    error: any;
+    /** 发生 401 的原始请求配置。 */
+    config: CurringConfig;
+}
+/** 项目可注册的 401 恢复处理器。 */
+export type UnauthorizedRecoveryHandler = (context: UnauthorizedRecoveryContext) => Promise<UnauthorizedRecoveryResult | null>;
+/**
+ * 注册项目自定义的 401 恢复处理器。
+ * 后注册的处理器会覆盖之前的处理器，避免不同项目逻辑同时接管认证流程。
+ * @param handler 项目自定义恢复处理器
+ * @returns 注销当前处理器的方法
+ */
+export declare const registerUnauthorizedRecovery: (handler: UnauthorizedRecoveryHandler) => () => void;
+/**
+ * 尝试恢复 401 请求。
+ * 并发 401 共用同一个恢复任务，避免短时间内重复续签 Token。
+ * @param context 401 请求上下文
+ * @returns 恢复成功后的新 Token；无法恢复时返回 null
+ */
+export declare const recoverUnauthorized: (context: UnauthorizedRecoveryContext) => unknown;

package/create-api-service/unauthorized-recovery/index.js

@@ -0,0 +1,10 @@
+let e = null, l = null;
+const n = (r) => (e = r, () => {
+  e === r && (e = null);
+}), o = async (r) => e ? (l || (l = Promise.resolve(e(r)).finally(() => {
+  l = null;
+})), l) : null;
+export {
+  o as recoverUnauthorized,
+  n as registerUnauthorizedRecovery
+};

package/curring-http/type.d.ts

@@ -52,6 +52,12 @@ export type CurringConfig = AxiosRequestConfig & {
   /** 接口401是否重定向到登录页 */
   noRedireLogin?: boolean
 
+  /** 是否跳过项目注册的401恢复逻辑 */
+  skipUnauthorizedRecovery?: boolean
+
+  /** 标记当前请求已完成一次401恢复重试，防止重复续签 */
+  _unauthorizedRecoveryRetried?: boolean
+
   /** 开启CSRF安全选项 */
   csrf?: boolean
 }

package/esm-map.json

@@ -142,5 +142,14 @@
   "analyApi": "/api-services/modules/iot/index",
   "calcTextWidth": "/common-tools/calc-text-width/index",
   "getFileExtension": "/common-tools/get-file-extension/index",
-  "getLanguages": "/common-info/index"
+  "getLanguages": "/common-info/index",
+  "appendQueryParams": "/common-tools/get-url-params/index",
+  "refreshToken": "/create-api-service/sso/index",
+  "isThirdLogin": "/create-api-service/thirdLogout/index",
+  "thirdLogout": "/create-api-service/thirdLogout/index",
+  "oauthClient": "/api-services/modules/justauth/index",
+  "zhongshenLogout": "/create-api-service/thirdLogout/index",
+  "jmcLogout": "/create-api-service/thirdLogout/index",
+  "registerUnauthorizedRecovery": "/create-api-service/unauthorized-recovery/index",
+  "recoverUnauthorized": "/create-api-service/unauthorized-recovery/index"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@das-fed/utils",
-  "version": "7.0.5-beta.8",
+  "version": "7.0.5-beta.8.2",
   "description": "",
   "type": "module",
   "main": "./index.js",
@@ -9,7 +9,7 @@
   "license": "ISC",
   "dependencies": {
     "@antv/x6": "^2.18.1",
-    "@das-fed/utils": "7.0.5-beta.8",
+    "@das-fed/utils": "7.0.5-beta.8.2",
     "@vue/shared": "^3.4.21",
     "@vueuse/core": "^9.6.0",
     "axios": "^1.6.7",
@@ -21,8 +21,8 @@
     "vue": "^3.4.21"
   },
   "devDependencies": {
-    "@das-fed/cli": "7.0.5-beta.8",
-    "@das-fed/web": "7.0.5-beta.8",
+    "@das-fed/cli": "7.0.5-beta.8.2",
+    "@das-fed/web": "7.0.5-beta.8.2",
     "@types/js-cookie": "^3.0.6",
     "@types/lodash-es": "^4.17.12",
     "@types/qs": "^6.9.15",

package/process-engine-info/index.js

@@ -1,15 +1,16 @@
-const s = (e) => {
-  sessionStorage.setItem("hotentToken", e.accessToken || ""), sessionStorage.setItem("currentUser", JSON.stringify({ token: e.accessToken || "" }));
-}, o = () => {
+const o = (e) => {
+  var s;
+  (s = window.webConfig) != null && s.disableSaveToken || (sessionStorage.setItem("hotentToken", e.accessToken || ""), sessionStorage.setItem("currentUser", JSON.stringify({ token: e.accessToken || "" })));
+}, n = () => {
   sessionStorage.removeItem("hotentToken"), sessionStorage.removeItem("currentUser");
 }, t = (e) => {
   sessionStorage.setItem("project", e);
-}, n = () => {
+}, r = () => {
   sessionStorage.removeItem("project");
 };
 export {
-  n as removeProcessEngineProject,
-  o as removeProcessEngineToken,
+  r as removeProcessEngineProject,
+  n as removeProcessEngineToken,
   t as setProcessEngineProject,
-  s as setProcessEngineToken
+  o as setProcessEngineToken
 };

package/token-tools/index.d.ts

@@ -10,7 +10,8 @@ export declare const getAccessToken: () => string;
 /**
  * 获取tokenInfo相关信息
  */
-export declare const getAccessTokenInfo: (key: typeof accessTokenExpiredAtKey | typeof refreshTokenKey | typeof redirectUriKey | typeof accessTokenInfoKey) => any;
+type TokenInfoKey = typeof accessTokenExpiredAtKey | typeof refreshTokenKey | typeof redirectUriKey | typeof accessTokenInfoKey;
+export declare const getAccessTokenInfo: (key: TokenInfoKey) => any;
 /**
  * 存入token、tokenInfo
  * @param token

package/token-tools/index.js

@@ -1,11 +1,83 @@
-const o = "accessToken", r = "accessTokenExpiredAt", c = "refreshToken", s = "redirectUri", a = () => localStorage.getItem(o) ?? sessionStorage.getItem(o) ?? "", n = (e) => localStorage.getItem(e) ?? sessionStorage.getItem(e) ?? "", l = (e, t = {}) => {
-  localStorage.setItem(o, e), localStorage.setItem(r, t.accessTokenExpiredAt ?? "0"), localStorage.setItem(c, t.refreshToken ?? ""), t.redirectUri && localStorage.setItem(s, t.redirectUri);
-}, g = () => {
-  localStorage.removeItem(o), localStorage.removeItem(r), localStorage.removeItem(c), localStorage.removeItem(s);
+/*! js-cookie v3.0.5 | MIT */
+function l(e) {
+  for (var t = 1; t < arguments.length; t++) {
+    var n = arguments[t];
+    for (var g in n)
+      e[g] = n[g];
+  }
+  return e;
+}
+var k = {
+  read: function(e) {
+    return e[0] === '"' && (e = e.slice(1, -1)), e.replace(/(%[\dA-F]{2})+/gi, decodeURIComponent);
+  },
+  write: function(e) {
+    return encodeURIComponent(e).replace(
+      /%(2[346BF]|3[AC-F]|40|5[BDE]|60|7[BCD])/g,
+      decodeURIComponent
+    );
+  }
+};
+function d(e, t) {
+  function n(r, i, o) {
+    if (!(typeof document > "u")) {
+      o = l({}, t, o), typeof o.expires == "number" && (o.expires = new Date(Date.now() + o.expires * 864e5)), o.expires && (o.expires = o.expires.toUTCString()), r = encodeURIComponent(r).replace(/%(2[346B]|5E|60|7C)/g, decodeURIComponent).replace(/[()]/g, escape);
+      var c = "";
+      for (var s in o)
+        o[s] && (c += "; " + s, o[s] !== !0 && (c += "=" + o[s].split(";")[0]));
+      return document.cookie = r + "=" + e.write(i, r) + c;
+    }
+  }
+  function g(r) {
+    if (!(typeof document > "u" || arguments.length && !r)) {
+      for (var i = document.cookie ? document.cookie.split("; ") : [], o = {}, c = 0; c < i.length; c++) {
+        var s = i[c].split("="), I = s.slice(1).join("=");
+        try {
+          var f = decodeURIComponent(s[0]);
+          if (o[f] = e.read(I, f), r === f)
+            break;
+        } catch {
+        }
+      }
+      return r ? o[r] : o;
+    }
+  }
+  return Object.create(
+    {
+      set: n,
+      get: g,
+      remove: function(r, i) {
+        n(
+          r,
+          "",
+          l({}, i, {
+            expires: -1
+          })
+        );
+      },
+      withAttributes: function(r) {
+        return d(this.converter, l({}, this.attributes, r));
+      },
+      withConverter: function(r) {
+        return d(l({}, this.converter, r), this.attributes);
+      }
+    },
+    {
+      attributes: { value: Object.freeze(t) },
+      converter: { value: Object.freeze(e) }
+    }
+  );
+}
+var p = d(k, { path: "/" });
+const a = "accessToken", m = "accessTokenExpiredAt", v = "refreshToken", u = "redirectUri", S = "csrf-token", h = () => localStorage.getItem(a) ?? p.get(a) ?? sessionStorage.getItem(a) ?? "", C = (e) => localStorage.getItem(e) ?? p.get(e) ?? sessionStorage.getItem(e) ?? "", x = (e, t = {}) => {
+  var n;
+  (n = window.webConfig) != null && n.disableSaveToken || (localStorage.setItem(a, e), localStorage.setItem(m, t.accessTokenExpiredAt ?? 0), localStorage.setItem(v, t.refreshToken ?? 0), t.redirectUri && localStorage.setItem(u, t.redirectUri));
+}, U = () => {
+  localStorage.removeItem(a), localStorage.removeItem(m), localStorage.removeItem(v), localStorage.removeItem(u), localStorage.removeItem(S);
 };
 export {
-  a as getAccessToken,
-  n as getAccessTokenInfo,
-  g as removeAccessToken,
-  l as setAccessToken
+  h as getAccessToken,
+  C as getAccessTokenInfo,
+  U as removeAccessToken,
+  x as setAccessToken
 };