Compare commits

..

10 Commits
1.4.2 ... 1.4.7

3 changed files with 7 additions and 6 deletions

View File

@@ -11,7 +11,7 @@ class User(BaseModel):
roles: str = "User" roles: str = "User"
status: int = 0 status: int = 0
email: EmailStr email: EmailStr
birth: str | None = None birth: datetime | 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

View File

@@ -31,7 +31,7 @@ async def read_tags(
if name: if name:
filters.append({"name": {"$eq": name, "$options": "i"}}) filters.append({"name": {"$regex": name, "$options": "i"}})
# Add ID filter # Add ID filter
if id_tags: if id_tags:
@@ -52,7 +52,7 @@ async def read_tags(
id=tag_index.id, id=tag_index.id,
name=tag_index.name name=tag_index.name
) )
list_tags.append(event) list_tags.append(tag)
return list_tags return list_tags

View File

@@ -143,8 +143,8 @@ 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
current_user.password = user_token.get_password_hash(userSingle.password) if len(userSingle.password) > 0:
current_user.roles = userSingle.roles current_user.password = user_token.get_password_hash(userSingle.password)
current_user.email = userSingle.email current_user.email = userSingle.email
user_repository.save(current_user) user_repository.save(current_user)
content = {"message": "user is updated"} content = {"message": "user is updated"}
@@ -202,7 +202,8 @@ async def update_users_id(item_id: str, authorize: Annotated[bool, Depends(permi
) )
user.username = userSingle.username user.username = userSingle.username
user.password = users_token.get_password_hash(userSingle.password) if len(userSingle.password) > 0:
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
user.firstName = userSingle.firstName user.firstName = userSingle.firstName