Update main.py

main.py

@@ -5,7 +5,7 @@ from fastapi.requests import Request
 from fastapi.responses import HTMLResponse, RedirectResponse
 from fastapi.templating import Jinja2Templates
 from sqlalchemy.orm import Session
-from auth import verify_token, oauth2_scheme, auth_views, register, UserCreate, verify_email, authenticate_user
+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
 #import auth
 #import tts
@@ -92,26 +92,26 @@ async def registration_successful(request: Request):
 
 
 
+
+
 @app.get("/verify/{verification_token}", response_class=HTMLResponse)
 async def verify_email(verification_token: str, request: Request, db: Session = Depends(get_db)):
     # Verify the email using the token
-    user_email = verify_token(verification_token)
-    if not user_email:
-        return HTTPException(status_code=400, detail="Invalid verification token")
-
-    # Get the user by email
-    user = get_user_by_email(db, user_email)
+    user = get_user_by_verification_token(db, verification_token)
+    
     if not user:
-        return HTTPException(status_code=400, detail="User not found")
+        raise HTTPException(status_code=400, detail="Invalid verification token")
 
     if user.is_verified:
-        return HTTPException(status_code=400, detail="Email already verified")
+        raise HTTPException(status_code=400, detail="Email already verified")
 
     # Mark the email as verified in the database
     user.is_verified = True
+    user.email_verification_token = None  # Optionally clear the verification token
     db.commit()
 
     # Handle a successful verification
+  #  return templates.TemplateResponse("verification_successful.html", {"request": request})
     return RedirectResponse("/protected")
 
 # User authentication (protected route)