@egova/egova-api 1.3.6 → 1.3.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1078,24 +1078,30 @@ var external_js_cookie_default = /*#__PURE__*/__webpack_require__.n(external_js_
1078
1078
  // CONCATENATED MODULE: ./src/common/utils/setting-util.ts
1079
1079
 
1080
1080
 
1081
-
1082
1081
  var COMMON_KEYS = ['dex-web:access_token', 'bigdata-web:access_token', 'access_token'];
1083
1082
  /* 用户中心专用 key */
1084
- var SSO_KEY = ['dex-web:admin_sso_token', 'bigdata-web:admin_sso_token', 'admin_sso_token'];
1083
+ var SSO_KEY = ['admin_sso_token'];
1085
1084
  /* 统一读取函数:先 cookie,再 localStorage */
1086
1085
  function readToken(key) {
1087
1086
  return external_js_cookie_default.a.get(key) || localStorage.getItem(key) || undefined;
1088
1087
  }
1089
1088
  function getToken() {
1090
1089
  var _a;
1091
- // 先尝试获取普通 token
1090
+ // 获取是否通过用户中心认证
1092
1091
  var isUserCenter = enableUserCenterCookie();
1093
- var keys = isUserCenter ? __spreadArray(__spreadArray([], SSO_KEY, true), COMMON_KEYS, true) : COMMON_KEYS;
1092
+ // 获取token
1093
+ var keys = isUserCenter ? SSO_KEY : COMMON_KEYS;
1094
1094
  var token = (_a = keys.map(readToken).find(Boolean)) !== null && _a !== void 0 ? _a : '';
1095
- // 获取是否通过用户中心认证
1095
+ // 获取headers
1096
+ var headers = isUserCenter ? {
1097
+ "X-Authorization": "Bearer ".concat(token)
1098
+ } : {
1099
+ Authorization: "Bearer ".concat(token)
1100
+ };
1096
1101
  return {
1097
1102
  token: token,
1098
- isUserCenter: isUserCenter
1103
+ isUserCenter: isUserCenter,
1104
+ headers: headers
1099
1105
  };
1100
1106
  }
1101
1107
  // CONCATENATED MODULE: ./src/common/utils/login-util.ts
@@ -2460,14 +2466,8 @@ var node_TreeNode = /** @class */function (_super) {
2460
2466
  });
