From 15c457d37700c21401af146c83f2a8564dc0015a Mon Sep 17 00:00:00 2001
From: Roger Joys <roger.joys.register@gmail.com>
Date: Sun, 15 Mar 2026 16:15:52 -0700
Subject: [PATCH] Fixing 404 due to construction of URL from Unifi

---
 app/main.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/app/main.py b/app/main.py
index 2bc53c9..c98dcbc 100644
--- a/app/main.py
+++ b/app/main.py
@@ -50,6 +50,18 @@ async def portal(request: Request, site: str, mac: str, ap: str = "", url: str =
         "url": url,
     }
 
+    @app.get("/guest/s/{site_id}/")
+    async def unifi_portal(request: Request, site_id: str, ap: str = "", id: str = "", t: str = "", url: str = "", ssid: str = ""):
+        """Handle UniFi's default captive portal redirect format."""
+        # Map ssid to site
+        site = next((s for s in config.sites.values() if s.ssid == ssid), None)
+        if site is None:
+            # Fall back to first site
+            site = next(iter(config.sites.values()))
+
+        mac = id  # UniFi sends MAC as 'id' parameter
+        return await portal(request, site=site.id, mac=mac, ap=ap, url=url)
+
     auth_url = get_authorization_url(config, state)
     return RedirectResponse(auth_url)