xctc-utils 1.2.0 → 1.2.2

package/dist/test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/test.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+// var crypto = require("./crypto/index")
+function testcrypto() {
+    var hrefState = "219281DA5170E6A003B47D8143F049E3E54F2EE0FA2487EE302BA86B3110045A2047367251B76089F3343B974BBC265A";
+    var key = "5uMz4R8rop26DkC8";
+    var iv = "5uMz4Rsd0926DkC8";
+    // let data = crypto.decrypt( hrefState , key , iv )
+    console.log(iv);
+}
+testcrypto();
+// module.exports = {
+//     testcrypto,
+// }

package/dist/weixin/index.d.ts

@@ -6,6 +6,7 @@ interface configOption {
     stateKey?: string;
     cryptoiv?: string;
     cryptokey?: string;
+    isPassLogin?: boolean;
 }
 export declare function weixinUrlCode(config: configOption): void;
 interface ShareConfig {

package/dist/weixin/index.js

@@ -23,46 +23,63 @@ function weixinUrlCode(config) {
     var localCode = "";
     if (codeKey)
         localCode = (0, index_1.getSessionStorage)(codeKey);
-    if (!localCode && search && search.indexOf("code=") != -1) {
-        // localCode 不存在， 微信链接中存在 code 用户初次登录系统，
-        // 用户从微信授权页面跳转回来，地址中携带code参数
-        var urlArr = formatSearch(search, "code=");
-        var code = "";
-        for (var k = 0; k < urlArr.length; k++) {
-            var item = urlArr[k];
-            if (item.indexOf("code=") != -1) {
-                code = item.substr(5);
-                if (codeKey)
-                    (0, index_1.useSessionStorage)(codeKey, code);
-            }
-        }
-        if (code) {
-            weixinLogin(code);
-        }
-    }
-    else if (localCode) {
-        // localCode 存在，用户已执行微信跳转链接，执行刷新操作
+    // 默认第一次通过链接进入系统，没有code和state
+    var searchIndex = -1;
+    var stateIndex = -1;
+    if (search) {
+        searchIndex = search.indexOf("code=");
+        stateIndex = search.indexOf("state=");
+        searchIndex = parseInt(searchIndex);
+        stateIndex = parseInt(stateIndex);
     }
-    else {
-        // 通过分享链接进入系统时，先提取分享链接中的 state
-        var hrefState = "";
-        if (search && search.indexOf("state=") != -1) {
-            var urlArr = formatSearch(search, "state=");
+    // 如果链接地址中带有code和state
+    if (searchIndex >= 0 && stateIndex >= 0) {
+        if (localCode) {
+            // localCode 存在，用户已执行微信跳转链接，用户可能执行当前网页的刷新操作
+            return;
+        }
+        else {
+            // 当前系统没有存储 code，流程为用户只需微信授权登录后返回系统，此时通过CODE执行微信登录
+            var urlArr = formatSearch(search, "code=");
+            var code = "";
             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'] || "weixinState";
-                    (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);
+                if (item.indexOf("code=") != -1) {
+                    code = item.substr(5);
+                    if (codeKey)
+                        (0, index_1.useSessionStorage)(codeKey, code);
                 }
             }
+            if (code) {
+                weixinLogin(code);
+            }
+        }
+        return;
+    }
+    //  用户通过分享链接进入系统，此时含有State参数，无code参数
+    if (stateIndex >= 0 && !(searchIndex >= 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'] || "weixinState";
+                (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);
+            }
         }
         // 将 state进行本地存储，存储完成后跳转到微信授权页面
         weixinCode(); // 微信授权页面获取CODE
+        return;
+    }
+    if (localCode)
+        return;
+    if (!localCode) {
+        return weixinCode();
     }
 }
 exports.weixinUrlCode = weixinUrlCode;
@@ -87,18 +104,26 @@ function weixinLogin(code) {
     };
     if (!http)
         return;
+    (0, index_1.useSessionStorage)("weixinLoginParams", JSON.stringify(obj));
+    if (weixinConfig === null || weixinConfig === void 0 ? void 0 : weixinConfig.isPassLogin)
+        return;
     weixinConfig.http(obj).then(function (res) {
         if (res.code == 40163) {
             // 未登录则先执行登录
             return weixinCode();
         }
         var data = res === null || res === void 0 ? void 0 : res.data;
-        if (data instanceof Object) {
-            (0, index_1.useSessionStorage)("weixinLoginData", JSON.stringify(data));
-        }
-        else {
-            (0, index_1.useSessionStorage)("weixinLoginStatus", "\u5FAE\u4FE1\u767B\u5F55\u5931\u8D25\uFF1A".concat(res.code, "\uFF1B").concat(res.msg));
-        }
+        // if( data instanceof Object  ){
+        //     useSessionStorage( "weixinLoginData" , JSON.stringify(data) )
+        // }else{
+        //     useSessionStorage( "weixinLoginStatus" , `微信登录失败：${res.code}；${res.msg}` )
+        // }
+        var resobj = {
+            code: res.code,
+            msg: res.msg,
+            data: res.data
+        };
+        (0, index_1.useSessionStorage)("weixinLoginData", JSON.stringify(resobj));
         for (var key in data) {
             var item = data[key];
             if (item instanceof Object) {

package/package.json

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