From 109972b1237ee49832d1a3bf6004258d6a9f637f Mon Sep 17 00:00:00 2001 From: Backend IM Bot Date: Fri, 28 Mar 2025 18:46:23 +0000 Subject: [PATCH] Update code in endpoints/login.post.py --- endpoints/login.post.py | 43 ++++++++++++++--------------------------- 1 file changed, 15 insertions(+), 28 deletions(-) diff --git a/endpoints/login.post.py b/endpoints/login.post.py index a8ab4aa..0d3d39f 100644 --- a/endpoints/login.post.py +++ b/endpoints/login.post.py @@ -1,37 +1,24 @@ -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 UserLogin, UserResponse +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, response_model=UserResponse) async def login( - user_data: UserAuth, + login_data: UserLogin, db: Session = Depends(get_db) ): - """User authentication endpoint""" - user = db.query(User).filter(User.username == user_data.username).first() + user = authenticate_user(db, login_data.username, login_data.password) + if not user: + raise HTTPException( + status_code=status.HTTP_401_UNAUTHORIZED, + detail="Incorrect username 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) - ) - - return { - "access_token": access_token, - "token_type": "bearer", - "user_id": user.id, - "username": user.username - } + access_token = create_access_token(data={"sub": user.username}) + return {"access_token": access_token, "token_type": "bearer"} \ No newline at end of file