Merge pull request #57 from Adyen/develop

New release 1.4.0

Author: AlexandrosMor

Adyen/__init__.py

@@ -18,7 +18,8 @@
     AdyenRecurring,
     AdyenPayment,
     AdyenThirdPartyPayout,
-    AdyenHPP)
+    AdyenHPP,
+    AdyenCheckoutApi)
 
 from .httpclient import HTTPClient
 
@@ -30,10 +31,12 @@ def __init__(self, **kwargs):
         self.payout = AdyenThirdPartyPayout(client=self.client)
         self.hpp = AdyenHPP(client=self.client)
         self.recurring = AdyenRecurring(client=self.client)
+        self.checkout = AdyenCheckoutApi(client=self.client)
 
 
 _base_adyen_obj = Adyen()
 recurring = _base_adyen_obj.recurring
 hpp = _base_adyen_obj.hpp
 payment = _base_adyen_obj.payment
 payout = _base_adyen_obj.payout
+checkout = _base_adyen_obj.checkout

Adyen/client.py

@@ -9,30 +9,26 @@ def __init__(self,
                  url="",
                  psp="",
                  headers="",
-                 status_code=""):
+                 status_code="",
+                 error_code=""):
         self.message = message
         self.raw_request = raw_request
         self.raw_response = raw_response
         self.url = url
         self.psp = psp
         self.headers = headers
         self.status_code = status_code
+        self.error_code = error_code
 
     def __str__(self):
         return repr("{}:{}".format(self.__class__.__name__, self.message))
 
     def debug(self):
         return ("class: {}\nmessage: {}\nHTTP status_code:{}\nurl: {}"
-                "request: {}\nresponse: {}\nheaders: {}".format(
-                    self.__class__.__name__,
-                    self.message,
-                    self.status_code,
-                    self.url,
-                    self.raw_request,
-                    self.raw_response,
-                    self.headers
-                    )
-                )
+                "request: {}\nresponse: {}\nheaders: {}"
+                .format(self.__class__.__name__, self.message,
+                        self.status_code, self.url, self.raw_request,
+                        self.raw_response, self.headers))
 
 
 class AdyenInvalidRequestError(AdyenError):
@@ -42,13 +38,9 @@ class AdyenInvalidRequestError(AdyenError):
 class AdyenAPIResponseError(AdyenError):
     def __init__(self,
                  message,
-                 result="",
-                 error_code="",
                  *args,
                  **kwargs):
         super(AdyenAPIResponseError, self).__init__(message, *args, **kwargs)
-        self.error_code = error_code
-        self.result = result
 
 
 class AdyenAPIAuthenticationError(AdyenAPIResponseError):
@@ -73,3 +65,7 @@ class AdyenAPIInvalidAmount(AdyenAPIResponseError):
 
 class AdyenAPIInvalidFormat(AdyenAPIResponseError):
     pass
+
+
+class AdyenEndpointInvalidFormat(AdyenError):
+    pass

Adyen/exceptions.py

