@das-fed/utils 7.1.0-dev.30 → 7.1.0-dev.31

package/create-api-service/thirdLogout/sso/utils.d.ts

@@ -0,0 +1,8 @@
+export declare const getQuery: (name: string) => any;
+/**
+ * 获取当前登录类型。
+ * 优先读取 URL 参数并同步到 localStorage，避免首屏 401 早于路由监听时读不到 loginType。
+ * @returns 当前登录类型
+ */
+export declare const getLoginType: () => any;
+export declare const removeQueryParams: (paramsToRemove: any[]) => void;

package/create-api-service/thirdLogout/{index.d.ts → thirdLogout/index.d.ts}

@@ -2,7 +2,7 @@
  * 判断当前是否使用需要定制退出流程的第三方登录。
  * @returns 是否需要执行第三方退出
  */
-export declare const isThirdLogin: () => boolean;
+export declare const isThirdLogin: () => any;
 /**
  * 执行中深项目的第三方退出登录。
  * @param redirctToUrl 平台退出完成后的回调地址

package/curring-http/type.d.ts

@@ -1,95 +1,95 @@
 import { AxiosInstance, AxiosRequestConfig, AxiosError } from 'axios';
 import { Ref } from 'vue';
-
-
-/** 请求工具配置项 */
-export type CurringConfig = AxiosRequestConfig & {
-  /** 请求实例 */
-  axiosInstance?: AxiosInstance
-
-  /** 请求方法 */
-  method?: Method
-
-  /** 请求的body数据 */
-  data?: any
-
-  /** 请求的query数据 */
-  params?: any
-
-  /** 接口地址前缀 */
-  urlPrefix?: string
-
-  /** 标记为公共接口，不需要鉴权，默认为false */
-  public?: boolean
-
-  /** 请求成功执行的回调 */
-  onSuccess?: (res: any, config: CurringConfig) => Promise<any>
-
-  /** 请求失败执行的回调 */
-  onError?: (error: any, config: CurringConfig) => Promise<any>
-
-  /** 自定义处理请求失败执行的回调 */
-  onCustomError?: (error: any, config: CurringConfig) => Promise<any>
-
-  /** 不管请求成功或失败都会执行的回调 */
-  finally?: (config: CurringConfig) => any
-
-  /** 每次请求之前都会执行的函数 */
-  beforeRun?: (config: CurringConfig) => Promise<CurringConfig>
-
-  /** 自定义错误信息 */
-  customErrorMessage?: (
-    /** 原始错误信息 */
-    message: string,
-
-    /** 原始错误对象 */
-    error: any,
-  ) => string | null | undefined
-
-  /** 忽略错误提示 */
-  ignoreErrorMessage?: boolean
-
-  /** 接口401是否重定向到登录页 */
-  noRedireLogin?: boolean
-
-  /** 是否跳过项目注册的401恢复逻辑 */
-  skipUnauthorizedRecovery?: boolean
-
-  /** 标记当前请求已完成一次401恢复重试，防止重复续签 */
-  _unauthorizedRecoveryRetried?: boolean
-
-  /** 开启CSRF安全选项 */
-  csrf?: boolean
-}
-
-export type Method = 'get' | 'post' | 'put' | 'delete' | 'patch'
-
-export type CurringConfigFun = (config: CurringConfig) => CurringConfig | Promise<CurringConfig>
-
-export type CurringRes = {
-  /** 请求时返回的接口数据 */
-  data: Ref<any>
-
-  /** 请求时的错误信息 */
-  error: Ref<any>
-
-  /** 请求时的loading */
-  loading: Ref<boolean>
-
-  /** 发起请求 返回格式 [ error, data ] */
-  run: (payload?: any, config?: CurringConfig) => CurringRunRes
-
-  /** 取消请求控制器 */
-  abortController: Ref<AbortController | null>
-}
-
-/** 返回为数组 [error, data], 请求成功error为null，请求失败data为null */
-export type CurringRunRes = Promise<
-  [
-    /** 请求返回的错误信息，请求成功时为null，请求失败时为错误信息 */
-    error: { code: string | number; msg: string; error: AxiosError } | null,
-
-    /** 请求返回的接口数据，请求成功时为后端数据，请求失败时为null */
-    data: any | null,
-  ]
->
+
+
+/** 请求工具配置项 */
+export type CurringConfig = AxiosRequestConfig & {
+  /** 请求实例 */
+  axiosInstance?: AxiosInstance
+
+  /** 请求方法 */
+  method?: Method
+
+  /** 请求的body数据 */
+  data?: any
+
+  /** 请求的query数据 */
+  params?: any
+
+  /** 接口地址前缀 */
+  urlPrefix?: string
+
+  /** 标记为公共接口，不需要鉴权，默认为false */
+  public?: boolean
+
+  /** 请求成功执行的回调 */
+  onSuccess?: (res: any, config: CurringConfig) => Promise<any>
+
+  /** 请求失败执行的回调 */
+  onError?: (error: any, config: CurringConfig) => Promise<any>
+
+  /** 自定义处理请求失败执行的回调 */
+  onCustomError?: (error: any, config: CurringConfig) => Promise<any>
+
+  /** 不管请求成功或失败都会执行的回调 */
+  finally?: (config: CurringConfig) => any
+
+  /** 每次请求之前都会执行的函数 */
+  beforeRun?: (config: CurringConfig) => Promise<CurringConfig>
+
+  /** 自定义错误信息 */
+  customErrorMessage?: (
+    /** 原始错误信息 */
+    message: string,
+
+    /** 原始错误对象 */
+    error: any,
+  ) => string | null | undefined
+
+  /** 忽略错误提示 */
+  ignoreErrorMessage?: boolean
+
+  /** 接口401是否重定向到登录页 */
+  noRedireLogin?: boolean
+
+  /** 是否跳过项目注册的401恢复逻辑 */
+  skipUnauthorizedRecovery?: boolean
+
+  /** 标记当前请求已完成一次401恢复重试，防止重复续签 */
+  _unauthorizedRecoveryRetried?: boolean
+
+  /** 开启CSRF安全选项 */
+  csrf?: boolean
+}
+
+export type Method = 'get' | 'post' | 'put' | 'delete' | 'patch'
+
+export type CurringConfigFun = (config: CurringConfig) => CurringConfig | Promise<CurringConfig>
+
+export type CurringRes = {
+  /** 请求时返回的接口数据 */
+  data: Ref<any>
+
+  /** 请求时的错误信息 */
+  error: Ref<any>
+
+  /** 请求时的loading */
+  loading: Ref<boolean>
+
+  /** 发起请求 返回格式 [ error, data ] */
+  run: (payload?: any, config?: CurringConfig) => CurringRunRes
+
+  /** 取消请求控制器 */
+  abortController: Ref<AbortController | null>
+}
+
+/** 返回为数组 [error, data], 请求成功error为null，请求失败data为null */
+export type CurringRunRes = Promise<
+  [
+    /** 请求返回的错误信息，请求成功时为null，请求失败时为错误信息 */
+    error: { code: string | number; msg: string; error: AxiosError } | null,
+
+    /** 请求返回的接口数据，请求成功时为后端数据，请求失败时为null */
+    data: any | null,
+  ]
+>

package/esm-map.json

@@ -124,6 +124,7 @@
   "getTokenParams": "/create-api-service/sso/index",
   "getTokenFromCode": "/create-api-service/sso/index",
   "real_uri": "/create-api-service/sso/index",
+  "getLoginType": "/create-api-service/sso/index",
   "getQuery": "/create-api-service/sso/index",
   "tokenStorage": "/create-api-service/sso/index",
   "login": "/create-api-service/sso/index",
@@ -152,5 +153,6 @@
   "jmcLogout": "/create-api-service/thirdLogout/index",
   "registerUnauthorizedRecovery": "/create-api-service/unauthorized-recovery/index",
   "recoverUnauthorized": "/create-api-service/unauthorized-recovery/index",
-  "hasUnauthorizedRecovery": "/create-api-service/unauthorized-recovery/index"
+  "hasUnauthorizedRecovery": "/create-api-service/unauthorized-recovery/index",
+  "clearPlatformAuthStorage": "/token-tools/index"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@das-fed/utils",
-  "version": "7.1.0-dev.30",
+  "version": "7.1.0-dev.31",
   "description": "",
   "type": "module",
   "main": "./index.js",
@@ -9,7 +9,7 @@
   "license": "ISC",
   "dependencies": {
     "@antv/x6": "^2.18.1",
-    "@das-fed/utils": "7.1.0-dev.30",
+    "@das-fed/utils": "7.1.0-dev.31",
     "@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.1.0-dev.30",
-    "@das-fed/web": "7.1.0-dev.30",
+    "@das-fed/cli": "7.1.0-dev.31",
+    "@das-fed/web": "7.1.0-dev.31",
     "@types/js-cookie": "^3.0.6",
     "@types/lodash-es": "^4.17.12",
     "@types/qs": "^6.9.15",

package/token-tools/index.d.ts

@@ -19,4 +19,39 @@ export declare const getAccessTokenInfo: (key: TokenInfoKey) => any;
  */
 export declare const setAccessToken: (token: string, info?: any) => void;
 export declare const removeAccessToken: () => void;
+/**
+ * 获取、保存和清理平台 token 相关数据。
+ * 统一放在 token-tools 中，便于 SSO 与业务模块复用同一套 token 存储规则。
+ * @returns token 存储操作集合
+ */
+export declare const tokenStorage: () => {
+    /**
+     * 获取当前平台 token 数据。
+     * @returns token、过期时间和 refresh token
+     */
+    getData: () => {
+        accessToken: string;
+        accessTokenExpiredAt: any;
+        refreshToken: any;
+    };
+    /**
+     * 保存平台 token 数据。
+     * @param data token 信息
+     */
+    save: (data: {
+        accessToken: string | null;
+        accessTokenExpiredAt: number;
+        refreshToken: string | null;
+        info: any;
+    }) => void;
+    /**
+     * 清理平台 token 数据。
+     */
+    remove: () => void;
+};
+/**
+ * 清理平台退出相关的本地认证数据。
+ * 统一封装退出清理动作，避免各退出入口遗漏 idelTime、sessionStorage 或流程引擎 token。
+ */
+export declare const clearPlatformAuthStorage: () => void;
 export {};

package/token-tools/index.js

@@ -1,13 +1,14 @@
+import { removeProcessEngineToken as I, setProcessEngineToken as h } from "@das-fed/utils/process-engine-info";
 /*! 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];
+  for (var n = 1; n < arguments.length; n++) {
+    var t = arguments[n];
+    for (var g in t)
+      e[g] = t[g];
   }
   return e;
 }
-var k = {
+var S = {
   read: function(e) {
     return e[0] === '"' && (e = e.slice(1, -1)), e.replace(/(%[\dA-F]{2})+/gi, decodeURIComponent);
   },
@@ -18,10 +19,10 @@ var k = {
     );
   }
 };
-function d(e, t) {
-  function n(r, i, o) {
+function m(e, n) {
+  function t(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);
+      o = l({}, n, 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]));
@@ -31,10 +32,10 @@ function d(e, t) {
   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("=");
+        var s = i[c].split("="), u = s.slice(1).join("=");
         try {
           var f = decodeURIComponent(s[0]);
-          if (o[f] = e.read(I, f), r === f)
+          if (o[f] = e.read(u, f), r === f)
             break;
         } catch {
         }
@@ -44,10 +45,10 @@ function d(e, t) {
   }
   return Object.create(
     {
-      set: n,
+      set: t,
       get: g,
       remove: function(r, i) {
-        n(
+        t(
           r,
           "",
           l({}, i, {
@@ -56,28 +57,61 @@ function d(e, t) {
         );
       },
       withAttributes: function(r) {
-        return d(this.converter, l({}, this.attributes, r));
+        return m(this.converter, l({}, this.attributes, r));
       },
       withConverter: function(r) {
-        return d(l({}, this.converter, r), this.attributes);
+        return m(l({}, this.converter, r), this.attributes);
       }
     },
     {
-      attributes: { value: Object.freeze(t) },
+      attributes: { value: Object.freeze(n) },
       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);
+var d = m(S, { path: "/" });
+const a = "accessToken", k = "accessTokenExpiredAt", T = "refreshToken", v = "redirectUri", x = "csrf-token", A = () => localStorage.getItem(a) ?? d.get(a) ?? sessionStorage.getItem(a) ?? "", p = (e) => localStorage.getItem(e) ?? d.get(e) ?? sessionStorage.getItem(e) ?? "", C = (e, n = {}) => {
+  var t;
+  (t = window.webConfig) != null && t.disableSaveToken || (localStorage.setItem(a, e), localStorage.setItem(k, n.accessTokenExpiredAt ?? 0), localStorage.setItem(T, n.refreshToken ?? 0), n.redirectUri && localStorage.setItem(v, n.redirectUri));
+}, E = () => {
+  localStorage.removeItem(a), localStorage.removeItem(k), localStorage.removeItem(T), localStorage.removeItem(v), localStorage.removeItem(x);
+}, U = () => ({
+  /**
+   * 获取当前平台 token 数据。
+   * @returns token、过期时间和 refresh token
+   */
+  getData: () => {
+    const e = p("accessTokenExpiredAt");
+    return {
+      accessToken: A(),
+      accessTokenExpiredAt: e ? Number(e) : 0,
+      refreshToken: p("refreshToken")
+    };
+  },
+  /**
+   * 保存平台 token 数据。
+   * @param data token 信息
+   */
+  save: (e) => {
+    C(e.accessToken ?? "", {
+      accessTokenExpiredAt: e.accessTokenExpiredAt,
+      refreshToken: e.refreshToken
+    }), h(e);
+  },
+  /**
+   * 清理平台 token 数据。
+   */
+  remove: () => {
+    E(), I();
+  }
+}), R = () => {
+  localStorage.removeItem("idelTime"), sessionStorage.clear(), U().remove();
 };
 export {
-  h as getAccessToken,
-  C as getAccessTokenInfo,
-  U as removeAccessToken,
-  x as setAccessToken
+  R as clearPlatformAuthStorage,
+  A as getAccessToken,
+  p as getAccessTokenInfo,
+  E as removeAccessToken,
+  C as setAccessToken,
+  U as tokenStorage
 };