xctc-utils 1.2.8 → 1.3.0

package/dist/crypto/index.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.decrypt = exports.encrypt = void 0;
 var crypto_js_1 = __importDefault(require("crypto-js"));
 var utils_1 = require("../utils");
-var index_1 = require("../storage/index");
 function formatVal(val) {
     var key = "5uMz4R8r0926DkC8";
     if (val)
@@ -37,9 +36,7 @@ function decrypt(word, key, iv) {
     var decrypt = crypto_js_1.default.AES.decrypt(src, key, { iv: iv, mode: crypto_js_1.default.mode.CBC, padding: crypto_js_1.default.pad.Pkcs7 });
     var decryptedStr = decrypt.toString(crypto_js_1.default.enc.Utf8);
     var data = decryptedStr.toString();
-    (0, index_1.useSessionStorage)("decryptData", data);
     if ((0, utils_1.isJson)(data)) {
-        (0, index_1.useSessionStorage)("decryptData2222", JSON.stringify(data));
         return JSON.parse(data);
     }
     else {

package/dist/weixin/index.js

@@ -18,8 +18,10 @@ function weixinUrlCode(config) {
     var search = loc.search; // ?code=0916SzFa1KH9TA0Ke7Ha1AQx6446SzFr&state=123
     // 获取地址栏返回 code 参数
     var codeKey = weixinConfig['codeKey'];
-    if (!codeKey)
+    if (!codeKey) {
         codeKey = "weixinCode";
+        weixinConfig['codeKey'] = codeKey;
+    }
     var localCode = "";
     if (codeKey)
         localCode = (0, index_1.getSessionStorage)(codeKey);
@@ -64,12 +66,14 @@ function weixinUrlCode(config) {
             var item = urlArr[k];
             if (item.indexOf("state=") != -1) {
                 hrefState = item.substr(6);
-                var stateKey = weixinConfig['stateKey'] || "weixinState";
+                var stateKey = weixinConfig['stateKey'];
+                if (!stateKey) {
+                    stateKey = "weixinState";
+                    weixinConfig['stateKey'] = stateKey;
+                }
                 (0, index_1.useSessionStorage)(stateKey, hrefState);
                 var cryptoObj = cryptoConfig(cryptokey, cryptoiv);
-                (0, index_1.useSessionStorage)("cryptoObj", cryptoObj);
                 var stateObj = (0, crypto_1.decrypt)(hrefState, cryptoObj.key, cryptoObj.iv);
-                (0, index_1.useSessionStorage)("".concat(stateKey, "Obj111111"), stateObj);
                 if (stateObj instanceof Object)
                     stateObj = JSON.stringify(stateObj);
                 (0, index_1.useSessionStorage)("".concat(stateKey, "Obj"), stateObj);
@@ -126,11 +130,14 @@ function weixinLogin(code) {
         }
         var url = loc.origin;
         var hashVal = loc.hash;
-        var state = (0, index_1.getSessionStorage)(stateKey);
+        var state = (0, index_1.getSessionStorage)(stateKey) || "";
         var str = "";
-        (0, index_1.useSessionStorage)("getWeixinSessionState", state);
+        (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] == "/") {
@@ -139,6 +146,7 @@ function weixinLogin(code) {
                     else {
                         url = "".concat(url, "/#/").concat(stateObj.path);
                     }
+                    (0, index_1.useSessionStorage)("url22222===", url);
                 }
                 else {
                     str += "".concat(key, "=").concat(stateObj[key], "&");
@@ -149,6 +157,7 @@ function weixinLogin(code) {
                     url = "".concat(url, "?").concat(str);
                 }
             }
+            (0, index_1.useSessionStorage)("url333333===", url);
             loc.replace(url);
         }
         else {
@@ -187,8 +196,12 @@ function weixinCode() {
         if (!weixinConfig['appId'])
             return;
         var scope = "snsapi_userinfo";
-        if (weixinConfig['scope'])
+        if (weixinConfig['scope']) {
             scope = weixinConfig['scope'];
+        }
+        else {
+            weixinConfig['scope'] = scope;
+        }
         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.2.8",
+  "version": "1.3.0",
   "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",