xydata-tools 1.1.3 → 1.1.4

package/dist/components/xyAuthLayout/index.js

@@ -6,53 +6,239 @@ import React, { useEffect } from 'react';
 import { getSessionStorage, setSessionStorage, removeSessionStorage } from "../../utils/token.js";
 import { message, Spin } from 'antd';
 import { queryAaaCurrent, queryCurrent, accountLogout, accountAAALogout } from "../../services/service.js";
+
+// ========== 公共辅助函数 ==========
+
+/**
+ * 安全解析环境数据
+ * 从 sessionStorage 中读取并解析环境配置数据
+ * @returns {Object} 环境数据对象,解析失败时返回空对象
+ */
+var getEnvData = function getEnvData() {
+  var envDataStr = getSessionStorage('env_data');
+  if (!envDataStr) return {};
+  try {
+    return JSON.parse(envDataStr);
+  } catch (e) {
+    console.error('解析 env_data 失败:', e);
+    return {};
+  }
+};
+
+/**
+ * 获取通用请求头
+ * @returns {Object} 包含 SID 和 service 的请求头对象
+ */
+var getCommonHeaders = function getCommonHeaders() {
+  var service = getSessionStorage('service');
+  return {
+    SID: SID,
+    service: service
+  };
+};
+
+/**
+ * 保存 Token 并跳转到重定向地址
+ * @param {string} token - 用户认证令牌
+ */
+var saveTokenAndRedirect = function saveTokenAndRedirect(token) {
+  setSessionStorage('Token', token);
+  var redirectUrl = getSessionStorage('sso_redirect_url');
+  if (redirectUrl) {
+    window.location.href = redirectUrl;
+  } else {
+    message.error('统一登陆跳转异常');
+  }
+};
+
+/**
+ * SSO 新版登录处理
+ * 调用新版 SSO 登录接口获取 token
+ * @async
+ */
+var ssoTypeByNew = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var commonHeaders, response, result, href;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          commonHeaders = getCommonHeaders();
+          _context.prev = 1;
+          _context.next = 4;
+          return fetch('/auth/login', {
+            headers: commonHeaders,
+            method: 'POST'
+          });
+        case 4:
+          response = _context.sent;
+          _context.next = 7;
+          return response.json();
+        case 7:
+          result = _context.sent;
+          if (result.rspCode === '000000') {
+            saveTokenAndRedirect(result.data);
+          } else {
+            message.error(result.rspMsg);
+            if (result.data) {
+              href = result.data + '?callback=' + encodeURIComponent(window.location.href);
+              setTimeout(function () {
+                window.location.href = href;
+              }, 1000);
+            } else if (result.rspCode === '999000') {
+              location.reload();
+            }
+          }
+          _context.next = 15;
+          break;
+        case 11:
+          _context.prev = 11;
+          _context.t0 = _context["catch"](1);
+          console.error('/auth/login 错误:', _context.t0);
+          message.error('网络请求失败,请稍后重试');
+        case 15:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee, null, [[1, 11]]);
+  }));
+  return function ssoTypeByNew() {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+/**
+ * 获取 SSO 跳转地址
+ * 从服务器获取 SSO 登录页面地址并跳转
+ * @async
+ */
+var fetchSSO = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var commonHeaders, response, data;
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          commonHeaders = getCommonHeaders();
+          _context2.prev = 1;
+          _context2.next = 4;
+          return fetch('/auth/sso', {
+            headers: commonHeaders
+          });
+        case 4:
+          response = _context2.sent;
+          if (!(response.status === 200)) {
+            _context2.next = 12;
+            break;
+          }
+          _context2.next = 8;
+          return response.text();
+        case 8:
+          data = _context2.sent;
+          window.location.href = data;
+          _context2.next = 13;
+          break;
+        case 12:
+          message.error('接口异常,请联系管理员');
+        case 13:
+          _context2.next = 19;
+          break;
+        case 15:
+          _context2.prev = 15;
+          _context2.t0 = _context2["catch"](1);
+          console.error('/auth/sso 错误:', _context2.t0);
+          message.error('网络请求失败,请稍后重试');
+        case 19:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2, null, [[1, 15]]);
+  }));
+  return function fetchSSO() {
+    return _ref2.apply(this, arguments);
+  };
+}();
+
+/**
+ * SSO 旧版登录处理
+ * 处理 URL 中的 code 参数,获取 token 或跳转到 SSO 登录页
+ * @async
+ */
+var ssoTypeByOld = /*#__PURE__*/function () {
+  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+    var urlParams, code, commonHeaders, response, data, token;
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          urlParams = new URLSearchParams(window.location.search);
+          code = urlParams.get('code');
+          if (!code) {
+            _context3.next = 21;
+            break;
+          }
+          commonHeaders = getCommonHeaders();
+          _context3.prev = 4;
+          _context3.next = 7;
+          return fetch('/auth/token?code=' + encodeURIComponent(code), {
+            headers: commonHeaders
+          });
+        case 7:
+          response = _context3.sent;
+          _context3.next = 10;
+          return response.json();
+        case 10:
+          data = _context3.sent;
+          token = data.access_token || (data.rspCode === '000000' ? data.data : null);
+          if (token) {
+            saveTokenAndRedirect(token);
+          } else {
+            message.error(data.rspMsg);
+          }
+          _context3.next = 19;
+          break;
+        case 15:
+          _context3.prev = 15;
+          _context3.t0 = _context3["catch"](4);
+          console.error('/auth/token 错误:', _context3.t0);
+          message.error('网络请求失败,请稍后重试');
+        case 19:
+          _context3.next = 22;
+          break;
+        case 21:
+          fetchSSO();
+        case 22:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3, null, [[4, 15]]);
+  }));
+  return function ssoTypeByOld() {
+    return _ref3.apply(this, arguments);
+  };
+}();
+
+/**
+ * 清理会话数据
+ * 清除 Token 和 SSO 重定向地址
+ */
+var removeSessionData = function removeSessionData() {
+  removeSessionStorage('Token');
+  removeSessionStorage('sso_redirect_url');
+};
+
+// ========== 组件定义 ==========
+
 var XyAuthLayout = function XyAuthLayout(props) {
   var children = props.children,
     propsEnvData = props.envData,
     propsService = props.service,
     getUserOk = props.getUserOk,
     getUserError = props.getUserError;
-  // 安全解析 JSON，避免解析异常
-  var getEnvData = function getEnvData() {
-    if (propsEnvData) return propsEnvData;
-    var envDataStr = getSessionStorage('env_data');
-    if (!envDataStr) return {};
-    try {
-      return JSON.parse(envDataStr);
-    } catch (e) {
-      console.error('解析 env_data 失败:', e);
-      return {};
-    }
-  };
-  var envData = getEnvData();
+
+  // 获取环境数据,优先使用 props 传入的
+  var envData = propsEnvData || getEnvData();
   var service = propsService || getSessionStorage('service');
   var token = getSessionStorage('Token');
   var loginType = envData.login_type || 'BOTH';
   var pathName = window.location.pathname;
-
-  // 通用请求头参数
-  var commonHeaders = {
-    SID: SID,
-    service: service
-  };
-
-  // 统一的错误处理
-  var handleError = function handleError(error) {
-    var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
-    console.error(context ? "".concat(context, ":") : '错误:', error);
-    message.error('网络请求失败,请稍后重试');
-  };
-
-  // 保存 Token 并跳转
-  var saveTokenAndRedirect = function saveTokenAndRedirect(token) {
-    setSessionStorage('Token', token);
-    var redirectUrl = getSessionStorage('sso_redirect_url');
-    if (redirectUrl) {
-      window.location.href = redirectUrl;
-    } else {
-      message.error('统一登陆跳转异常');
-    }
-  };
   useEffect(function () {
     if (!token) {
       // 当登录方式设为两端登录时，可在路径加上sso进行统一登陆，当登录方式固定为SSO时，直接跳转到SSO登录
@@ -67,228 +253,64 @@ var XyAuthLayout = function XyAuthLayout(props) {
       getUserinfo();
     }
   }, []);
-
-  // 处理 401 未授权错误(登录过期)
-  var handleUnauthorized = function handleUnauthorized() {
-    var actualLoginType = loginType;
-    if (loginType === 'BOTH') {
-      var redirectUrl = getSessionStorage('sso_redirect_url');
-      actualLoginType = redirectUrl ? 'SSO' : 'AAA';
-    }
-
-    // 清理本地存储
-    removeSessionStorage('Token');
-    removeSessionStorage('sso_redirect_url');
-
-    // 根据实际登录类型重定向到对应的登录页面
-    if (actualLoginType === 'SSO') {
-      // SSO 登录过期,重新进行 SSO 登录流程
-      setSessionStorage('sso_redirect_url', window.location.href);
-      envData.sso_type === 'new' ? ssoTypeByNew() : ssoTypeByOld();
-    } else {
-      // AAA 登录过期,跳转到 AAA 登录页面
-      window.location.href = "".concat(window.publicPath, "user/login");
-    }
-  };
   var getUserinfo = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
       var response;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
           case 0:
-            _context.prev = 0;
+            _context4.prev = 0;
             if (!(loginType === 'SSO')) {
-              _context.next = 7;
+              _context4.next = 7;
               break;
             }
-            _context.next = 4;
+            _context4.next = 4;
             return queryCurrent({});
           case 4:
-            _context.t0 = _context.sent;
-            _context.next = 10;
+            _context4.t0 = _context4.sent;
+            _context4.next = 10;
             break;
           case 7:
-            _context.next = 9;
+            _context4.next = 9;
             return queryAaaCurrent({});
           case 9:
-            _context.t0 = _context.sent;
+            _context4.t0 = _context4.sent;
           case 10:
-            response = _context.t0;
+            response = _context4.t0;
             if (!((response === null || response === void 0 ? void 0 : response.status) === 401 || (response === null || response === void 0 ? void 0 : response.rspCode) === '401')) {
-              _context.next = 17;
+              _context4.next = 17;
               break;
             }
             if (!getUserError) {
-              _context.next = 15;
+              _context4.next = 15;
               break;
             }
             getUserError(response);
-            return _context.abrupt("return");
+            return _context4.abrupt("return");
           case 15:
             // 否则自动处理登录过期
-            handleUnauthorized();
-            return _context.abrupt("return");
+            handleUnauthorized(envData);
+            return _context4.abrupt("return");
           case 17:
             if (response.rspCode === '000000') {
               getUserOk && getUserOk(response.data);
             } else {
               getUserError && getUserError(response);
             }
-            _context.next = 24;
+            _context4.next = 24;
             break;
           case 20:
-            _context.prev = 20;
-            _context.t1 = _context["catch"](0);
-            console.error('获取用户信息失败:', _context.t1);
-            getUserError && getUserError(_context.t1);
+            _context4.prev = 20;
+            _context4.t1 = _context4["catch"](0);
+            console.error('获取用户信息失败:', _context4.t1);
+            getUserError && getUserError(_context4.t1);
           case 24:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee, null, [[0, 20]]);
-    }));
-    return function getUserinfo() {
-      return _ref.apply(this, arguments);
-    };
-  }();
-  var ssoTypeByNew = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var response, result, href;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
-          case 0:
-            _context2.prev = 0;
-            _context2.next = 3;
-            return fetch('/auth/login', {
-              headers: commonHeaders,
-              method: 'POST'
-            });
-          case 3:
-            response = _context2.sent;
-            _context2.next = 6;
-            return response.json();
-          case 6:
-            result = _context2.sent;
-            if (result.rspCode === '000000') {
-              saveTokenAndRedirect(result.data);
-            } else {
-              message.error(result.rspMsg);
-              if (result.data) {
-                href = result.data + '?callback=' + encodeURIComponent(window.location.href);
-                setTimeout(function () {
-                  window.location.href = href;
-                }, 1000);
-              } else if (result.rspCode === '999000') {
-                // 服务器响应超时
-                location.reload();
-              }
-            }
-            _context2.next = 13;
-            break;
-          case 10:
-            _context2.prev = 10;
-            _context2.t0 = _context2["catch"](0);
-            handleError(_context2.t0, '/auth/login');
-          case 13:
-          case "end":
-            return _context2.stop();
-        }
-      }, _callee2, null, [[0, 10]]);
-    }));
-    return function ssoTypeByNew() {
-      return _ref2.apply(this, arguments);
-    };
-  }();
-  var fetchSSO = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-      var response, data;
-      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
-          case 0:
-            _context3.prev = 0;
-            _context3.next = 3;
-            return fetch('/auth/sso', {
-              headers: commonHeaders
-            });
-          case 3:
-            response = _context3.sent;
-            if (!(response.status === 200)) {
-              _context3.next = 11;
-              break;
-            }
-            _context3.next = 7;
-            return response.text();
-          case 7:
-            data = _context3.sent;
-            window.location.href = data;
-            _context3.next = 12;
-            break;
-          case 11:
-            message.error('接口异常,请联系管理员');
-          case 12:
-            _context3.next = 17;
-            break;
-          case 14:
-            _context3.prev = 14;
-            _context3.t0 = _context3["catch"](0);
-            handleError(_context3.t0, '/auth/sso');
-          case 17:
-          case "end":
-            return _context3.stop();
-        }
-      }, _callee3, null, [[0, 14]]);
-    }));
-    return function fetchSSO() {
-      return _ref3.apply(this, arguments);
-    };
-  }();
-  var ssoTypeByOld = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-      var urlParams, code, response, data, _token;
-      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
-          case 0:
-            urlParams = new URLSearchParams(window.location.search);
-            code = urlParams.get('code');
-            if (!code) {
-              _context4.next = 19;
-              break;
-            }
-            _context4.prev = 3;
-            _context4.next = 6;
-            return fetch('/auth/token?code=' + encodeURIComponent(code), {
-              headers: commonHeaders
-            });
-          case 6:
-            response = _context4.sent;
-            _context4.next = 9;
-            return response.json();
-          case 9:
-            data = _context4.sent;
-            _token = data.access_token || (data.rspCode === '000000' ? data.data : null);
-            if (_token) {
-              saveTokenAndRedirect(_token);
-            } else {
-              message.error(data.rspMsg);
-            }
-            _context4.next = 17;
-            break;
-          case 14:
-            _context4.prev = 14;
-            _context4.t0 = _context4["catch"](3);
-            handleError(_context4.t0, '/auth/token');
-          case 17:
-            _context4.next = 20;
-            break;
-          case 19:
-            fetchSSO();
-          case 20:
           case "end":
             return _context4.stop();
         }
