xctc-utils 1.6.18 → 1.6.20

package/dist/params/index.d.ts

@@ -20,4 +20,5 @@ interface GetOptions {
     iv?: string;
 }
 export declare const get: (options: GetOptions) => any;
+export declare const urlStateParams: (cacheKey?: string, key?: string, iv?: string) => void;
 export {};

package/dist/params/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.get = exports.set = void 0;
+exports.urlStateParams = exports.get = exports.set = void 0;
 var crypto_1 = require("../crypto");
 var storage_1 = require("../storage");
 var defaultKey = "5uMz4R8rop26DkC8";
@@ -34,7 +34,10 @@ var get = function (options) {
         search = search.substring(1);
     }
     var urlArr = search.split("&");
-    var paramsData = {};
+    var paramsData = (0, storage_1.getSessionStorage)(cacheKey) || {};
+    if (!((keys === null || keys === void 0 ? void 0 : keys.length) && (urlArr === null || urlArr === void 0 ? void 0 : urlArr.length))) {
+        return;
+    }
     for (var k = 0; k < keys.length; k++) {
         var keyItem = keys[k];
         if (keyItem.includes("=")) {
@@ -50,9 +53,11 @@ var get = function (options) {
             urlItem = urlArr[i];
             if (urlItem === null || urlItem === void 0 ? void 0 : urlItem.includes(keyItem)) {
                 var dataStr = urlItem.substring(urlItem.indexOf(keyItem) + keyItem.length + 1);
+                var decryptData = (0, crypto_1.decrypt)(dataStr, key, iv);
                 var decryptStr = (0, crypto_1.decrypt)(dataStr, key, iv);
                 paramsData[keyItem] = {
-                    data: getParamsObj(decryptStr),
+                    // data:getParamsObj(decryptStr),
+                    data: decryptData,
                     str: dataStr
                 };
             }
@@ -81,3 +86,30 @@ var getParamsObj = function (objStr) {
     }
     return objData;
 };
+var urlStateParams = function (cacheKey, key, iv) {
+    if (!cacheKey)
+        cacheKey = "urlParamsData";
+    if (!key)
+        key = defaultKey;
+    if (!iv)
+        iv = defaultIv;
+    var win = window;
+    var loc = win.location;
+    var search = loc.search;
+    if (search.startsWith("?")) {
+        search = search.substring(1);
+    }
+    var urlArr = search.split("&");
+    for (var k = 0; k < urlArr.length; k++) {
+        var item = urlArr[k];
+        if (item.includes("state=")) {
+            var indexVal = item.indexOf("=");
+            var keys = item.substring(0, indexVal);
+            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 } });
+        }
+    }
+};
+exports.urlStateParams = urlStateParams;

package/dist/weixin/index.js

@@ -70,7 +70,7 @@ function getUrlCode(config) {
     var localCode = (0, index_1.getSessionStorage)("urlParamsData") || "";
     // 本地未存储微信授权 code 值， 并且地址栏携带有 code 值 ，则先存储该值
     if (!localCode && codeIndex != -1 && isAuth) {
-        params.get({ keys: ['code', 'state'], cache: "session", key: cryptokey, iv: cryptoiv });
+        params.get({ keys: ['code'], cache: "session", key: cryptokey, iv: cryptoiv });
     }
     // 如果本地已经存储 微信授权返回的 code 值，证明用户在执行刷新操作，不再执行微信授权逻辑
     if (localCode && stateIndex == -1 && codeIndex == -1 && !isAuth) {
@@ -102,6 +102,7 @@ function getUrlCode(config) {
         if (debuggerStatus) {
             alert("用户通过分享链接进入系统，无code参数 ，跳转到code授权页面");
         }
+        params.urlStateParams();
         return getCode(); // 微信授权页面获取CODE
     }
     //  && stateIndex == -1 && codeIndex == -1
@@ -156,9 +157,13 @@ function login(code) {
         if (res === null || res === void 0 ? void 0 : res.hasOwnProperty("code")) {
             code = res.code;
         }
-        if (res === null || res === void 0 ? void 0 : res.hasOwnProperty("Code")) {
+        else if (res === null || res === void 0 ? void 0 : res.hasOwnProperty("Code")) {
             code = res.Code;
         }
+        else {
+            console.error("http响应数据格式必须是：res:{code:xx,data:{}}");
+            return;
+        }
         if (code == 40163) {
             // 未登录则先执行登录
             return getCode();
@@ -167,9 +172,13 @@ function login(code) {
         if (res === null || res === void 0 ? void 0 : res.hasOwnProperty("data")) {
             data = res.data;
         }
-        if (res === null || res === void 0 ? void 0 : res.hasOwnProperty("Data")) {
+        else if (res === null || res === void 0 ? void 0 : res.hasOwnProperty("Data")) {
             data = res.Data;
         }
+        else {
+            console.error("http响应数据格式必须是：res:{code:xx,data:{}}");
+            return;
+        }
         for (var key in data) {
             var item = data[key];
             if (item instanceof Object) {
@@ -349,9 +358,13 @@ function configReady(config) {
             if (res === null || res === void 0 ? void 0 : res.hasOwnProperty("data")) {
                 data = res.data;
             }
-            if (res === null || res === void 0 ? void 0 : res.hasOwnProperty("Data")) {
+            else if (res === null || res === void 0 ? void 0 : res.hasOwnProperty("Data")) {
                 data = res.Data;
             }
+            else {
+                console.error("http响应数据格式必须是：res:{data:{appid:xx,timestamp:xx,noncestr:xx,signature:xx}}");
+                return;
+            }
             for (var key in data) {
                 var newKey = key.toLowerCase();
                 data[newKey] = data[key];
@@ -360,25 +373,19 @@ function configReady(config) {
                 console.error("后端响应的data数据中缺乏appid或者appId或者AppId字段！");
                 return;
             }
-            var timestamp = (data === null || data === void 0 ? void 0 : data.timestamp) || "";
-            if (!timestamp) {
-                return;
-            }
-            timestamp = Number(timestamp);
             var obj = {
                 jsApiList: jsApiListData,
                 openTagList: openTagListData,
                 debug: false,
                 appId: data === null || data === void 0 ? void 0 : data.appid,
-                timestamp: timestamp,
+                timestamp: data === null || data === void 0 ? void 0 : data.timestamp,
                 nonceStr: data === null || data === void 0 ? void 0 : data.noncestr,
                 signature: data === null || data === void 0 ? void 0 : data.signature, //必填，生成的签名
             };
             var wx = initSdk();
-            (0, index_1.useSessionStorage)("configReadyData", obj);
             wx.config(obj);
             wx.ready(function (res) {
-                (0, index_1.useSessionStorage)("configReadySuccess", res);
+                (0, index_1.useSessionStorage)("configReadySuccess", "wx.ready");
                 if (config['cb'] && typeof config.cb === "function")
                     config.cb();
             });

package/package.json

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