From fb4e6bab14f5da3fa6818a9dfd34449b7ff17f28 Mon Sep 17 00:00:00 2001 From: Miroslav Prasil Date: Mon, 1 Oct 2018 15:59:10 +0100 Subject: [PATCH] Clean up the share_collection handling --- src/api/core/ciphers.rs | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/api/core/ciphers.rs b/src/api/core/ciphers.rs index 23554820..66c7c88c 100644 --- a/src/api/core/ciphers.rs +++ b/src/api/core/ciphers.rs @@ -430,16 +430,12 @@ fn share_cipher_by_uuid(uuid: &str, data: ShareCipherData, headers: &Headers, co Some(organization_uuid) => { let mut shared_to_collection = false; for uuid in &data.CollectionIds { - match Collection::find_by_uuid(uuid, &conn) { + match Collection::find_by_uuid_and_org(uuid, &organization_uuid, &conn) { None => err!("Invalid collection ID provided"), Some(collection) => { if collection.is_writable_by_user(&headers.user.uuid, &conn) { - if collection.org_uuid == organization_uuid { - CollectionCipher::save(&cipher.uuid.clone(), &collection.uuid, &conn); - shared_to_collection = true; - } else { - err!("Collection does not belong to organization") - } + CollectionCipher::save(&cipher.uuid.clone(), &collection.uuid, &conn); + shared_to_collection = true; } else { err!("No rights to modify the collection") }