Skip to content

WIP Settings should be json value - not raw string #212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
brollb wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

WIP Settings should be json value - not raw string #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions crates/api-common/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,13 +688,14 @@ pub struct ClientInfo {
#[ts(export)]
pub struct ServiceSettings {
/// Service settings owned by the user
#[ts(optional)]
pub user: Option<String>,
#[ts(type = "object", optional)]
pub user: Option<Value>,
/// Service settings owned by a group in which the user is a member
#[ts(optional)]
pub member: Option<String>,
#[ts(type = "object", optional)]
pub member: Option<Value>,
/// Service settings owned by a groups created by the user
pub groups: HashMap<GroupId, String>,
#[ts(type = "object")]
pub groups: HashMap<GroupId, Value>,
}

/// Send message request (for authorized services)
Expand Down
2 changes: 1 addition & 1 deletion crates/cloud-common/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ pub struct User {
pub created_at: DateTime,
pub linked_accounts: Vec<LinkedAccount>,
pub services_hosts: Option<Vec<ServiceHost>>,
pub service_settings: HashMap<String, String>,
pub service_settings: HashMap<String, Value>,
}

impl User {
Expand Down