Merge pull request #68 from Ishrock/patch-2

HTTPClient interface #65

Author: AlexandrosMor

Adyen/client.py

@@ -222,11 +222,13 @@ def call_api(self, request_data, service, action, idempotency=False,
 
         # username at self object has highest priority. fallback to root module
         # and ensure that it is set.
+        xapikey = None
         if self.xapikey:
             xapikey = self.xapikey
         elif 'xapikey' in kwargs:
             xapikey = kwargs.pop("xapikey")
 
+        username = None
         if self.username:
             username = self.username
         elif 'username' in kwargs:
@@ -237,15 +239,18 @@ def call_api(self, request_data, service, action, idempotency=False,
                 username = self._store_payout_username(**kwargs)
             else:
                 username = self._review_payout_username(**kwargs)
-        if not username:
+
+        if not username and not xapikey:
             errorstring = """Please set your webservice username.
               You can do this by running
               'Adyen.username = 'Your username'"""
             raise AdyenInvalidRequestError(errorstring)
             # password at self object has highest priority.
             # fallback to root module
             # and ensure that it is set.
-        if self.password:
+
+        password = None
+        if self.password and not xapikey:
             password = self.password
         elif 'password' in kwargs:
             password = kwargs.pop("password")
@@ -255,7 +260,8 @@ def call_api(self, request_data, service, action, idempotency=False,
                 password = self._store_payout_pass(**kwargs)
             else:
                 password = self._review_payout_pass(**kwargs)
-        if not password:
+
+        if not password and not xapikey:
             errorstring = """Please set your webservice password.
               You can do this by running
               'Adyen.password = 'Your password'"""

Adyen/httpclient.py

@@ -60,6 +60,7 @@ def _pycurl_post(self,
                      data=None,
                      username="",
                      password="",
+                     xapikey="",
                      headers={},
                      timeout=30):
         """This function will POST to the url endpoint using pycurl. returning
@@ -77,6 +78,8 @@ def _pycurl_post(self,
                 as part of password.
             password (str, optional): Password for basic auth. Must be included
                 as part of username.
+            xapikey (str, optional):    Adyen API key.  Will be used for auth
+                                        if username and password are absent.
             headers (dict, optional): Key/Value pairs of headers to include
             timeout (int, optional): Default 30. Timeout for the request.
 
@@ -102,6 +105,11 @@ def _pycurl_post(self,
         # request can be identified as coming from the Adyen Python library.
         headers['User-Agent'] = self.user_agent
 
+        if username and password:
+            curl.setopt(curl.USERPWD, '%s:%s' % (username, password))
+        elif xapikey:
+            headers["X-API-KEY"] = xapikey
+
         # Convert the header dict to formatted array as pycurl needs.
         if sys.version_info[0] >= 3:
             header_list = ["%s:%s" % (k, v) for k, v in headers.items()]
@@ -120,9 +128,6 @@ def _pycurl_post(self,
         raw_request = json_lib.dumps(json) if json else urlencode(data)
         curl.setopt(curl.POSTFIELDS, raw_request)
 
-        if username and password:
-            curl.setopt(curl.USERPWD, '%s:%s' % (username, password))
-
         curl.setopt(curl.TIMEOUT, timeout)
         curl.perform()
 
@@ -143,7 +148,7 @@ def _requests_post(self, url,
                        username="",
                        password="",
                        xapikey="",
-                       headers=None,
+                       headers={},
                        timeout=30):
         """This function will POST to the url endpoint using requests.
         Returning an AdyenResult object on 200 HTTP response.
@@ -160,6 +165,8 @@ def _requests_post(self, url,
                 as part of password.
             password (str, optional): Password for basic auth. Must be included
                 as part of username.
+            xapikey (str, optional):    Adyen API key.  Will be used for auth
+                                        if username and password are absent.
             headers (dict, optional): Key/Value pairs of headers to include
             timeout (int, optional): Default 30. Timeout for the request.
 
@@ -169,8 +176,6 @@ def _requests_post(self, url,
             int:    HTTP status code, eg 200,404,401
             dict:   Key/Value pairs of the headers received.
         """
-        if headers is None:
-            headers = {}
 
         # Adding basic auth if username and password provided.
         auth = None
@@ -194,11 +199,12 @@ def _requests_post(self, url,
         return request.text, message, request.status_code, request.headers
 
     def _urllib_post(self, url,
-                     json="",
-                     data="",
+                     json=None,
+                     data=None,
                      username="",
                      password="",
-                     headers=None,
+                     xapikey="",
+                     headers={},
                      timeout=30):
 
         """This function will POST to the url endpoint using urllib2. returning
@@ -216,6 +222,8 @@ def _urllib_post(self, url,
                                         uncluded as part of password.
             password (str, optional):   Password for basic auth. Must be
                                         included as part of username.
+            xapikey (str, optional):    Adyen API key.  Will be used for auth
+                                        if username and password are absent.
             headers (dict, optional):   Key/Value pairs of headers to include
             timeout (int, optional): Default 30. Timeout for the request.
 
@@ -225,8 +233,6 @@ def _urllib_post(self, url,
             int:    HTTP status code, eg 200,404,401
             dict:   Key/Value pairs of the headers received.
         """
-        if headers is None:
-            headers = {}
 
         # Store regular dict to return later:
         raw_store = json
@@ -258,6 +264,8 @@ def _urllib_post(self, url,
                     replace('\n', '')
             url_request.add_header("Authorization",
                                    "Basic %s" % basic_authstring)
+        elif xapikey:
+            headers["X-API-KEY"] = xapikey
 
         # Adding the headers to the request.
         for key, value in headers.items():
@@ -302,6 +310,8 @@ def request(self, url,
                                         uncluded as part of password.
             password (str, optional):   Password for basic auth. Must be
                                         included as part of username.
+            xapikey (str, optional):    Adyen API key.  Will be used for auth
+                                        if username and password are absent.
             headers (dict, optional):   Key/Value pairs of headers to include
         Returns:
             str:    Raw request placed

test/BaseTest.py

@@ -1,4 +1,8 @@
-import mock
+
+try:
+    import mock
+except Exception:
+    from unittest import mock
 import json
 from Adyen import httpclient