Skip to content

org user roles filtering pass #3060

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ikreymer wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

org user roles filtering pass #3060

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 32 additions & 4 deletions backend/btrixcloud/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2062,6 +2062,35 @@ class UserOut(UserOutNoId):

# ============================================================================
# ORGS
# ============================================================================

# Org field filters by access type
ORG_ADMIN_EXCLUDE_FIELDS = ["storage"]

ORG_CRAWLER_EXCLUDE_FIELDS = [
*ORG_ADMIN_EXCLUDE_FIELDS,
"users",
"quotaUpdates",
"webhookUrls",
"readOnlyReason",
"subscription",
]

ORG_VIEWER_EXCLUDE_FIELDS = [
*ORG_CRAWLER_EXCLUDE_FIELDS,
"usage",
"crawlExecSeconds",
"qaUsage",
"qaCrawlExecSeconds",
"monthlyExecSeconds",
"extraExecSeconds",
"giftedExecSeconds",
"quotas",
"allowSharedProxies",
"crawlingDefaults",
]


# ============================================================================
class OrgReadOnlyOnCancel(BaseModel):
"""Make org readOnly on subscription cancellation instead of deleting"""
Expand Down Expand Up @@ -2267,14 +2296,13 @@ def _is_auth(self, user, value):
async def serialize_for_user(self, user: User, user_manager) -> OrgOut:
"""Serialize result based on current user access"""

exclude = {"storage"}
exclude = ORG_ADMIN_EXCLUDE_FIELDS

if not self.is_owner(user):
exclude.add("users")
exclude = ORG_CRAWLER_EXCLUDE_FIELDS

if not self.is_crawler(user):
exclude.add("usage")
exclude.add("crawlExecSeconds")
exclude = ORG_VIEWER_EXCLUDE_FIELDS

result = self.to_dict(
exclude_unset=True,
Expand Down
Loading