octoleo/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2024-12-23 11:29:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24 from mprasil/myvault_collections

Browse Source 
Support editing collections from user vault
This commit is contained in:
Daniel García 2018-05-19 22:56:35 +02:00 committed by GitHub
commit 726ba36e5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,6 +76,11 @@ fn get_cipher_admin(uuid: String, headers: Headers, conn: DbConn) -> JsonResult
get_cipher(uuid, headers, conn) 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)] #[derive(Deserialize, Debug)]
#[allow(non_snake_case)] #[allow(non_snake_case)]
struct CipherData { struct CipherData {
@ -306,6 +311,11 @@ struct CollectionsAdminData {
collectionIds: Vec<String>, 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>")] #[post("/ciphers/<uuid>/collections-admin", data = "<data>")]
fn post_collections_admin(uuid: String, data: Json<CollectionsAdminData>, headers: Headers, conn: DbConn) -> EmptyResult { fn post_collections_admin(uuid: String, data: Json<CollectionsAdminData>, headers: Headers, conn: DbConn) -> EmptyResult {
let data: CollectionsAdminData = data.into_inner(); let data: CollectionsAdminData = data.into_inner();

2
src/api/core/mod.rs
View File

@ -27,6 +27,7 @@ pub fn routes() -> Vec<Route> {
get_ciphers, get_ciphers,
get_cipher, get_cipher,
get_cipher_admin, get_cipher_admin,
get_cipher_details,
post_ciphers, post_ciphers,
post_ciphers_admin, post_ciphers_admin,
post_ciphers_import, post_ciphers_import,
@ -69,6 +70,7 @@ pub fn routes() -> Vec<Route> {
post_organization_collections, post_organization_collections,
post_organization_collection_update, post_organization_collection_update,
post_organization_collection_delete, post_organization_collection_delete,
post_collections_update,
post_collections_admin, post_collections_admin,
get_org_details, get_org_details,
get_org_users, get_org_users,