From ae1f9242e47c1ba7695f22f48296431ca7c5efc9 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Wed, 14 May 2025 15:16:10 +0200 Subject: [PATCH 1/3] convert accessGroups only if are string --- ayon_api/server_api.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ayon_api/server_api.py b/ayon_api/server_api.py index 01385a5d0..09a302150 100644 --- a/ayon_api/server_api.py +++ b/ayon_api/server_api.py @@ -1187,8 +1187,9 @@ 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) yield user def get_user_by_name( From 62e54d4984c844aba1a895cdb81cd6737041984e Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Wed, 14 May 2025 15:44:51 +0200 Subject: [PATCH 2/3] convert allAttrib too --- ayon_api/server_api.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ayon_api/server_api.py b/ayon_api/server_api.py index 09a302150..79ca63f10 100644 --- a/ayon_api/server_api.py +++ b/ayon_api/server_api.py @@ -1190,6 +1190,10 @@ def get_users( 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( From c60094f09592b8abac7141ad8ddc1f88f3a531f2 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Wed, 14 May 2025 15:45:00 +0200 Subject: [PATCH 3/3] fill own attribs on user --- ayon_api/server_api.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ayon_api/server_api.py b/ayon_api/server_api.py index 79ca63f10..4c12dddb2 100644 --- a/ayon_api/server_api.py +++ b/ayon_api/server_api.py @@ -1250,7 +1250,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