saltyming/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-06-14 14:50:08 +00:00
Code Activity

Fix FolderCipher creation, handle some errors

Browse source
This commit is contained in:
Miroslav Prasil 2018-05-01 16:54:22 +01:00
parent 514a372bc8
commit c3be1b4298
3 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/db/models/cipher.rs
View file

@ -163,10 +163,10 @@ impl Cipher {
current_folder.delete(&conn).or(Err("Failed removing old folder mapping"))
},
None => Ok(()) // Weird, but nothing to do
};
FolderCipher::new(&new_folder, &self.uuid)
.save(&conn).or(Err("Couldn't save folder setting"))
}.and_then(
|()| FolderCipher::new(&new_folder, &self.uuid)
.save(&conn).or(Err("Couldn't save folder setting"))
)
}
},
None => {

4
src/db/models/folder.rs
View file

@ -55,10 +55,10 @@ impl Folder {
}
impl FolderCipher {
pub fn new(cipher_uuid: &str, folder_uuid: &str) -> Self {
pub fn new(folder_uuid: &str, cipher_uuid: &str) -> Self {
Self {
cipher_uuid: cipher_uuid.to_string(),
folder_uuid: folder_uuid.to_string(),
cipher_uuid: cipher_uuid.to_string(),
}
}
}