geforkt von mirrored/vaultwarden
Merge pull request #3277 from jjlin/org-vault-display
Fix vault item display in org vault view
Dieser Commit ist enthalten in:
Commit
af6d17b701
1 geänderte Dateien mit 7 neuen und 5 gelöschten Zeilen
|
@ -2056,11 +2056,13 @@ async fn _restore_organization_user(
|
||||||
|
|
||||||
#[get("/organizations/<org_id>/groups")]
|
#[get("/organizations/<org_id>/groups")]
|
||||||
async fn get_groups(org_id: String, _headers: ManagerHeadersLoose, mut conn: DbConn) -> JsonResult {
|
async fn get_groups(org_id: String, _headers: ManagerHeadersLoose, mut conn: DbConn) -> JsonResult {
|
||||||
if !CONFIG.org_groups_enabled() {
|
let groups = if CONFIG.org_groups_enabled() {
|
||||||
err!("Group support is disabled");
|
Group::find_by_organization(&org_id, &mut conn).await.iter().map(Group::to_json).collect::<Value>()
|
||||||
}
|
} else {
|
||||||
|
// The Bitwarden clients seem to call this API regardless of whether groups are enabled,
|
||||||
let groups = Group::find_by_organization(&org_id, &mut conn).await.iter().map(Group::to_json).collect::<Value>();
|
// so just act as if there are no groups.
|
||||||
|
Value::Array(Vec::new())
|
||||||
|
};
|
||||||
|
|
||||||
Ok(Json(json!({
|
Ok(Json(json!({
|
||||||
"Data": groups,
|
"Data": groups,
|
||||||
|
|
Laden …
In neuem Issue referenzieren