Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions apps/common/auth/handle/impl/user_token.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ def get_permissions(
if p is not None and PermissionScopeConstants.WORKSPACE in p.meta.scope:
permissions.append(p)

for group, ps in group_by(permissions, lambda p: p.meta.group).items():
for group, ps in group_by(permissions, lambda p: p.value.group).items():
k = f"{group}:w:{_.workspace_id}:r:{_.target}"
bits = reduce(lambda x, y: x | y, [p.value.bit() for p in ps], 0)
permission_map[k] = permission_map.get(k, 0) | bits
Expand All @@ -131,7 +131,7 @@ def get_permissions(
for _permission in permissions
if _permission is not None and PermissionScopeConstants.WORKSPACE in _permission.meta.scope
]
for group, ps in group_by(permissions, lambda p: p.meta.group).items():
for group, ps in group_by(permissions, lambda p: p.value.group).items():
k = f"{group}:w:{_.workspace_id}"
bits = reduce(lambda x, y: x | y, [p.value.bit() for p in ps], 0)
permission_map[k] = permission_map.get(k, 0) | bits
Expand All @@ -145,7 +145,7 @@ def get_permissions(
for _permission in system_permissions
if _permission is not None and PermissionScopeConstants.SYSTEM in _permission.meta.scope
]
for group, permissions in group_by(system_permissions, lambda _permission: _permission.meta.group).items():
for group, permissions in group_by(system_permissions, lambda _permission: _permission.value.group).items():
permission_map[f"{group}"] = reduce(
lambda x, y: x | y, [_permission.value.bit() for _permission in permissions], 0
)
Expand Down
Loading