Создание чата4

backend/app/api/endpoints/auth.py

@@ -1,59 +1,37 @@
 """Authentication router"""
+from datetime import timedelta
 from fastapi import APIRouter, Depends, HTTPException, status
-from fastapi.security import OAuth2PasswordBearer, OAuth2PasswordRequestForm
+from fastapi.security import OAuth2PasswordRequestForm
 from sqlalchemy.orm import Session
-from typing import Optional
 
-from ..database import get_db
-from ..crud import employees
-from ..schemas.auth import Token
-from ..utils.auth import verify_password
-from ..utils.jwt import create_and_save_token
+from app.core.auth import create_access_token, get_current_user, verify_password, ACCESS_TOKEN_EXPIRE_MINUTES
+from app.database import get_db
+from app.models.user import User
+from app.schemas.token import Token
+from app.schemas.user import User as UserSchema
 
 router = APIRouter()
-oauth2_scheme = OAuth2PasswordBearer(tokenUrl="/api/auth/login")
 
-@router.post("/login", response_model=Token)
-async def login_for_access_token(
+@router.post("/token", response_model=Token)
+def login_for_access_token(
     form_data: OAuth2PasswordRequestForm = Depends(),
     db: Session = Depends(get_db)
 ):
-    # Проверяем учетные данные сотрудника
-    employee = employees.get_employee_by_last_name(db, form_data.username)
-    if not employee or not verify_password(form_data.password, employee.hashed_password):
+    user = db.query(User).filter(User.email == form_data.username).first()
+    if not user or not verify_password(form_data.password, user.hashed_password):
         raise HTTPException(
             status_code=status.HTTP_401_UNAUTHORIZED,
             detail="Incorrect username or password",
             headers={"WWW-Authenticate": "Bearer"},
         )
     
-    # Создаем и сохраняем токен
-    access_token = create_and_save_token(employee.id, db)
-    
-    return {
-        "access_token": access_token,
-        "token_type": "bearer"
-    }
+    access_token_expires = timedelta(minutes=ACCESS_TOKEN_EXPIRE_MINUTES)
+    access_token = create_access_token(
+        data={"sub": user.email}, expires_delta=access_token_expires
+    )
+    return {"access_token": access_token, "token_type": "bearer"}
 
-@router.post("/admin/login", response_model=Token)
-async def admin_login(
-    form_data: OAuth2PasswordRequestForm = Depends(),
-    db: Session = Depends(get_db)
-):
-    # Проверяем учетные данные администратора
-    if form_data.username != "admin" or form_data.password != "admin123":
-        raise HTTPException(
-            status_code=status.HTTP_401_UNAUTHORIZED,
-            detail="Incorrect username or password",
-            headers={"WWW-Authenticate": "Bearer"},
-        )
-    
-    # Для админа используем специальный ID
-    admin_id = -1
-    access_token = create_and_save_token(admin_id, db)
-    
-    return {
-        "access_token": access_token,
-        "token_type": "bearer"
-    }
+@router.get("/me", response_model=UserSchema)
+def read_users_me(current_user: User = Depends(get_current_user)):
+    return current_user