Compare commits
No commits in common. "ea6f9790d9a024a9fed72100ebd3ea63c86d471d" and "c22af013fdb05bb0fe27d74192de797fb1d6e37d" have entirely different histories.
ea6f9790d9
...
c22af013fd
@ -19,7 +19,7 @@ async def create_user(userSingle: users.UserCreate | None = None):
|
|||||||
if user is not None:
|
if user is not None:
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
status_code=status.HTTP_204_NO_CONTENT,
|
status_code=status.HTTP_204_NO_CONTENT,
|
||||||
detail="User already exist"
|
detail="User is already exist"
|
||||||
)
|
)
|
||||||
|
|
||||||
fm = FastMail(mail.conf)
|
fm = FastMail(mail.conf)
|
||||||
@ -36,7 +36,6 @@ async def create_user(userSingle: users.UserCreate | None = None):
|
|||||||
|
|
||||||
await fm.send_message(message, template_name="mailer.html")
|
await fm.send_message(message, template_name="mailer.html")
|
||||||
current_user = users.User(username=userSingle.username, password=users_token.get_password_hash(userSingle.password), email=userSingle.email)
|
current_user = users.User(username=userSingle.username, password=users_token.get_password_hash(userSingle.password), email=userSingle.email)
|
||||||
current_user.status = 0
|
|
||||||
user_repository.save(current_user)
|
user_repository.save(current_user)
|
||||||
database.connect_redis.set(userSingle.username, key_hashed)
|
database.connect_redis.set(userSingle.username, key_hashed)
|
||||||
return JSONResponse(status_code=status.HTTP_200_OK, content={"message": "email has been sent"})
|
return JSONResponse(status_code=status.HTTP_200_OK, content={"message": "email has been sent"})
|
||||||
@ -56,6 +55,6 @@ async def confirm_user(key: str | None = None, username: str | None = None):
|
|||||||
status_code=status.HTTP_400_BAD_REQUEST,
|
status_code=status.HTTP_400_BAD_REQUEST,
|
||||||
detail="Key is invalid"
|
detail="Key is invalid"
|
||||||
)
|
)
|
||||||
user.status = 1
|
user.confirmed = True
|
||||||
user_repository.save(user)
|
user_repository.save(user)
|
||||||
return JSONResponse(status_code=status.HTTP_200_OK, content={"message": "user account confirmed"})
|
return JSONResponse(status_code=status.HTTP_200_OK, content={"message": "user account confirmed"})
|
@ -139,7 +139,6 @@ async def delete_users_id(item_id : str, authorize: Annotated[bool, Depends(perm
|
|||||||
response = JSONResponse(content=content)
|
response = JSONResponse(content=content)
|
||||||
return response
|
return response
|
||||||
|
|
||||||
|
|
||||||
@router.put("/users/me",tags=["users"])
|
@router.put("/users/me",tags=["users"])
|
||||||
async def update_users_me(current_user: Annotated[users.User, Depends(users_token.get_current_active_user)], authorize: Annotated[bool, Depends(permissions_checker.PermissionChecker(roles=["Admin", "User"]))], userSingle: users.UserIn | None = None):
|
async def update_users_me(current_user: Annotated[users.User, Depends(users_token.get_current_active_user)], authorize: Annotated[bool, Depends(permissions_checker.PermissionChecker(roles=["Admin", "User"]))], userSingle: users.UserIn | None = None):
|
||||||
user_repository = users.UserRepository(database=database.database)
|
user_repository = users.UserRepository(database=database.database)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user