Compare commits
No commits in common. "master" and "1.4.4" have entirely different histories.
@ -11,7 +11,7 @@ class User(BaseModel):
|
|||||||
roles: str = "User"
|
roles: str = "User"
|
||||||
status: int = 0
|
status: int = 0
|
||||||
email: EmailStr
|
email: EmailStr
|
||||||
birth: datetime | None = None
|
birth: str | None = None
|
||||||
created_at: datetime = datetime.today()
|
created_at: datetime = datetime.today()
|
||||||
connected_at: datetime | None = None
|
connected_at: datetime | None = None
|
||||||
updated_at: datetime | None = None
|
updated_at: datetime | None = None
|
||||||
|
@ -143,12 +143,9 @@ async def delete_users_id(item_id : str, authorize: Annotated[bool, Depends(perm
|
|||||||
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)
|
||||||
current_user.username = userSingle.username
|
current_user.username = userSingle.username
|
||||||
if len(userSingle.password) > 0:
|
|
||||||
current_user.password = user_token.get_password_hash(userSingle.password)
|
current_user.password = user_token.get_password_hash(userSingle.password)
|
||||||
|
current_user.roles = userSingle.roles
|
||||||
current_user.email = userSingle.email
|
current_user.email = userSingle.email
|
||||||
current_user.name = userSingle.name
|
|
||||||
current_user.firstName = userSingle.firstName
|
|
||||||
current_user.birth = userSingle.birth
|
|
||||||
user_repository.save(current_user)
|
user_repository.save(current_user)
|
||||||
content = {"message": "user is updated"}
|
content = {"message": "user is updated"}
|
||||||
response = JSONResponse(content=content)
|
response = JSONResponse(content=content)
|
||||||
@ -205,7 +202,6 @@ async def update_users_id(item_id: str, authorize: Annotated[bool, Depends(permi
|
|||||||
)
|
)
|
||||||
|
|
||||||
user.username = userSingle.username
|
user.username = userSingle.username
|
||||||
if len(userSingle.password) > 0:
|
|
||||||
user.password = users_token.get_password_hash(userSingle.password)
|
user.password = users_token.get_password_hash(userSingle.password)
|
||||||
user.roles = userSingle.roles
|
user.roles = userSingle.roles
|
||||||
user.email = userSingle.email
|
user.email = userSingle.email
|
||||||
|
Loading…
x
Reference in New Issue
Block a user