Fixes with e2e test

Author: AlexandrosMor

Adyen/client.py

@@ -135,6 +135,9 @@ def _determine_checkout_url(self, platform, service, action):
             action = "payment/details"
         if action == "paymentResult":
             action = "payment/result"
+        if action == "originKey":
+            action = "v1/originKeys"
+
         base_uri = settings.BASE_CHECKOUT_URL.format(platform)
         api_version = settings.CHECKOUT_API_VERSION
 
@@ -239,6 +242,17 @@ def call_api(self, request_data, service, action, idempotency=False,
              You can do this by running 'Adyen.password = 'Your password'"""
             raise AdyenInvalidRequestError(errorstring)
 
+            # xapikey at self object has highest priority. fallback to root module
+            # and ensure that it is set.
+            if self.xapikey:
+                xapikey = self.xapikey
+            elif 'xapikey' in kwargs:
+                xapikey = kwargs.pop("xapikey")
+            if not xapikey:
+                errorstring = """Please set your webservice xapikey.
+                    You can do this by running 'Adyen.xapikey = 'Your xapikey'"""
+                raise AdyenInvalidRequestError(errorstring)
+
         # platform at self object has highest priority. fallback to root module
         # and ensure that it is set to either 'live' or 'test'.
         if self.platform:
@@ -473,7 +487,6 @@ def _handle_response(self, url, raw_response, raw_request,
         Returns:
             AdyenResult: Result object if successful.
         """
-
         if status_code != 200:
             response = {}
             # If the result can't be parsed into json, most likely is raw html.

Adyen/httpclient.py

@@ -142,11 +142,13 @@ def _requests_post(self, url,
                        data=None,
                        username="",
                        password="",
+                       xapikey="",
                        headers=None,
                        timeout=30):
+        self.pr = """pr"""
         """This function will POST to the url endpoint using requests.
         Returning an AdyenResult object on 200 HTTP response.
-        Either json or data has to be provided.
+        Either json or data has to be %sovided.
         If username and password are provided, basic auth will be used.
 
 
@@ -167,14 +169,16 @@ def _requests_post(self, url,
             str:    Raw request placed
             int:    HTTP status code, eg 200,404,401
             dict:   Key/Value pairs of the headers received.
-        """
+        """ % self.pr
         if headers is None:
             headers = {}
 
         # Adding basic auth if username and password provided.
         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 +250,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/services.py

@@ -328,7 +328,7 @@ def payments_details(self, request="", **kwargs):
                                                  action, **kwargs)
 
     def payment_session(self, request="", **kwargs):
-        action = "paymentsSession"
+        action = "paymentSession"
         if validation.check_in(request, action):
             return self.client.call_checkout_api(request, self.service,
                                                  action, **kwargs)
@@ -339,7 +339,7 @@ def payment_result(self, request="", **kwargs):
             return self.client.call_checkout_api(request, self.service, action,
                                                  **kwargs)
 
-    def origin_key(self, request="", **kwargs):
+    def origin_keys(self, request="", **kwargs):
         action = "originKeys"
         if validation.check_in(request, action):
             return self.client.call_checkout_api(request, self.service,

Adyen/validation.py

@@ -21,10 +21,10 @@
 actions['payments'] = ["amount", "reference", "paymentMethod",
                        "merchantAccount", "returnUrl"]
 actions['paymentsDetails'] = ["paymentData", "details"]
-actions['paymentsSession'] = ["amount", "reference", "shopperReference",
-                              "channel", "token", "returnUrl", "countryCode",
-                              "shopperLocale", "sessionValidity",
-                              "merchantAccount"]
+actions['paymentSession'] = ["amount", "reference", "shopperReference",
+                             "channel", "returnUrl", "countryCode",
+                             "shopperLocale", "sessionValidity",
+                             "merchantAccount"]
 actions['paymentResult'] = ["payload"]
 actions['originKeys'] = ["originDomains"]