Release braintree-web 3.99.1 source

Co-authored-by: Joe Plukarski <[email protected]>

CHANGELOG.md

@@ -1,5 +1,12 @@
 # CHANGELOG
 
+# 3.99.1
+
+- Venmo
+  - Fix bug where the Venmo Desktop Popup would sometimes return a tokenization error when a customer canceled within the modal.
+- Package updates
+  - Replace `tomashanacek/gulp-envify` with `ladjs/gulp-envify` due to missing dependency (`tomashanacek/loose-envify`).
+
 # 3.99.0
 
 - Venmo

package.json

@@ -1,6 +1,6 @@
 {
   "name": "braintree-web",
-  "version": "3.99.0",
+  "version": "3.99.1",
   "license": "MIT",
   "main": "src/index.js",
   "private": true,
@@ -50,7 +50,7 @@
     "eslint-config-braintree": "^5.0.1",
     "eslint-config-prettier": "^8.5.0",
     "gulp": "^4.0.2",
-    "gulp-envify": "tomashanacek/gulp-envify#37d97bca9073ec4161957c69d774f1870fdb6e57",
+    "@ladjs/gulp-envify": "^2.0.1",
     "gulp-minifier": "^3.5.0",
     "gulp-remove-code": "^3.0.2",
     "gulp-rename": "^2.0.0",

src/venmo/shared/web-login-backdrop.js

@@ -3,6 +3,8 @@
 var frameService = require("../../lib/frame-service/external");
 var useMin = require("../../lib/use-min");
 var ExtendedPromise = require("@braintree/extended-promise");
+var errors = require("../shared/errors");
+var BraintreeError = require("../../lib/braintree-error");
 
 var VERSION = process.env.npm_package_version;
 var VENMO_LOGO_SVG =
@@ -30,6 +32,7 @@ function openPopup(options) {
   var venmoUrl = options.venmoUrl;
   var checkForStatusChange = options.checkForStatusChange;
   var cancelTokenization = options.cancelTokenization;
+  var checkPaymentContextStatus = options.checkPaymentContextStatus;
   var extendedPromise = new ExtendedPromise();
 
   document
@@ -44,7 +47,6 @@ function openPopup(options) {
       cancelTokenization();
       closeBackdrop();
     });
-
   frameServiceInstance.open({}, function (frameServiceErr) {
     var retryStartingCount = 1;
 
@@ -59,6 +61,22 @@ function openPopup(options) {
           extendedPromise.reject(statusCheckError);
         });
     }
+
+    // We add this check here because at this point
+    // the status should not be in CREATED status.
+    // However, there is an edge case where if a buyer
+    // cancels in the popup, the popup might close itself
+    // before it can send the graphQL mutation to update its status.
+    // In these cases, the status will be stuck in CREATED status, and
+    // tokenization would fail, incorrectly throwing a tokenization error
+    // instead of informing the merchant that the customer canceled.
+    checkPaymentContextStatus().then(function (status) {
+      if (status === "CREATED") {
+        extendedPromise.reject(
+          new BraintreeError(errors.VENMO_CUSTOMER_CANCELED)
+        );
+      }
+    });
     frameServiceInstance.close();
     closeBackdrop();
   });

src/venmo/venmo.js

