deploy at 2024-08-25 07:42:37.050643

main.py

@@ -191,9 +191,16 @@ class SimpleAuthBackend(AuthenticationBackend):
             return None
         return AuthCredentials(["authenticated"]), SimpleUser("admin")
 
-# Simplified middleware setup
+
+# Modify the middleware setup
 middlewares = [
-    Middleware(SessionMiddleware, secret_key=SECRET_KEY, max_age=3600),
+    Middleware(
+        SessionMiddleware,
+        secret_key=SECRET_KEY,
+        max_age=3600,
+        same_site='None',  # Try 'Lax' if 'None' doesn't work
+        https_only=False,  # Set to True if your site uses HTTPS
+    ),
     Middleware(AuthenticationMiddleware, backend=SimpleAuthBackend()),
 ]
 
@@ -224,6 +231,16 @@ app, rt = fast_app(
     same_site="None",
 )
 
+# Add this function for debugging
+@app.middleware("http")
+async def debug_request_middleware(request: Request, call_next):
+    print(f"Request headers: {request.headers}")
+    print(f"Request cookies: {request.cookies}")
+    response = await call_next(request)
+    print(f"Response headers: {response.headers}")
+    if hasattr(response, 'cookies'):
+        print(f"Response cookies: {response.cookies}")
+    return response
 
 sesskey = get_key(fname=sess_key_path)
 print(f"Session key: {sesskey}")
@@ -452,6 +469,14 @@ async def login(request: Request):
     if username == ADMIN_NAME and compare_digest(ADMIN_PWD.encode("utf-8"), password.encode("utf-8")):
         request.session["auth"] = True
         response = RedirectResponse("/admin", status_code=303)
+        response.set_cookie(
+            "admin_auth",
+            request.session,
+            max_age=3600,
+            httponly=True,
+            samesite='Lax',  # Try 'Lax' if 'None' doesn't work
+            secure=False,  # Set to True if your site uses HTTPS
+        )
         return response
     
     return RedirectResponse("/login?error=True", status_code=303)
@@ -659,7 +684,8 @@ def download_csv(request: Request):
 
 @app.route("/admin")
 async def admin(request: Request):
-    if not request.session.get("auth", False):
+    auth = request.cookies.get("admin_auth", None)
+    if auth is None:
         return RedirectResponse("/login", status_code=303)
     
     page = int(request.query_params.get("page", 1))