Spaces:
Runtime error
Runtime error
added user name
Browse files- auth/domain/user_domain.py +2 -0
- auth/service/auth_service.py +4 -4
- models/user.py +1 -0
auth/domain/user_domain.py
CHANGED
|
@@ -2,6 +2,7 @@ from pydantic import BaseModel
|
|
| 2 |
|
| 3 |
class UserCreate(BaseModel):
|
| 4 |
email: str
|
|
|
|
| 5 |
password: str
|
| 6 |
|
| 7 |
class UserLogin(BaseModel):
|
|
@@ -11,6 +12,7 @@ class UserLogin(BaseModel):
|
|
| 11 |
class User(BaseModel):
|
| 12 |
id: int
|
| 13 |
email: str
|
|
|
|
| 14 |
|
| 15 |
class AuthResponse(BaseModel):
|
| 16 |
access_token: str
|
|
|
|
| 2 |
|
| 3 |
class UserCreate(BaseModel):
|
| 4 |
email: str
|
| 5 |
+
name: str
|
| 6 |
password: str
|
| 7 |
|
| 8 |
class UserLogin(BaseModel):
|
|
|
|
| 12 |
class User(BaseModel):
|
| 13 |
id: int
|
| 14 |
email: str
|
| 15 |
+
name: str
|
| 16 |
|
| 17 |
class AuthResponse(BaseModel):
|
| 18 |
access_token: str
|
auth/service/auth_service.py
CHANGED
|
@@ -4,19 +4,19 @@ from models import user as user_model
|
|
| 4 |
from auth.domain.user_domain import AuthResponse, User
|
| 5 |
import auth.auth_utils as auth_utils
|
| 6 |
|
| 7 |
-
def signup_user(email: str, password: str, db: Session)->AuthResponse:
|
| 8 |
db_user = db.query(user_model.User).filter(user_model.User.email == email).first()
|
| 9 |
if db_user:
|
| 10 |
raise HTTPException(status_code=400, detail="Email already registered")
|
| 11 |
|
| 12 |
hashed_pw = auth_utils.hash_password(password)
|
| 13 |
-
new_user = user_model.User(email=email, hashed_password=hashed_pw)
|
| 14 |
db.add(new_user)
|
| 15 |
db.commit()
|
| 16 |
db.refresh(new_user)
|
| 17 |
|
| 18 |
token = auth_utils.create_access_token({"sub": new_user.email})
|
| 19 |
-
new_user_response = User(id=new_user.id, email=new_user.email)
|
| 20 |
return AuthResponse(access_token=token, user=new_user_response)
|
| 21 |
|
| 22 |
def login_user(email: str, password: str, db: Session)->AuthResponse:
|
|
@@ -25,7 +25,7 @@ def login_user(email: str, password: str, db: Session)->AuthResponse:
|
|
| 25 |
raise HTTPException(status_code=401, detail="Invalid credentials")
|
| 26 |
|
| 27 |
token = auth_utils.create_access_token({"sub": db_user.email})
|
| 28 |
-
user_response = User(id=db_user.id, email=db_user.email)
|
| 29 |
return AuthResponse(access_token=token, user=user_response)
|
| 30 |
|
| 31 |
def auth(token: str, db: Session):
|
|
|
|
| 4 |
from auth.domain.user_domain import AuthResponse, User
|
| 5 |
import auth.auth_utils as auth_utils
|
| 6 |
|
| 7 |
+
def signup_user(email: str, name: str, password: str, db: Session)->AuthResponse:
|
| 8 |
db_user = db.query(user_model.User).filter(user_model.User.email == email).first()
|
| 9 |
if db_user:
|
| 10 |
raise HTTPException(status_code=400, detail="Email already registered")
|
| 11 |
|
| 12 |
hashed_pw = auth_utils.hash_password(password)
|
| 13 |
+
new_user = user_model.User(email=email, hashed_password=hashed_pw, name=name)
|
| 14 |
db.add(new_user)
|
| 15 |
db.commit()
|
| 16 |
db.refresh(new_user)
|
| 17 |
|
| 18 |
token = auth_utils.create_access_token({"sub": new_user.email})
|
| 19 |
+
new_user_response = User(id=new_user.id, email=new_user.email, name=new_user.name)
|
| 20 |
return AuthResponse(access_token=token, user=new_user_response)
|
| 21 |
|
| 22 |
def login_user(email: str, password: str, db: Session)->AuthResponse:
|
|
|
|
| 25 |
raise HTTPException(status_code=401, detail="Invalid credentials")
|
| 26 |
|
| 27 |
token = auth_utils.create_access_token({"sub": db_user.email})
|
| 28 |
+
user_response = User(id=db_user.id, email=db_user.email, name=db_user.name)
|
| 29 |
return AuthResponse(access_token=token, user=user_response)
|
| 30 |
|
| 31 |
def auth(token: str, db: Session):
|
models/user.py
CHANGED
|
@@ -6,3 +6,4 @@ class User(Base):
|
|
| 6 |
id = Column(Integer, primary_key=True, index=True)
|
| 7 |
email = Column(String, unique=True, index=True, nullable=False)
|
| 8 |
hashed_password = Column(String, nullable=False)
|
|
|
|
|
|
| 6 |
id = Column(Integer, primary_key=True, index=True)
|
| 7 |
email = Column(String, unique=True, index=True, nullable=False)
|
| 8 |
hashed_password = Column(String, nullable=False)
|
| 9 |
+
name = Column(String, nullable=False)
|