-      }, _callee4, null, [[3, 14]]);
+      }, _callee4, null, [[0, 20]]);
     }));
-    return function ssoTypeByOld() {
+    return function getUserinfo() {
       return _ref4.apply(this, arguments);
     };
   }();
@@ -313,22 +335,33 @@ var XyAuthLayout = function XyAuthLayout(props) {
 };
 export default XyAuthLayout;
 
-// 退出登录的工具函数
+// ========== 导出的工具函数 ==========
+
+/**
+ * 退出登录的工具函数
+ * 根据登录类型执行相应的退出登录操作并跳转到登录页
+ * @async
+ * @param {string} [loginType='BOTH'] - 登录类型: 'SSO' | 'AAA' | 'BOTH'
+ * @example
+ * // AAA 登录退出
+ * await logout('AAA');
+ *
+ * // SSO 登录退出
+ * await logout('SSO');
+ *
+ * // 自动判断登录类型
+ * await logout('BOTH');
+ */
 export var logout = /*#__PURE__*/function () {
   var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
     var loginType,
       actualLoginType,
       redirectUrl,
       res,
-      removeSessionData,
       _args5 = arguments;
     return _regeneratorRuntime().wrap(function _callee5$(_context5) {
       while (1) switch (_context5.prev = _context5.next) {
         case 0:
-          removeSessionData = function _removeSessionData() {
-            removeSessionStorage('Token');
-            removeSessionStorage('sso_redirect_url');
-          };
           loginType = _args5.length > 0 && _args5[0] !== undefined ? _args5[0] : 'BOTH';
           // 当 loginType 为 BOTH 时，根据 sessionStorage 中的 'sso_redirect_url' 判断实际登录方式
           // 有 'sso_redirect_url' 说明使用的是 SSO 登录,否则是 AAA 登录
@@ -338,47 +371,80 @@ export var logout = /*#__PURE__*/function () {
             actualLoginType = redirectUrl ? 'SSO' : 'AAA';
           }
           if (!(actualLoginType === 'AAA')) {
-            _context5.next = 17;
+            _context5.next = 16;
             break;
           }
-          _context5.prev = 5;
-          _context5.next = 8;
+          _context5.prev = 4;
+          _context5.next = 7;
           return accountAAALogout({});
-        case 8:
+        case 7:
           removeSessionData();
-          _context5.next = 14;
+          _context5.next = 13;
           break;
-        case 11:
-          _context5.prev = 11;
-          _context5.t0 = _context5["catch"](5);
+        case 10:
+          _context5.prev = 10;
+          _context5.t0 = _context5["catch"](4);
           console.error('AAA 退出登录失败:', _context5.t0);
-        case 14:
+        case 13:
           window.location.href = "".concat(window.publicPath || '/', "user/login");
-          _context5.next = 28;
+          _context5.next = 27;
           break;
-        case 17:
-          _context5.prev = 17;
-          _context5.next = 20;
+        case 16:
+          _context5.prev = 16;
+          _context5.next = 19;
           return accountLogout({});
-        case 20:
+        case 19:
           res = _context5.sent;
           removeSessionData();
           if (res) {
             window.location.href = res;
           }
-          _context5.next = 28;
+          _context5.next = 27;
           break;
-        case 25:
-          _context5.prev = 25;
-          _context5.t1 = _context5["catch"](17);
+        case 24:
+          _context5.prev = 24;
+          _context5.t1 = _context5["catch"](16);
           console.error('SSO 退出登录失败:', _context5.t1);
-        case 28:
+        case 27:
         case "end":
           return _context5.stop();
       }
-    }, _callee5, null, [[5, 11], [17, 25]]);
+    }, _callee5, null, [[4, 10], [16, 24]]);
   }));
   return function logout() {
     return _ref5.apply(this, arguments);
   };
-}();
+}();
+
+/**
+ * 处理 401 未授权错误(登录过期)的工具函数
+ * 清理本地存储并根据登录类型重定向到相应的登录页面
+ * @param {Object} envData - 环境配置数据
+ * @param {string} [envData.login_type] - 登录类型: 'SSO' | 'AAA' | 'BOTH'
+ * @param {string} [envData.sso_type] - SSO 类型: 'new' | 'old'
+ * @example
+ * // 在请求拦截器中使用
+ * if (response.status === 401) {
+ *   handleUnauthorized({ login_type: 'BOTH', sso_type: 'new' });
+ * }
+ */
+export var handleUnauthorized = function handleUnauthorized(envData) {
+  var actualLoginType = envData.login_type || 'BOTH';
+  if (actualLoginType === 'BOTH') {
+    var redirectUrl = getSessionStorage('sso_redirect_url');
+    actualLoginType = redirectUrl ? 'SSO' : 'AAA';
+  }
+
+  // 清理本地存储
+  removeSessionData();
+
+  // 根据实际登录类型重定向到对应的登录页面
+  if (actualLoginType === 'SSO') {
+    // SSO 登录过期,重新进行 SSO 登录流程
+    setSessionStorage('sso_redirect_url', window.location.href);
+    envData.sso_type === 'new' ? ssoTypeByNew() : ssoTypeByOld();
+  } else {
+    // AAA 登录过期,跳转到 AAA 登录页面
+    window.location.href = "".concat(window.publicPath, "user/login");
+  }
+};

package/dist/types/components/xyAuthLayout/index.d.ts

@@ -1,3 +1,7 @@
 export default XyAuthLayout;
 export function logout(loginType?: string): Promise<void>;
+export function handleUnauthorized(envData: {
+    login_type?: string;
+    sso_type?: string;
+}): void;
 declare function XyAuthLayout(props: any): import("react/jsx-runtime").JSX.Element;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "xydata-tools",
-	"version": "1.1.3",
+	"version": "1.1.4",
 	"description": "xydata tools",
 	"main": "dist/index.js",
 	"module": "dist/index.js",