Fix, support api defined by 42-cent-models

Author: lorenzofox3

lib/AuthorizeNetGateway.js

@@ -3,11 +3,11 @@ var util = require('util');
 var BaseGateway = require('42-cent-base').BaseGateway;
 var mapKeys = require('42-cent-util').mapKeys;
 var GatewayError = require('42-cent-base').GatewayError;
-var Promise = require('bluebird');
+var P = require('bluebird');
 var request = require('request');
-var toJson = Promise.promisify(require('xml2js').parseString);
+var toJson = P.promisify(require('xml2js').parseString);
 var xml2js = require('xml2js');
-var post = Promise.promisify(request.post);
+var post = P.promisify(request.post);
 var schemas = require('./schemas.js');
 
 var billToSchema = schemas.billing;
@@ -50,34 +50,26 @@ function setRequest (service, rootNodeName, requestNode) {
 
   requestObject[rootNodeName][requestNode.key] = requestNode.value;
 
-  //var objarray2 = xmlBuilder.buildObject(requestObject);
-  //objarray(requestObject);
-
-  //objarray2[0][rootNodeName].unshift({
-  //  _attr: {
-  //    "xmlns:xsi": "http://www.w3.org/2001/XMLSchema-instance",
-  //    "xmlns:xsd": "http://www.w3.org/2001/XMLSchema",
-  //    "xmlns": "AnetApi/xml/v1/schema/AnetApiSchema.xsd"
-  //  }
-  //});
-
   return requestObject;
 
 }
 
