From 5c71aef5bf420dc5a135679f7725193700680147 Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 26 Jul 2021 18:02:52 +0900 Subject: [PATCH] some changes --- auth/login/repository/login.py | 4 +++- auth/routers/authentication.py | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/auth/login/repository/login.py b/auth/login/repository/login.py index c35f725..34626bc 100644 --- a/auth/login/repository/login.py +++ b/auth/login/repository/login.py @@ -34,7 +34,9 @@ def create_user(db: Session, user: schemas.UserCreate): db_user = models.User( email=user.email, login = user.login, - phone = user.phone, + phone = user.phone, + name = user.name, + surname = user.surname, hashed_password = now_hashed_password, role_id = user.role_id ) diff --git a/auth/routers/authentication.py b/auth/routers/authentication.py index 6bc50dc..d675b96 100644 --- a/auth/routers/authentication.py +++ b/auth/routers/authentication.py @@ -2,7 +2,7 @@ from fastapi import APIRouter, Depends, status, HTTPException from fastapi.security import OAuth2PasswordRequestForm from auth import token 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 auth.hashing import Hash from sqlalchemy.orm import Session @@ -13,9 +13,9 @@ router = APIRouter(tags=['Authentication']) @router.post('/login') def login(request: OAuth2PasswordRequestForm = Depends(), db: Session = Depends(database.get_db)): - user_list = [login.get_user_by_email(db, request.username), - login.get_user_by_login(db, request.username), - login.get_user_by_phone(db, request.username)] + user_list = [resp.get_user_by_email(db, request.username), + resp.get_user_by_login(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) if not user: raise HTTPException(status_code=status.HTTP_404_NOT_FOUND,