Merge pull request #83 from opengisch/QF-6452-trailing-slash

fix: add trailing URL slash so we not break query string in the URL

Author: suricactus

qfieldcloud_sdk/sdk.py

@@ -13,7 +13,7 @@
 from requests.adapters import HTTPAdapter, Retry
 
 from .interfaces import QfcException, QfcRequest, QfcRequestException
-from .utils import calc_etag, log
+from .utils import calc_etag, log, add_trailing_slash_to_url
 from pathvalidate import is_valid_filepath
 
 
@@ -1727,11 +1727,10 @@ def _request(
             if path.startswith("/"):
                 path = path[1:]
 
-            if not path.endswith("/"):
-                path += "/"
-
             path = self.url + path
 
+        path = add_trailing_slash_to_url(path)
+
         if pagination:
             limit = pagination.limit or DEFAULT_PAGINATION_LIMIT
             offset = pagination.offset or 0

qfieldcloud_sdk/utils.py

@@ -3,6 +3,7 @@
 import os
 import sys
 from typing import List
+from urllib.parse import urlparse, urlunparse
 
 
 def print_json(data):
@@ -114,3 +115,38 @@ def format_project_table(projects: List) -> str:
         headers=["ID", "OWNER/NAME", "IS PUBLIC", "DESCRIPTION"],
         data=data,
     )
+
+
+def add_trailing_slash_to_url(url: str) -> str:
+    """
+    Add a trailing slash to a URL if it doesn't already have one.
+
+    Args:
+        url (str): The URL to process
+
+    Returns:
+        str: URL with trailing slash added
+
+    Examples:
+        >>> add_trailing_slash("https://example.com")
+        'https://example.com/'
+        >>> add_trailing_slash("https://example.com/")
+        'https://example.com/'
+        >>> add_trailing_slash("https://example.com/path")
+        'https://example.com/path/'
+        >>> add_trailing_slash("https://example.com/file.txt")
+        'https://example.com/file.txt/'
+    """
+    if not url:
+        return url
+
+    parsed = urlparse(url)
+
+    # Add trailing slash to path if it doesn't end with one
+    path = parsed.path
+    if not path.endswith("/"):
+        path += "/"
+
+    # Reconstruct the URL with the modified path
+    modified_parsed = parsed._replace(path=path)
+    return urlunparse(modified_parsed)