Compare commits
8 Commits
Author | SHA1 | Date | |
---|---|---|---|
e5128a9182 | |||
579ac3d303 | |||
ce24b50b8b | |||
587763d808 | |||
531656c169 | |||
7096c1d507 | |||
1ea5948ed0 | |||
216b4bb3f2 |
@@ -11,7 +11,7 @@ class User(BaseModel):
|
||||
roles: str = "User"
|
||||
status: int = 0
|
||||
email: EmailStr
|
||||
birth: str | None = None
|
||||
birth: datetime | None = None
|
||||
created_at: datetime = datetime.today()
|
||||
connected_at: datetime | None = None
|
||||
updated_at: datetime | None = None
|
||||
|
@@ -31,7 +31,7 @@ async def read_tags(
|
||||
|
||||
|
||||
if name:
|
||||
filters.append({"name": {"$eq": name, "$options": "i"}})
|
||||
filters.append({"name": {"$regex": name, "$options": "i"}})
|
||||
|
||||
# Add ID filter
|
||||
if id_tags:
|
||||
@@ -52,7 +52,7 @@ async def read_tags(
|
||||
id=tag_index.id,
|
||||
name=tag_index.name
|
||||
)
|
||||
list_tags.append(event)
|
||||
list_tags.append(tag)
|
||||
|
||||
return list_tags
|
||||
|
||||
|
@@ -143,6 +143,7 @@ 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):
|
||||
user_repository = users.UserRepository(database=database.database)
|
||||
current_user.username = userSingle.username
|
||||
if len(userSingle.password) > 0:
|
||||
current_user.password = user_token.get_password_hash(userSingle.password)
|
||||
current_user.roles = userSingle.roles
|
||||
current_user.email = userSingle.email
|
||||
@@ -202,6 +203,7 @@ async def update_users_id(item_id: str, authorize: Annotated[bool, Depends(permi
|
||||
)
|
||||
|
||||
user.username = userSingle.username
|
||||
if len(userSingle.password) > 0:
|
||||
user.password = users_token.get_password_hash(userSingle.password)
|
||||
user.roles = userSingle.roles
|
||||
user.email = userSingle.email
|
||||
|
Reference in New Issue
Block a user