MyFavMirrors
/
vaultwarden
mirror of https://github.com/dani-garcia/vaultwarden.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Daniel García 2021-07-25 19:08:38 +02:00
parent 2db30f918e 91e80657e4
commit c68fbb41d2
No known key found for this signature in database
GPG Key ID: FC8A7D14C3CD543A
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/api/core/ciphers.rs
View File

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