xctc-utils 1.1.3 → 1.1.4

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.
@@ -7,9 +7,12 @@ var utils_1 = require("../utils");
7
7
  var crypto_1 = require("../crypto");
8
8
  var w = window;
9
9
  var loc = w.location;
10
+ var defaultKey = "5uMz4R8rop26DkC8";
11
+ var defaultIv = "5uMz4Rsd0926DkC8";
10
12
  var weixinConfig = {};
11
13
  function weixinUrlCode(config) {
12
- weixinConfig = config;
14
+ weixinConfig = config || {};
15
+ var cryptoiv = weixinConfig.cryptoiv, cryptokey = weixinConfig.cryptokey;
13
16
  var search = loc.search; // ?code=0916SzFa1KH9TA0Ke7Ha1AQx6446SzFr&state=123
14
17
  // 获取地址栏返回 code 参数
15
18
  var codeKey = weixinConfig['codeKey'];
@@ -44,7 +47,10 @@ function weixinUrlCode(config) {
44
47
  hrefState = item.substr(6);
45
48
  var stateKey = weixinConfig['stateKey'] || "weixinState";
46
49
  w.sessionStorage.setItem(stateKey, hrefState);
47
- w.sessionStorage.setItem("".concat(stateKey, "Obj"), (0, crypto_1.decrypt)(hrefState, cryptoConfig().key, cryptoConfig().iv));
50
+ var stateObj = (0, crypto_1.decrypt)(hrefState, cryptoConfig(cryptokey).key, cryptoConfig(cryptoiv).iv);
51
+ if (stateObj instanceof Object)
52
+ stateObj = JSON.stringify(stateObj);
53
+ w.sessionStorage.setItem("".concat(stateKey, "Obj"), stateObj);
48
54
  }
49
55
  }
50
56
  }
@@ -53,12 +59,11 @@ function weixinUrlCode(config) {
53
59
  }
54
60
  }
55
61
  exports.weixinUrlCode = weixinUrlCode;
56
- function cryptoConfig() {
57
- var key = "5uMz4R8rop26DkC8", iv = "5uMz4Rsd0926DkC8";
58
- if (weixinConfig['cryptoiv'])
59
- iv = weixinConfig.cryptoiv;
60
- if (weixinConfig['cryptokey'])
61
- key = weixinConfig.cryptokey;
62
+ function cryptoConfig(key, iv) {
63
+ if (!key)
64
+ key = defaultKey;
65
+ if (!iv)
66
+ key = defaultIv;
62
67
  return {
63
68
  key: key,
64
69
  iv: iv,
@@ -218,7 +223,7 @@ function weixinShareInit(options) {
218
223
  var state = "";
219
224
  if (options === null || options === void 0 ? void 0 : options.data) {
220
225
  var data = options.data;
221
- state = (0, crypto_1.encrypt)(data, options['key'], options['iv']);
226
+ state = (0, crypto_1.encrypt)(data, cryptoConfig(options['key']).key, cryptoConfig(options['iv']).iv);
222
227
  link = "".concat(link, "?state=").concat(state);
223
228
  }
224
229
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "xctc-utils",
3
- "version": "1.1.3",
3
+ "version": "1.1.4",
4
4
  "description": "localStorage存储\r ```\r sessionStorage存储\r ```\r crypto-js加密、解密\r ```\r 微信授权登录、微信分享\r ```\r 设备环境获取\r ```\r 是否是微信浏览器\r ```\r 时间戳转时间,字符串转时间戳",
5
5
  "main": "./dist/index.js",
6
6
  "types": "./dist/index.d.ts",