From bdfe1f32062c33ca74003156aedb6620ec9dea7c Mon Sep 17 00:00:00 2001 From: Brian Broll Date: Mon, 4 Dec 2023 10:09:17 -0600 Subject: [PATCH] WIP Settings should be json value - not raw string --- crates/api-common/src/lib.rs | 11 ++++++----- crates/cloud-common/src/lib.rs | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/crates/api-common/src/lib.rs b/crates/api-common/src/lib.rs index 295d134e..b033bfa4 100644 --- a/crates/api-common/src/lib.rs +++ b/crates/api-common/src/lib.rs @@ -688,13 +688,14 @@ pub struct ClientInfo { #[ts(export)] pub struct ServiceSettings { /// Service settings owned by the user - #[ts(optional)] - pub user: Option, + #[ts(type = "object", optional)] + pub user: Option, /// Service settings owned by a group in which the user is a member - #[ts(optional)] - pub member: Option, + #[ts(type = "object", optional)] + pub member: Option, /// Service settings owned by a groups created by the user - pub groups: HashMap, + #[ts(type = "object")] + pub groups: HashMap, } /// Send message request (for authorized services) diff --git a/crates/cloud-common/src/lib.rs b/crates/cloud-common/src/lib.rs index 72f3905a..741af579 100644 --- a/crates/cloud-common/src/lib.rs +++ b/crates/cloud-common/src/lib.rs @@ -27,7 +27,7 @@ pub struct User { pub created_at: DateTime, pub linked_accounts: Vec, pub services_hosts: Option>, - pub service_settings: HashMap, + pub service_settings: HashMap, } impl User {