@egova/egova-api 1.3.6 → 1.3.8

package/dist/index.common.js

@@ -1078,24 +1078,31 @@ var external_js_cookie_default = /*#__PURE__*/__webpack_require__.n(external_js_
 // CONCATENATED MODULE: ./src/common/utils/setting-util.ts
 
 
-
 var COMMON_KEYS = ['dex-web:access_token', 'bigdata-web:access_token', 'access_token'];
 /* 用户中心专用 key */
-var SSO_KEY = ['dex-web:admin_sso_token', 'bigdata-web:admin_sso_token', 'admin_sso_token'];
+var SSO_KEY = ['admin_sso_token'];
 /* 统一读取函数：先 cookie，再 localStorage */
 function readToken(key) {
   return external_js_cookie_default.a.get(key) || localStorage.getItem(key) || undefined;
 }
 function getToken() {
   var _a;
-  // 先尝试获取普通 token
-  var isUserCenter = enableUserCenterCookie();
-  var keys = isUserCenter ? __spreadArray(__spreadArray([], SSO_KEY, true), COMMON_KEYS, true) : COMMON_KEYS;
-  var token = (_a = keys.map(readToken).find(Boolean)) !== null && _a !== void 0 ? _a : '';
-  // 获取是否通过用户中心认证
+  // 1. 获取SSO_token
+  var ssoToken = SSO_KEY.map(readToken).find(Boolean);
+  // 2. 根据 SSO_KEY token 与 配置存在性决定是否用户中心
+  var isUserCenter = enableUserCenterCookie() && !!ssoToken;
+  // 3. 获取最终 token（优先使用 ssoToken 或回退 COMMON_KEYS）
+  var token = isUserCenter ? ssoToken : (_a = COMMON_KEYS.map(readToken).find(Boolean)) !== null && _a !== void 0 ? _a : '';
+  // 获取headers
+  var headers = isUserCenter ? {
+    "X-Authorization": "Bearer ".concat(token)
+  } : {
+    Authorization: "Bearer ".concat(token)
+  };
   return {
     token: token,
-    isUserCenter: isUserCenter
+    isUserCenter: isUserCenter,
+    headers: headers
   };
 }
 // CONCATENATED MODULE: ./src/common/utils/login-util.ts
@@ -2460,14 +2467,8 @@ var node_TreeNode = /** @class */function (_super) {
   });
   Object.defineProperty(TreeNode.prototype, "headers", {
     get: function () {
-      var _a = getToken(),
-        token = _a.token,
-        isUserCenter = _a.isUserCenter;
-      return isUserCenter ? {
-        "X-Authorization": "Bearer ".concat(token)
-      } : {
-        Authorization: "Bearer " + token
-      };
+      var headers = getToken().headers;
+      return headers;
     },
     enumerable: false,
     configurable: true
@@ -2573,14 +2574,8 @@ var tree_Tree = /** @class */function (_super) {
   });
   Object.defineProperty(Tree.prototype, "headers", {
     get: function () {
-      var _a = getToken(),
-        token = _a.token,
-        isUserCenter = _a.isUserCenter;
-      return isUserCenter ? {
-        "X-Authorization": "Bearer ".concat(token)
-      } : {
-        Authorization: "Bearer " + token
-      };
+      var headers = getToken().headers;
+      return headers;
     },
     enumerable: false,
     configurable: true
@@ -6346,16 +6341,10 @@ var project_list_ProjectList = /** @class */function (_super) {
   };
   Object.defineProperty(ProjectList.prototype, "headers", {
     get: function () {
-      var _a = getToken(),
-        token = _a.token,
-        isUserCenter = _a.isUserCenter;
-      return isUserCenter ? {
-        "X-Authorization": "Bearer ".concat(token),
+      var headers = getToken().headers;
+      return __assign(__assign({}, headers), {
         "App-Id": signature.appIdCode.id
-      } : {
-        Authorization: "Bearer " + token,
-        "App-Id": signature.appIdCode.id
-      };
+      });
     },
     enumerable: false,
     configurable: true

package/dist/index.umd.js

@@ -1087,24 +1087,31 @@ var external_js_cookie_default = /*#__PURE__*/__webpack_require__.n(external_js_
 // CONCATENATED MODULE: ./src/common/utils/setting-util.ts
 
 
-
 var COMMON_KEYS = ['dex-web:access_token', 'bigdata-web:access_token', 'access_token'];
 /* 用户中心专用 key */
-var SSO_KEY = ['dex-web:admin_sso_token', 'bigdata-web:admin_sso_token', 'admin_sso_token'];
+var SSO_KEY = ['admin_sso_token'];
 /* 统一读取函数：先 cookie，再 localStorage */
 function readToken(key) {
   return external_js_cookie_default.a.get(key) || localStorage.getItem(key) || undefined;
 }
 function getToken() {
   var _a;
-  // 先尝试获取普通 token
-  var isUserCenter = enableUserCenterCookie();
-  var keys = isUserCenter ? __spreadArray(__spreadArray([], SSO_KEY, true), COMMON_KEYS, true) : COMMON_KEYS;
-  var token = (_a = keys.map(readToken).find(Boolean)) !== null && _a !== void 0 ? _a : '';
-  // 获取是否通过用户中心认证
+  // 1. 获取SSO_token
+  var ssoToken = SSO_KEY.map(readToken).find(Boolean);
+  // 2. 根据 SSO_KEY token 与 配置存在性决定是否用户中心
+  var isUserCenter = enableUserCenterCookie() && !!ssoToken;
+  // 3. 获取最终 token（优先使用 ssoToken 或回退 COMMON_KEYS）
+  var token = isUserCenter ? ssoToken : (_a = COMMON_KEYS.map(readToken).find(Boolean)) !== null && _a !== void 0 ? _a : '';
+  // 获取headers
+  var headers = isUserCenter ? {
+    "X-Authorization": "Bearer ".concat(token)
+  } : {
+    Authorization: "Bearer ".concat(token)
+  };
   return {
     token: token,
-    isUserCenter: isUserCenter
+    isUserCenter: isUserCenter,
+    headers: headers
   };
 }
 // CONCATENATED MODULE: ./src/common/utils/login-util.ts
@@ -2469,14 +2476,8 @@ var node_TreeNode = /** @class */function (_super) {
   });
   Object.defineProperty(TreeNode.prototype, "headers", {
     get: function () {
-      var _a = getToken(),
-        token = _a.token,
-        isUserCenter = _a.isUserCenter;
-      return isUserCenter ? {
-        "X-Authorization": "Bearer ".concat(token)
-      } : {
-        Authorization: "Bearer " + token
-      };
+      var headers = getToken().headers;
+      return headers;
     },
     enumerable: false,
     configurable: true
@@ -2582,14 +2583,8 @@ var tree_Tree = /** @class */function (_super) {
   });
   Object.defineProperty(Tree.prototype, "headers", {
     get: function () {
-      var _a = getToken(),
-        token = _a.token,
-        isUserCenter = _a.isUserCenter;
-      return isUserCenter ? {
-        "X-Authorization": "Bearer ".concat(token)
-      } : {
-        Authorization: "Bearer " + token
-      };
+      var headers = getToken().headers;
+      return headers;
     },
     enumerable: false,
     configurable: true
@@ -6355,16 +6350,10 @@ var project_list_ProjectList = /** @class */function (_super) {
   };
   Object.defineProperty(ProjectList.prototype, "headers", {
     get: function () {
-      var _a = getToken(),
-        token = _a.token,
-        isUserCenter = _a.isUserCenter;
-      return isUserCenter ? {
-        "X-Authorization": "Bearer ".concat(token),
+      var headers = getToken().headers;
+      return __assign(__assign({}, headers), {
         "App-Id": signature.appIdCode.id
-      } : {
-        Authorization: "Bearer " + token,
-        "App-Id": signature.appIdCode.id
-      };
+      });
     },
     enumerable: false,
     configurable: true