xctc-utils 1.6.21 → 1.6.23

package/dist/params/index.js

@@ -63,9 +63,10 @@ var get = function (options) {
                 var decryptData = (0, crypto_1.decrypt)(dataStr, key, iv);
                 var decryptStr = (0, crypto_1.decrypt)(dataStr, key, iv);
                 console.log("get-decryptData:", decryptData);
+                // decryptData 格式为  "path=/user/user-login&id=1"
                 paramsData[keyItem] = {
                     // data:getParamsObj(decryptStr),
-                    data: decryptData,
+                    data: getParamsObj(decryptData),
                     str: dataStr
                 };
             }
@@ -116,7 +117,8 @@ var urlStateParams = function (cacheKey, key, iv) {
             keys = keys[0].toUpperCase() + keys.substring(1);
             var val = item.substring(indexVal + 1);
             var data = (0, crypto_1.decrypt)(val, key, iv);
-            (0, storage_1.useSessionStorage)(cacheKey, { state: { str: val, data: data } });
+            // data 格式为  "path=/user/user-login&id=1"
+            (0, storage_1.useSessionStorage)(cacheKey, { state: { str: val, data: getParamsObj(data) } });
         }
     }
 };

package/dist/weixin/index.js

@@ -29,6 +29,7 @@ var weixin = require("weixin-js-sdk");
 var utils_1 = require("../utils");
 var crypto_1 = require("../crypto");
 var params = __importStar(require("../params"));
+var is_1 = require("../is");
 var index_1 = require("../storage/index");
 var w = window;
 var loc = w.location;
@@ -67,13 +68,13 @@ function getUrlCode(config) {
         isAuth = search.includes("state=state");
     }
     // 获取地址栏返回 code 参数值
-    var localCode = (0, index_1.getSessionStorage)("urlParamsData") || "";
+    var localParamsData = (0, index_1.getSessionStorage)("urlParamsData") || "";
     // 本地未存储微信授权 code 值， 并且地址栏携带有 code 值 ，则先存储该值
-    if (!localCode && codeIndex != -1 && isAuth) {
+    if (codeIndex != -1 && isAuth) {
         params.get({ keys: ['code'], cache: "session", key: cryptokey, iv: cryptoiv });
     }
     // 如果本地已经存储 微信授权返回的 code 值，证明用户在执行刷新操作，不再执行微信授权逻辑
-    if (localCode && stateIndex == -1 && codeIndex == -1 && !isAuth) {
+    if ((localParamsData === null || localParamsData === void 0 ? void 0 : localParamsData.code) && stateIndex == -1 && codeIndex == -1 && !isAuth) {
         if (debuggerStatus) {
             alert("本地已经存储 code ，不再执行微信授权逻辑");
         }
@@ -81,7 +82,7 @@ function getUrlCode(config) {
     }
     // 如果链接地址中带有code，证明执行微信授权登录，并返回授权所需的 code 参数
     if (codeIndex >= 0 && isAuth) {
-        if (localCode) {
+        if (localParamsData === null || localParamsData === void 0 ? void 0 : localParamsData.code) {
             // localCode 存在，用户已执行微信跳转链接，用户可能执行当前网页的刷新操作
             if (debuggerStatus) {
                 alert("codeIndex 》 0 ，本地已经存储 code ，不再执行微信授权逻辑");
@@ -102,11 +103,11 @@ function getUrlCode(config) {
         if (debuggerStatus) {
             alert("用户通过分享链接进入系统，无code参数 ，跳转到code授权页面");
         }
-        params.urlStateParams();
+        params.urlStateParams("urlParamsData", cryptokey, cryptoiv);
         return getCode(); // 微信授权页面获取CODE
     }
     //  && stateIndex == -1 && codeIndex == -1
-    if (!localCode && codeIndex == -1) {
+    if (!(localParamsData === null || localParamsData === void 0 ? void 0 : localParamsData.code) && codeIndex == -1) {
         if (debuggerStatus) {
             alert("无本地code参数 ，跳转到code授权页面");
         }
@@ -195,7 +196,7 @@ function login(code) {
         var urlParamsData = (0, index_1.getSessionStorage)("urlParamsData") || "";
         var stateData = ((_a = urlParamsData === null || urlParamsData === void 0 ? void 0 : urlParamsData.state) === null || _a === void 0 ? void 0 : _a.data) || ""; // 默认有值，链接携带
         var str = "";
-        if (stateData) {
+        if ((0, is_1.isObject)(stateData)) {
             for (var key in stateData) {
                 if (key == "path") {
                     if (stateData[key][0] == "/") {
@@ -223,7 +224,7 @@ function login(code) {
         }
         else {
             if (typeof cb === "function") {
-                cb(res);
+                cb({ res: res, url: url });
             }
             else {
                 loc.replace(url);

package/package.json

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