1
0
Fork 1
Spiegel von https://github.com/dani-garcia/vaultwarden.git synchronisiert 2024-11-26 05:50:29 +01:00

Fix bulk collection deletion (#4257)

The bulk collection delete seems to have removed the extra org_id in the
posted data. Now we only use the org_id from the path.

Fixes #4253
Dieser Commit ist enthalten in:
Mathijs van Veluw 2024-01-25 21:57:35 +01:00 committet von GitHub
Ursprung 2775c6ce8a
Commit 5c77431c2d
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: B5690EEEBB952194

Datei anzeigen

@ -611,7 +611,6 @@ async fn post_organization_collection_delete(
#[allow(non_snake_case)] #[allow(non_snake_case)]
struct BulkCollectionIds { struct BulkCollectionIds {
Ids: Vec<String>, Ids: Vec<String>,
OrganizationId: String,
} }
#[delete("/organizations/<org_id>/collections", data = "<data>")] #[delete("/organizations/<org_id>/collections", data = "<data>")]
@ -622,9 +621,6 @@ async fn bulk_delete_organization_collections(
mut conn: DbConn, mut conn: DbConn,
) -> EmptyResult { ) -> EmptyResult {
let data: BulkCollectionIds = data.into_inner().data; let data: BulkCollectionIds = data.into_inner().data;
if org_id != data.OrganizationId {
err!("OrganizationId mismatch");
}
let collections = data.Ids; let collections = data.Ids;