-function sendXmlifiedRequest (service, request) {
-
-  var builder = new xml2js.Builder();
-
-  var xmlContent = builder.buildObject(request);
-
-  return post(service.endpoint, {
-    headers: {
-      'Content-Type': 'application/xml',
-      'Content-Length': xmlContent.length
-    },
-    body: xmlContent
-  });
+function sendXmlifiedRequest (service) {
+
+  return function (request) {
+    return P.resolve()
+      .then(function () {
+        var builder = new xml2js.Builder();
+        var xmlContent = builder.buildObject(request);
+        return post(service.endpoint, {
+          headers: {
+            'Content-Type': 'application/xml',
+            'Content-Length': xmlContent.length
+          },
+          body: xmlContent
+        })
+      });
+  }
 }
 
 function createJsonCallback (cb) {
@@ -97,12 +89,17 @@ function createJsonCallback (cb) {
 }
 
 AuthorizeNetGateway.prototype.sendTransactionRequest = function setTransactionRequest (body, transactionCb) {
-  var obj = setRequest(this, 'createTransactionRequest', {
-    key: 'transactionRequest',
-    value: body
-  });
 
-  return sendXmlifiedRequest(this, obj)
+  var service = this;
+
+  return P.resolve()
+    .then(function () {
+      return setRequest(service, 'createTransactionRequest', {
+        key: 'transactionRequest',
+        value: body
+      });
+    })
+    .then(sendXmlifiedRequest(service))
     .spread(createJsonCallback(function (json) {
       if (json.createTransactionResponse) {
 
@@ -288,7 +285,7 @@ AuthorizeNetGateway.prototype.refundTransaction = function refundTransaction (tr
   var opt = options || {};
 
   if (!opt.expirationMonth || !opt.expirationYear) {
-    return Promise.reject(new Error('expirationMonth and expirationYear must be provided in the options object'));
+    return P.reject(new Error('expirationMonth and expirationYear must be provided in the options object'));
   }
 
   //fetch missing info if required
@@ -299,7 +296,7 @@ AuthorizeNetGateway.prototype.refundTransaction = function refundTransaction (tr
         opt.creditCardNumber = opt.creditCardNumber || res.payment[0].creditCard[0].cardNumber[0];
         return opt;
       }) :
-    Promise.resolve(opt);
+    P.resolve(opt);
 
 
   return fullOptions.then(function (fullOpt) {
@@ -333,17 +330,21 @@ AuthorizeNetGateway.prototype.refundTransaction = function refundTransaction (tr
 
 AuthorizeNetGateway.prototype.getTransactionList = function getTransactionList (batchId) {
 
-  var obj = setRequest(this, 'getTransactionListRequest', {
-    key: 'batchId',
-    value: batchId
-  });
+  var service = this;
 
-  return sendXmlifiedRequest(this, obj)
+  return P.resolve()
+    .then(function () {
+      return setRequest(service, 'createTransactionRequest', {
+        key: 'batchId',
+        value: batchId
+      });
+    })
+    .then(sendXmlifiedRequest(service))
     .spread(createJsonCallback(function (json) {
       var transactions;
       if (json.getTransactionListResponse) {
 
-        if (json.getTransactionListResponse.messages.resultCode === 'Error') {
+        if (json.getTransactionListResponse.messages[0].resultCode[0] === 'Error') {
           throw new GatewayError('some error from the gateway', json.getTransactionListResponse);
         }
 
@@ -359,20 +360,25 @@ AuthorizeNetGateway.prototype.getTransactionList = function getTransactionList (
 };
 
 AuthorizeNetGateway.prototype.getTransactionDetails = function getTransactionDetails (transId) {
-  var obj = setRequest(this, 'getTransactionDetailsRequest', {
-    key: 'transId',
-    value: transId
-  });
 
-  return sendXmlifiedRequest(this, obj)
+  var service = this;
+
+  return P.resolve()
+    .then(function () {
+      return setRequest(service, 'getTransactionDetailsRequest', {
+        key: 'transId',
+        value: transId
+      });
+    })
+    .then(sendXmlifiedRequest(service))
     .spread(createJsonCallback(function (json) {
       if (json.getTransactionDetailsResponse) {
 
-        if (json.getTransactionDetailsResponse.messages.resultCode === 'Error') {
+        if (json.getTransactionDetailsResponse.messages[0].resultCode[0] === 'Error') {
           throw new GatewayError('some error from the gateway', json.getTransactionDetailsResponse);
         }
 
-        return json.getTransactionDetailsResponse.transaction;
+        return json.getTransactionDetailsResponse.transaction[0];
 
       } else {
         throw new Error('Can not parse answer from gateway');
@@ -401,31 +407,37 @@ AuthorizeNetGateway.prototype.voidTransaction = function voidTransaction (transa
  */
 AuthorizeNetGateway.prototype.createCustomerProfile = function (payment, billing, shipping, options) {
 
-  options = options || {};
+  var service = this;
 
-  var body = {
-    merchantCustomerId: options.merchantCustomerId || '',
-    description: options.description || '',
-    email: billing.billingEmailAddress,
-    paymentProfiles: {
-      payment: {
-        creditCard: {
-          cardNumber: payment.creditCardNumber,
-          expirationDate: [payment.expirationYear.toString(), payment.expirationMonth.toString()].join('-'),
-          cardCode: payment.cvv2
+  return P.resolve()
+    .then(function () {
+      options = options || {};
+
+      var body = {
+        merchantCustomerId: options.merchantCustomerId || '',
+        description: options.description || '',
+        email: billing.billingEmailAddress,
+        paymentProfiles: {
+          payment: {
+            creditCard: {
+              cardNumber: payment.creditCardNumber,
+              expirationDate: [payment.expirationYear.toString(), payment.expirationMonth.toString()].join('-'),
+              cardCode: payment.cvv2
+            }
+          }
         }
-      }
-    }
-  };
+      };
 
-  var obj = setRequest(this, 'createCustomerProfileRequest', {
-    key: 'profile',
-    value: body
-  });
+      var obj = setRequest(service, 'createCustomerProfileRequest', {
+        key: 'profile',
+        value: body
+      });
 
-  obj.createCustomerProfileRequest.validationMode = this.testMode ? 'testMode' : 'none';
+      obj.createCustomerProfileRequest.validationMode = this.testMode ? 'testMode' : 'none';
 
-  return sendXmlifiedRequest(this, obj)
+      return obj;
+    })
+    .then(sendXmlifiedRequest(service))
     .spread(createJsonCallback(function (json) {
 
       var errors;
@@ -499,9 +511,12 @@ AuthorizeNetGateway.prototype.chargeCustomer = function (order, prospect, other)
  */
 AuthorizeNetGateway.prototype.getCustomerProfile = function getCustomerProfile (profileId) {
 
-  var req = setRequest(this, 'getCustomerProfileRequest', {key: 'customerProfileId', value: profileId});
-
-  return sendXmlifiedRequest(this, req)
+var service = this;
+  return P.resolve()
+    .then(function () {
+      return  setRequest(service, 'getCustomerProfileRequest', {key: 'customerProfileId', value: profileId});
+    })
+    .then(sendXmlifiedRequest(service))
     .spread(createJsonCallback(function (json) {
       if (json.getCustomerProfileResponse) {
 
@@ -551,38 +566,41 @@ AuthorizeNetGateway.prototype.createSubscription = function createSubscription (
     return yearString + '-' + monthString + '-' + dayString;
   }
 
-  var expirationYear = cc.expirationYear.toString().length === 4 ? cc.expirationYear.toString().substr(-2) : cc.expirationYear.toString();
-  var expirationMonth = cc.expirationMonth.toString().length === 2 ? cc.expirationMonth.toString() : '0' + cc.expirationMonth.toString();
-  var startDate = new Date(subscriptionPlan.startingDate);
-
-  var body = {
-    paymentSchedule: {
-      interval: {
-        length: subscriptionPlan.periodLength || 1,
-        unit: subscriptionPlan.periodUnit || 'months'
-      },
-      startDate: formatString(startDate),
-      totalOccurrences: subscriptionPlan.iterationCount,
-      trialOccurrences: subscriptionPlan.trialCount || 0
-    },
-    amount: subscriptionPlan.amount,
-    trialAmount: subscriptionPlan.trialAmount || 0,
-    payment: {
-      creditCard: {
-        cardNumber: cc.creditCardNumber,
-        expirationDate: expirationMonth + expirationYear,
-        cardCode: cc.cvv
-      }
-    },
-    billTo: mapKeys(prospect, billToSchema)
-  };
+  var service = this;
 
-  var obj = setRequest(this, 'ARBCreateSubscriptionRequest', {
-    key: 'subscription',
-    value: body
-  });
+  return P.resolve()
+    .then(function () {
+      var expirationYear = cc.expirationYear.toString().length === 4 ? cc.expirationYear.toString().substr(-2) : cc.expirationYear.toString();
+      var expirationMonth = cc.expirationMonth.toString().length === 2 ? cc.expirationMonth.toString() : '0' + cc.expirationMonth.toString();
+      var startDate = new Date(subscriptionPlan.startingDate);
+      var body = {
+        paymentSchedule: {
+          interval: {
+            length: subscriptionPlan.periodLength || 1,
+            unit: subscriptionPlan.periodUnit || 'months'
+          },
+          startDate: formatString(startDate),
+          totalOccurrences: subscriptionPlan.iterationCount,
+          trialOccurrences: subscriptionPlan.trialCount || 0
+        },
+        amount: subscriptionPlan.amount,
+        trialAmount: subscriptionPlan.trialAmount || 0,
+        payment: {
+          creditCard: {
+            cardNumber: cc.creditCardNumber,
+            expirationDate: expirationMonth + expirationYear,
+            cardCode: cc.cvv2
+          }
+        },
+        billTo: mapKeys(prospect, billToSchema)
+      };
 
-  return sendXmlifiedRequest(this, obj)
+      return setRequest(service, 'ARBCreateSubscriptionRequest', {
+        key: 'subscription',
+        value: body
+      });
+    })
+    .then(sendXmlifiedRequest(service))
     .spread(createJsonCallback(function (json) {
       if (json.ARBCreateSubscriptionResponse) {
 
@@ -605,8 +623,6 @@ AuthorizeNetGateway.prototype.createSubscription = function createSubscription (
       } else {
         throw new Error('Can not parse the answer from the gateway');
       }
-
-
     }));
 };
 

lib/schemas.js

@@ -1,20 +1,20 @@
 module.exports = {
     billing: {
-        customerFirstName: 'firstName',
-        customerLastName: 'lastName',
-        billingAddress: 'address',
+        billingFirstName: 'firstName',
+        billingLastName: 'lastName',
+        billingAddress1: 'address',
         billingCity: 'city',
         billingState: 'state',
-        billingZip: 'zip',
+        billingPostalCode: 'zip',
         billingCountry: 'country'
     },
     shipping: {
         shippingFirstName: 'firstName',
         shippingLastName: 'lastName',
-        shippingAddress: 'address',
+        shippingAddress1: 'address',
         shippingCity: 'city',
         shippingState: 'state',
-        shippingZip: 'zip',
+        shippingPostalCode: 'zip',
         shippingCountry: 'country'
     }
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "authorize-net",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "Node.js SDK for Authorize.net paymenet gateway.",
   "main": "index.js",
   "scripts": {
@@ -26,7 +26,8 @@
     "xml2js": "^0.4.6"
   },
   "devDependencies": {
-    "42-cent-model": "^1.0.0",
+    "42-cent-model": "^2.0.0",
+    "casual": "^1.4.7",
     "mocha": "^1.21.4"
   }
 }