From 1d7f704754db42ba1f98d4eeeb80d59996d7e4f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa?= Date: Fri, 11 Jan 2019 01:08:35 +0100 Subject: [PATCH] Send CipherUpdate when adding and deleting attachments --- src/api/core/ciphers.rs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/api/core/ciphers.rs b/src/api/core/ciphers.rs index 56fa54e0..de75a98f 100644 --- a/src/api/core/ciphers.rs +++ b/src/api/core/ciphers.rs @@ -632,7 +632,7 @@ fn share_cipher_by_uuid( } #[post("/ciphers//attachment", format = "multipart/form-data", data = "")] -fn post_attachment(uuid: String, data: Data, content_type: &ContentType, headers: Headers, conn: DbConn) -> JsonResult { +fn post_attachment(uuid: String, data: Data, content_type: &ContentType, headers: Headers, conn: DbConn, nt: Notify) -> JsonResult { let cipher = match Cipher::find_by_uuid(&uuid, &conn) { Some(cipher) => cipher, None => err!("Cipher doesn't exist"), @@ -692,6 +692,8 @@ fn post_attachment(uuid: String, data: Data, content_type: &ContentType, headers }) .expect("Error processing multipart data"); + nt.send_cipher_update(UpdateType::CipherUpdate, &cipher, &cipher.update_users_revision(&conn)); + Ok(Json(cipher.to_json(&headers.host, &headers.user.uuid, &conn))) } @@ -702,8 +704,9 @@ fn post_attachment_admin( content_type: &ContentType, headers: Headers, conn: DbConn, + nt: Notify, ) -> JsonResult { - post_attachment(uuid, data, content_type, headers, conn) + post_attachment(uuid, data, content_type, headers, conn, nt) } #[post( @@ -721,7 +724,7 @@ fn post_attachment_share( nt: Notify, ) -> JsonResult { _delete_cipher_attachment_by_id(&uuid, &attachment_id, &headers, &conn, &nt)?; - post_attachment(uuid, data, content_type, headers, conn) + post_attachment(uuid, data, content_type, headers, conn, nt) } #[post("/ciphers//attachment//delete-admin")] @@ -929,6 +932,6 @@ fn _delete_cipher_attachment_by_id( // Delete attachment attachment.delete(&conn)?; - nt.send_cipher_update(UpdateType::CipherDelete, &cipher, &cipher.update_users_revision(&conn)); + nt.send_cipher_update(UpdateType::CipherUpdate, &cipher, &cipher.update_users_revision(&conn)); Ok(()) }