@@ -142,6 +142,7 @@ def _requests_post(self, url,
                        data=None,
                        username="",
                        password="",
+                       xapikey="",
                        headers=None,
                        timeout=30):
         """This function will POST to the url endpoint using requests.
@@ -175,6 +176,8 @@ def _requests_post(self, url,
         auth = None
         if username and password:
             auth = requests.auth.HTTPBasicAuth(username, password)
+        elif xapikey:
+            headers['x-api-key'] = xapikey
 
         # Add User-Agent header to request so that the request
         # can be identified as coming from the Adyen Python library.
@@ -246,12 +249,12 @@ def _urllib_post(self, url,
         if username and password:
             if sys.version_info[0] >= 3:
                 basic_authstring = base64.encodebytes(('%s:%s' %
-                                                      (username, password))
-                                                      .encode()).decode().\
+                                                       (username, password))
+                                                      .encode()).decode(). \
                     replace('\n', '')
             else:
                 basic_authstring = base64.encodestring('%s:%s' % (username,
-                                                                  password)).\
+                                                                  password)). \
                     replace('\n', '')
             url_request.add_header("Authorization",
                                    "Basic %s" % basic_authstring)

Adyen/httpclient.py

@@ -117,7 +117,7 @@ def hpp_payment(self, request="", skip_details=None, **kwargs):
             if all(k in request for k in ("shopperEmail", "shopperReference",
                                           "recurringContract")):
                 recc = request['recurringContract']
-                if recc != 'ONECLICK' and recc != 'RECURRING'\
+                if recc != 'ONECLICK' and recc != 'RECURRING' \
                         and recc != 'ONECLICK,RECURRING':
                     raise ValueError(
                         "HPP: recurringContract must be on of the following"
@@ -190,8 +190,8 @@ def capture(self, request="", **kwargs):
         action = "capture"
 
         if validation.check_in(request, action):
-            if request['modificationAmount']["value"] == "" or\
-                            request['modificationAmount']['value'] == "0":
+            if request['modificationAmount']["value"] == "" or \
+                    request['modificationAmount']['value'] == "0":
                 raise ValueError(
                     "Set the 'modificationAmount' to the original transaction"
                     " amount, or less for a partial capture. "
@@ -210,8 +210,8 @@ def refund(self, request="", **kwargs):
         action = "refund"
 
         if validation.check_in(request, action):
-            if request['modificationAmount']['value'] == "" or\
-                            request['modificationAmount']['value'] == "0":
+            if request['modificationAmount']['value'] == "" or \
+                    request['modificationAmount']['value'] == "0":
                 raise ValueError(
                     "To refund this payment, provide the original value. "
                     "Set the value to less than the original amount, "
@@ -279,3 +279,62 @@ def store_detail_and_submit(self, request=None, **kwargs):
             return self.client.call_api(
                 request, self.service, action, **kwargs
             )
+
+
+class AdyenCheckoutApi(AdyenServiceBase):
+    """This represents the Adyen Checkout API .
+
+    API calls currently implemented:
+        paymentMethods
+        payments
+        payments/details
+        originKeys
+    Please refer to the checkout documentation for specifics around the API.
+    https://docs.adyen.com/developers/checkout
+
+    The AdyenPayment class, is accessible as adyen.payment.method(args)
+
+    Args:
+        client (AdyenAPIClient, optional): An API client for the service to
+            use. If not provided, a new API client will be created.
+    """
+
+    def __init__(self, client=""):
+        super(AdyenCheckoutApi, self).__init__(client=client)
+        self.service = "Checkout"
+
+    def payment_methods(self, request="", **kwargs):
+        action = "paymentMethods"
+        if validation.check_in(request, action):
+            if 'merchantAccount' in request:
+                if request['merchantAccount'] == '':
+                    raise ValueError(
+                        'merchantAccount must contain the merchant account'
+                        ' when retrieving payment methods.')
+
+            return self.client.call_checkout_api(request, action, **kwargs)
+
+    def payments(self, request="", **kwargs):
+        action = "payments"
+        if validation.check_in(request, action):
+            return self.client.call_checkout_api(request, action, **kwargs)
+
+    def payments_details(self, request="", **kwargs):
+        action = "paymentsDetails"
+        if validation.check_in(request, action):
+            return self.client.call_checkout_api(request, action, **kwargs)
+
+    def payment_session(self, request="", **kwargs):
+        action = "paymentSession"
+        if validation.check_in(request, action):
+            return self.client.call_checkout_api(request, action, **kwargs)
+
+    def payment_result(self, request="", **kwargs):
+        action = "paymentsResult"
+        if validation.check_in(request, action):
+            return self.client.call_checkout_api(request, action, **kwargs)
+
+    def origin_keys(self, request="", **kwargs):
+        action = "originKeys"
+        if validation.check_in(request, action):
+            return self.client.call_checkout_api(request, action, **kwargs)

Adyen/services.py

@@ -1,6 +1,11 @@
-#!/bin/python
-
+# Those constants are used from the library only
 BASE_PAL_URL = "https://pal-{}.adyen.com/pal/servlet"
 BASE_HPP_URL = "https://{}.adyen.com/hpp"
-API_VERSION = "v30"
+ENDPOINT_CHECKOUT_TEST = "https://checkout-test.adyen.com"
+ENDPOINT_CHECKOUT_LIVE_SUFFIX = "https://{}-checkout-live" \
+                                ".adyenpayments.com/checkout"
+API_CHECKOUT_VERSION = "v40"
+API_CHECKOUT_UTILITY_VERSION = "v1"
 API_RECURRING_VERSION = "v25"
+API_PAYMENT_VERSION = "v40"
+API_PAYOUT_VERSION = "v30"

Adyen/settings.py

@@ -17,6 +17,17 @@
 actions['refund'] = ["modificationAmount", "originalReference"]
 actions['cancelOrRefund'] = ["originalReference"]
 
+actions['paymentMethods'] = ["merchantAccount"]
+actions['payments'] = ["amount", "reference", "paymentMethod",
+                       "merchantAccount", "returnUrl"]
+actions['paymentsDetails'] = ["paymentData", "details"]
+actions['paymentSession'] = ["amount", "reference", "shopperReference",
+                             "channel", "returnUrl", "countryCode",
+                             "shopperLocale", "sessionValidity",
+                             "merchantAccount"]
+actions['paymentsResult'] = ["payload"]
+actions['originKeys'] = ["originDomains"]
+
 payout_required_fields = {
     'confirmThirdParty': (
         'merchantAccount',

Adyen/validation.py

@@ -3,7 +3,7 @@
 setup(
     name='Adyen',
     packages=['Adyen'],
-    version='1.3.0',
+    version='1.4.0',
     maintainer='Adyen',
     maintainer_email='support@adyen.com',
     description='Adyen Python Api',