some changes
This commit is contained in:
@ -34,7 +34,9 @@ def create_user(db: Session, user: schemas.UserCreate):
|
|||||||
db_user = models.User(
|
db_user = models.User(
|
||||||
email=user.email,
|
email=user.email,
|
||||||
login = user.login,
|
login = user.login,
|
||||||
phone = user.phone,
|
phone = user.phone,
|
||||||
|
name = user.name,
|
||||||
|
surname = user.surname,
|
||||||
hashed_password = now_hashed_password,
|
hashed_password = now_hashed_password,
|
||||||
role_id = user.role_id
|
role_id = user.role_id
|
||||||
)
|
)
|
||||||
|
@ -2,7 +2,7 @@ from fastapi import APIRouter, Depends, status, HTTPException
|
|||||||
from fastapi.security import OAuth2PasswordRequestForm
|
from fastapi.security import OAuth2PasswordRequestForm
|
||||||
from auth import token
|
from auth import token
|
||||||
from auth.login.models import login as models
|
from auth.login.models import login as models
|
||||||
from auth.login.repository import login
|
from auth.login.repository import login as resp
|
||||||
from databases.pgsql import database
|
from databases.pgsql import database
|
||||||
from auth.hashing import Hash
|
from auth.hashing import Hash
|
||||||
from sqlalchemy.orm import Session
|
from sqlalchemy.orm import Session
|
||||||
@ -13,9 +13,9 @@ router = APIRouter(tags=['Authentication'])
|
|||||||
@router.post('/login')
|
@router.post('/login')
|
||||||
def login(request: OAuth2PasswordRequestForm = Depends(), db: Session = Depends(database.get_db)):
|
def login(request: OAuth2PasswordRequestForm = Depends(), db: Session = Depends(database.get_db)):
|
||||||
|
|
||||||
user_list = [login.get_user_by_email(db, request.username),
|
user_list = [resp.get_user_by_email(db, request.username),
|
||||||
login.get_user_by_login(db, request.username),
|
resp.get_user_by_login(db, request.username),
|
||||||
login.get_user_by_phone(db, request.username)]
|
resp.get_user_by_phone(db, request.username)]
|
||||||
user = next((user for user in user_list if user is not None), None)
|
user = next((user for user in user_list if user is not None), None)
|
||||||
if not user:
|
if not user:
|
||||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND,
|
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND,
|
||||||
|
Reference in New Issue
Block a user