vw_small

commit c68fbb41d251841e65fcd0279c917e91d9784286
parent 2db30f918e93052e6d800082934b57036dce93fd
Author: Daniel García <dani-garcia@users.noreply.github.com>
Date:   Sun, 25 Jul 2021 19:08:38 +0200

Merge branch 'fix-org-attachment-uploads' of https://github.com/jjlin/vaultwarden into jjlin-fix-org-attachment-uploads

Diffstat:
M
src/api/core/ciphers.rs
 | 
12
++++++------

1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/api/core/ciphers.rs b/src/api/core/ciphers.rs
@@ -783,10 +783,7 @@ struct AttachmentRequestData {
     Key: String,
     FileName: String,
     FileSize: i32,
-    // We check org owner/admin status via is_write_accessible_to_user(),
-    // so we can just ignore this field.
-    //
-    // AdminRequest: bool,
+    AdminRequest: Option<bool>, // true when attaching from an org vault view
 }
 
 enum FileUploadType {
@@ -821,14 +818,17 @@ fn post_attachment_v2(
     attachment.save(&conn).expect("Error saving attachment");
 
     let url = format!("/ciphers/{}/attachment/{}", cipher.uuid, attachment_id);
+    let response_key = match data.AdminRequest {
+        Some(b) if b => "CipherMiniResponse",
+        _ => "CipherResponse",
+    };
 
     Ok(Json(json!({ // AttachmentUploadDataResponseModel
         "Object": "attachment-fileUpload",
         "AttachmentId": attachment_id,
         "Url": url,
         "FileUploadType": FileUploadType::Direct as i32,
-        "CipherResponse": cipher.to_json(&headers.host, &headers.user.uuid, &conn),
-        "CipherMiniResponse": null,
+        response_key: cipher.to_json(&headers.host, &headers.user.uuid, &conn),
     })))
 }