Skip to content

User: Data conversion #251

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

Merged
iLLiCiTiT merged 4 commits into from
May 14, 2025
Merged

User: Data conversion #251

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ae1f924
convert accessGroups only if are string
iLLiCiTiT May 14, 2025
62e54d4
convert allAttrib too
iLLiCiTiT May 14, 2025
c60094f
fill own attribs on user
iLLiCiTiT May 14, 2025
10ee794
Merge branch 'develop' into enhancement/user-conversion
iLLiCiTiT May 14, 2025
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
13 changes: 10 additions & 3 deletions ayon_api/server_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1188,8 +1188,13 @@ def get_users(

for parsed_data in query.continuous_query(self):
for user in parsed_data["users"]:
user["accessGroups"] = json.loads(
user["accessGroups"])
access_groups = user.get("accessGroups")
if isinstance(access_groups, str):
user["accessGroups"] = json.loads(access_groups)
all_attrib = user.get("allAttrib")
if isinstance(all_attrib, str):
user["allAttrib"] = json.loads(all_attrib)
fill_own_attribs(user)
yield user

def get_user_by_name(
Expand Down Expand Up @@ -1246,7 +1251,9 @@ def get_user(

response = self.get(f"users/{username}")
response.raise_for_status()
return response.data
user = response.data
fill_own_attribs(user)
return user

def get_headers(
self, content_type: Optional[str] = None
Expand Down