fix determine checkout url

Author: AlexandrosMor

Adyen/client.py

@@ -123,21 +123,21 @@ def _determine_hpp_url(self, platform, action):
         result = '/'.join([base_uri, service])
         return result
 
-    def _determine_checkout_url(self, platform, service, action):
+    def _determine_checkout_url(self, platform, action):
         """This returns the Adyen API endpoint based on the provided platform,
         service and action.
 
         Args:
             platform (str): Adyen platform, ie 'live' or 'test'.
-            service (str): API service to place request through.
             action (str): the API action to perform.
         """
         api_version = settings.API_CHECKOUT_VERSION
-        base_uri = settings.ENDPOINT_CHECKOUT_URL.format(platform)
-        if self.live_endpoint_prefix is not None and platform == "live":
+        if platform == "test":
+            base_uri = settings.ENDPOINT_CHECKOUT_TEST
+        elif self.live_endpoint_prefix is not None and platform == "live":
             base_uri = settings.ENDPOINT_CHECKOUT_LIVE_SUFFIX.format(
                 self.live_endpoint_prefix)
-        if self.live_endpoint_prefix is not None and platform == "test":
+        elif self.live_endpoint_prefix is None and platform == "live":
             errorstring = """Please set your live suffix. You can set it
                    by running 'settings.
                    ENDPOINT_CHECKOUT_LIVE_SUFFIX = 'Your live suffix'"""
@@ -373,7 +373,7 @@ class instance.
                                              status_code, headers, message)
         return adyen_result
 
-    def call_checkout_api(self, request_data, service, action, **kwargs):
+    def call_checkout_api(self, request_data, action, **kwargs):
         """This will call the checkout adyen api. xapi key merchant_account,
         and platform are pulled from root module level and or self object.
         AdyenResult will be returned on 200 response. Otherwise, an exception
@@ -426,7 +426,7 @@ def call_checkout_api(self, request_data, service, action, **kwargs):
         # merchant account and merchant reference to determine uniqueness.
         headers = {}
 
-        url = self._determine_checkout_url(platform, service, action)
+        url = self._determine_checkout_url(platform, action)
 
         raw_response, raw_request, status_code, headers = \
             self.http_client.request(url, json=request_data,

Adyen/services.py

@@ -312,35 +312,29 @@ def payment_methods(self, request="", **kwargs):
                         'merchantAccount must contain the merchant account'
                         ' when retrieving payment methods.')
 
-            return self.client.call_checkout_api(request, self.service,
-                                                 action, **kwargs)
+            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, self.service,
-                                                 action, **kwargs)
+            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, self.service,
-                                                 action, **kwargs)
+            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, self.service,
-                                                 action, **kwargs)
+            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, self.service, action,
-                                                 **kwargs)
+            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, self.service,
-                                                 action, **kwargs)
+            return self.client.call_checkout_api(request, action, **kwargs)

Adyen/settings.py

@@ -3,7 +3,7 @@
 BASE_PAL_URL = "https://pal-{}.adyen.com/pal/servlet"
 BASE_HPP_URL = "https://{}.adyen.com/hpp"
 ENDPOINT_LIVE_SUFFIX = "-pal-live.adyenpayments.com"
-ENDPOINT_CHECKOUT_URL = "https://checkout-{}.adyen.com"
+ENDPOINT_CHECKOUT_TEST = "https://checkout-test.adyen.com"
 ENDPOINT_CHECKOUT_LIVE_SUFFIX = "https://{}-checkout-live" \
                                 ".adyenpayments.com/checkout"
 API_CHECKOUT_VERSION = "v40"

test/CheckoutUtilityTest.py

@@ -47,7 +47,6 @@ def test_origin_keys_success_mocked(self):
                          ['https://www.your-domain2.com'])
 
     def test_checkout_utility_api_url_custom(self):
-        url = self.ady.client._determine_checkout_url("test", "",
-                                                      "originKeys")
+        url = self.ady.client._determine_checkout_url("test", "originKeys")
 
         self.assertEqual(url, "https://checkout-test.adyen.com/v1/originKeys")

test/DetermineEndpointTest.py

@@ -15,12 +15,19 @@ class TestDetermineUrl(unittest.TestCase):
 
     def test_checkout_api_url_custom(self):
         self.client.live_endpoint_prefix = "1797a841fbb37ca7-AdyenDemo"
-        url = self.adyen.client._determine_checkout_url("live", "",
-                                                        "payments")
+        url = self.adyen.client._determine_checkout_url("live", "payments")
         self.client.live_endpoint_prefix = "1797a841fbb37ca7-AdyenDemo"
         self.assertEqual(url, "https://1797a841fbb37ca7-AdyenDemo-checkout-"
                               "live.adyenpayments.com/checkout/v40/payments")
 
+    def test_checkout_api_url(self):
+
+        self.client.live_endpoint_prefix = None
+        url = self.adyen.client._determine_checkout_url("test",
+                                                        "paymentsDetails")
+        self.assertEqual(url, "https://checkout-test.adyen.com"
+                              "/v40/payments/details")
+
     def test_payments_invalid_platform(self):
 
         request = {'amount': {"value": "100000", "currency": "EUR"},
@@ -35,17 +42,10 @@ def test_payments_invalid_platform(self):
                    }, 'merchantAccount': "YourMerchantAccount",
                    'returnUrl': "https://your-company.com/..."}
 
-        self.client.platform = "test"
+        self.client.platform = "live"
+        self.client.live_endpoint_prefix = None
         try:
             result = self.adyen.checkout.payments(request)
         except AdyenEndpointInvalidFormat as error:
             print("the error" + str(error.__class__.__name__))
             self.assertIsNotNone("dfasdf")
-
-    def test_checkout_api_url(self):
-
-        self.client.live_endpoint_prefix = None
-        url = self.adyen.client._determine_checkout_url("test", "",
-                                                        "paymentsDetails")
-        self.assertEqual(url, "https://checkout-test.adyen.com"
-                              "/v40/payments/details")