@@ -723,6 +723,7 @@ Venmo.prototype._tokenizeWebLoginWithRedirect = function () {
         frameServiceInstance: self._frameServiceInstance,
         venmoUrl: url,
         debug: self._isDebug,
+        checkPaymentContextStatus: self._checkPaymentContextStatus.bind(self),
       })
       .then(function (payload) {
         analytics.sendEvent(
@@ -786,6 +787,50 @@ Venmo.prototype._checkPaymentContextStatusAndProcessResult = function (
 ) {
   var self = this;
 
+  return self._checkPaymentContextStatus().then(function (node) {
+    var resultStatus = node.status;
+
+    if (resultStatus !== self._venmoPaymentContextStatus) {
+      self._venmoPaymentContextStatus = resultStatus;
+
+      analytics.sendEvent(
+        self._createPromise,
+        "venmo.tokenize.web-login.status-change"
+      );
+
+      switch (resultStatus) {
+        case "APPROVED":
+          return Promise.resolve(node);
+        case "CANCELED":
+          return Promise.reject(
+            new BraintreeError(errors.VENMO_CUSTOMER_CANCELED)
+          );
+        case "FAILED":
+          return Promise.reject(
+            new BraintreeError(errors.VENMO_TOKENIZATION_FAILED)
+          );
+        default:
+      }
+    }
+
+    return new Promise(function (resolve, reject) {
+      if (retryCount < self._maxRetryCount) {
+        retryCount++;
+
+        return self
+          ._checkPaymentContextStatusAndProcessResult(retryCount)
+          .then(resolve)
+          .catch(reject);
+      }
+
+      return reject(new BraintreeError(errors.VENMO_TOKENIZATION_FAILED));
+    });
+  });
+};
+
+Venmo.prototype._checkPaymentContextStatus = function () {
+  var self = this;
+
   return self
     ._queryPaymentContextStatus(self._venmoPaymentContextId)
     .catch(function (networkError) {
@@ -799,43 +844,7 @@ Venmo.prototype._checkPaymentContextStatusAndProcessResult = function (
       );
     })
     .then(function (node) {
-      var resultStatus = node.status;
-
-      if (resultStatus !== self._venmoPaymentContextStatus) {
-        self._venmoPaymentContextStatus = resultStatus;
-
-        analytics.sendEvent(
-          self._createPromise,
-          "venmo.tokenize.web-login.status-change"
-        );
-
-        switch (resultStatus) {
-          case "APPROVED":
-            return Promise.resolve(node);
-          case "CANCELED":
-            return Promise.reject(
-              new BraintreeError(errors.VENMO_CUSTOMER_CANCELED)
-            );
-          case "FAILED":
-            return Promise.reject(
-              new BraintreeError(errors.VENMO_TOKENIZATION_FAILED)
-            );
-          default:
-        }
-      }
-
-      return new Promise(function (resolve, reject) {
-        if (retryCount < self._maxRetryCount) {
-          retryCount++;
-
-          return self
-            ._checkPaymentContextStatusAndProcessResult(retryCount)
-            .then(resolve)
-            .catch(reject);
-        }
-
-        return reject(new BraintreeError(errors.VENMO_TOKENIZATION_FAILED));
-      });
+      return Promise.resolve(node);
     });
 };
 

tasks/build.js

@@ -1,7 +1,7 @@
 "use strict";
 
 var gulp = require("gulp");
-var envify = require("gulp-envify");
+var envify = require("@ladjs/gulp-envify");
 var rename = require("gulp-rename");
 var removeCode = require("gulp-remove-code");
 var replace = require("gulp-replace");

test/venmo/unit/venmo.js

@@ -2952,6 +2952,7 @@ describe("Venmo", () => {
           frameServiceInstance: expect.any(Object),
           venmoUrl: expect.stringContaining(venmoConstants.VENMO_WEB_LOGIN_URL),
           debug: testContext.configuration.isDebug,
+          checkPaymentContextStatus: expect.any(Function),
         });
       });
 

test/venmo/unit/web-login-backdrop.js

@@ -24,6 +24,7 @@ describe("web-login-backdrop", () => {
     classListAddMock,
     classListRemoveMock,
     setupOptions,
+    mockPaymentContextStatus,
     openOptions;
 
   beforeEach(() => {
@@ -40,6 +41,7 @@ describe("web-login-backdrop", () => {
     mockClose = jest.fn();
     mockCancelTokenization = jest.fn();
     mockStatusCheck = jest.fn().mockResolvedValue();
+    mockPaymentContextStatus = jest.fn().mockResolvedValue();
     classListAddMock = jest.fn();
     eventListenerMock = jest.fn();
     classListRemoveMock = jest.fn();
@@ -69,6 +71,7 @@ describe("web-login-backdrop", () => {
       frameServiceInstance: mockFrameService,
       cancelTokenization: mockCancelTokenization,
       checkForStatusChange: mockStatusCheck,
+      checkPaymentContextStatus: mockPaymentContextStatus,
     };
   });