Merge pull request #3 from martincostello/ApplePay-JS-V2

Add support for Apple Pay JS version 2

ApplePaySession.js

@@ -12,9 +12,11 @@
             var self = {};
 
             self.hasActiveSession = false;
+            self.isApplePaySetUp = true;
             self.paymentsEnabled = true;
             self.paymentRequest = null;
             self.merchantIdentifier = "";
+            self.supportedVersions = [1, 2];
             self.validationURL = "https://apple-pay-gateway-cert.apple.com/paymentservices/startSession";
             self.version = 1;
 
@@ -40,6 +42,14 @@
                 self.merchantIdentifier = merchantIdentifier;
             };
 
+            /**
+             * Sets whether the user has set up Apple Pay.
+             * @param {Boolean} isSetUp - Whether Apple Pay has been set up by the user on the device.
+             */
+            self.setUserSetupStatus = function (isSetUp) {
+                self.isApplePaySetUp = isSetUp;
+            };
+
             /**
              * Sets the validation URL to use for merchant validation.
              * @param {String} validationURL - The URL to use for merchant validation.
@@ -87,7 +97,7 @@
                     throw "Page already has an active payment session.";
                 }
 
-                if (version !== self.version) {
+                if (self.supportedVersions.indexOf(version) === -1) {
                     throw "\"" + version + "\" is not a supported version.";
                 }
 
@@ -100,6 +110,10 @@
                 var merchantCapabilities = ["supports3DS", "supportsEMV", "supportsCredit", "supportsDebit"];
                 var paymentNetworks = ["amex", "discover", "interac", "masterCard", "privateLabel", "visa"];
 
+                if (version > 1) {
+                    paymentNetworks.push("jcb");
+                }
+
                 if (countryCodes.indexOf(paymentRequest.countryCode) === -1) {
                     throw "\"" + paymentRequest.countryCode + "\" is not valid country code.";
                 }
@@ -190,9 +204,9 @@
             self.onCanMakePaymentsWithActiveCard = function (session, merchantIdentifier) {
 
                 var result =
-                       self.paymentsEnabled === true &&
-                       merchantIdentifier &&
-                       merchantIdentifier === self.merchantIdentifier;
+                    self.paymentsEnabled === true &&
+                    merchantIdentifier &&
+                    merchantIdentifier === self.merchantIdentifier;
 
                 return Promise.resolve(result);
             };
@@ -276,14 +290,33 @@
 
             };
 
+            /**
+             * Callback for ApplePaySession.openPaymentSetup().
+             * @param {Object} session - The current ApplePaySession.
+             * @param {String} merchantIdentifier - The merchant identifier passed to the function.
+             */
+            self.onOpenPaymentSetup = function (session, merchantIdentifier) {
+
+                var result =
+                    self.paymentsEnabled === true &&
+                    merchantIdentifier &&
+                    merchantIdentifier === self.merchantIdentifier;
+
+                if (result === true) {
+                    result = self.isApplePaySetUp;
+                }
+
+                return Promise.resolve(result);
+            };
+
             /**
              * Callback for ApplePaySession.supportsVersion().
              * @param {Object} session - The current ApplePaySession.
              * @param {Number} version - The version passed to the function.
              * @return {Boolean} The value to return from ApplePaySession.supportsVersion().
              */
             self.onSupportsVersion = function (session, version) {
-                return version === self.version;
+                return self.supportedVersions.indexOf(version) !== -1;
             };
 
             return self;
@@ -318,6 +351,10 @@
             return ApplePaySessionPolyfill.onCanMakePaymentsWithActiveCard(this, merchantIdentifier);
         };
 
+        ApplePaySession.openPaymentSetup = function (merchantIdentifier) {
+            return ApplePaySessionPolyfill.onOpenPaymentSetup(this, merchantIdentifier);
+        };
+
         ApplePaySession.supportsVersion = function (version) {
             return ApplePaySessionPolyfill.onSupportsVersion(this, version);
         };

README.md

@@ -10,6 +10,8 @@ Apple Pay JS is a way of accepting Apple Pay in websites using Safari in either
 
 This polyfill provides a way to make [```ApplePaySession```](https://developer.apple.com/reference/applepayjs/applepaysession) available for testing your implementation in browsers that would otherwise not provide support for Apple Pay JS, such as in Chrome on Windows.
 
+The polyfill supports Apple Pay JS versions 1 and 2.
+
 ## Examples
 
 To create a minimal working integration using the polyfill, first install the JavaScript using [bower](https://bower.io/):
@@ -93,6 +95,22 @@ if ("ApplePaySession" in window && ApplePaySession.canMakePayments() === true) {
 }
 ```
 
+### Apple Pay Set Up
+
+If you need to test displaying the "Set Up Apple Pay" button, use the ```setUserSetupStatus(bool)``` function, as shown below, to specify that the user has not yet set up Apple Pay on the device.
+
+```js
+ApplePaySessionPolyfill.setUserSetupStatus(false);
+```
+
+By default this value is set to ```true``` so that Apple Pay is available in the polyfill.
+
+If you need to test compatibility with devices that do not support Apple Pay set up, then delete the function from ```ApplePaySession``` before your implementation code is loaded:
+
+```js
+delete ApplePaySession.openPaymentSetup;
+```
+
 ## Feedback
 
 Any feedback or issues can be added to the [issues](https://github.com/justeat/applepayjs-polyfill/issues) for this project in GitHub.