@lingxiteam/assets 3.5.1-alpha.6 → 3.5.1-alpha.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.
Files changed (7) hide show
  1. package/es/security/const.d.ts +2 -1
  2. package/es/security/const.js +9 -6
  3. package/es/security/fetch.js +23 -9
  4. package/lib/security/const.d.ts +2 -1
  5. package/lib/security/const.js +8 -6
  6. package/lib/security/fetch.js +23 -9
  7. package/package.json +1 -1
package/es/security/const.d.ts CHANGED
@@ -9,7 +9,8 @@ export declare enum MODE {
9
9
  SIGN_UUID_WITHOUT_USER = "1.2.1",
10
10
  RSA = "2.0",
11
11
  AES = "3.0",
12
- DES = "4.0"
12
+ DES = "4.0",
13
+ SIGN_AES = "3.1"
13
14
  }
14
15
  export declare const SIGN_MODE: MODE[];
15
16
  export declare const signKey: string;
package/es/security/const.js CHANGED
@@ -1,5 +1,5 @@
1
- var defaultAESKey = 'd86d7bab3d6ac01a';
2
- var defaultDESKey = '91THRABY';
1
+ var a = 'd86d7bab3d6ac01a';
2
+ var b = '91THRABY';
3
3
  export var securityHeaderKey = 'XA-TYPE';
4
4
  export var defaultSignKey = 'X-SIGN';
5
5
  export var MODE;
@@ -12,14 +12,17 @@ export var MODE;
12
12
  MODE["SIGN_UUID_WITHOUT_USER"] = "1.2.1";
13
13
  MODE["RSA"] = "2.0";
14
14
  MODE["AES"] = "3.0";
15
- MODE["DES"] = "4.0"; // DES参数加密
15
+ MODE["DES"] = "4.0";
16
+ MODE["SIGN_AES"] = "3.1";
16
17
  })(MODE || (MODE = {}));
17
- export var SIGN_MODE = [MODE.SIGN_KEY, MODE.SIGN, MODE.SIGN_WITH_TIME, MODE.SIGN_WITHOUT_USER, MODE.SIGN_UUID, MODE.SIGN_UUID_WITHOUT_USER];
18
+ export var SIGN_MODE = [MODE.SIGN_KEY, MODE.SIGN, MODE.SIGN_WITH_TIME, MODE.SIGN_WITHOUT_USER, MODE.SIGN_UUID, MODE.SIGN_UUID_WITHOUT_USER, MODE.SIGN_AES // AES参数加密
19
+ ];
20
+
18
21
  export var signKey = process.env.LINGXI_HTTP_SIGN_HEADER_KEY || process.env.REACT_APP_HTTP_SIGN_HEADER_KEY || process.env.UMI_APP_HTTP_SIGN_HEADER_KEY || process.env.FISHX_APP_HTTP_SIGN_HEADER_KEY || defaultSignKey;
19
22
  export var rsaPublicKey = process.env.LINGXI_HTTP_RSA_PUBLIC_KEY || process.env.REACT_APP_HTTP_RSA_PUBLIC_KEY || process.env.UMI_APP_HTTP_RSA_PUBLIC_KEY || process.env.FISHX_APP_HTTP_RSA_PUBLIC_KEY;
20
23
  export var rsaPrivKey = process.env.LINGXI_HTTP_RSA_PRIV_KEY || process.env.REACT_APP_HTTP_RSA_PRIV_KEY || process.env.UMI_APP_HTTP_RSA_PRIV_KEY || process.env.FISHX_APP_HTTP_RSA_PRIV_KEY;
