Update auth.py

auth.py

@@ -53,7 +53,24 @@ 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 (implement email.verify_token)
+    email = email.verify_token(verification_token)
+    if not email:
+        raise HTTPException(status_code=400, detail="Invalid verification token")
+
+    # Get the user by email
+    user = database.get_user_by_email(db, email)
+    if not user:
+        raise HTTPException(status_code=400, detail="User not found")
 
+    if user.is_verified:
+        raise HTTPException(status_code=400, detail="Email already verified")
+
+    # Mark the email as verified
+    user.is_verified = True
+    db.commit()
+    return {"message": "Email verification successful"}
 
 def register(user: UserCreate, db: Session):
     # Validate email format and check for existing users
@@ -61,7 +78,6 @@ def register(user: UserCreate, db: Session):
     if db_user:
         raise HTTPException(status_code=400, detail="Email already registered")
 
-    
     # Hash the password
     hashed_password = pwd_context.hash(user.password)
 
@@ -71,6 +87,9 @@ def register(user: UserCreate, db: Session):
     # Send a verification email
     send_verification_email(user.email, verification_token)
 
+    # Verify the email
+    verify_email(verification_token, db)
+
     # Create the user in the database
     user_in_db = User(email=user.email, hashed_password=hashed_password)
     db.add(user_in_db)
@@ -78,24 +97,7 @@ def register(user: UserCreate, db: Session):
     db.refresh(user_in_db)
     return user_in_db
 
-def verify_email(self, verification_token: str, db: Session = Depends(get_db)):
-    # Verify the email using the token (implement email.verify_token)
-    email = email.verify_token(verification_token)
-    if not email:
-        raise HTTPException(status_code=400, detail="Invalid verification token")
-
-    # Get the user by email
-    user = database.get_user_by_email(db, email)
-    if not user:
-        raise HTTPException(status_code=400, detail="User not found")
-
-    if user.is_verified:
-        raise HTTPException(status_code=400, detail="Email already verified")
 
-    # Mark the email as verified
-    user.is_verified = True
-    db.commit()
-    return {"message": "Email verification successful"}
 
 def get_current_user(token: str = Depends(verify_token)):
     if not token: