xctc-utils 1.1.3 → 1.1.5

package/dist/weixin/index.js

@@ -5,17 +5,21 @@ exports.weixinPay = exports.weixinShareInit = exports.weixinShareConfig = export
 var weixin = require("weixin-js-sdk");
 var utils_1 = require("../utils");
 var crypto_1 = require("../crypto");
+var index_1 = require("../storage/index");
 var w = window;
 var loc = w.location;
+var defaultKey = "5uMz4R8rop26DkC8";
+var defaultIv = "5uMz4Rsd0926DkC8";
 var weixinConfig = {};
 function weixinUrlCode(config) {
-    weixinConfig = config;
+    weixinConfig = config || {};
+    var cryptoiv = weixinConfig.cryptoiv, cryptokey = weixinConfig.cryptokey;
     var search = loc.search; // ?code=0916SzFa1KH9TA0Ke7Ha1AQx6446SzFr&state=123
     // 获取地址栏返回 code 参数
     var codeKey = weixinConfig['codeKey'];
     var localCode = "";
     if (codeKey)
-        localCode = w.sessionStorage.getItem(codeKey);
+        localCode = (0, index_1.getSessionStorage)(codeKey);
     if (!localCode && search && search.indexOf("code=") != -1) {
         // localCode 不存在， 微信链接中存在 code 用户初次登录系统，
         var urlArr = formatSearch(search, "code=");
@@ -25,7 +29,7 @@ function weixinUrlCode(config) {
             if (item.indexOf("code=") != -1) {
                 code = item.substr(5);
                 if (codeKey)
-                    w.sessionStorage.setItem(codeKey, code);
+                    (0, index_1.useSessionStorage)(codeKey, code);
             }
         }
         weixinLogin(code);
@@ -43,8 +47,11 @@ function weixinUrlCode(config) {
                 if (item.indexOf("state=") != -1) {
                     hrefState = item.substr(6);
                     var stateKey = weixinConfig['stateKey'] || "weixinState";
-                    w.sessionStorage.setItem(stateKey, hrefState);
-                    w.sessionStorage.setItem("".concat(stateKey, "Obj"), (0, crypto_1.decrypt)(hrefState, cryptoConfig().key, cryptoConfig().iv));
+                    (0, index_1.useSessionStorage)(stateKey, hrefState);
+                    var stateObj = (0, crypto_1.decrypt)(hrefState, cryptoConfig(cryptokey).key, cryptoConfig(cryptoiv).iv);
+                    if (stateObj instanceof Object)
+                        stateObj = JSON.stringify(stateObj);
+                    (0, index_1.useSessionStorage)("".concat(stateKey, "Obj"), stateObj);
                 }
             }
         }
@@ -53,12 +60,11 @@ function weixinUrlCode(config) {
     }
 }
 exports.weixinUrlCode = weixinUrlCode;
-function cryptoConfig() {
-    var key = "5uMz4R8rop26DkC8", iv = "5uMz4Rsd0926DkC8";
-    if (weixinConfig['cryptoiv'])
-        iv = weixinConfig.cryptoiv;
-    if (weixinConfig['cryptokey'])
-        key = weixinConfig.cryptokey;
+function cryptoConfig(key, iv) {
+    if (!key)
+        key = defaultKey;
+    if (!iv)
+        key = defaultIv;
     return {
         key: key,
         iv: iv,
@@ -66,13 +72,14 @@ function cryptoConfig() {
 }
 // 执行微信登录
 function weixinLogin(code) {
-    if (!weixinConfig['appId'])
+    var cryptoiv = weixinConfig.cryptoiv, cryptokey = weixinConfig.cryptokey, appId = weixinConfig.appId, http = weixinConfig.http, stateKey = weixinConfig.stateKey;
+    if (!appId)
         return;
     var obj = {
-        "app_id": weixinConfig.appId,
+        "app_id": appId,
         "js_code": code
     };
-    if (!weixinConfig.http)
+    if (!http)
         return;
     weixinConfig.http(obj).then(function (res) {
         if (res.code == 40163) {
@@ -85,13 +92,13 @@ function weixinLogin(code) {
             if (item instanceof Object) {
                 item = JSON.stringify(item);
             }
-            w.sessionStorage.setItem(key, item);
+            (0, index_1.useSessionStorage)(key, item);
         }
         var url = loc.origin;
-        var state = w.sessionStorage.getItem(weixinConfig.key);
+        var state = (0, index_1.getSessionStorage)(stateKey);
         var str = "";
         if (state) {
-            var stateObj = (0, crypto_1.decrypt)(state, cryptoConfig().key, cryptoConfig().iv);
+            var stateObj = (0, index_1.getSessionStorage)("".concat(stateKey, "Obj"));
             for (var key in stateObj) {
                 if (key == "path") {
                     if (stateObj[key][0] == "/") {
@@ -208,7 +215,7 @@ function weixinShareInit(options) {
     var desc = "微信分享描述";
     if (options === null || options === void 0 ? void 0 : options.desc)
         desc = options.desc;
-    var link = loc.href.split("#")[0];
+    var link = loc.origin;
     if (options === null || options === void 0 ? void 0 : options.link)
         link = options.link;
     var imgUrl = "";
@@ -218,13 +225,13 @@ function weixinShareInit(options) {
         var state = "";
         if (options === null || options === void 0 ? void 0 : options.data) {
             var data = options.data;
-            state = (0, crypto_1.encrypt)(data, options['key'], options['iv']);
+            state = (0, crypto_1.encrypt)(data, cryptoConfig(options['key']).key, cryptoConfig(options['iv']).iv);
             link = "".concat(link, "?state=").concat(state);
         }
     }
     var wx = weixinInit();
     // console.log("shareUrl===",link)
-    w.sessionStorage.setItem("shareUrl", link);
+    (0, index_1.useSessionStorage)("shareUrl", link);
     wx.ready(function () {
         //需在用户可能点击分享按钮前就先调用
         wx.updateAppMessageShareData({

package/package.json

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