refac
This commit is contained in:
@@ -160,30 +160,29 @@ async def get_tools(
|
|||||||
return tools
|
return tools
|
||||||
else:
|
else:
|
||||||
user_group_ids = {group.id for group in await Groups.get_groups_by_member_id(user.id, db=db)}
|
user_group_ids = {group.id for group in await Groups.get_groups_by_member_id(user.id, db=db)}
|
||||||
tools = [
|
filtered_tools = []
|
||||||
tool
|
for tool in tools:
|
||||||
for tool in tools
|
if tool.user_id == user.id:
|
||||||
if tool.user_id == user.id
|
filtered_tools.append(tool)
|
||||||
or (
|
elif str(tool.id).startswith('server:'):
|
||||||
has_access(
|
if await has_access(
|
||||||
user.id,
|
user.id,
|
||||||
'read',
|
'read',
|
||||||
server_access_grants.get(str(tool.id), []),
|
server_access_grants.get(str(tool.id), []),
|
||||||
user_group_ids,
|
user_group_ids,
|
||||||
db=db,
|
db=db,
|
||||||
)
|
):
|
||||||
if str(tool.id).startswith('server:')
|
filtered_tools.append(tool)
|
||||||
else await AccessGrants.has_access(
|
elif await AccessGrants.has_access(
|
||||||
user_id=user.id,
|
user_id=user.id,
|
||||||
resource_type='tool',
|
resource_type='tool',
|
||||||
resource_id=tool.id,
|
resource_id=tool.id,
|
||||||
permission='read',
|
permission='read',
|
||||||
user_group_ids=user_group_ids,
|
user_group_ids=user_group_ids,
|
||||||
db=db,
|
db=db,
|
||||||
)
|
):
|
||||||
)
|
filtered_tools.append(tool)
|
||||||
]
|
return filtered_tools
|
||||||
return tools
|
|
||||||
|
|
||||||
|
|
||||||
############################
|
############################
|
||||||
|
|||||||
Reference in New Issue
Block a user