From 27d40788e2e2c8fbeb8873e895d77a76bbd49a45 Mon Sep 17 00:00:00 2001 From: Munyoki Kilyungi Date: Mon, 11 Mar 2024 19:34:18 +0300 Subject: Define User using a frozen dataclass. * gn_auth/auth/authentication/users.py: Import dataclass. Remove NamedTuple and Tuple import. (User): Use a frozen dataclass. (User.get_user_id): Delete. (User.dictify): Ditto. * gn_auth/auth/authorisation/data/views.py: Import dataclasses.dict. (authorisation): Replace user._asdict() with asdict(user). (metadata_resources): Ditto. * gn_auth/auth/authorisation/resources/groups/views.py: (group_members): Replace dictify with asdict. * gn_auth/auth/authorisation/resources/models.py: Import dataclasses.asdict. (assign_resource_user): Replace dictify(user) with asdict(user). (unassign_resource_user): Ditto. * gn_auth/auth/authorisation/resources/views.py: (resource_users): Replace dictify with asdict. * gn_auth/auth/authorisation/users/masquerade/views.py: Import dataclasses.asdict. (masquerade): Replace masq_user._asdict() with asdict(masq_user). * gn_auth/auth/authorisation/users/views.py: (list_all_users): Replace dictify with asdict. Signed-off-by: Munyoki Kilyungi --- gn_auth/auth/authorisation/data/views.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gn_auth/auth/authorisation/data') diff --git a/gn_auth/auth/authorisation/data/views.py b/gn_auth/auth/authorisation/data/views.py index e5c8fd6..9d59a70 100644 --- a/gn_auth/auth/authorisation/data/views.py +++ b/gn_auth/auth/authorisation/data/views.py @@ -2,6 +2,7 @@ import sys import uuid import json +from dataclasses import asdict from typing import Any from functools import partial @@ -152,7 +153,7 @@ def authorisation() -> Response: return jsonify(tuple( { - "user": user._asdict(), + "user": asdict(user), **{key:trait[key] for key in ("trait_fullname", "trait_name")}, "dataset_name": trait["db"]["dataset_name"], "dataset_type": __translate__(trait["db"]["dataset_type"]), @@ -377,7 +378,7 @@ def metadata_resources() -> Response: } return jsonify( { - "user": user._asdict(), + "user": asdict(user), "resource_id": resource_map.get( request.json.get("name") #type: ignore[union-attr] ), -- cgit v1.2.3