21
- export var aesKey = process.env.LINGXI_HTTP_AES_KEY || process.env.REACT_APP_HTTP_AES_KEY || process.env.UMI_APP_HTTP_AES_KEY || process.env.FISHX_APP_HTTP_AES_KEY || defaultAESKey;
22
- export var desKey = process.env.LINGXI_HTTP_DES_KEY || process.env.REACT_APP_HTTP_DES_KEY || process.env.UMI_APP_HTTP_DES_KEY || process.env.FISHX_APP_HTTP_DES_KEY || defaultDESKey;
24
+ export var aesKey = process.env.LINGXI_HTTP_AES_KEY || process.env.REACT_APP_HTTP_AES_KEY || process.env.UMI_APP_HTTP_AES_KEY || process.env.FISHX_APP_HTTP_AES_KEY || a;
25
+ export var desKey = process.env.LINGXI_HTTP_DES_KEY || process.env.REACT_APP_HTTP_DES_KEY || process.env.UMI_APP_HTTP_DES_KEY || process.env.FISHX_APP_HTTP_DES_KEY || b;
23
26
  export default {
24
27
  signKey: signKey,
25
28
  rsaPublicKey: rsaPublicKey,
package/es/security/fetch.js CHANGED
@@ -30,7 +30,7 @@ var LXREQ = {};
30
30
  window.LXREQ = LXREQ;
31
31
  function encryptedStr(str, type) {
32
32
  var config = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
33
- if (type === MODE.AES) {
33
+ if (type === MODE.AES || type === MODE.SIGN_AES) {
34
34
  var _config$aesOptions, _config$aesOptions2;
35
35
  return AESEncrypt(str, ((_config$aesOptions = config.aesOptions) === null || _config$aesOptions === void 0 ? void 0 : _config$aesOptions.key) || aesKey, (_config$aesOptions2 = config.aesOptions) === null || _config$aesOptions2 === void 0 ? void 0 : _config$aesOptions2.encrypt);
36
36
  }
@@ -46,7 +46,7 @@ function encryptedStr(str, type) {
46
46
  }
47
47
  function decryptedStr(str, type) {
48
48
  var config = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
49
- if (type === MODE.AES) {
49
+ if (type === MODE.AES || type === MODE.SIGN_AES) {
50
50
  var _config$aesOptions3, _config$aesOptions4;
51
51
  return AESDecrypt(str, ((_config$aesOptions3 = config.aesOptions) === null || _config$aesOptions3 === void 0 ? void 0 : _config$aesOptions3.key) || aesKey, (_config$aesOptions4 = config.aesOptions) === null || _config$aesOptions4 === void 0 ? void 0 : _config$aesOptions4.decrypt);
52
52
  }
@@ -145,7 +145,21 @@ var fetch = function fetch(url) {
145
145
  SIGN_MODE.includes(optSecurityHeaderKey)) {
146
146
  var _config$signKeyOption;
147
147
  opts.headers = _objectSpread(_objectSpread(_defineProperty({}, securityHeaderKey, securityMode), opts.headers), {}, _defineProperty({}, (config === null || config === void 0 ? void 0 : (_config$signKeyOption = config.signKeyOptions) === null || _config$signKeyOption === void 0 ? void 0 : _config$signKeyOption.key) || signKey, createHttpSignStr(url, fetchOptions, securityMode)));
148
- requester = originFetch(url, opts);
148
+ var tempUrl = url;
149
+ var tempOpts = opts;
150
+ // 如果请求头是3.1
151
+ if (securityMode === MODE.SIGN_AES && (fetchOptions === null || fetchOptions === void 0 ? void 0 : fetchOptions.disabledEncrypted) !== true) {
152
+ // 标记请求ID，用于获取解密数据
153
+ var reqId = "XA".concat(+new Date());
154
+ // search和body加密
155
+ var _encrypted = encrypted(url, opts, securityMode || optSecurityHeaderKey, config, reqId),
156
+ _encrypted2 = _slicedToArray(_encrypted, 2),
157
+ encryptedUrl = _encrypted2[0],
158
+ encryptedOpts = _encrypted2[1];
159
+ tempUrl = encryptedUrl;
160
+ tempOpts = encryptedOpts;
161
+ }
162
+ requester = originFetch(tempUrl, tempOpts);
149
163
  } else if (
150
164
  // ------ 参数加密 ------
151
165
  // 配置开启加密
@@ -153,13 +167,13 @@ var fetch = function fetch(url) {
153
167
  // 请求头开启加密
154
168
  [MODE.RSA, MODE.AES, MODE.DES].includes(optSecurityHeaderKey)) {
155
169
  // 标记请求ID，用于获取解密数据
156
- var reqId = "XA".concat(+new Date());
170
+ var _reqId = "XA".concat(+new Date());
157
171
  // search和body加密
158
- var _encrypted = encrypted(url, opts, securityMode || optSecurityHeaderKey, config, reqId),
159
- _encrypted2 = _slicedToArray(_encrypted, 2),
160
- encryptedUrl = _encrypted2[0],
161
- encryptedOpts = _encrypted2[1];
162
- requester = originFetch(encryptedUrl, encryptedOpts);
172
+ var _encrypted3 = encrypted(url, opts, securityMode || optSecurityHeaderKey, config, _reqId),
173
+ _encrypted4 = _slicedToArray(_encrypted3, 2),
174
+ _encryptedUrl = _encrypted4[0],
175
+ _encryptedOpts = _encrypted4[1];
176
+ requester = originFetch(_encryptedUrl, _encryptedOpts);
163
177
  } else {
164
178
  requester = originFetch(url, opts);
165
179
  }
package/lib/security/const.d.ts CHANGED
@@ -9,7 +9,8 @@ export declare enum MODE {
9
9
  SIGN_UUID_WITHOUT_USER = "1.2.1",
10
10
  RSA = "2.0",
11
11
  AES = "3.0",
12
- DES = "4.0"
12
+ DES = "4.0",
13
+ SIGN_AES = "3.1"
13
14
  }
14
15
  export declare const SIGN_MODE: MODE[];
15
16
  export declare const signKey: string;
package/lib/security/const.js CHANGED
@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.signKey = exports.securityHeaderKey = exports.rsaPublicKey = exports.rsaPrivKey = exports.desKey = exports.defaultSignKey = exports.default = exports.aesKey = exports.SIGN_MODE = exports.MODE = void 0;
7
- var defaultAESKey = 'd86d7bab3d6ac01a';
8
- var defaultDESKey = '91THRABY';
7
+ var a = 'd86d7bab3d6ac01a';
8
+ var b = '91THRABY';
9
9
  var securityHeaderKey = 'XA-TYPE';
10
10
  exports.securityHeaderKey = securityHeaderKey;
11
11
  var defaultSignKey = 'X-SIGN';
@@ -21,9 +21,11 @@ exports.MODE = MODE;
21
21
  MODE["SIGN_UUID_WITHOUT_USER"] = "1.2.1";
22
22
  MODE["RSA"] = "2.0";
23
23
  MODE["AES"] = "3.0";
24
- MODE["DES"] = "4.0"; // DES参数加密
24
+ MODE["DES"] = "4.0";
25
+ MODE["SIGN_AES"] = "3.1";
25
26
  })(MODE || (exports.MODE = MODE = {}));
26
- var SIGN_MODE = [MODE.SIGN_KEY, MODE.SIGN, MODE.SIGN_WITH_TIME, MODE.SIGN_WITHOUT_USER, MODE.SIGN_UUID, MODE.SIGN_UUID_WITHOUT_USER];
27
+ var SIGN_MODE = [MODE.SIGN_KEY, MODE.SIGN, MODE.SIGN_WITH_TIME, MODE.SIGN_WITHOUT_USER, MODE.SIGN_UUID, MODE.SIGN_UUID_WITHOUT_USER, MODE.SIGN_AES // AES参数加密
28
+ ];
27
29
  exports.SIGN_MODE = SIGN_MODE;
28
30
  var signKey = process.env.LINGXI_HTTP_SIGN_HEADER_KEY || process.env.REACT_APP_HTTP_SIGN_HEADER_KEY || process.env.UMI_APP_HTTP_SIGN_HEADER_KEY || process.env.FISHX_APP_HTTP_SIGN_HEADER_KEY || defaultSignKey;
29
31
  exports.signKey = signKey;
@@ -31,9 +33,9 @@ var rsaPublicKey = process.env.LINGXI_HTTP_RSA_PUBLIC_KEY || process.env.REACT_A
31
33
  exports.rsaPublicKey = rsaPublicKey;
32
34
  var rsaPrivKey = process.env.LINGXI_HTTP_RSA_PRIV_KEY || process.env.REACT_APP_HTTP_RSA_PRIV_KEY || process.env.UMI_APP_HTTP_RSA_PRIV_KEY || process.env.FISHX_APP_HTTP_RSA_PRIV_KEY;
33
35
  exports.rsaPrivKey = rsaPrivKey;
34
- var aesKey = process.env.LINGXI_HTTP_AES_KEY || process.env.REACT_APP_HTTP_AES_KEY || process.env.UMI_APP_HTTP_AES_KEY || process.env.FISHX_APP_HTTP_AES_KEY || defaultAESKey;
36
+ var aesKey = process.env.LINGXI_HTTP_AES_KEY || process.env.REACT_APP_HTTP_AES_KEY || process.env.UMI_APP_HTTP_AES_KEY || process.env.FISHX_APP_HTTP_AES_KEY || a;
35
37
  exports.aesKey = aesKey;
36
- var desKey = process.env.LINGXI_HTTP_DES_KEY || process.env.REACT_APP_HTTP_DES_KEY || process.env.UMI_APP_HTTP_DES_KEY || process.env.FISHX_APP_HTTP_DES_KEY || defaultDESKey;
38
+ var desKey = process.env.LINGXI_HTTP_DES_KEY || process.env.REACT_APP_HTTP_DES_KEY || process.env.UMI_APP_HTTP_DES_KEY || process.env.FISHX_APP_HTTP_DES_KEY || b;
37
39
  exports.desKey = desKey;
38
40
  var _default = {
39
41
  signKey: signKey,
package/lib/security/fetch.js CHANGED
@@ -36,7 +36,7 @@ var LXREQ = {};
36
36
  window.LXREQ = LXREQ;
37
37
  function encryptedStr(str, type) {
38
38
  var config = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
39
- if (type === _const.MODE.AES) {
39
+ if (type === _const.MODE.AES || type === _const.MODE.SIGN_AES) {
40
40
  var _config$aesOptions, _config$aesOptions2;
41
41
  return (0, _aes.AESEncrypt)(str, ((_config$aesOptions = config.aesOptions) === null || _config$aesOptions === void 0 ? void 0 : _config$aesOptions.key) || _const.aesKey, (_config$aesOptions2 = config.aesOptions) === null || _config$aesOptions2 === void 0 ? void 0 : _config$aesOptions2.encrypt);
42
42
  }
@@ -52,7 +52,7 @@ function encryptedStr(str, type) {
52
52
  }
53
53
  function decryptedStr(str, type) {
54
54
  var config = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
55
- if (type === _const.MODE.AES) {
55
+ if (type === _const.MODE.AES || type === _const.MODE.SIGN_AES) {
56
56
  var _config$aesOptions3, _config$aesOptions4;
57
57
  return (0, _aes.AESDecrypt)(str, ((_config$aesOptions3 = config.aesOptions) === null || _config$aesOptions3 === void 0 ? void 0 : _config$aesOptions3.key) || _const.aesKey, (_config$aesOptions4 = config.aesOptions) === null || _config$aesOptions4 === void 0 ? void 0 : _config$aesOptions4.decrypt);
58
58
  }
@@ -151,7 +151,21 @@ var fetch = function fetch(url) {
151
151
  _const.SIGN_MODE.includes(optSecurityHeaderKey)) {
152
152
  var _config$signKeyOption;
153
153
  opts.headers = _objectSpread(_objectSpread(_defineProperty({}, _const.securityHeaderKey, securityMode), opts.headers), {}, _defineProperty({}, (config === null || config === void 0 ? void 0 : (_config$signKeyOption = config.signKeyOptions) === null || _config$signKeyOption === void 0 ? void 0 : _config$signKeyOption.key) || _const.signKey, (0, _sign.createHttpSignStr)(url, fetchOptions, securityMode)));
154
- requester = originFetch(url, opts);
154
+ var tempUrl = url;
155
+ var tempOpts = opts;
156
+ // 如果请求头是3.1
157
+ if (securityMode === _const.MODE.SIGN_AES && (fetchOptions === null || fetchOptions === void 0 ? void 0 : fetchOptions.disabledEncrypted) !== true) {
158
+ // 标记请求ID，用于获取解密数据
159
+ var reqId = "XA".concat(+new Date());
160
+ // search和body加密
161
+ var _encrypted = encrypted(url, opts, securityMode || optSecurityHeaderKey, config, reqId),
162
+ _encrypted2 = _slicedToArray(_encrypted, 2),
163
+ encryptedUrl = _encrypted2[0],
164
+ encryptedOpts = _encrypted2[1];
165
+ tempUrl = encryptedUrl;
166
+ tempOpts = encryptedOpts;
167
+ }
168
+ requester = originFetch(tempUrl, tempOpts);
155
169
  } else if (
156
170
  // ------ 参数加密 ------
157
171
  // 配置开启加密
@@ -159,13 +173,13 @@ var fetch = function fetch(url) {
159
173
  // 请求头开启加密
160
174
  [_const.MODE.RSA, _const.MODE.AES, _const.MODE.DES].includes(optSecurityHeaderKey)) {
161
175
  // 标记请求ID，用于获取解密数据
162
- var reqId = "XA".concat(+new Date());
176
+ var _reqId = "XA".concat(+new Date());
163
177
  // search和body加密
164
- var _encrypted = encrypted(url, opts, securityMode || optSecurityHeaderKey, config, reqId),
165
- _encrypted2 = _slicedToArray(_encrypted, 2),
166
- encryptedUrl = _encrypted2[0],
167
- encryptedOpts = _encrypted2[1];
168
- requester = originFetch(encryptedUrl, encryptedOpts);
178
+ var _encrypted3 = encrypted(url, opts, securityMode || optSecurityHeaderKey, config, _reqId),
179
+ _encrypted4 = _slicedToArray(_encrypted3, 2),
180
+ _encryptedUrl = _encrypted4[0],
181
+ _encryptedOpts = _encrypted4[1];
182
+ requester = originFetch(_encryptedUrl, _encryptedOpts);
169
183
  } else {
170
184
  requester = originFetch(url, opts);
171
185
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@lingxiteam/assets",
3
- "version": "3.5.1-alpha.6",
3
+ "version": "3.5.1-alpha.7",
4
4
  "description": "灵犀低代码平台移动端 - 工具类",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",