From 149d56dc92a4c8fed52890d866e3df903070cc14 Mon Sep 17 00:00:00 2001 From: Backend IM Bot Date: Fri, 28 Mar 2025 18:12:29 +0000 Subject: [PATCH] Update code in endpoints/login.post.py --- endpoints/login.post.py | 40 ++++++++++++++++------------------------ 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/endpoints/login.post.py b/endpoints/login.post.py index a8ab4aa..8be9da3 100644 --- a/endpoints/login.post.py +++ b/endpoints/login.post.py @@ -1,37 +1,29 @@ -from fastapi import APIRouter, Depends, HTTPException -from pydantic import BaseModel -from datetime import timedelta -from core.database import get_db +from fastapi import APIRouter, Depends, HTTPException, status 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 UserSchema, UserLogin +from helpers.auth_helpers import authenticate_user, create_access_token router = APIRouter() -class UserAuth(BaseModel): - username: str - password: str - -@router.post("/login") +@router.post("/login", status_code=200) async def login( - user_data: UserAuth, + user_credentials: UserLogin, db: Session = Depends(get_db) ): - """User authentication endpoint""" - user = db.query(User).filter(User.username == user_data.username).first() + user = authenticate_user(db, user_credentials.email, user_credentials.password) + if not user: + raise HTTPException( + status_code=status.HTTP_401_UNAUTHORIZED, + detail="Incorrect email or password", + headers={"WWW-Authenticate": "Bearer"}, + ) - if not user or not verify_password(user_data.password, user.hashed_password): - raise HTTPException(status_code=400, detail="Invalid credentials") - - # 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, - "username": user.username - } + "user": user + } \ No newline at end of file