|
12 | 12 |
|
13 | 13 | @user_router.post('/users', tags=['Auth'], response_model=User, status_code=status.HTTP_200_OK)
|
14 | 14 | def create_user(user: UserCreate):
|
15 |
| - check_user_exists(user) |
| 15 | + if check_user_exists(user): |
| 16 | + return JSONResponse(status_code=status.HTTP_400_BAD_REQUEST, content={"message": "User already exists"}) |
16 | 17 |
|
17 | 18 | UserService(db).create_user(user)
|
18 | 19 |
|
19 | 20 | return JSONResponse(status_code=status.HTTP_200_OK, content={"message": "User created"})
|
20 | 21 |
|
21 | 22 |
|
22 | 23 | def check_user_exists(user):
|
23 |
| - if UserService(db).get_user_by_email(email=user.email): |
24 |
| - return JSONResponse(status_code=status.HTTP_400_BAD_REQUEST, content={"message": "User already exists"}) |
| 24 | + return bool(UserService(db).get_user_by_email(email=user.email)) |
25 | 25 |
|
26 | 26 |
|
27 | 27 | @user_router.post('/login', tags=['Auth'], status_code=status.HTTP_200_OK)
|
28 | 28 | def login(user: UserCreate):
|
29 |
| - validate_password(user) |
| 29 | + |
| 30 | + if validates_password(user): |
| 31 | + return JSONResponse(status_code=status.HTTP_401_UNAUTHORIZED, content={"message": "Unauthorized"}) |
30 | 32 |
|
31 | 33 | token: str = create_token(user.dict())
|
32 | 34 |
|
33 | 35 | return JSONResponse(status_code=status.HTTP_200_OK, content=token)
|
34 | 36 |
|
35 | 37 |
|
36 |
| -def validate_password(user): |
| 38 | +def validates_password(user): |
37 | 39 | user_found = UserService(db).get_user_by_email(email=user.email)
|
38 | 40 |
|
39 |
| - if not (user_found and Auth().verify_password(user.password, user_found.password)): |
40 |
| - return JSONResponse(status_code=status.HTTP_401_UNAUTHORIZED, content={"message": "Unauthorized"}) |
| 41 | + return not bool(check_user_exists(user) and Auth().verify_password(user.password, user_found.password)) |
0 commit comments