Strip slashes from env var URLs

nationalarchives · Jan 5, 2024 · 7769e7a · 7769e7a
1 parent a103371
commit 7769e7a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/app/__init__.py b/app/__init__.py
@@ -114,7 +114,6 @@ def get_wagtail_media(media_id):
             get_wagtail_image=get_wagtail_image,
             get_wagtail_page=get_wagtail_page,
             get_wagtail_media=get_wagtail_media,
-            # WAGTAIL_MEDIA_URL=Config().WAGTAIL_MEDIA_URL.strip("/"),
             WAGTAIL_MEDIA_URL=Config().WAGTAIL_MEDIA_URL,
         )
 

diff --git a/app/wagtail/api.py b/app/wagtail/api.py
@@ -11,7 +11,6 @@ def wagtail_request_handler(uri, params={}):
     if not api_url:
         current_app.logger.critical("WAGTAIL_API_URL not set")
         raise Exception("WAGTAIL_API_URL not set")
-    api_url = api_url.strip("/")
     params["format"] = "json"
     query_string = (
         "?"

diff --git a/config.py b/config.py
@@ -7,9 +7,9 @@ class Config(object):
     ENVIRONMENT = os.environ.get("ENVIRONMENT", "production")
     SECRET_KEY = os.environ.get("SECRET_KEY")
     DEBUG = strtobool(os.getenv("DEBUG", "False"))
-    WAGTAIL_API_URL = os.environ.get("WAGTAIL_API_URL")
-    WAGTAIL_MEDIA_URL = os.environ.get("WAGTAIL_MEDIA_URL")
-    SEARCH_API_URL = os.environ.get("SEARCH_API_URL")
+    WAGTAIL_API_URL = os.environ.get("WAGTAIL_API_URL").rstrip("/")
+    WAGTAIL_MEDIA_URL = os.environ.get("WAGTAIL_MEDIA_URL").rstrip("/")
+    SEARCH_API_URL = os.environ.get("SEARCH_API_URL").rstrip("/")
 
 
 cache_config = {