Merge pull request #39 from RocketBus/fix/SWEB-370-token-error

#SWEB-370 - Loading "Enviando seu pagamento" fica eternamente com erro na geração de token
RocketBus · Oct 10, 2019 · b1a0a4a · b1a0a4a
2 parents 781bd4b + 5734c85
commit b1a0a4a
Show file tree

Hide file tree

Showing 8 changed files with 65 additions and 41 deletions.
diff --git a/clickbus-payments-min.js b/clickbus-payments-min.js
diff --git a/clickbus-payments.js b/clickbus-payments.js
@@ -3,6 +3,12 @@
 /**
  * Created by tiagobutzke on 7/2/15.
  */
+
+
+var ERROR_TEXT = 'error';
+var TYPE_CREDIT_CARD = 'credit_card';
+var TYPE_DEBIT_CARD = 'debit_card';
+
 function ClickPromise(callable, clickbusPayments) {
     this.callable = callable;
     this.clickbusPayments = clickbusPayments;
@@ -39,7 +45,7 @@ ClickPromise.prototype.finish = function(status, response) {
                 this.clickbusPayments.successResponse[response.type]['token'] = {};
             }
 
-            if ((response.type == 'credit_card' && !response.oneClickPayment) || response.type == 'debit_card') {
+            if ((response.type == TYPE_CREDIT_CARD && !response.oneClickPayment) || response.type == TYPE_DEBIT_CARD) {
                 this.clickbusPayments.successResponse[response.type]['brand'] = this.clickbusPayments.getCardBrand();
             }
 
@@ -93,10 +99,11 @@ ClickPromise.prototype.finish = function(status, response) {
  * @param {Object} options
  * @api public
  */
+
 function ClickBusPayments() {
     this.options = {
         paymentFormId: "payment_form",
-        creditcardFieldClass: "credit_card",
+        creditcardFieldClass: TYPE_CREDIT_CARD,
         securityCodeFieldClass: "security_code",
         expirationMonthFieldClass: "expiration_month",
         expirationYearFieldClass: "expiration_year",
@@ -540,7 +547,7 @@ function merge(primary, secundary) {
 "use strict";
 
 function MercadoPago(publicKey, customName) {
-    this.type = 'credit_card';
+    this.type = TYPE_CREDIT_CARD;
     this.name = 'mercadoPago';
     this.customName = customName;
 
@@ -635,9 +642,11 @@ MercadoPago.prototype.reset = function() {
 
 "use strict";
 
+var MUNDIPAGG_NAME = 'mundipagg';
+
 function MundiPagg(publicKey, isTest) {
-    this.type = 'credit_card';
-    this.name = 'mundipagg';
+    this.type = TYPE_CREDIT_CARD;
+    this.name = MUNDIPAGG_NAME;
 
     this.gatewayUrl = "https://api.mundipagg.com/core/v1/tokens?appId="+publicKey;
 }
@@ -662,18 +671,18 @@ MundiPagg.prototype.createToken = function(form, clickPromise, options) {
     request.open('POST', this.gatewayUrl);
     request.setRequestHeader("Content-Type", "application/json");
     request.onload = function() {
-        var response = JSON.parse(request.response);
-
         if (request.status == 200) {
+            var response = JSON.parse(request.response);
+
             clickPromise.finish(request.status, {content: response.id, type: this.type, name: this.name});
             return;
         }
 
-        clickPromise.finish(request.status, {name: this.name, type: this.type, cause: response.ErrorReport});
+        clickPromise.finish(request.status, {name: this.name, type: this.type, cause: ERROR_TEXT});
     }.bind(this);
 
     request.onerror = function() {
-        clickPromise.finish(request.status, {name: this.name, cause: 'error'});
+        clickPromise.finish(request.status, {name: MUNDIPAGG_NAME, cause: ERROR_TEXT, type: TYPE_CREDIT_CARD});
     };
 
     request.send(JSON.stringify(this.formatRequest(clickPromise.clickbusPayments)));
@@ -719,9 +728,11 @@ EletronicFundsTransfer.prototype.createToken = function() { };
 
 "use strict";
 
+var PAYPAL_NAME = 'paypal';
+
 function Paypal(publicKey, isTest) {
-    this.type = 'paypal';
-    this.name = 'paypal';
+    this.type = PAYPAL_NAME;
+    this.name = PAYPAL_NAME;
     this.publicKey = publicKey;
 }
 
@@ -733,28 +744,29 @@ Paypal.prototype.createToken = function(form, clickPromise) {
     var request = new XMLHttpRequest();
     request.open('GET', '/payment/token/paypal');
     request.onload = function() {
-        var response = JSON.parse(request.response);
         if (request.status == 200) {
+            var response = JSON.parse(request.response);
             clickPromise.finish(request.status, {content: response, type: this.type, name: this.name});
             return;
         }
 
-        clickPromise.finish(request.status, {name: this.name, cause: response.ErrorReport});
+        clickPromise.finish(request.status, {name: this.name, cause: ERROR_TEXT, type: this.type});
     }.bind(this);
 
     request.onerror = function() {
-        console.log(request);
-        clickPromise.finish(request.status, {name: this.name, cause: 'error'});
+        clickPromise.finish(request.status, {name: PAYPAL_NAME, cause: ERROR_TEXT, type: PAYPAL_NAME});
     };
 
     request.send();
 };
 
 "use strict";
 
+var PAYZEN_NAME = 'payzen';
+
 function PayZen() {
-    this.type = 'debit_card';
-    this.name = 'payzen';
+    this.type = TYPE_DEBIT_CARD;
+    this.name = PAYZEN_NAME;
 }
 
 PayZen.prototype.start = function() { };
@@ -765,17 +777,17 @@ PayZen.prototype.createToken = function(form, clickPromise) {
     var request = new XMLHttpRequest();
     request.open('POST', '/payment/token/debit_card');
     request.onload = function() {
-        var response = JSON.parse(request.response);
         if (request.status == 200) {
+            var response = JSON.parse(request.response);
             clickPromise.finish(request.status, {content: response, type: this.type, name: this.name});
             return;
         }
 
-        clickPromise.finish(request.status, {name: this.name, cause: response.ErrorReport});
+        clickPromise.finish(request.status, {name: this.name, cause: ERROR_TEXT, type: this.type});
     }.bind(this);
 
     request.onerror = function() {
-        clickPromise.finish(request.status, {name: this.name, cause: 'error'});
+        clickPromise.finish(request.status, {name: PAYZEN_NAME, cause: ERROR_TEXT, type: TYPE_DEBIT_CARD});
     };
 
     request.send(JSON.stringify(this.formatRequest(clickPromise.clickbusPayments)));

diff --git a/src/click-promise.js b/src/click-promise.js
@@ -3,6 +3,12 @@
 /**
  * Created by tiagobutzke on 7/2/15.
  */
+
+
+var ERROR_TEXT = 'error';
+var TYPE_CREDIT_CARD = 'credit_card';
+var TYPE_DEBIT_CARD = 'debit_card';
+
 function ClickPromise(callable, clickbusPayments) {
     this.callable = callable;
     this.clickbusPayments = clickbusPayments;
@@ -39,7 +45,7 @@ ClickPromise.prototype.finish = function(status, response) {
                 this.clickbusPayments.successResponse[response.type]['token'] = {};
             }
 
-            if ((response.type == 'credit_card' && !response.oneClickPayment) || response.type == 'debit_card') {
+            if ((response.type == TYPE_CREDIT_CARD && !response.oneClickPayment) || response.type == TYPE_DEBIT_CARD) {
                 this.clickbusPayments.successResponse[response.type]['brand'] = this.clickbusPayments.getCardBrand();
             }
 

diff --git a/src/gateways/mercadopago.js b/src/gateways/mercadopago.js
@@ -1,7 +1,7 @@
 "use strict";
 
 function MercadoPago(publicKey, customName) {
-    this.type = 'credit_card';
+    this.type = TYPE_CREDIT_CARD;
     this.name = 'mercadoPago';
     this.customName = customName;
 

diff --git a/src/gateways/mundipagg.js b/src/gateways/mundipagg.js
@@ -1,8 +1,10 @@
 "use strict";
 
+var MUNDIPAGG_NAME = 'mundipagg';
+
 function MundiPagg(publicKey, isTest) {
-    this.type = 'credit_card';
-    this.name = 'mundipagg';
+    this.type = TYPE_CREDIT_CARD;
+    this.name = MUNDIPAGG_NAME;
 
     this.gatewayUrl = "https://api.mundipagg.com/core/v1/tokens?appId="+publicKey;
 }
@@ -27,18 +29,18 @@ MundiPagg.prototype.createToken = function(form, clickPromise, options) {
     request.open('POST', this.gatewayUrl);
     request.setRequestHeader("Content-Type", "application/json");
     request.onload = function() {
-        var response = JSON.parse(request.response);
-
         if (request.status == 200) {
+            var response = JSON.parse(request.response);
+
             clickPromise.finish(request.status, {content: response.id, type: this.type, name: this.name});
             return;
         }
 
-        clickPromise.finish(request.status, {name: this.name, type: this.type, cause: response.ErrorReport});
+        clickPromise.finish(request.status, {name: this.name, type: this.type, cause: ERROR_TEXT});
     }.bind(this);
 
     request.onerror = function() {
-        clickPromise.finish(request.status, {name: this.name, cause: 'error'});
+        clickPromise.finish(request.status, {name: MUNDIPAGG_NAME, cause: ERROR_TEXT, type: TYPE_CREDIT_CARD});
     };
 
     request.send(JSON.stringify(this.formatRequest(clickPromise.clickbusPayments)));

diff --git a/src/gateways/paypal.js b/src/gateways/paypal.js
@@ -1,8 +1,10 @@
 "use strict";
 
+var PAYPAL_NAME = 'paypal';
+
 function Paypal(publicKey, isTest) {
-    this.type = 'paypal';
-    this.name = 'paypal';
+    this.type = PAYPAL_NAME;
+    this.name = PAYPAL_NAME;
     this.publicKey = publicKey;
 }
 
@@ -14,18 +16,17 @@ Paypal.prototype.createToken = function(form, clickPromise) {
     var request = new XMLHttpRequest();
     request.open('GET', '/payment/token/paypal');
     request.onload = function() {
-        var response = JSON.parse(request.response);
         if (request.status == 200) {
+            var response = JSON.parse(request.response);
             clickPromise.finish(request.status, {content: response, type: this.type, name: this.name});
             return;
         }
 
-        clickPromise.finish(request.status, {name: this.name, cause: response.ErrorReport});
+        clickPromise.finish(request.status, {name: this.name, cause: ERROR_TEXT, type: this.type});
     }.bind(this);
 
     request.onerror = function() {
-        console.log(request);
-        clickPromise.finish(request.status, {name: this.name, cause: 'error'});
+        clickPromise.finish(request.status, {name: PAYPAL_NAME, cause: ERROR_TEXT, type: PAYPAL_NAME});
     };
 
     request.send();

diff --git a/src/gateways/payzen.js b/src/gateways/payzen.js
@@ -1,8 +1,10 @@
 "use strict";
 
+var PAYZEN_NAME = 'payzen';
+
 function PayZen() {
-    this.type = 'debit_card';
-    this.name = 'payzen';
+    this.type = TYPE_DEBIT_CARD;
+    this.name = PAYZEN_NAME;
 }
 
 PayZen.prototype.start = function() { };
@@ -13,17 +15,17 @@ PayZen.prototype.createToken = function(form, clickPromise) {
     var request = new XMLHttpRequest();
     request.open('POST', '/payment/token/debit_card');
     request.onload = function() {
-        var response = JSON.parse(request.response);
         if (request.status == 200) {
+            var response = JSON.parse(request.response);
             clickPromise.finish(request.status, {content: response, type: this.type, name: this.name});
             return;
         }
 
-        clickPromise.finish(request.status, {name: this.name, cause: response.ErrorReport});
+        clickPromise.finish(request.status, {name: this.name, cause: ERROR_TEXT, type: this.type});
     }.bind(this);
 
     request.onerror = function() {
-        clickPromise.finish(request.status, {name: this.name, cause: 'error'});
+        clickPromise.finish(request.status, {name: PAYZEN_NAME, cause: ERROR_TEXT, type: TYPE_DEBIT_CARD});
     };
 
     request.send(JSON.stringify(this.formatRequest(clickPromise.clickbusPayments)));

diff --git a/src/main.js b/src/main.js
@@ -23,10 +23,11 @@
  * @param {Object} options
  * @api public
  */
+
 function ClickBusPayments() {
     this.options = {
         paymentFormId: "payment_form",
-        creditcardFieldClass: "credit_card",
+        creditcardFieldClass: TYPE_CREDIT_CARD,
         securityCodeFieldClass: "security_code",
         expirationMonthFieldClass: "expiration_month",
         expirationYearFieldClass: "expiration_year",