From 848d2ede5c02d4892e25b56312de0b051dac25fa Mon Sep 17 00:00:00 2001 From: gilbertyiga Date: Fri, 1 Nov 2024 12:52:11 +0300 Subject: [PATCH 1/3] url correction --- app/routers/auth.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/routers/auth.py b/app/routers/auth.py index 4814ed2..e656dec 100644 --- a/app/routers/auth.py +++ b/app/routers/auth.py @@ -169,7 +169,6 @@ async def google_login(request: Request): redirect_uri = request.url_for("google_callback") return await oauth.google.authorize_redirect(request, redirect_uri) - @router.get("/auth/google/callback") async def google_callback(request: Request, db: AsyncSession = Depends(get_db)): token = await oauth.google.authorize_access_token(request) @@ -212,5 +211,3 @@ async def save_organization( # Redirect to account or another relevant page return RedirectResponse(url="/account", status_code=status.HTTP_303_SEE_OTHER) - - From 7c2b4eec729551986dc88383b4203a9ca5bd75ce Mon Sep 17 00:00:00 2001 From: gilbertyiga Date: Fri, 1 Nov 2024 13:05:32 +0300 Subject: [PATCH 2/3] Added sessionMiddleware --- app/api.py | 4 ++++ app/routers/auth.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/api.py b/app/api.py index c8dccb6..af8b542 100644 --- a/app/api.py +++ b/app/api.py @@ -24,6 +24,8 @@ from app.routers.frontend import router as frontend_router from app.routers.tasks import router as tasks_router from app.utils.exception_utils import validation_exception_handler +from starlette.middleware.sessions import SessionMiddleware + load_dotenv() logging.basicConfig(level=logging.INFO) @@ -86,6 +88,8 @@ async def lifespan(app: FastAPI): lifespan=lifespan, ) +# Add SessionMiddleware to enable session-based authentication +app.add_middleware(SessionMiddleware, secret_key=os.getenv("SECRET_KEY")) static_files_directory = Path(__file__).parent.absolute() / "static" app.mount("/static", StaticFiles(directory=static_files_directory), name="static") diff --git a/app/routers/auth.py b/app/routers/auth.py index e656dec..078f28a 100644 --- a/app/routers/auth.py +++ b/app/routers/auth.py @@ -169,7 +169,7 @@ async def google_login(request: Request): redirect_uri = request.url_for("google_callback") return await oauth.google.authorize_redirect(request, redirect_uri) -@router.get("/auth/google/callback") +@router.get("/auth/google/callback", name="google_callback") async def google_callback(request: Request, db: AsyncSession = Depends(get_db)): token = await oauth.google.authorize_access_token(request) user_info = await oauth.google.parse_id_token(request, token) From 4a04d4ed24a466c57af4747d333c13eef05dfffe Mon Sep 17 00:00:00 2001 From: gilbertyiga Date: Fri, 1 Nov 2024 13:25:56 +0300 Subject: [PATCH 3/3] url correction --- app/routers/auth.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/routers/auth.py b/app/routers/auth.py index 078f28a..d0570bf 100644 --- a/app/routers/auth.py +++ b/app/routers/auth.py @@ -164,12 +164,12 @@ async def change_password( return {"message": "Password change successful", "success": True} -@router.get("/auth/google/login", name="auth/google_login") +@router.get("/google/login", name="auth/google_login") async def google_login(request: Request): redirect_uri = request.url_for("google_callback") return await oauth.google.authorize_redirect(request, redirect_uri) -@router.get("/auth/google/callback", name="google_callback") +@router.get("/google/callback", name="google_callback") async def google_callback(request: Request, db: AsyncSession = Depends(get_db)): token = await oauth.google.authorize_access_token(request) user_info = await oauth.google.parse_id_token(request, token)