diff --git a/app/routers/mail.py b/app/routers/mail.py index e140385..79bd6f3 100644 --- a/app/routers/mail.py +++ b/app/routers/mail.py @@ -19,7 +19,7 @@ async def create_user(userSingle: users.UserCreate | None = None): if user is not None: raise HTTPException( status_code=status.HTTP_204_NO_CONTENT, - detail="User is already exist" + detail="User already exist" ) fm = FastMail(mail.conf) @@ -36,6 +36,7 @@ async def create_user(userSingle: users.UserCreate | None = None): 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.status = 0 user_repository.save(current_user) database.connect_redis.set(userSingle.username, key_hashed) return JSONResponse(status_code=status.HTTP_200_OK, content={"message": "email has been sent"}) @@ -55,6 +56,6 @@ async def confirm_user(key: str | None = None, username: str | None = None): status_code=status.HTTP_400_BAD_REQUEST, detail="Key is invalid" ) - user.confirmed = True + user.status = 1 user_repository.save(user) return JSONResponse(status_code=status.HTTP_200_OK, content={"message": "user account confirmed"}) \ No newline at end of file diff --git a/app/routers/users.py b/app/routers/users.py index b252f4a..03887e7 100644 --- a/app/routers/users.py +++ b/app/routers/users.py @@ -139,6 +139,7 @@ async def delete_users_id(item_id : str, authorize: Annotated[bool, Depends(perm response = JSONResponse(content=content) return response + @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): user_repository = users.UserRepository(database=database.database)