From 472fedc3ae635536e17d3aeda71e7608a42897ab Mon Sep 17 00:00:00 2001
From: Leo Vasanko <leo@git>
Date: Wed, 10 Dec 2025 17:39:09 +0000
Subject: [PATCH] Fix devserver script misprocessing in some situations where
 auth-host was being used. Deduplicate origins on server end.

---
 paskia/fastapi/__main__.py |  6 ++++-
 scripts/devserver.py       | 53 ++++++++++++++------------------------
 2 files changed, 25 insertions(+), 34 deletions(-)

diff --git a/paskia/fastapi/__main__.py b/paskia/fastapi/__main__.py
index f346031..9c25129 100644
--- a/paskia/fastapi/__main__.py
+++ b/paskia/fastapi/__main__.py
@@ -185,9 +185,13 @@ def main():
 
         # If origins are configured, ensure auth_host is included at top
         if origins:
-            # Insert auth_host at the beginning (Passkey.__init__ will dedupe)
+            # Insert auth_host at the beginning
             origins.insert(0, args.auth_host)
 
+    # Remove duplicates while preserving order
+    seen = set()
+    origins = [x for x in origins if not (x in seen or seen.add(x))]
+
     # Compute site_url and site_path for reset links
     # Priority: auth_host > first origin with localhost > http://localhost:port
     if args.auth_host:
diff --git a/scripts/devserver.py b/scripts/devserver.py
index 86573a9..f4db987 100755
--- a/scripts/devserver.py
+++ b/scripts/devserver.py
@@ -389,20 +389,25 @@ def main():
 
     # Compute origins for Caddy (user-specified or auto-generated)
     caddy_origins = []
+    if args.auth_host:
+        auth_host = args.auth_host
+        if "://" not in auth_host:
+            auth_host = f"https://{auth_host}"
+        caddy_origins.append(auth_host)
+        # Also run on rp-id when auth-host is specified
+        caddy_origins.append(f"https://{args.rp_id}")
     if args.origins:
-        # User specified explicit origins - use those
-        caddy_origins = args.origins
-    elif args.caddy:
-        # Caddy mode without explicit origins: add https origin for the hostname
-        if args.auth_host:
-            # auth-host is the primary origin
-            auth_host = args.auth_host
-            if "://" not in auth_host:
-                auth_host = f"https://{auth_host}"
-            caddy_origins.append(auth_host)
-        else:
-            # Use rp-id as the hostname (standard port 443, no port in URL)
-            caddy_origins.append(f"https://{args.rp_id}")
+        for origin in args.origins:
+            if "://" not in origin:
+                origin = f"https://{origin}"
+            caddy_origins.append(origin)
+    # If neither auth-host nor origins specified, run on rp-id
+    if not args.auth_host and not args.origins:
+        caddy_origins.append(f"https://{args.rp_id}")
+
+    # Remove duplicates while preserving order
+    seen = set()
+    caddy_origins = [x for x in caddy_origins if not (x in seen or seen.add(x))]
 
     # Start Caddy if requested (after computing origins)
     if args.caddy:
@@ -429,28 +434,10 @@ def main():
     if args.auth_host:
         cmd.extend(["--auth-host", args.auth_host])
 
-    # Collect all origins: Caddy origins first (auth-host first), then user origins
-    # Use a set to track and avoid duplicates
-    all_origins = []
-    seen_origins = set(args.origins) if args.origins else set()
-
-    # Add Caddy origins first (they include auth-host origin if configured)
-    if args.caddy:
-        for origin in caddy_origins:
-            if origin not in seen_origins:
-                all_origins.append(origin)
-                seen_origins.add(origin)
-
-    # Add user-specified origins
+    # Pass through origins as specified
     if args.origins:
         for origin in args.origins:
-            if origin not in seen_origins:
-                all_origins.append(origin)
-                seen_origins.add(origin)
-
-    # Pass all origins to backend
-    for origin in all_origins:
-        cmd.extend(["--origin", origin])
+            cmd.extend(["--origin", origin])
 
     # Add remaining args (ones we didn't parse)
     cmd.extend(remaining)