Update auth.py

auth.py

@@ -21,69 +21,69 @@ class AuthViews:
 
     def register(self, user: UserCreate, db: Session = Depends(get_db)):
     # Validate email format and check for existing users
-    db_user = database.get_user_by_email(db, user.email)
-    if db_user:
-        raise HTTPException(status_code=400, detail="Email already registered")
+        db_user = database.get_user_by_email(db, user.email)
+        if db_user:
+            raise HTTPException(status_code=400, detail="Email already registered")
 
     # Hash the password
-    hashed_password = self.pwd_context.hash(user.password)
+        hashed_password = self.pwd_context.hash(user.password)
 
     # Generate a verification token
-    verification_token = email.generate_verification_token(user.email)
+        verification_token = email.generate_verification_token(user.email)
 
     # Send a verification email (implement email.send_verification_email)
 
     # Create the user in the database
-    user_in_db = models.User(email=user.email, hashed_password=hashed_password)
-    db.add(user_in_db)
-    db.commit()
-    db.refresh(user_in_db)
+        user_in_db = models.User(email=user.email, hashed_password=hashed_password)
+        db.add(user_in_db)
+        db.commit()
+        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")
+        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")
+        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")
+        if user.is_verified:
+            raise HTTPException(status_code=400, detail="Email already verified")
 
     # Mark the email as verified
-    user.is_verified = True
-    db.commit()
+        user.is_verified = True
+        db.commit()
     return {"message": "Email verification successful"}
 
 
     def login(self, form_data: OAuth2PasswordRequestForm = Depends()):
     # Check email verification
-    db_user = database.get_user_by_email(db, form_data.username)
-    if not db_user or not self.pwd_context.verify(form_data.password, db_user.hashed_password):
-        raise HTTPException(status_code=400, detail="Incorrect email or password")
+        db_user = database.get_user_by_email(db, form_data.username)
+        if not db_user or not self.pwd_context.verify(form_data.password, db_user.hashed_password):
+            raise HTTPException(status_code=400, detail="Incorrect email or password")
 
-    if not db_user.is_verified:
-        raise HTTPException(status_code=400, detail="Email not verified")
+        if not db_user.is_verified:
+            raise HTTPException(status_code=400, detail="Email not verified")
 
     # Generate an access token
-    access_token_expires = timedelta(minutes=self.ACCESS_TOKEN_EXPIRE_MINUTES)
-    access_token = jwt.encode(
-        {"sub": db_user.email, "exp": datetime.utcnow() + access_token_expires},
-        self.SECRET_KEY,
-        algorithm=self.ALGORITHM,
-    )
+        access_token_expires = timedelta(minutes=self.ACCESS_TOKEN_EXPIRE_MINUTES)
+        access_token = jwt.encode(
+            {"sub": db_user.email, "exp": datetime.utcnow() + access_token_expires},
+            self.SECRET_KEY,
+            algorithm=self.ALGORITHM,
+        )
 
     return {"access_token": access_token, "token_type": "bearer"}
 
 
     # Import User model and database functions
-from app.models import User
-from app.database import get_user_by_email
+#from app.models import User
+#from app.database import get_user_by_email
 
 # ...