From 00e4391a6f19d3e5a082193d6787a3cec9bfa9e3 Mon Sep 17 00:00:00 2001 From: Timothy Jaeryang Baek Date: Thu, 5 Jun 2025 01:05:33 +0400 Subject: [PATCH] refac --- backend/open_webui/routers/notes.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/backend/open_webui/routers/notes.py b/backend/open_webui/routers/notes.py index 09bcb97e83..94f8325d70 100644 --- a/backend/open_webui/routers/notes.py +++ b/backend/open_webui/routers/notes.py @@ -124,8 +124,9 @@ async def get_note_by_id(request: Request, id: str, user=Depends(get_verified_us status_code=status.HTTP_404_NOT_FOUND, detail=ERROR_MESSAGES.NOT_FOUND ) - if (user.role != "admin" and user.id != note.user_id) or ( - not has_access(user.id, type="read", access_control=note.access_control) + if user.role != "admin" or ( + user.id != note.user_id + and not has_access(user.id, type="read", access_control=note.access_control) ): raise HTTPException( status_code=status.HTTP_403_FORBIDDEN, detail=ERROR_MESSAGES.DEFAULT() @@ -157,8 +158,9 @@ async def update_note_by_id( status_code=status.HTTP_404_NOT_FOUND, detail=ERROR_MESSAGES.NOT_FOUND ) - if (user.role != "admin" and user.id != note.user_id) or ( - not has_access(user.id, type="write", access_control=note.access_control) + if user.role != "admin" or ( + user.id != note.user_id + and not has_access(user.id, type="write", access_control=note.access_control) ): raise HTTPException( status_code=status.HTTP_403_FORBIDDEN, detail=ERROR_MESSAGES.DEFAULT() @@ -195,8 +197,9 @@ async def delete_note_by_id(request: Request, id: str, user=Depends(get_verified status_code=status.HTTP_404_NOT_FOUND, detail=ERROR_MESSAGES.NOT_FOUND ) - if (user.role != "admin" and user.id != note.user_id) or ( - not has_access(user.id, type="write", access_control=note.access_control) + if user.role != "admin" or ( + user.id != note.user_id + and not has_access(user.id, type="write", access_control=note.access_control) ): raise HTTPException( status_code=status.HTTP_403_FORBIDDEN, detail=ERROR_MESSAGES.DEFAULT()