summaryrefslogtreecommitdiff
path: root/src/api
diff options
context:
space:
mode:
authorMathijs van Veluw <[email protected]>2024-10-11 18:42:40 +0200
committerGitHub <[email protected]>2024-10-11 18:42:40 +0200
commite3541763fd349e9b66142f5119041db89fbf97a6 (patch)
treed7c535b6f4a9741fea1121e22a900081dfee62f5 /src/api
parentf0efec7c9623fab4ba3c2b53cba724e4e6a8a739 (diff)
downloadvaultwarden-e3541763fd349e9b66142f5119041db89fbf97a6.tar.gz
vaultwarden-e3541763fd349e9b66142f5119041db89fbf97a6.zip
Updates and collection management fixes (#5072)
* Fix collections not editable by managers Since a newer version of the web-vault we use manager were not able to create sub collections anymore. This was because of some missing details in the response of some json objects. This commit fixes this by using the `to_json_details` instead of the `to_json` Fixes #5066 Fixes #5044 * Update crates and GitHub Actions - Updated all the crates - Updated all the GHA dependencies - Configured the trivy workflow to only run on the main repo and not on forks Also selected a random new scheduled date so it will not run at the same time as all other forks. The two changes should help running this scan every day without failing, and also prevent the same for new or updated forks.
Diffstat (limited to 'src/api')
-rw-r--r--src/api/core/organizations.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/api/core/organizations.rs b/src/api/core/organizations.rs
index 3784e74e..afd2d388 100644
--- a/src/api/core/organizations.rs
+++ b/src/api/core/organizations.rs
@@ -358,7 +358,7 @@ async fn get_org_collections_details(org_id: &str, headers: ManagerHeadersLoose,
Vec::with_capacity(0)
};
- let mut json_object = col.to_json();
+ let mut json_object = col.to_json_details(&headers.user.uuid, None, &mut conn).await;
json_object["assigned"] = json!(assigned);
json_object["users"] = json!(users);
json_object["groups"] = json!(groups);
@@ -680,7 +680,7 @@ async fn get_org_collection_detail(
let assigned = Collection::can_access_collection(&user_org, &collection.uuid, &mut conn).await;
- let mut json_object = collection.to_json();
+ let mut json_object = collection.to_json_details(&headers.user.uuid, None, &mut conn).await;
json_object["assigned"] = json!(assigned);
json_object["users"] = json!(users);
json_object["groups"] = json!(groups);