From c55aef2f0cccac4f9c6ae5f47406c1e71ef674b0 Mon Sep 17 00:00:00 2001
From: spwoodcock <sam.woodcock@protonmail.com>
Date: Thu, 14 Nov 2024 10:17:41 +0000
Subject: [PATCH] fix(backend): building of extra cors origins, type mismatch

---
 src/backend/app/config.py | 66 ++++++++++++++++++---------------------
 1 file changed, 31 insertions(+), 35 deletions(-)

diff --git a/src/backend/app/config.py b/src/backend/app/config.py
index 36fba47f50..82abb942c3 100644
--- a/src/backend/app/config.py
+++ b/src/backend/app/config.py
@@ -158,49 +158,45 @@ class Settings(BaseSettings):
     FMTM_DOMAIN: str
     FMTM_DEV_PORT: Optional[str] = "7050"
 
-    EXTRA_CORS_ORIGINS: Optional[str | list[str]] = []
+    EXTRA_CORS_ORIGINS: Optional[str | list[str]] = None
 
     @field_validator("EXTRA_CORS_ORIGINS", mode="before")
     @classmethod
     def assemble_cors_origins(
         cls,
-        extra_origins: Optional[str | list[str]],
+        extra_origins: Optional[Union[str, list[str]]],
         info: ValidationInfo,
-    ) -> Union[list[str], str]:
-        """Build and validate CORS origins list.
-
-        By default, the provided frontend URLs are included in the origins list.
-        If this variable used, the provided urls are appended to the list.
-        """
-        # If a string is passed, convert to list
-        if isinstance(extra_origins, str):
-            default_origins = [i.strip() for i in extra_origins.split(",")]
-        else:
-            default_origins = []
-
-        # Add XLSForm editor url by default
-        default_origins += ["https://xlsforms.fmtm.dev"]
-
-        # Handle localhost / testing scenario
-        if "localhost" in (domain := info.data.get("FMTM_DOMAIN")):
-            dev_port = info.data.get("FMTM_DEV_PORT", "false")
-            if dev_port.lower() in ("0", "no", "false", ""):
-                local_server_port = ""
-            else:
-                local_server_port = f":{dev_port}"
+    ) -> list[str]:
+        """Build and validate CORS origins list."""
+        # Initialize default origins
+        default_origins = ["https://xlsforms.fmtm.dev"]
+
+        # Handle localhost/testing scenario
+        domain = info.data.get("FMTM_DOMAIN", "localhost")
+        dev_port = info.data.get("FMTM_DEV_PORT", "")
+        if "localhost" in domain:
+            local_server_port = (
+                f":{dev_port}"
+                if dev_port and dev_port.lower() not in ("0", "no", "false")
+                else ""
+            )
             default_origins.append(f"http://{domain}{local_server_port}")
-            return default_origins
-
-        # Add the main FMTM domain
-        default_origins.append(f"https://{domain}")
-
-        # If no extra origins, return frontend + XLSForm editor URLs
-        if extra_origins is None:
-            return default_origins
-        # Else add extra origins to defaults
         else:
-            default_origins.append(extra_origins)
-            return default_origins
+            # Add the main FMTM domain
+            default_origins.append(f"https://{domain}")
+
+        # Process `extra_origins` if provided
+        if isinstance(extra_origins, str):
+            # Split by comma and strip whitespace
+            extra_origins_list = [
+                i.strip() for i in extra_origins.split(",") if i.strip()
+            ]
+            default_origins.extend(extra_origins_list)
+        elif isinstance(extra_origins, list):
+            default_origins.extend(extra_origins)
+
+        # Ensure uniqueness and return (remove dups)
+        return list(dict.fromkeys(default_origins))
 
     API_PREFIX: str = ""