Merge pull request #5 from kumar303/mozpay

Provide callbacks for mozPay events (bug 981229)
mozilla · Mar 11, 2014 · fc6ca73 · fc6ca73
2 parents 4f79ca2 + a222fe0
commit fc6ca73
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 4 deletions.
diff --git a/lib/fxpay.js b/lib/fxpay.js
@@ -8,6 +8,7 @@
         throw err;
       }
     };
+    opt.oncheckpayment = opt.oncheckpayment || function() {};
     opt.log = opt.log || window.console;
     opt.mozPay = opt.mozPay || navigator.mozPay;
     opt.maxTries = opt.maxTries || undefined;
@@ -33,14 +34,16 @@
 
       var payReq = opt.mozPay([data.webpayJWT]);
 
-      payReq.onerror = function() {
-        log.error('mozPay: received onerror()');
-        // TODO: fire a callback here for apps.
+      payReq.onerror = function(err) {
+        log.error('mozPay: received onerror():', err);
+        opt.onpurchase(err);
       };
 
       payReq.onsuccess = function() {
         log.debug('mozPay: received onsuccess()');
-        // TODO: fire a callback here for apps so they can update their UI.
+        // The payment flow has closed. Let's wait for
+        // payment verification.
+        opt.oncheckpayment();
 
         function onTransaction(err, data) {
           if (err) {

diff --git a/tests/test-fxpay.js b/tests/test-fxpay.js
@@ -97,6 +97,61 @@ describe('fxpay', function () {
       server.respond();
     });
 
+    it('should call back when mozPay window closes', function (done) {
+
+      fxpay.purchase(123, {
+        oncheckpayment: function() {
+          done();
+        },
+        onpurchase: function(err) {
+          // Make sure we don't have an unexpected error.
+          assert.equal(err, null)
+        },
+        mozPay: mozPay
+      });
+
+      // Respond to fetching the JWT.
+      server.respondWith(
+        'POST',
+        /.*payments\/in\-app\/purchase\/product\/123/,
+        [200, {"Content-Type": "application/json"},
+         JSON.stringify({webpayJWT: '<jwt>',
+                         contribStatusURL: '/transaction/XYZ'})]);
+      server.respond();
+
+      mozPay.returnValues[0].onsuccess();  // resolve the DOM request.
+
+      // Respond to polling the transaction.
+      server.respondWith(
+        'POST',
+        /.*\/transaction\/XYZ/,
+        [200, {"Content-Type": "application/json"},
+         JSON.stringify({state: 'COMPLETED'})]);
+      server.respond();
+    });
+
+    it('should call back with mozPay error', function (done) {
+
+      fxpay.purchase(123, {
+        onpurchase: function(err) {
+          assert.equal(err, 'DIALOG_CLOSED_BY_USER');
+          done();
+        },
+        mozPay: mozPay
+      });
+
+      // Respond to fetching the JWT.
+      server.respondWith(
+        'POST',
+        /.*payments\/in\-app\/purchase\/product\/123/,
+        [200, {"Content-Type": "application/json"},
+         JSON.stringify({webpayJWT: '<jwt>',
+                         contribStatusURL: '/transaction/XYZ'})]);
+      server.respond();
+
+      mozPay.returnValues[0].onerror('DIALOG_CLOSED_BY_USER');
+    });
+
     it('should report invalid transaction state', function (done) {
       var productId = 123;