2461
2467
  Object.defineProperty(TreeNode.prototype, "headers", {
2462
2468
  get: function () {
2463
- var _a = getToken(),
2464
- token = _a.token,
2465
- isUserCenter = _a.isUserCenter;
2466
- return isUserCenter ? {
2467
- "X-Authorization": "Bearer ".concat(token)
2468
- } : {
2469
- Authorization: "Bearer " + token
2470
- };
2469
+ var headers = getToken().headers;
2470
+ return headers;
2471
2471
  },
2472
2472
  enumerable: false,
2473
2473
  configurable: true
@@ -2573,14 +2573,8 @@ var tree_Tree = /** @class */function (_super) {
2573
2573
  });
2574
2574
  Object.defineProperty(Tree.prototype, "headers", {
2575
2575
  get: function () {
2576
- var _a = getToken(),
2577
- token = _a.token,
2578
- isUserCenter = _a.isUserCenter;
2579
- return isUserCenter ? {
2580
- "X-Authorization": "Bearer ".concat(token)
2581
- } : {
2582
- Authorization: "Bearer " + token
2583
- };
2576
+ var headers = getToken().headers;
2577
+ return headers;
2584
2578
  },
2585
2579
  enumerable: false,
2586
2580
  configurable: true
@@ -6346,16 +6340,10 @@ var project_list_ProjectList = /** @class */function (_super) {
6346
6340
  };
6347
6341
  Object.defineProperty(ProjectList.prototype, "headers", {
6348
6342
  get: function () {
6349
- var _a = getToken(),
6350
- token = _a.token,
6351
- isUserCenter = _a.isUserCenter;
6352
- return isUserCenter ? {
6353
- "X-Authorization": "Bearer ".concat(token),
6354
- "App-Id": signature.appIdCode.id
6355
- } : {
6356
- Authorization: "Bearer " + token,
6343
+ var headers = getToken().headers;
6344
+ return __assign(__assign({}, headers), {
6357
6345
  "App-Id": signature.appIdCode.id
6358
- };
6346
+ });
6359
6347
  },
6360
6348
  enumerable: false,
6361
6349
  configurable: true
package/dist/index.umd.js CHANGED
@@ -1087,24 +1087,30 @@ var external_js_cookie_default = /*#__PURE__*/__webpack_require__.n(external_js_
1087
1087
  // CONCATENATED MODULE: ./src/common/utils/setting-util.ts
1088
1088
 
1089
1089
 
1090
-
1091
1090
  var COMMON_KEYS = ['dex-web:access_token', 'bigdata-web:access_token', 'access_token'];
1092
1091
  /* 用户中心专用 key */
1093
- var SSO_KEY = ['dex-web:admin_sso_token', 'bigdata-web:admin_sso_token', 'admin_sso_token'];
1092
+ var SSO_KEY = ['admin_sso_token'];
1094
1093
  /* 统一读取函数:先 cookie,再 localStorage */
1095
1094
  function readToken(key) {
1096
1095
  return external_js_cookie_default.a.get(key) || localStorage.getItem(key) || undefined;
1097
1096
  }
1098
1097
  function getToken() {
1099
1098
  var _a;
1100
- // 先尝试获取普通 token
1099
+ // 获取是否通过用户中心认证
1101
1100
  var isUserCenter = enableUserCenterCookie();
1102
- var keys = isUserCenter ? __spreadArray(__spreadArray([], SSO_KEY, true), COMMON_KEYS, true) : COMMON_KEYS;
1101
+ // 获取token
1102
+ var keys = isUserCenter ? SSO_KEY : COMMON_KEYS;
1103
1103
  var token = (_a = keys.map(readToken).find(Boolean)) !== null && _a !== void 0 ? _a : '';
1104
- // 获取是否通过用户中心认证
1104
+ // 获取headers
1105
+ var headers = isUserCenter ? {
1106
+ "X-Authorization": "Bearer ".concat(token)
1107
+ } : {
1108
+ Authorization: "Bearer ".concat(token)
1109
+ };
1105
1110
  return {
1106
1111
  token: token,
1107
- isUserCenter: isUserCenter
1112
+ isUserCenter: isUserCenter,
1113
+ headers: headers
1108
1114
  };
1109
1115
  }
1110
1116
  // CONCATENATED MODULE: ./src/common/utils/login-util.ts
@@ -2469,14 +2475,8 @@ var node_TreeNode = /** @class */function (_super) {
2469
2475
  });
2470
2476
  Object.defineProperty(TreeNode.prototype, "headers", {
2471
2477
  get: function () {
2472
- var _a = getToken(),
2473
- token = _a.token,
2474
- isUserCenter = _a.isUserCenter;
2475
- return isUserCenter ? {
2476
- "X-Authorization": "Bearer ".concat(token)
2477
- } : {
2478
- Authorization: "Bearer " + token
2479
- };
2478
+ var headers = getToken().headers;
2479
+ return headers;
2480
2480
  },
2481
2481
  enumerable: false,
2482
2482
  configurable: true
@@ -2582,14 +2582,8 @@ var tree_Tree = /** @class */function (_super) {
2582
2582
  });
2583
2583
  Object.defineProperty(Tree.prototype, "headers", {
2584
2584
  get: function () {
2585
- var _a = getToken(),
2586
- token = _a.token,
2587
- isUserCenter = _a.isUserCenter;
2588
- return isUserCenter ? {
2589
- "X-Authorization": "Bearer ".concat(token)
2590
- } : {
2591
- Authorization: "Bearer " + token
2592
- };
2585
+ var headers = getToken().headers;
2586
+ return headers;
2593
2587
  },
2594
2588
  enumerable: false,
2595
2589
  configurable: true
@@ -6355,16 +6349,10 @@ var project_list_ProjectList = /** @class */function (_super) {
6355
6349
  };
6356
6350
  Object.defineProperty(ProjectList.prototype, "headers", {
6357
6351
  get: function () {
6358
- var _a = getToken(),
6359
- token = _a.token,
6360
- isUserCenter = _a.isUserCenter;
6361
- return isUserCenter ? {
6362
- "X-Authorization": "Bearer ".concat(token),
6363
- "App-Id": signature.appIdCode.id
6364
- } : {
6365
- Authorization: "Bearer " + token,
6352
+ var headers = getToken().headers;
6353
+ return __assign(__assign({}, headers), {
6366
6354
  "App-Id": signature.appIdCode.id
6367
- };
6355
+ });
6368
6356
  },
6369
6357
  enumerable: false,
6370
6358
  configurable: true