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

Allow no folder when editing cipher

This commit is contained in:
Daniel García 2018-04-19 17:54:56 +02:00
parent 328cbade19
commit e6b6d7f3a0
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,9 +112,9 @@ fn post_ciphers(data: Json<CipherData>, headers: Headers, conn: DbConn) -> JsonR
Ok(Json(cipher.to_json(&headers.host, &conn))) Ok(Json(cipher.to_json(&headers.host, &conn)))
} }
fn update_cipher_from_data(cipher: &mut Cipher, data: CipherData, headers: &Headers, conn: &DbConn) -> EmptyResult { fn update_cipher_from_data(cipher: &mut Cipher, data: CipherData, headers: &Headers, conn: &DbConn) -> EmptyResult {
if let Some(folder_id) = data.folderId { if let Some(ref folder_id) = data.folderId {
match Folder::find_by_uuid(&folder_id, conn) { match Folder::find_by_uuid(folder_id, conn) {
Some(folder) => { Some(folder) => {
if folder.user_uuid != headers.user.uuid { if folder.user_uuid != headers.user.uuid {
err!("Folder is not owned by user") err!("Folder is not owned by user")
@ -122,10 +122,10 @@ fn update_cipher_from_data(cipher: &mut Cipher, data: CipherData, headers: &Head
} }
None => err!("Folder doesn't exist") None => err!("Folder doesn't exist")
} }
cipher.folder_uuid = Some(folder_id);
} }
cipher.folder_uuid = data.folderId;
if let org_id @ Some(_) = data.organizationId { if let org_id @ Some(_) = data.organizationId {
// TODO: Check if user in org // TODO: Check if user in org
cipher.organization_uuid = org_id; cipher.organization_uuid = org_id;