Update code in endpoints/login.post.py

endpoints/login.post.py

@@ -1,37 +1,29 @@
-from fastapi import APIRouter, Depends, HTTPException
+from fastapi import APIRouter, Depends, HTTPException, status
-from pydantic import BaseModel
-from datetime import timedelta
-from core.database import get_db
 from sqlalchemy.orm import Session
-from core.auth import verify_password, create_access_token
+from core.database import get_db
 from models.user import User
+from schemas.user import UserLogin, UserResponse
+from helpers.user_helpers import authenticate_user
+from core.security import create_access_token
 
 router = APIRouter()
 
-class UserAuth(BaseModel):
+@router.post("/login", response_model=UserResponse)
-    username: str
-    password: str
-
-@router.post("/login")
 async def login(
-    user_data: UserAuth,
+    user_credentials: UserLogin,
     db: Session = Depends(get_db)
 ):
-    """User authentication endpoint"""
+    user = authenticate_user(db, user_credentials.email, user_credentials.password)
-    user = db.query(User).filter(User.username == user_data.username).first()
+    if not user:
-    
+        raise HTTPException(
-    if not user or not verify_password(user_data.password, user.hashed_password):
+            status_code=status.HTTP_401_UNAUTHORIZED,
-        raise HTTPException(status_code=400, detail="Invalid credentials")
+            detail="Incorrect email or password",
-    
+            headers={"WWW-Authenticate": "Bearer"},
-    # Generate token with expiration
+        )
-    access_token = create_access_token(
-        data={"sub": user.id},
-        expires_delta=timedelta(hours=1)
-    )
     
+    access_token = create_access_token(data={"sub": user.email})
     return {
         "access_token": access_token,
         "token_type": "bearer",
-        "user_id": user.id,
+        "user": user
-        "username": user.username
+    }
-    }