mirror of
https://github.com/dani-garcia/vaultwarden.git
synced 2024-12-26 23:25:56 -05:00
Change update_cipher method to save cipher before creating folder mapping, otherwise there is an error when creating a cipher with a folder value
This commit is contained in:
parent
9273c38b69
commit
e301e69ff5
@ -183,10 +183,6 @@ fn update_cipher_from_data(cipher: &mut Cipher, data: CipherData, headers: &Head
|
|||||||
// Copy the type data and change the names to the correct case
|
// Copy the type data and change the names to the correct case
|
||||||
copy_values(&type_data, &mut values);
|
copy_values(&type_data, &mut values);
|
||||||
|
|
||||||
if cipher.move_to_folder(data.folderId, &headers.user.uuid, &conn).is_err() {
|
|
||||||
err!("Error saving the folder information")
|
|
||||||
}
|
|
||||||
|
|
||||||
cipher.favorite = data.favorite.unwrap_or(false);
|
cipher.favorite = data.favorite.unwrap_or(false);
|
||||||
cipher.name = data.name;
|
cipher.name = data.name;
|
||||||
cipher.notes = data.notes;
|
cipher.notes = data.notes;
|
||||||
@ -194,6 +190,11 @@ fn update_cipher_from_data(cipher: &mut Cipher, data: CipherData, headers: &Head
|
|||||||
cipher.data = values.to_string();
|
cipher.data = values.to_string();
|
||||||
|
|
||||||
cipher.save(&conn);
|
cipher.save(&conn);
|
||||||
|
|
||||||
|
if cipher.move_to_folder(data.folderId, &headers.user.uuid, &conn).is_err() {
|
||||||
|
err!("Error saving the folder information")
|
||||||
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user