Adds an almost-working way of supporting apple pay

onegov/pay/assets/js/stripe.js

@@ -53,6 +53,61 @@ var handleToken = function(token, button) {
     }
 };
 
+var useApplePay = function() {
+    if (window.location.hash === '#applepay') {
+        return true;
+    }
+
+    try {
+        return ApplePaySession && ApplePaySession.canMakePayments();
+    } catch (e) {
+        return false;
+    }
+
+};
+
+var convertToApplePayButton = function(button) {
+    button.innerHTML = '';
+    button.className += ' apple-pay-button';
+};
+
+var newApplePayHandler = function(config) {
+    return function(e) {
+        e.preventDefault();
+
+        var payment = {
+            countryCode: config.country,
+            currencyCode: config.currency,
+            total: {
+                label: config.description,
+                amount: parseFloat(config.amount / 100).toFixed(2)
+            }
+        };
+
+        Stripe.setPublishableKey(config.key);
+
+        var session = Stripe.applePay.buildSession(payment, function(result, completion) {
+            config.token(result.token);
+
+            // XXX
+            // we don't know yet if the payment will succeed, therefore we have
+            // to do everything on the backend before showing the result
+            // -> unfortunately this pretty much goes against the way we use
+            // stripe, so for now we can't support apple pay
+            completion(ApplePaySession.STATUS_SUCCESS);
+        });
+
+        session.begin();
+    };
+};
+
+var newStripePaymentHandler = function(config) {
+    return function(e) {
+        e.preventDefault();
+        StripeCheckout.configure(config).open();
+    };
+};
+
 var setupCheckoutButton = function(button) {
     var config = {
         token: function(token) {
@@ -66,11 +121,16 @@ var setupCheckoutButton = function(button) {
         config[attribute.name.replace('data-stripe-', '')] = attribute.value;
     }
 
-    var handler = StripeCheckout.configure(config);
-    button.addEventListener('click', function(e) {
-        handler.open();
-        e.preventDefault();
-    });
+    var onClick = null;
+
+    if (useApplePay()) {
+        convertToApplePayButton(button);
+        onClick = newApplePayHandler(config);
+    } else {
+        onClick = newStripePaymentHandler(config);
+    }
+
+    button.addEventListener('click', onClick);
 
     // close checkout on page navigation
     window.addEventListener('popstate', function() {
@@ -79,10 +139,12 @@ var setupCheckoutButton = function(button) {
 };
 
 var setupCheckout = function(buttons) {
-    loadScript('https://checkout.stripe.com/checkout.js', function() {
-        for (var i = 0; i < buttons.length; i++) {
-            setupCheckoutButton(buttons[i]);
-        }
+    loadScript('https://js.stripe.com/v2/', function() {
+        loadScript('https://checkout.stripe.com/checkout.js', function() {
+            for (var i = 0; i < buttons.length; i++) {
+                setupCheckoutButton(buttons[i]);
+            }
+        });
     });
 };
 

onegov/pay/collections/payment.py

@@ -52,6 +52,10 @@ def payment_links_by_batch(self, batch=None):
         """
 
         batch = batch or self.batch
+
+        if not batch:
+            return None
+
         payment_links = defaultdict(list)
 
         for cls in Payment.registered_links.values():

onegov/pay/integration.py

@@ -1,5 +1,6 @@
 from more.webassets import WebassetsApp
 from onegov.core.orm import orm_cached
+from onegov.core.utils import module_path, render_file
 from onegov.pay import log
 from onegov.pay import PaymentProvider
 from onegov.pay.errors import CARD_ERRORS
@@ -52,6 +53,17 @@ def get_pay_assets():
     yield 'stripe.js'
 
 
+@PayApp.path(path='/.well-known/apple-developer-merchantid-domain-association')
+class ApplePayMerchantIdDomainAssociation(object):
+    path = module_path(
+        'onegov.pay', 'static/apple-developer-merchantid-domain-association')
+
+
+@PayApp.view(model=ApplePayMerchantIdDomainAssociation, render=render_file)
+def view_apple_pay_merchant_id_domain_association(self, app):
+    return self.path
+
+
 def process_payment(method, price, provider=None, token=None):
     """ Processes a payment using various methods, returning the processed
     payment or None.

onegov/pay/models/payment_providers/stripe.py

@@ -10,6 +10,7 @@
 from onegov.pay import log
 from onegov.pay.models.payment import Payment
 from onegov.pay.models.payment_provider import PaymentProvider
+from purl import URL
 from sqlalchemy.orm import object_session
 from uuid import UUID, uuid4, uuid5
 
@@ -276,16 +277,23 @@ def checkout_button(self, label, amount, currency, action='submit',
                         **extra):
         """ Generates the html for the checkout button. """
 
+        # XXX make configurable
+        extra['country'] = 'CH'
+
         extra['amount'] = round(amount * 100, 0)
         extra['currency'] = currency
         extra['key'] = self.publishable_key
+        extra['account'] = self.user_id
 
         attrs = {
             'data-stripe-{}'.format(key): str(value)
             for key, value in extra.items()
         }
         attrs['data-action'] = action
 
+        if 'locale' in extra:
+            attrs['lang'] = extra['locale']
+
         return """
             <input type="hidden" name="payment_token" id="{target}">
             <button class="checkout-button stripe-connect"
@@ -343,7 +351,7 @@ def prepare_oauth_request(self, redirect_uri, success_url, error_url,
             user_fields=user_fields
         )
 
-    def process_oauth_response(self, request_params):
+    def process_oauth_response(self, request_url, request_params):
         """ Takes the parameters of an incoming oauth request and stores
         them on the payment provider if successful.
 
@@ -364,6 +372,10 @@ def process_oauth_response(self, request_params):
                 grant_type='authorization_code',
                 code=self.authorization_code,
             )
+            response = stripe.ApplePayDomain.create(
+                domain_name=URL(request_url).host(),
+                stripe_account=token['stripe_user_id']
+            )
 
         assert token['scope'] == 'read_write'
 

onegov/pay/static/apple-developer-merchantid-domain-association

@@ -0,0 +1 @@
+7B227073704964223A2239373943394538343346343131343044463144313834343232393232313734313034353044314339464446394437384337313531303944334643463542433731222C2276657273696F6E223A312C22637265617465644F6E223A313437313435343137313137362C227369676E6174757265223A2233303830303630393261383634383836663730643031303730326130383033303830303230313031333130663330306430363039363038363438303136353033303430323031303530303330383030363039326138363438383666373064303130373031303030306130383033303832303365363330383230333862613030333032303130323032303836383630663639396439636361373066333030613036303832613836343863653364303430333032333037613331326533303263303630333535303430333063323534313730373036633635323034313730373036633639363336313734363936663665323034393665373436353637373236313734363936663665323034333431323032643230343733333331323633303234303630333535303430623063316434313730373036633635323034333635373237343639363636393633363137343639366636653230343137353734363836663732363937343739333131333330313130363033353530343061306330613431373037303663363532303439366536333265333130623330303930363033353530343036313330323535353333303165313730643331333633303336333033333331333833313336333433303561313730643332333133303336333033323331333833313336333433303561333036323331323833303236303630333535303430333063316636353633363332643733366437303264363237323666366236353732326437333639363736653566353534333334326435333431346534343432346635383331313433303132303630333535303430623063306236393466353332303533373937333734363536643733333131333330313130363033353530343061306330613431373037303663363532303439366536333265333130623330303930363033353530343036313330323535353333303539333031333036303732613836343863653364303230313036303832613836343863653364303330313037303334323030303438323330666461626333396366373565323032633530643939623435313265363337653261393031646436636233653062316364346235323637393866386366346562646538316132356138633231653463333364646365386532613936633266366166613139333033343563346538376134343236636539353162313239356133383230323131333038323032306433303435303630383262303630313035303530373031303130343339333033373330333530363038326230363031303530353037333030313836323936383734373437303361326632663666363337333730326536313730373036633635326536333666366432663666363337333730333033343264363137303730366336353631363936333631333333303332333031643036303335353164306530343136303431343032323433303062396165656564343633313937613461363561323939653432373138323163343533303063303630333535316431333031303166663034303233303030333031663036303335353164323330343138333031363830313432336632343963343466393365346566323765366334663632383663336661326262666432653462333038323031316430363033353531643230303438323031313433303832303131303330383230313063303630393261383634383836663736333634303530313330383166653330383163333036303832623036303130353035303730323032333038316236306338316233353236353663363936313665363336353230366636653230373436383639373332303633363537323734363936363639363336313734363532303632373932303631366537393230373036313732373437393230363137333733373536643635373332303631363336333635373037343631366536333635323036663636323037343638363532303734363836353665323036313730373036633639363336313632366336353230373337343631366536343631373236343230373436353732366437333230363136653634323036333666366536343639373436393666366537333230366636363230373537333635326332303633363537323734363936363639363336313734363532303730366636633639363337393230363136653634323036333635373237343639363636393633363137343639366636653230373037323631363337343639363336353230373337343631373436353664363536653734373332653330333630363038326230363031303530353037303230313136326136383734373437303361326632663737373737373265363137303730366336353265363336663664326636333635373237343639363636393633363137343635363137353734363836663732363937343739326633303334303630333535316431663034326433303262333032396130323761303235383632333638373437343730336132663266363337323663326536313730373036633635326536333666366432663631373037303663363536313639363336313333326536333732366333303065303630333535316430663031303166663034303430333032303738303330306630363039326138363438383666373633363430363164303430323035303033303061303630383261383634386365336430343033303230333439303033303436303232313030646131633633616538626535663634663865313165383635363933376239623639633437326265393365616333323333613136373933366534613864356538333032323130306264356166626638363966336330636132373462326664646534663731373135396362336264373139396232636130666634303964653635396138326232346433303832303265653330383230323735613030333032303130323032303834393664326662663361393864613937333030613036303832613836343863653364303430333032333036373331316233303139303630333535303430333063313234313730373036633635323035323666366637343230343334313230326432303437333333313236333032343036303335353034306230633164343137303730366336353230343336353732373436393636363936333631373436393666366532303431373537343638366637323639373437393331313333303131303630333535303430613063306134313730373036633635323034393665363332653331306233303039303630333535303430363133303235353533333031653137306433313334333033353330333633323333333433363333333035613137306433323339333033353330333633323333333433363333333035613330376133313265333032633036303335353034303330633235343137303730366336353230343137303730366336393633363137343639366636653230343936653734363536373732363137343639366636653230343334313230326432303437333333313236333032343036303335353034306230633164343137303730366336353230343336353732373436393636363936333631373436393666366532303431373537343638366637323639373437393331313333303131303630333535303430613063306134313730373036633635323034393665363332653331306233303039303630333535303430363133303235353533333035393330313330363037326138363438636533643032303130363038326138363438636533643033303130373033343230303034663031373131383431396437363438356435316135653235383130373736653838306132656664653762616534646530386466633462393365313333353664353636356233356165323264303937373630643232346537626261303866643736313763653838636237366262363637306265633865383239383466663534343561333831663733303831663433303436303630383262303630313035303530373031303130343361333033383330333630363038326230363031303530353037333030313836326136383734373437303361326632663666363337333730326536313730373036633635326536333666366432663666363337333730333033343264363137303730366336353732366636663734363336313637333333303164303630333535316430653034313630343134323366323439633434663933653465663237653663346636323836633366613262626664326534623330306630363033353531643133303130316666303430353330303330313031666633303166303630333535316432333034313833303136383031346262623064656131353833333838396161343861393964656265626465626166646163623234616233303337303630333535316431663034333033303265333032636130326161303238383632363638373437343730336132663266363337323663326536313730373036633635326536333666366432663631373037303663363537323666366637343633363136373333326536333732366333303065303630333535316430663031303166663034303430333032303130363330313030363061326138363438383666373633363430363032306530343032303530303330306130363038326138363438636533643034303330323033363730303330363430323330336163663732383335313136393962313836666233356333353663613632626666343137656464393066373534646132386562656631396338313565343262373839663839386637396235393966393864353431306438663964653963326665303233303332326464353434323162306133303537373663356466333338336239303637666431373763326332313664393634666336373236393832313236663534663837613764316239396362396230393839323136313036393930663039393231643030303033313832303136303330383230313563303230313031333038313836333037613331326533303263303630333535303430333063323534313730373036633635323034313730373036633639363336313734363936663665323034393665373436353637373236313734363936663665323034333431323032643230343733333331323633303234303630333535303430623063316434313730373036633635323034333635373237343639363636393633363137343639366636653230343137353734363836663732363937343739333131333330313130363033353530343061306330613431373037303663363532303439366536333265333130623330303930363033353530343036313330323535353330323038363836306636393964396363613730663330306430363039363038363438303136353033303430323031303530306130363933303138303630393261383634383836663730643031303930333331306230363039326138363438383666373064303130373031333031633036303932613836343838366637306430313039303533313066313730643331333633303338333133373331333733313336333133313561333032663036303932613836343838366637306430313039303433313232303432303733343832623432653665366332323264616536643963303961346336663332316534656136653666326661626631356430376562333338643264613435646233303061303630383261383634386365336430343033303230343438333034363032323130306564333264376438616131623536623036626164623162396639396264643063653662363931316530623032393232633934333362663564326130656135353830323231303066393433353637663030323361643061343561373236663238376636303062656334666566373335383832383935633733313531383337336163383934383137303030303030303030303030227D

onegov/pay/tests/test_stripe.py

@@ -38,6 +38,7 @@ def test_process_oauth_response():
 
     with pytest.raises(RuntimeError) as e:
         provider.process_oauth_response(
+            'https://example.org',
             {
                 'error': 'foo',
                 'error_description': 'bar',
@@ -53,15 +54,19 @@ def test_process_oauth_response():
         'refresh_token': 'rtoken',
         'access_token': 'atoken',
     }):
-        provider.process_oauth_response({
-            'code': '0xdeadbeef',
-            'oauth_redirect_secret': 'foo'
-        })
-
-        assert provider.publishable_key == 'pubkey'
-        assert provider.user_id == 'uid'
-        assert provider.refresh_token == 'rtoken'
-        assert provider.access_token == 'atoken'
+        with mock.patch('stripe.ApplePayDomain.create', return_value=None):
+            provider.process_oauth_response(
+                'https://example.org',
+                {
+                    'code': '0xdeadbeef',
+                    'oauth_redirect_secret': 'foo'
+                }
+            )
+
+    assert provider.publishable_key == 'pubkey'
+    assert provider.user_id == 'uid'
+    assert provider.refresh_token == 'rtoken'
+    assert provider.access_token == 'atoken'
 
 
 def test_stripe_fee_policy():