Skip to content

Commit ae09bd9

Browse files
authored
Merge pull request #251 from ynput/enhancement/user-conversion
User: Data conversion
2 parents 9c1c0e1 + 10ee794 commit ae09bd9

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

ayon_api/server_api.py

+10-3
Original file line numberDiff line numberDiff line change
@@ -1188,8 +1188,13 @@ def get_users(
11881188

11891189
for parsed_data in query.continuous_query(self):
11901190
for user in parsed_data["users"]:
1191-
user["accessGroups"] = json.loads(
1192-
user["accessGroups"])
1191+
access_groups = user.get("accessGroups")
1192+
if isinstance(access_groups, str):
1193+
user["accessGroups"] = json.loads(access_groups)
1194+
all_attrib = user.get("allAttrib")
1195+
if isinstance(all_attrib, str):
1196+
user["allAttrib"] = json.loads(all_attrib)
1197+
fill_own_attribs(user)
11931198
yield user
11941199

11951200
def get_user_by_name(
@@ -1246,7 +1251,9 @@ def get_user(
12461251

12471252
response = self.get(f"users/{username}")
12481253
response.raise_for_status()
1249-
return response.data
1254+
user = response.data
1255+
fill_own_attribs(user)
1256+
return user
12501257

12511258
def get_headers(
12521259
self, content_type: Optional[str] = None

0 commit comments

Comments
 (0)