vw_small

commit 45d676eb1074ea3e40f9d33383ce4b9f4a5e0054
parent 08b551624ca625a95a5d16af00ec49ea1cbc1439
Author: Miroslav Prasil <miroslav@prasil.info>
Date:   Wed, 29 Aug 2018 10:07:09 +0100

Merge branch 'master' into alpine

Diffstat:
M
src/api/core/ciphers.rs
 | 
10
++++++++++
M
src/api/core/mod.rs
 | 
2
++

2 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/api/core/ciphers.rs b/src/api/core/ciphers.rs
@@ -520,6 +520,11 @@ fn delete_attachment(uuid: String, attachment_id: String, headers: Headers, conn
     _delete_cipher_attachment_by_id(&uuid, &attachment_id, &headers, &conn)
 }
 
+#[delete("/ciphers/<uuid>/attachment/<attachment_id>/admin")]
+fn delete_attachment_admin(uuid: String, attachment_id: String, headers: Headers, conn: DbConn) -> EmptyResult {
+    _delete_cipher_attachment_by_id(&uuid, &attachment_id, &headers, &conn)
+}
+
 #[post("/ciphers/<uuid>/delete")]
 fn delete_cipher_post(uuid: String, headers: Headers, conn: DbConn) -> EmptyResult {
     _delete_cipher_by_uuid(&uuid, &headers, &conn)
@@ -535,6 +540,11 @@ fn delete_cipher(uuid: String, headers: Headers, conn: DbConn) -> EmptyResult {
     _delete_cipher_by_uuid(&uuid, &headers, &conn)
 }
 
+#[delete("/ciphers/<uuid>/admin")]
+fn delete_cipher_admin(uuid: String, headers: Headers, conn: DbConn) -> EmptyResult {
+    _delete_cipher_by_uuid(&uuid, &headers, &conn)
+}
+
 #[delete("/ciphers", data = "<data>")]
 fn delete_cipher_selected(data: JsonUpcase<Value>, headers: Headers, conn: DbConn) -> EmptyResult {
     let data: Value = data.into_inner().data;
diff --git a/src/api/core/mod.rs b/src/api/core/mod.rs
@@ -43,6 +43,7 @@ pub fn routes() -> Vec<Route> {
         delete_attachment_post,
         delete_attachment_post_admin,
         delete_attachment,
+        delete_attachment_admin,
         post_cipher_admin,
         post_cipher_share,
         put_cipher_share,
@@ -52,6 +53,7 @@ pub fn routes() -> Vec<Route> {
         delete_cipher_post,
         delete_cipher_post_admin,
         delete_cipher,
+        delete_cipher_admin,
         delete_cipher_selected,
         delete_cipher_selected_post,
         delete_all,