diff --git a/api/chalicelib/core/users.py b/api/chalicelib/core/users.py index ceada34f8..0ef2f2088 100644 --- a/api/chalicelib/core/users.py +++ b/api/chalicelib/core/users.py @@ -377,6 +377,7 @@ def get_members(tenant_id): users.email, users.role, users.name, + users.created_at, basic_authentication.generated_password, (CASE WHEN users.role = 'owner' THEN TRUE ELSE FALSE END) AS super_admin, (CASE WHEN users.role = 'admin' THEN TRUE ELSE FALSE END) AS admin, @@ -393,6 +394,7 @@ def get_members(tenant_id): if len(r): r = helper.list_to_camel_case(r) for u in r: + r["createdAt"] = TimeUTC.datetime_to_timestamp(r["createdAt"]) if u["invitationToken"]: u["invitationLink"] = __get_invitation_link(u.pop("invitationToken")) else: diff --git a/ee/api/chalicelib/core/users.py b/ee/api/chalicelib/core/users.py index b70f6a269..d34e2f5f9 100644 --- a/ee/api/chalicelib/core/users.py +++ b/ee/api/chalicelib/core/users.py @@ -414,6 +414,7 @@ def get_members(tenant_id): users.email, users.role, users.name, + users.created_at, basic_authentication.generated_password, (CASE WHEN users.role = 'owner' THEN TRUE ELSE FALSE END) AS super_admin, (CASE WHEN users.role = 'admin' THEN TRUE ELSE FALSE END) AS admin, @@ -435,6 +436,7 @@ def get_members(tenant_id): if len(r): r = helper.list_to_camel_case(r) for u in r: + r["createdAt"] = TimeUTC.datetime_to_timestamp(r["createdAt"]) if u["invitationToken"]: u["invitationLink"] = __get_invitation_link(u.pop("invitationToken")) else: