From 677f6028d96e4b7b8a7907022f0d8ebf233e1fe3 Mon Sep 17 00:00:00 2001 From: Hidosi Date: Thu, 16 Jul 2026 18:16:27 +0700 Subject: [PATCH] Fix cookie auth for API endpoints and clean up navbar --- server/auth.py | 5 ++++- server/templates/base.html | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/server/auth.py b/server/auth.py index a56ebd9..fc6a755 100644 --- a/server/auth.py +++ b/server/auth.py @@ -2,7 +2,7 @@ from datetime import datetime, timedelta, timezone from typing import Optional from jose import JWTError, jwt from passlib.context import CryptContext -from fastapi import Depends, HTTPException, status +from fastapi import Depends, HTTPException, Request, status from fastapi.security import OAuth2PasswordBearer from sqlalchemy.orm import Session from config import get_settings @@ -50,9 +50,12 @@ def verify_token(token: str, token_type: str) -> Optional[dict]: def get_current_user( + request: Request, token: Optional[str] = Depends(oauth2_scheme), db: Session = Depends(get_db), ) -> Optional[models.User]: + if not token: + token = request.cookies.get("access_token") if not token: raise HTTPException( status_code=status.HTTP_401_UNAUTHORIZED, diff --git a/server/templates/base.html b/server/templates/base.html index a71bfe3..57b7b3d 100644 --- a/server/templates/base.html +++ b/server/templates/base.html @@ -21,13 +21,15 @@