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

---
 app/main.py | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/main.py b/app/main.py
index cabb0ca..3276c2d 100644
--- a/app/main.py
+++ b/app/main.py
@@ -1,17 +1,15 @@
 import logging
 import secrets
-from urllib.parse import urlencode
 
 from fastapi import FastAPI, Request, HTTPException
 from fastapi.responses import HTMLResponse, RedirectResponse
+from fastapi.staticfiles import StaticFiles
 from fastapi.templating import Jinja2Templates
 
 from app.auth import get_authorization_url, exchange_code_for_token, get_userinfo, get_guest_duration
 from app.config import load_config
 from app.unifi import authorize_guest
 
-from fastapi.staticfiles import StaticFiles
-
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
@@ -33,7 +31,7 @@ async def index(request: Request):
     })
 
 
-@app.get("/portal", response_class=HTMLResponse)
+@app.get("/portal")
 async def portal(request: Request, site: str, mac: str, ap: str = "", url: str = ""):
     """
     Entry point from UniFi captive portal redirect.
@@ -50,17 +48,24 @@ async def portal(request: Request, site: str, mac: str, ap: str = "", url: str =
         "url": url,
     }
 
+    auth_url = get_authorization_url(config, state)
+    return RedirectResponse(auth_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)
+    state = secrets.token_urlsafe(32)
+    state_store[state] = {
+        "site": site.id,
+        "mac": id,
+        "ap": ap,
+        "url": url,
+    }
 
     auth_url = get_authorization_url(config, state)
     return RedirectResponse(auth_url)
@@ -104,4 +109,4 @@ async def callback(request: Request, code: str, state: str):
         "userinfo": userinfo,
         "duration_hours": duration // 60,
         "original_url": original_url,
-    })
+    })
\ No newline at end of file