Update main.py

main.py

@@ -1,6 +1,6 @@
 #main.py
 
-from fastapi import FastAPI, Form, Depends, HTTPException, status, Query
+from fastapi import FastAPI, Form, Depends, HTTPException, status
 from fastapi.requests import Request
 from fastapi.responses import HTMLResponse, RedirectResponse, JSONResponse
 from fastapi.templating import Jinja2Templates
@@ -8,7 +8,7 @@ from sqlalchemy.orm import Session
 from auth import verify_token, oauth2_scheme, auth_views, register, UserCreate, authenticate_user, get_user_by_verification_token
 from database import get_db, get_user_by_email
 from datetime import timedelta
-from typing import Optional
+#from typing import Optional
 #import auth
 #import tts
 import os
@@ -138,31 +138,44 @@ async def verify_email(verification_token: str, db: Session = Depends(get_db)):
     # Redirect to the protected route with the token as a query parameter (or as required by your front-end/client)
     return RedirectResponse(url=f"/protected?token={access_token}")
 
-from jwt import decode, PyJWTError  # make sure jwt is imported
-
-
+#from jwt import decode, PyJWTError  # make sure jwt is imported
 
 @app.get("/protected", response_class=HTMLResponse)
-async def get_protected(request: Request, token: Optional[str] = None, db: Session = Depends(get_db)):
-    # Try to get the token from the query parameter first, then fall back to the cookie
-    token = token or request.cookies.get("access_token")
-    if not token:
-        raise HTTPException(status_code=401, detail="Not authenticated")
-
-    try:
-        payload = decode(token, auth_views.SECRET_KEY, algorithms=[auth_views.ALGORITHM])
-        user_email = payload.get("sub")
-        if user_email is None:
-            raise HTTPException(status_code=401, detail="Not authenticated")
-    except PyJWTError:
-        raise HTTPException(status_code=401, detail="Could not validate credentials")
+async def get_protected(
+    request: Request, 
+    token: str = Depends(verify_token),  # Use Depends to inject the token after verification
+    db: Session = Depends(get_db)
+):
+    user_email = token  # As verify_token returns the 'sub' which is user email
 
     db_user = get_user_by_email(db, user_email)
     if db_user is None or not db_user.is_verified:
         raise HTTPException(status_code=401, detail="User not found or not verified in the database")
 
+    # Render a template response
     return templates.TemplateResponse("protected.html", {"request": request, "user": db_user.username})
 
+#@app.get("/protected", response_class=HTMLResponse)
+#async def get_protected(request: Request, token: Optional[str] = None, db: Session = Depends(get_db)):
+    # Try to get the token from the query parameter first, then fall back to the cookie
+#    token = token or request.cookies.get("access_token")
+#    if not token:
+#        raise HTTPException(status_code=401, detail="Not authenticated")
+
+#    try:
+#        payload = decode(token, auth_views.SECRET_KEY, algorithms=[auth_views.ALGORITHM])
+#        user_email = payload.get("sub")
+#        if user_email is None:
+#            raise HTTPException(status_code=401, detail="Not authenticated")
+ #   except PyJWTError:
+ #       raise HTTPException(status_code=401, detail="Could not validate credentials")
+
+ #   db_user = get_user_by_email(db, user_email)
+#    if db_user is None or not db_user.is_verified:
+#        raise HTTPException(status_code=401, detail="User not found or not verified in the database")
+
+#    return templates.TemplateResponse("protected.html", {"request": request, "user": db_user.username})
+
 #async def get_protected(
  #   request: Request,
  #   token: str = Query(None),  # Accept token from query parameters