[recurring] Code generation: update services and models

Adyen/client.py

@@ -162,12 +162,6 @@ def _determine_api_url(self, platform, endpoint):
                 "https://pal-test.adyen.com/pal/servlet/",
                 f"https://{live_endpoint_prefix}-pal-live.adyenpayments.com/pal/servlet/",
             )
-        elif "paltokenization-" in endpoint:
-            live_endpoint_prefix = self._require_live_endpoint_prefix()
-            endpoint = endpoint.replace(
-                "https://paltokenization-test.adyen.com/paltokenization/servlet/",
-                f"https://{live_endpoint_prefix}-paltokenization-live.adyenpayments.com/paltokenization/servlet/",
-            )
         elif "checkout-" in endpoint:
             live_endpoint_prefix = self._require_live_endpoint_prefix()
 

Adyen/services/recurring/recurring_api.py

@@ -11,9 +11,7 @@ class RecurringApi(AdyenServiceBase):
     def __init__(self, client=None):
         super().__init__(client=client)
         self.service = "recurring"
-        self.baseUrl = (
-            "https://paltokenization-test.adyen.com/paltokenization/servlet/Recurring/v68"
-        )
+        self.baseUrl = "https://pal-test.adyen.com/pal/servlet/Recurring/v68"
 
     def create_permit(self, request, idempotency_key=None, **kwargs):
         """

test/DetermineEndpointTest.py

@@ -160,9 +160,7 @@ def test_live_capital_api_url(self):
 
     def test_recurring_api_base_url(self):
         self.assertTrue(
-            self.recurring_url.startswith(
-                "https://paltokenization-test.adyen.com/paltokenization/servlet/Recurring/"
-            )
+            self.recurring_url.startswith("https://pal-test.adyen.com/pal/servlet/Recurring/")
         )
 
     def test_recurring_api_url_test_platform(self):
@@ -175,8 +173,8 @@ def test_recurring_api_url_live_with_prefix(self):
         url = self.adyen.client._determine_api_url("live", self.recurring_url + RECURRING_DETAILS)
         self.assertEqual(
             url,
-            "https://1797a841fbb37ca7-AdyenDemo-paltokenization-live.adyenpayments.com"
-            f"/paltokenization/servlet/Recurring/{self.recurring_version}{RECURRING_DETAILS}",
+            "https://1797a841fbb37ca7-AdyenDemo-pal-live.adyenpayments.com"
+            f"/pal/servlet/Recurring/{self.recurring_version}{RECURRING_DETAILS}",
         )
 
     def test_recurring_api_url_live_no_prefix_raises(self):

test/RecurringTest.py

@@ -2,6 +2,7 @@
 
 import Adyen
 from Adyen import settings
+from Adyen.exceptions import AdyenEndpointInvalidFormat
 
 try:
     from BaseTest import BaseTest
@@ -18,6 +19,31 @@ class TestRecurring(unittest.TestCase):
     client.platform = "test"
     baseUrl = adyen.recurring.recurring_api.baseUrl
 
+    def test_base_url_test_environment(self):
+        url = self.adyen.client._determine_api_url("test", self.baseUrl)
+        self.assertEqual(url, self.baseUrl)
+        self.assertTrue(url.startswith("https://pal-test.adyen.com/pal/servlet/Recurring/"))
+
+    def test_base_url_live_environment(self):
+        self.adyen.client.live_endpoint_prefix = "1797a841fbb37ca7-AdyenDemo"
+        recurring_version = self.baseUrl.split("/")[-1]
+        url = self.adyen.client._determine_api_url("live", self.baseUrl)
+        self.assertEqual(
+            url,
+            f"https://1797a841fbb37ca7-AdyenDemo-pal-live.adyenpayments.com"
+            f"/pal/servlet/Recurring/{recurring_version}",
+        )
+        self.adyen.client.live_endpoint_prefix = None
+
+    def test_base_url_live_environment_no_prefix_raises(self):
+        self.adyen.client.live_endpoint_prefix = None
+        self.assertRaises(
+            AdyenEndpointInvalidFormat,
+            self.adyen.client._determine_api_url,
+            "live",
+            self.baseUrl,
+        )
+
     def test_list_recurring_details(self):
         request = {}
         request["merchantAccount"] = "YourMerchantAccount"