rzmk/learnhouse
1
0
Fork 0
mirror of https://github.com/rzmk/learnhouse.git synced 2025-12-19 04:19:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: various bugs + improve api readability

Browse source
This commit is contained in:
swve 2023-11-29 21:59:35 +01:00
parent 7daf6df5a0
commit 2bf80030d7
21 changed files with 98 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

11
apps/api/src/services/users/users.py
View file

@ -158,11 +158,12 @@ async def create_user_without_org(
async def update_user(
request: Request,
db_session: Session,
user_id: int,
current_user: PublicUser | AnonymousUser,
user_object: UserUpdate,
):
# Get user
statement = select(User).where(User.username == user_object.username)
statement = select(User).where(User.id == user_id)
user = db_session.exec(statement).first()
if not user:
@ -170,7 +171,7 @@ async def update_user(
status_code=400,
detail="User does not exist",
)
# RBAC check
await rbac_check(request, current_user, "update", user.user_uuid, db_session)
@ -195,10 +196,11 @@ async def update_user_password(
request: Request,
db_session: Session,
current_user: PublicUser | AnonymousUser,
user_id: int,
form: UserUpdatePassword,
):
# Get user
statement = select(User).where(User.username == form.user_id)
statement = select(User).where(User.id == user_id)
user = db_session.exec(statement).first()
if not user:
@ -206,7 +208,7 @@ async def update_user_password(
status_code=400,
detail="User does not exist",
)
# RBAC check
await rbac_check(request, current_user, "update", user.user_uuid, db_session)
@ -339,7 +341,6 @@ async def rbac_check(
await authorization_verify_based_on_roles_and_authorship(
request, current_user.id, "create", "user_x", db_session
)
else:
await authorization_verify_if_user_is_anon(current_user.id)