easy3wui 1.5.21 → 1.5.24

package/lib/Easy3wCaHandler/index.js

@@ -23,10 +23,15 @@ function Easy3wCaHandler(serverURL) {
   if (url.charAt(url.length - 1) === '/') {
     url = url.substring(0, url.length - 1);
   }
+  var protocol = url.substring(0, url.indexOf(':'));
   var host = url.substring(url.indexOf(':') + 1);
   var sender = getId();
   var receiver = sender + '_server';
-  var urlSignatureSocket = 'wss:' + host + '/signatureSocket/' + sender;
+  var wsprotocol = 'ws';
+  if (protocol.toUpperCase() === 'HTTPS') {
+    wsprotocol = 'wss';
+  }
+  var urlSignatureSocket = wsprotocol + ':' + host + '/signatureSocket/' + sender;
   var urlCASign = url + '/TWCA/signMessageNew.html?listenerno=' + receiver;
   var caIframe = document.getElementById('casigniframe');
   if (caIframe) {
@@ -54,15 +59,25 @@ function Easy3wCaHandler(serverURL) {
     return null;
   }
   // 签名回调
-  var signCallBackFunc = void 0;
+  var signCallbackFunc = void 0;
+  // 根据证书名称签名回调
+  var signByCNCallbackFunc = void 0;
   // 验签回调
-  var verifyCallBackFunc = void 0;
+  var verifyCallbackFunc = void 0;
   // 获取公钥回调
   var getPublicKeyCallbackFunc = void 0;
+  // 根据证书名称获取公钥回调
+  var getPublicKeyByCNCallbackFunc = void 0;
   // 获取供方名称
   var getSupplierNameCallbackFunc = void 0;
   // 获取证书列表回调
   var getCertListCallbackFunc = void 0;
+  // 解密回调
+  var decryptCallbackFunc = void 0;
+  // 加密回调
+  var encryptCallbackFunc = void 0;
+  // 根据证书名称加密回调
+  var encryptByCNCallbackFunc = void 0;
   // 连接发生错误的回调方法
   window.signSocket.onerror = function () {
     console.log('WebSocket连接发生错误');
@@ -84,24 +99,24 @@ function Easy3wCaHandler(serverURL) {
 
           if (method === 'sign') {
             // 签名数据
-            if (signCallBackFunc && typeof signCallBackFunc === 'function') {
+            if (signCallbackFunc && typeof signCallbackFunc === 'function') {
               var response = { data: data, status: status };
               if (status === 'success') {
                 // 签名成功
-                signCallBackFunc(response);
+                signCallbackFunc(response);
               } else {
                 response = (0, _extends3['default'])({}, response, { errorMsg: errorMsg });
-                signCallBackFunc(response);
+                signCallbackFunc(response);
               }
             }
           } else if (method === 'verify') {
-            if (verifyCallBackFunc && typeof verifyCallBackFunc === 'function') {
+            if (verifyCallbackFunc && typeof verifyCallbackFunc === 'function') {
               var _response = { status: status };
               if (status === 'success') {
-                verifyCallBackFunc(_response);
+                verifyCallbackFunc(_response);
               } else {
                 _response = (0, _extends3['default'])({}, _response, { errorMsg: errorMsg });
-                verifyCallBackFunc(_response);
+                verifyCallbackFunc(_response);
               }
             }
           } else if (method === 'getPublicKey') {
@@ -114,24 +129,74 @@ function Easy3wCaHandler(serverURL) {
                 getPublicKeyCallbackFunc(_response2);
               }
             }
-          } else if (method === 'getSupplierName') {
-            if (getSupplierNameCallbackFunc && typeof getSupplierNameCallbackFunc === 'function') {
+          } else if (method === 'getPublicKeyByCN') {
+            if (getPublicKeyByCNCallbackFunc && typeof getPublicKeyByCNCallbackFunc === 'function') {
               var _response3 = { data: data, status: status };
               if (status === 'success') {
-                getSupplierNameCallbackFunc(_response3);
+                getPublicKeyByCNCallbackFunc(_response3);
               } else {
                 _response3 = (0, _extends3['default'])({}, _response3, { errorMsg: errorMsg });
-                getSupplierNameCallbackFunc(_response3);
+                getPublicKeyByCNCallbackFunc(_response3);
               }
             }
-          } else if (method === 'getCertList') {
-            if (getCertListCallbackFunc && typeof getCertListCallbackFunc === 'function') {
+          } else if (method === 'getSupplierName') {
+            if (getSupplierNameCallbackFunc && typeof getSupplierNameCallbackFunc === 'function') {
               var _response4 = { data: data, status: status };
               if (status === 'success') {
-                getCertListCallbackFunc(_response4);
+                getSupplierNameCallbackFunc(_response4);
               } else {
                 _response4 = (0, _extends3['default'])({}, _response4, { errorMsg: errorMsg });
-                getCertListCallbackFunc(_response4);
+                getSupplierNameCallbackFunc(_response4);
+              }
+            }
+          } else if (method === 'getCertList') {
+            if (getCertListCallbackFunc && typeof getCertListCallbackFunc === 'function') {
+              var _response5 = { data: data, status: status };
+              if (status === 'success') {
+                getCertListCallbackFunc(_response5);
+              } else {
+                _response5 = (0, _extends3['default'])({}, _response5, { errorMsg: errorMsg });
+                getCertListCallbackFunc(_response5);
+              }
+            }
+          } else if (method === 'decrypt') {
+            if (decryptCallbackFunc && typeof decryptCallbackFunc === 'function') {
+              var _response6 = { data: data, status: status };
+              if (status === 'success') {
+                decryptCallbackFunc(_response6);
+              } else {
+                _response6 = (0, _extends3['default'])({}, _response6, { errorMsg: errorMsg });
+                decryptCallbackFunc(_response6);
+              }
+            }
+          } else if (method === 'encrypt') {
+            if (encryptCallbackFunc && typeof encryptCallbackFunc === 'function') {
+              var _response7 = { data: data, status: status };
+              if (status === 'success') {
+                encryptCallbackFunc(_response7);
+              } else {
+                _response7 = (0, _extends3['default'])({}, _response7, { errorMsg: errorMsg });
+                encryptCallbackFunc(_response7);
+              }
+            }
+          } else if (method === 'signByCN') {
+            if (signByCNCallbackFunc && typeof signByCNCallbackFunc === 'function') {
+              var _response8 = { data: data, status: status };
+              if (status === 'success') {
+                signByCNCallbackFunc(_response8);
+              } else {
+                _response8 = (0, _extends3['default'])({}, _response8, { errorMsg: errorMsg });
+                signByCNCallbackFunc(_response8);
+              }
+            }
+          } else if (method === 'encryptByCN') {
+            if (encryptByCNCallbackFunc && typeof encryptByCNCallbackFunc === 'function') {
+              var _response9 = { data: data, status: status };
+              if (status === 'success') {
+                encryptByCNCallbackFunc(_response9);
+              } else {
+                _response9 = (0, _extends3['default'])({}, _response9, { errorMsg: errorMsg });
+                encryptByCNCallbackFunc(_response9);
               }
             }
           }
@@ -152,18 +217,26 @@ function Easy3wCaHandler(serverURL) {
     window.signSocket.close();
   };
   var CAExec = {
-    // 获取签名
-    getSign: function getSign(original, serialNumber, signCallBack) {
-      signCallBackFunc = null;
-      signCallBackFunc = signCallBack;
+    // 根据序列号获取签名
+    getSign: function getSign(original, serialNumber, signCallback) {
+      signCallbackFunc = null;
+      signCallbackFunc = signCallback;
       var sendData = { method: 'sign', data: original, serialNumber: serialNumber, receiver: receiver, sender: sender };
       var msg = JSON.stringify(sendData);
       window.signSocket.send(msg);
     },
+    // 根据证书名称获取签名
+    getSignByCN: function getSignByCN(original, cn, signByCNCallback) {
+      signByCNCallbackFunc = null;
+      signByCNCallbackFunc = signByCNCallback;
+      var sendData = { method: 'signByCN', data: original, cn: cn, receiver: receiver, sender: sender };
+      var msg = JSON.stringify(sendData);
+      window.signSocket.send(msg);
+    },
     // 验签
-    verifySign: function verifySign(original, sign, verifyCallBack) {
-      verifyCallBackFunc = null;
-      verifyCallBackFunc = verifyCallBack;
+    verifySign: function verifySign(original, sign, verifyCallback) {
+      verifyCallbackFunc = null;
+      verifyCallbackFunc = verifyCallback;
       var sendData = { method: 'verify', data: { sign: sign, original: original }, receiver: receiver, sender: sender };
       var msg = JSON.stringify(sendData);
       window.signSocket.send(msg);
@@ -176,6 +249,14 @@ function Easy3wCaHandler(serverURL) {
       var msg = JSON.stringify(sendData);
       window.signSocket.send(msg);
     },
+    // 根据证书名称获取公钥
+    getPublicKeyByCN: function getPublicKeyByCN(cn, certType, getPublicKeyByCNCallback) {
+      getPublicKeyByCNCallbackFunc = null;
+      getPublicKeyByCNCallbackFunc = getPublicKeyByCNCallback;
+      var sendData = { method: 'getPublicKeyByCN', cn: cn, certType: certType, receiver: receiver, sender: sender };
+      var msg = JSON.stringify(sendData);
+      window.signSocket.send(msg);
+    },
     // 获取供方名称
     getSupplierName: function getSupplierName(serialNumber, getSupplierNameCallback) {
       getSupplierNameCallbackFunc = null;
@@ -191,6 +272,30 @@ function Easy3wCaHandler(serverURL) {
       var sendData = { method: 'getCertList', receiver: receiver, sender: sender };
       var msg = JSON.stringify(sendData);
       window.signSocket.send(msg);
+    },
+    // 加密
+    encrypt: function encrypt(encryptOriginal, serialNumber, encryptCallback) {
+      encryptCallbackFunc = null;
+      encryptCallbackFunc = encryptCallback;
+      var sendData = { method: 'encrypt', data: encryptOriginal, serialNumber: serialNumber, receiver: receiver, sender: sender };
+      var msg = JSON.stringify(sendData);
+      window.signSocket.send(msg);
+    },
+    // 根据证书名称加密
+    encryptByCN: function encryptByCN(encryptOriginal, cn, encryptByCNCallback) {
+      encryptByCNCallbackFunc = null;
+      encryptByCNCallbackFunc = encryptByCNCallback;
+      var sendData = { method: 'encryptByCN', data: encryptOriginal, cn: cn, receiver: receiver, sender: sender };
+      var msg = JSON.stringify(sendData);
+      window.signSocket.send(msg);
+    },
+    // 解密
+    decrypt: function decrypt(encryptData, decryptCallback) {
+      decryptCallbackFunc = null;
+      decryptCallbackFunc = decryptCallback;
+      var sendData = { method: 'decrypt', data: encryptData, receiver: receiver, sender: sender };
+      var msg = JSON.stringify(sendData);
+      window.signSocket.send(msg);
     }
   };
   return CAExec;
@@ -199,6 +304,7 @@ function Easy3wCaHandler(serverURL) {
 var getId = function getId() {
   return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
     var r = Math.random() * 16 | 0;
+    // eslint-disable-next-line no-mixed-operators
     var v = c === 'x' ? r : r & 0x3 | 0x8;
     return v.toString(16);
   }).toUpperCase();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wui",
-  "version": "1.5.21",
+  "version": "1.5.24",
   "description": "easy3wui components for react",
   "keywords": [
     "react",