Merge pull request #1 from sqrter/master

Adjust validateResponse to support v2

Author: has-well

lib/util.js

@@ -13,6 +13,7 @@ function genSignatureV2 (data, secret) {
   const signString = secret + '|' + data
   return crypto.createHash('sha1').update(signString).digest('hex')
 }
+
 /**
  * Generate sha1 sign
  * @param data
@@ -130,22 +131,27 @@ function dateFormat (date, fstr, utc) {
 /**
  * Validate Response object
  */
-function validateResponse (data, secret) {
-  if (!data.signature) {
+function validateResponse (response, secret) {
+  if (!response.signature) {
     return false
   }
-  if (!data.merchant_id) {
-    return false
+  const originSign = response.signature
+  let calculatedSign
+  if (response.version === '2.0') {
+    calculatedSign = genSignatureV2(response.data, secret)
+  } else {
+    if (!response.merchant_id) {
+      return false
+    }
+    calculatedSign = genSignature(response, secret)
   }
 
-  const originSign = data.signature
-  const calculatedSign = genSignature(data, secret)
-
   return originSign === calculatedSign
 }
 
 module.exports = {
   genSignature,
+  genSignatureV2,
   getConvertedData,
   generateOrderId,
   getContentHeader,