Update auth.py

auth.py

@@ -56,25 +56,27 @@ def authenticate_user(db: Session, email: str, password: str):
 
 from emailx import send_verification_email, generate_verification_token
 
-def verify_email(self, verification_token: str, db: Session = Depends(get_db)):
-    # Verify the email using the token
-    user_email = verify_token(verification_token)
-    if not user_email:
-        raise HTTPException(status_code=400, detail="Invalid verification token")
+def get_user_by_verification_token(db: Session, verification_token: str):
+    return db.query(User).filter(User.email_verification_token == verification_token).first()
 
-    # Get the user by email
-    user = get_user_by_email(db, user_email)
+def verify_email(verification_token: str, db: Session = Depends(get_db)):
+    # Verify the email using the token
+    user = get_user_by_verification_token(db, verification_token)
+    
     if not user:
-        raise HTTPException(status_code=400, detail="User not found")
+        raise HTTPException(status_code=400, detail="Invalid verification token")
 
     if user.is_verified:
         raise HTTPException(status_code=400, detail="Email already verified")
 
     # Mark the email as verified
     user.is_verified = True
+    user.email_verification_token = None  # Optionally clear the verification token
     db.commit()
     return {"message": "Email verification successful"}
 
+
+
 def register(user: UserCreate, db: Session):
     # Validate email format and check for existing users
     db_user = get_user_by_email(db, user.email)
@@ -94,7 +96,9 @@ def register(user: UserCreate, db: Session):
    # verify_email(verification_token, db)
 
     # Create the user in the database
-    user_in_db = User(email=user.email, hashed_password=hashed_password)
+    # Set the email_verification_token field in the User model
+    user_in_db = User(email=user.email, hashed_password=hashed_password, email_verification_token=verification_token)
+
     db.add(user_in_db)
     db.commit()
     db.refresh(user_in_db)