Remove duplicate slashes and add user-header

Fixes #PV-617
City-of-Helsinki · Aug 31, 2023 · 1bd5aa0 · 1bd5aa0
1 parent 8535bb0
commit 1bd5aa0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/parking_permits/models/order.py b/parking_permits/models/order.py
@@ -1,4 +1,5 @@
 import logging
+from urllib.parse import urljoin
 
 import requests
 from dateutil.relativedelta import relativedelta
@@ -39,7 +40,7 @@ def validate_order(order_id, user_id):
             "Content-Type": "application/json",
         }
         response = requests.get(
-            f"{settings.TALPA_ORDER_EXPERIENCE_API}/admin/{order_id}",
+            urljoin(settings.TALPA_ORDER_EXPERIENCE_API, f"admin/{order_id}"),
             headers=headers,
         )
         if response.status_code == 200:
@@ -369,10 +370,13 @@ def _cancel_talpa_order(self):
         headers = {
             "api-key": settings.TALPA_API_KEY,
             "namespace": settings.NAMESPACE,
+            "user": str(self.customer.user.uuid),
             "Content-Type": "application/json",
         }
         response = requests.post(
-            f"{settings.TALPA_ORDER_EXPERIENCE_API}/{self.talpa_order_id}/cancel",
+            urljoin(
+                settings.TALPA_ORDER_EXPERIENCE_API, f"{self.talpa_order_id}/cancel"
+            ),
             headers=headers,
         )
         if response.status_code == 200:
@@ -452,7 +456,10 @@ def _cancel_talpa_subcription(self):
             "Content-Type": "application/json",
         }
         response = requests.post(
-            f"{settings.TALPA_ORDER_EXPERIENCE_API}/subcription/{self.talpa_subscription_id}/cancel",
+            urljoin(
+                settings.TALPA_ORDER_EXPERIENCE_API,
+                f"subcription/{self.talpa_subscription_id}/cancel",
+            ),
             headers=headers,
         )
         if response.status_code == 200:

diff --git a/parking_permits/models/product.py b/parking_permits/models/product.py
@@ -1,6 +1,7 @@
 import json
 import logging
 from decimal import Decimal
+from urllib.parse import urljoin
 
 import requests
 from dateutil.relativedelta import relativedelta
@@ -180,7 +181,10 @@ def get_merchant_id(self):
             "Content-Type": "application/json",
         }
         response = requests.get(
-            f"{settings.TALPA_MERCHANT_EXPERIENCE_API}/list/merchants/{settings.NAMESPACE}/",
+            urljoin(
+                settings.TALPA_MERCHANT_EXPERIENCE_API,
+                f"list/merchants/{settings.NAMESPACE}/",
+            ),
             headers=headers,
         )
         if response.status_code == 200: