From 8919d8a82afc9e3ec7e802d6bf8f039d74f25a42 Mon Sep 17 00:00:00 2001 From: Timothy Jaeryang Baek Date: Thu, 12 Feb 2026 15:52:50 -0600 Subject: [PATCH] refac --- backend/open_webui/routers/channels.py | 86 +++----------------------- 1 file changed, 7 insertions(+), 79 deletions(-) diff --git a/backend/open_webui/routers/channels.py b/backend/open_webui/routers/channels.py index b42419d28..1748eaf7e 100644 --- a/backend/open_webui/routers/channels.py +++ b/backend/open_webui/routers/channels.py @@ -174,14 +174,7 @@ async def get_channels( user=Depends(get_verified_user), db: Session = Depends(get_session), ): - check_channels_access(request) - if user.role != "admin" and not has_permission( - user.id, "features.channels", request.app.state.config.USER_PERMISSIONS, db=db - ): - raise HTTPException( - status_code=status.HTTP_401_UNAUTHORIZED, - detail=ERROR_MESSAGES.UNAUTHORIZED, - ) + check_channels_access(request, user) channels = Channels.get_channels_by_user_id(user.id, db=db) channel_list = [] @@ -254,15 +247,7 @@ async def get_dm_channel_by_user_id( user=Depends(get_verified_user), db: Session = Depends(get_session), ): - check_channels_access(request) - if user.role != "admin" and not has_permission( - user.id, "features.channels", request.app.state.config.USER_PERMISSIONS, db=db - ): - raise HTTPException( - status_code=status.HTTP_401_UNAUTHORIZED, - detail=ERROR_MESSAGES.UNAUTHORIZED, - ) - + check_channels_access(request, user) try: existing_channel = Channels.get_dm_channel_by_user_ids( [user.id, user_id], db=db @@ -334,14 +319,7 @@ async def create_new_channel( user=Depends(get_verified_user), db: Session = Depends(get_session), ): - check_channels_access(request) - if user.role != "admin" and not has_permission( - user.id, "features.channels", request.app.state.config.USER_PERMISSIONS, db=db - ): - raise HTTPException( - status_code=status.HTTP_401_UNAUTHORIZED, - detail=ERROR_MESSAGES.UNAUTHORIZED, - ) + check_channels_access(request, user) if form_data.type not in ["group", "dm"] and user.role != "admin": # Only admins can create standard channels (joined by default) @@ -422,13 +400,6 @@ async def get_channel_by_id( db: Session = Depends(get_session), ): check_channels_access(request, user) - if user.role != "admin" and not has_permission( - user.id, "features.channels", request.app.state.config.USER_PERMISSIONS, db=db - ): - raise HTTPException( - status_code=status.HTTP_401_UNAUTHORIZED, - detail=ERROR_MESSAGES.UNAUTHORIZED, - ) channel = Channels.get_channel_by_id(id, db=db) if not channel: raise HTTPException( @@ -541,13 +512,6 @@ async def get_channel_members_by_id( db: Session = Depends(get_session), ): check_channels_access(request, user) - if user.role != "admin" and not has_permission( - user.id, "features.channels", request.app.state.config.USER_PERMISSIONS, db=db - ): - raise HTTPException( - status_code=status.HTTP_401_UNAUTHORIZED, - detail=ERROR_MESSAGES.UNAUTHORIZED, - ) channel = Channels.get_channel_by_id(id, db=db) if not channel: @@ -673,15 +637,7 @@ async def add_members_by_id( user=Depends(get_verified_user), db: Session = Depends(get_session), ): - check_channels_access(request) - if user.role != "admin" and not has_permission( - user.id, "features.channels", request.app.state.config.USER_PERMISSIONS, db=db - ): - raise HTTPException( - status_code=status.HTTP_401_UNAUTHORIZED, - detail=ERROR_MESSAGES.UNAUTHORIZED, - ) - + check_channels_access(request, user) channel = Channels.get_channel_by_id(id, db=db) if not channel: raise HTTPException( @@ -723,14 +679,7 @@ async def remove_members_by_id( user=Depends(get_verified_user), db: Session = Depends(get_session), ): - check_channels_access(request) - if user.role != "admin" and not has_permission( - user.id, "features.channels", request.app.state.config.USER_PERMISSIONS, db=db - ): - raise HTTPException( - status_code=status.HTTP_401_UNAUTHORIZED, - detail=ERROR_MESSAGES.UNAUTHORIZED, - ) + check_channels_access(request, user) channel = Channels.get_channel_by_id(id, db=db) if not channel: @@ -769,14 +718,7 @@ async def update_channel_by_id( user=Depends(get_verified_user), db: Session = Depends(get_session), ): - check_channels_access(request) - if user.role != "admin" and not has_permission( - user.id, "features.channels", request.app.state.config.USER_PERMISSIONS, db=db - ): - raise HTTPException( - status_code=status.HTTP_401_UNAUTHORIZED, - detail=ERROR_MESSAGES.UNAUTHORIZED, - ) + check_channels_access(request, user) channel = Channels.get_channel_by_id(id, db=db) if not channel: @@ -811,14 +753,7 @@ async def delete_channel_by_id( user=Depends(get_verified_user), db: Session = Depends(get_session), ): - check_channels_access(request) - if user.role != "admin" and not has_permission( - user.id, "features.channels", request.app.state.config.USER_PERMISSIONS, db=db - ): - raise HTTPException( - status_code=status.HTTP_401_UNAUTHORIZED, - detail=ERROR_MESSAGES.UNAUTHORIZED, - ) + check_channels_access(request, user) channel = Channels.get_channel_by_id(id, db=db) if not channel: @@ -869,13 +804,6 @@ async def get_channel_messages( db: Session = Depends(get_session), ): check_channels_access(request, user) - if user.role != "admin" and not has_permission( - user.id, "features.channels", request.app.state.config.USER_PERMISSIONS, db=db - ): - raise HTTPException( - status_code=status.HTTP_401_UNAUTHORIZED, - detail=ERROR_MESSAGES.UNAUTHORIZED, - ) channel = Channels.get_channel_by_id(id, db=db) if not channel: raise HTTPException(