saltyming/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-08-02 00:59:08 +00:00
Code Activity

small refactor to make it easier to review

Browse source
This commit is contained in:
Stefan Melmuk 2024-01-05 04:49:06 +01:00 • committed by Matlink
commit e314c4e417
1 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/api/core/organizations.rs
View file

@ -326,24 +326,11 @@ async fn get_org_collections_details(org_id: &str, headers: ManagerHeadersLoose,
// check if current user has full access to the organization (either directly or via any group)
let has_full_access_via_group =
CONFIG.org_groups_enabled() && GroupUser::has_full_access_by_member(org_id, &user_org.uuid, &mut conn).await;
let has_full_access = user_org.access_all || has_full_access_via_group;
let has_full_access_to_org = user_org.access_all || has_full_access_via_group;
for col in Collection::find_by_organization(org_id, &mut conn).await {
// get the group details for the given collection
let groups: Vec<Value> = if CONFIG.org_groups_enabled() {
CollectionGroup::find_by_collection(&col.uuid, &mut conn)
.await
.iter()
.map(|collection_group| {
SelectionReadOnly::to_collection_group_details_read_only(collection_group).to_json()
})
.collect()
} else {
Vec::with_capacity(0)
};
// assigned indicates whether the current user has access to the given collection
let mut assigned = has_full_access;
let mut assigned = has_full_access_to_org;
// get the users assigned directly to the given collection
let users: Vec<Value> = coll_users
@ -363,6 +350,19 @@ async fn get_org_collections_details(org_id: &str, headers: ManagerHeadersLoose,
assigned = GroupUser::has_access_to_collection_by_member(&col.uuid, &user_org.uuid, &mut conn).await;
}
// get the group details for the given collection
let groups: Vec<Value> = if CONFIG.org_groups_enabled() {
CollectionGroup::find_by_collection(&col.uuid, &mut conn)
.await
.iter()
.map(|collection_group| {
SelectionReadOnly::to_collection_group_details_read_only(collection_group).to_json()
})
.collect()
} else {
Vec::with_capacity(0)
};
let mut json_object = col.to_json();
json_object["Assigned"] = json!(assigned);
json_object["Users"] = json!(users);