xctc-utils 1.3.1 → 1.3.3

package/dist/weixin/index.js

@@ -12,30 +12,38 @@ var defaultKey = "5uMz4R8rop26DkC8";
 var defaultIv = "5uMz4Rsd0926DkC8";
 var weixinConfig = {};
 function weixinUrlCode(config) {
-    weixinConfig = config || {};
+    var _a, _b, _c, _d;
+    config = config !== null && config !== void 0 ? config : {};
+    var appId = (_a = config === null || config === void 0 ? void 0 : config.appId) !== null && _a !== void 0 ? _a : "";
+    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['scope'] = scope;
+    weixinConfig['codeKey'] = codeKey;
+    weixinConfig['stateKey'] = stateKey;
     (0, index_1.useSessionStorage)("weixinConfig", weixinConfig);
-    var cryptoiv = weixinConfig.cryptoiv, cryptokey = weixinConfig.cryptokey;
+    var _e = weixinConfig.cryptoiv, cryptoiv = _e === void 0 ? "" : _e, _f = weixinConfig.cryptokey, cryptokey = _f === void 0 ? "" : _f;
     var search = loc.search; // ?code=0916SzFa1KH9TA0Ke7Ha1AQx6446SzFr&state=123
     // 获取地址栏返回 code 参数
-    var codeKey = weixinConfig['codeKey'];
-    if (!codeKey) {
-        codeKey = "weixinCode";
-        weixinConfig['codeKey'] = codeKey;
-    }
     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;
@@ -59,33 +67,31 @@ 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++) {
             var item = urlArr[k];
             if (item.indexOf("state=") != -1) {
                 hrefState = item.substr(6);
-                var stateKey = weixinConfig['stateKey'];
-                if (!stateKey) {
-                    stateKey = "weixinState";
-                    weixinConfig['stateKey'] = stateKey;
+                var stateKey_1 = weixinConfig['stateKey'];
+                if (!stateKey_1) {
+                    stateKey_1 = "weixinState";
+                    weixinConfig['stateKey'] = stateKey_1;
                 }
-                (0, index_1.useSessionStorage)(stateKey, hrefState);
+                (0, index_1.useSessionStorage)(stateKey_1, hrefState);
                 var cryptoObj = cryptoConfig(cryptokey, cryptoiv);
                 var stateObj = (0, crypto_1.decrypt)(hrefState, cryptoObj.key, cryptoObj.iv);
                 if (stateObj instanceof Object)
                     stateObj = JSON.stringify(stateObj);
-                (0, index_1.useSessionStorage)("".concat(stateKey, "Obj"), stateObj);
+                (0, index_1.useSessionStorage)("".concat(stateKey_1, "Obj"), stateObj);
             }
         }
         // 将 state进行本地存储，存储完成后跳转到微信授权页面
         weixinCode(); // 微信授权页面获取CODE
         return;
     }
-    if (localCode)
-        return;
-    if (!localCode) {
+    if (!localCode && stateIndex == -1 && searchIndex == -1) {
         return weixinCode();
     }
 }
@@ -130,15 +136,10 @@ function weixinLogin(code) {
         }
         var url = loc.origin;
         var hashVal = loc.hash;
-        (0, index_1.useSessionStorage)("stateKey===", stateKey);
-        var state = (0, index_1.getSessionStorage)(stateKey) || "";
+        var state = (0, index_1.getSessionStorage)(stateKey);
         var str = "";
-        (0, index_1.useSessionStorage)("getstatedata===", state);
         if (state) {
-            (0, index_1.useSessionStorage)("stateKey===", "".concat(stateKey, "Obj"));
             var stateObj = (0, index_1.getSessionStorage)("".concat(stateKey, "Obj"));
-            (0, index_1.useSessionStorage)("getstateObj===", stateObj);
-            (0, index_1.useSessionStorage)("url11111===", url);
             for (var key in stateObj) {
                 if (key == "path") {
                     if (stateObj[key][0] == "/") {
@@ -147,7 +148,6 @@ function weixinLogin(code) {
                     else {
                         url = "".concat(url, "/#/").concat(stateObj.path);
                     }
-                    (0, index_1.useSessionStorage)("url22222===", url);
                 }
                 else {
                     str += "".concat(key, "=").concat(stateObj[key], "&");
@@ -158,7 +158,6 @@ function weixinLogin(code) {
                     url = "".concat(url, "?").concat(str);
                 }
             }
-            (0, index_1.useSessionStorage)("url333333===", url);
             loc.replace(url);
         }
         else {
@@ -193,16 +192,11 @@ function weixinInit() {
     return wx;
 }
 function weixinCode() {
+    var _a;
     if ((0, utils_1.weixinBrowser)()) {
         if (!weixinConfig['appId'])
             return;
-        var scope = "snsapi_userinfo";
-        if (weixinConfig['scope']) {
-            scope = weixinConfig['scope'];
-        }
-        else {
-            weixinConfig['scope'] = scope;
-        }
+        var scope = (_a = weixinConfig === null || weixinConfig === void 0 ? void 0 : weixinConfig.scope) !== null && _a !== void 0 ? _a : "snsapi_userinfo";
         var base = "https://open.weixin.qq.com/connect/oauth2/authorize?";
         var uri = encodeURIComponent(loc.href.split("?")[0]);
         var config = "appid=".concat(weixinConfig.appId, "&redirect_uri=").concat(uri, "&response_type=code&scope=").concat(scope, "&state=state#wechat_redirect");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xctc-utils",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "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",