xctc-utils 1.3.2 → 1.3.4

package/dist/weixin/index.js

@@ -12,36 +12,37 @@ var defaultKey = "5uMz4R8rop26DkC8";
 var defaultIv = "5uMz4Rsd0926DkC8";
 var weixinConfig = {};
 function weixinUrlCode(config) {
-    var _a, _b, _c, _d;
-    var appId = (_a = config === null || config === void 0 ? void 0 : config.appId) !== null && _a !== void 0 ? _a : "";
+    config = config || {};
+    var appId = config['appId'] || "";
     if (!appId)
         return;
-    weixinConfig = config || {};
-    var scope = (_b = config === null || config === void 0 ? void 0 : config.scope) !== null && _b !== void 0 ? _b : "snsapi_userinfo";
-    var codeKey = (_c = config === null || config === void 0 ? void 0 : config.codeKey) !== null && _c !== void 0 ? _c : "weixinCode";
-    var stateKey = (_d = config === null || config === void 0 ? void 0 : config.stateKey) !== null && _d !== void 0 ? _d : "weixinState";
+    weixinConfig = config;
+    var scope = config['scope'] || "snsapi_userinfo";
+    var codeKey = config['codeKey'] || "weixinCode";
+    var stateKey = config['stateKey'] || "weixinState";
     weixinConfig['scope'] = scope;
     weixinConfig['codeKey'] = codeKey;
     weixinConfig['stateKey'] = stateKey;
-    weixinConfig['scope'] = scope;
     (0, index_1.useSessionStorage)("weixinConfig", weixinConfig);
-    var cryptoiv = weixinConfig.cryptoiv, cryptokey = weixinConfig.cryptokey;
+    var _a = weixinConfig.cryptoiv, cryptoiv = _a === void 0 ? "" : _a, _b = weixinConfig.cryptokey, cryptokey = _b === void 0 ? "" : _b;
     var search = loc.search; // ?code=0916SzFa1KH9TA0Ke7Ha1AQx6446SzFr&state=123
     // 获取地址栏返回 code 参数
     var localCode = "";
-    if (codeKey)
+    if (codeKey) {
         localCode = (0, index_1.getSessionStorage)(codeKey);
+    }
     // 默认第一次通过链接进入系统，没有code和state
     var searchIndex = -1;
     var stateIndex = -1;
     if (search) {
         searchIndex = search.indexOf("code=");
         stateIndex = search.indexOf("state=");
-        searchIndex = parseInt(searchIndex);
-        stateIndex = parseInt(stateIndex);
     }
-    // 如果链接地址中带有code和state
-    if (searchIndex >= 0 && stateIndex >= 0) {
+    if (localCode && stateIndex == -1 && searchIndex == -1) {
+        return;
+    }
+    // 如果链接地址中带有code
+    if (searchIndex >= 0) {
         if (localCode) {
             // localCode 存在，用户已执行微信跳转链接，用户可能执行当前网页的刷新操作
             return;
@@ -65,7 +66,7 @@ function weixinUrlCode(config) {
         return;
     }
     //  用户通过分享链接进入系统，此时含有State参数，无code参数
-    if (stateIndex >= 0 && !(searchIndex >= 0)) {
+    if (stateIndex >= 0) {
         var hrefState = "";
         var urlArr = formatSearch(search, "state=");
         for (var k = 0; k < urlArr.length; k++) {
@@ -89,9 +90,7 @@ function weixinUrlCode(config) {
         weixinCode(); // 微信授权页面获取CODE
         return;
     }
-    if (localCode)
-        return;
-    if (!localCode) {
+    if (!localCode && stateIndex == -1 && searchIndex == -1) {
         return weixinCode();
     }
 }
@@ -119,14 +118,14 @@ function weixinLogin(code) {
         return;
     (0, index_1.useSessionStorage)("weixinLoginParams", JSON.stringify(obj));
     // 调试字段 isPassLogin ，为true 时不继续执行微信登录，前端可拿到 code 给后端测试
-    if (weixinConfig === null || weixinConfig === void 0 ? void 0 : weixinConfig.isPassLogin)
+    if (weixinConfig['isPassLogin'])
         return;
     weixinConfig.http(obj).then(function (res) {
         if (res.code == 40163) {
             // 未登录则先执行登录
             return weixinCode();
         }
-        var data = res === null || res === void 0 ? void 0 : res.data;
+        var data = res['data'] || {};
         for (var key in data) {
             var item = data[key];
             if (item instanceof Object) {
@@ -197,7 +196,7 @@ function weixinCode() {
             return;
         var scope = "snsapi_userinfo";
         if (weixinConfig['scope']) {
-            scope = weixinConfig['scope'];
+            scope = weixinConfig.scope;
         }
         var base = "https://open.weixin.qq.com/connect/oauth2/authorize?";
         var uri = encodeURIComponent(loc.href.split("?")[0]);
@@ -216,8 +215,7 @@ var defaultJsApiList = [
     "downloadImage", "translateVoice", "getNetworkType", "openLocation", "getLocation", "hideOptionMenu", "showOptionMenu", "hideMenuItems", "showMenuItems", "hideAllNonBaseMenuItem", "showAllNonBaseMenuItem",
 ];
 function weixinShareConfig(config) {
-    var _a;
-    if (!(config === null || config === void 0 ? void 0 : config.http))
+    if (!config['http'])
         return;
     var url = loc.href.split("#")[0];
     var param = {
@@ -225,12 +223,12 @@ function weixinShareConfig(config) {
         appId: config.appId,
     };
     var jsApiList = defaultJsApiList;
-    if ((_a = config === null || config === void 0 ? void 0 : config.jsApiList) === null || _a === void 0 ? void 0 : _a.length)
+    if (config && config.jsApiList && config.jsApiList.length) {
         jsApiList = config.jsApiList;
+    }
     config.http(param).then(function (res) {
-        var _a;
         if (res.code == 0) {
-            var data = (_a = res === null || res === void 0 ? void 0 : res.data) !== null && _a !== void 0 ? _a : {};
+            var data = res['data'] || {};
             var wx = weixinInit();
             wx.config({
                 debug: false,
@@ -243,7 +241,7 @@ function weixinShareConfig(config) {
             wx.ready(function (res) {
                 console.log("加载微信分享配置完成：", res);
                 (0, index_1.useSessionStorage)("weixinShareConfigSuccess", "\u52A0\u8F7D\u5FAE\u4FE1\u5206\u4EAB\u914D\u7F6E\u5B8C\u6210\uFF1A".concat(res));
-                if ((config === null || config === void 0 ? void 0 : config.cb) && typeof config.cb === "function")
+                if (config['cb'] && typeof config.cb === "function")
                     config.cb();
             });
             wx.error(function (err) {
@@ -254,23 +252,26 @@ function weixinShareConfig(config) {
 }
 exports.weixinShareConfig = weixinShareConfig;
 function weixinShareInit(options) {
-    var title = "微信分享";
-    if (options === null || options === void 0 ? void 0 : options.title)
+    var title = "微信分享标题";
+    if (options['title'])
         title = options.title;
     var desc = "微信分享描述";
-    if (options === null || options === void 0 ? void 0 : options.desc)
+    if (options['desc'])
         desc = options.desc;
     var link = loc.origin;
-    if (options === null || options === void 0 ? void 0 : options.link)
+    if (options['link'])
         link = options.link;
     var imgUrl = "";
-    if (options === null || options === void 0 ? void 0 : options.imgUrl)
+    if (options['imgUrl'])
         imgUrl = options.imgUrl;
     if (options && typeof options == "object") {
         var state = "";
-        if (options === null || options === void 0 ? void 0 : options.data) {
+        if (options['data']) {
             var data = options.data;
-            state = (0, crypto_1.encrypt)(data, cryptoConfig(options['key']).key, cryptoConfig(options['iv']).iv);
+            var key = options['key'] || defaultKey;
+            var iv = options['iv'] || defaultIv;
+            var cryptoObj = cryptoConfig(key, iv);
+            state = (0, crypto_1.encrypt)(data, cryptoObj.key, cryptoObj.iv);
             link = "".concat(link, "?state=").concat(state);
         }
     }
@@ -314,7 +315,7 @@ function weixinPay(config) {
     var wx = weixinInit();
     // let { timeStamp,signType,prepay_id,paySign,package,nonceStr,appId } = params
     var cb = "";
-    if ((config === null || config === void 0 ? void 0 : config.cb) && typeof config.cb === "function")
+    if (config['cb'] && typeof config.cb === "function")
         cb = config.cb;
     wx.chooseWXPay({
         timestamp: config.timeStamp,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xctc-utils",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "description": "localStorage存储\r ```\r sessionStorage存储\r ```\r crypto-js加密、解密\r ```\r 微信授权登录、微信分享\r ```\r 设备环境获取\r ```\r 是否是微信浏览器\r ```\r 时间戳转时间，字符串转时间戳",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",