Merge pull request #24 from mprasil/myvault_collections

Support editing collections from user vault
dani-garcia · May 19, 2018 · 726ba36 · 726ba36
2 parents e301e69 + 2215bdf
commit 726ba36
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/api/core/ciphers.rs b/src/api/core/ciphers.rs
@@ -76,6 +76,11 @@ fn get_cipher_admin(uuid: String, headers: Headers, conn: DbConn) -> JsonResult
     get_cipher(uuid, headers, conn)
 }
 
+#[get("/ciphers/<uuid>/details")]
+fn get_cipher_details(uuid: String, headers: Headers, conn: DbConn) -> JsonResult {
+    get_cipher(uuid, headers, conn)
+}
+
 #[derive(Deserialize, Debug)]
 #[allow(non_snake_case)]
 struct CipherData {
@@ -306,6 +311,11 @@ struct CollectionsAdminData {
     collectionIds: Vec<String>,
 }
 
+#[post("/ciphers/<uuid>/collections", data = "<data>")]
+fn post_collections_update(uuid: String, data: Json<CollectionsAdminData>, headers: Headers, conn: DbConn) -> EmptyResult {
+    post_collections_admin(uuid, data, headers, conn)
+}
+
 #[post("/ciphers/<uuid>/collections-admin", data = "<data>")]
 fn post_collections_admin(uuid: String, data: Json<CollectionsAdminData>, headers: Headers, conn: DbConn) -> EmptyResult {
     let data: CollectionsAdminData = data.into_inner();

diff --git a/src/api/core/mod.rs b/src/api/core/mod.rs
@@ -27,6 +27,7 @@ pub fn routes() -> Vec<Route> {
         get_ciphers,
         get_cipher,
         get_cipher_admin,
+        get_cipher_details,
         post_ciphers,
         post_ciphers_admin,
         post_ciphers_import,
@@ -69,6 +70,7 @@ pub fn routes() -> Vec<Route> {
         post_organization_collections,
         post_organization_collection_update,
         post_organization_collection_delete,
+        post_collections_update,
         post_collections_admin,
         get_org_details,
         get_org_users,