Added support for custom live endpoint URLs for PAL service (#120)

* Added support for custom live endpoint URLs for PAL service. Covers issue #119

* Added test for determining binlookup service URL. Issue #119

* Updated TestDetermineUrl tests after merge with upstream

Author: sashakruglov

Adyen/client.py

@@ -103,8 +103,7 @@ def __init__(
         self.live_endpoint_prefix = live_endpoint_prefix
         self.http_timeout = http_timeout
 
-    @staticmethod
-    def _determine_api_url(platform, service, action):
+    def _determine_api_url(self, platform, service, action):
         """This returns the Adyen API endpoint based on the provided platform,
         service and action.
 
@@ -113,7 +112,13 @@ def _determine_api_url(platform, service, action):
             service (str): API service to place request through.
             action (str): the API action to perform.
         """
-        base_uri = settings.BASE_PAL_URL.format(platform)
+        if platform == "live" and self.live_endpoint_prefix:
+            base_uri = settings.PAL_LIVE_ENDPOINT_URL_TEMPLATE.format(
+                self.live_endpoint_prefix
+            )
+        else:
+            base_uri = settings.BASE_PAL_URL.format(platform)
+
         if service == "Recurring":
             api_version = settings.API_RECURRING_VERSION
         elif service == "Payout":

Adyen/settings.py

@@ -1,5 +1,7 @@
 # Those constants are used from the library only
 BASE_PAL_URL = "https://pal-{}.adyen.com/pal/servlet"
+PAL_LIVE_ENDPOINT_URL_TEMPLATE = "https://{}-pal-live" \
+                                 ".adyenpayments.com/pal/servlet"
 BASE_HPP_URL = "https://{}.adyen.com/hpp"
 ENDPOINT_CHECKOUT_TEST = "https://checkout-test.adyen.com"
 ENDPOINT_CHECKOUT_LIVE_SUFFIX = "https://{}-checkout-live" \

test/DetermineEndpointTest.py

@@ -54,3 +54,55 @@ def test_payments_invalid_platform(self):
             self.adyen.checkout.payments(request)
         except AdyenEndpointInvalidFormat as error:
             self.assertIsNotNone(error)
+
+    def test_pal_url_live_endpoint_prefix_live_platform(self):
+        self.client.live_endpoint_prefix = "1797a841fbb37ca7-AdyenDemo"
+        url = self.adyen.client._determine_api_url(
+            "live", "Payment", "payments"
+        )
+        self.assertEqual(
+            url,
+            ("https://1797a841fbb37ca7-AdyenDemo-pal-"
+             "live.adyenpayments.com/pal/servlet/Payment/v64/payments")
+        )
+
+    def test_pal_url_live_endpoint_prefix_test_platform(self):
+        self.client.live_endpoint_prefix = "1797a841fbb37ca7-AdyenDemo"
+        url = self.adyen.client._determine_api_url(
+            "test", "Payment", "payments"
+        )
+        self.assertEqual(
+            url,
+            "https://pal-test.adyen.com/pal/servlet/Payment/v64/payments"
+        )
+
+    def test_pal_url_no_live_endpoint_prefix_live_platform(self):
+        self.client.live_endpoint_prefix = None
+        url = self.adyen.client._determine_api_url(
+            "live", "Payment", "payments"
+        )
+        self.assertEqual(
+            url,
+            "https://pal-live.adyen.com/pal/servlet/Payment/v64/payments"
+        )
+
+    def test_pal_url_no_live_endpoint_prefix_test_platform(self):
+        self.client.live_endpoint_prefix = None
+        url = self.adyen.client._determine_api_url(
+            "test", "Payment", "payments"
+        )
+        self.assertEqual(
+            url,
+            "https://pal-test.adyen.com/pal/servlet/Payment/v64/payments"
+        )
+
+    def test_binlookup_url_no_live_endpoint_prefix_test_platform(self):
+        self.client.live_endpoint_prefix = None
+        url = self.adyen.client._determine_api_url(
+            "test", "BinLookup", "get3dsAvailability"
+        )
+        self.assertEqual(
+            url,
+            ("https://pal-test.adyen.com/pal/servlet/"
+             "BinLookup/v50/get3dsAvailability")
+        )