Spiegel von
https://github.com/dani-garcia/vaultwarden.git
synchronisiert 2024-11-25 05:40:29 +01:00
Clean up the share_collection handling
Dieser Commit ist enthalten in:
Ursprung
9eaa9c1a17
Commit
fb4e6bab14
1 geänderte Dateien mit 3 neuen und 7 gelöschten Zeilen
|
@ -430,16 +430,12 @@ fn share_cipher_by_uuid(uuid: &str, data: ShareCipherData, headers: &Headers, co
|
||||||
Some(organization_uuid) => {
|
Some(organization_uuid) => {
|
||||||
let mut shared_to_collection = false;
|
let mut shared_to_collection = false;
|
||||||
for uuid in &data.CollectionIds {
|
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"),
|
None => err!("Invalid collection ID provided"),
|
||||||
Some(collection) => {
|
Some(collection) => {
|
||||||
if collection.is_writable_by_user(&headers.user.uuid, &conn) {
|
if collection.is_writable_by_user(&headers.user.uuid, &conn) {
|
||||||
if collection.org_uuid == organization_uuid {
|
|
||||||
CollectionCipher::save(&cipher.uuid.clone(), &collection.uuid, &conn);
|
CollectionCipher::save(&cipher.uuid.clone(), &collection.uuid, &conn);
|
||||||
shared_to_collection = true;
|
shared_to_collection = true;
|
||||||
} else {
|
|
||||||
err!("Collection does not belong to organization")
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
err!("No rights to modify the collection")
|
err!("No rights to modify the collection")
|
||||||
}
|
}
|
||||||
|
|
Laden …
In neuem Issue referenzieren