saret/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-09-12 11:35:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'async-updates' of https://github.com/BlackDex/vaultwarden into BlackDex-async-updates

Browse Source
This commit is contained in:
Daniel García
2022-02-27 21:50:33 +01:00
parent 2ff51ae77e 42136a7097
commit 843f205f6f
36 changed files with 4884 additions and 2443 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/core/organizations.rs
View File

@@ -1182,9 +1182,7 @@ async fn post_org_import(
let ciphers = stream::iter(data.Ciphers)
.then(|cipher_data| async {
let mut cipher = Cipher::new(cipher_data.Type, cipher_data.Name.clone());
update_cipher_from_data(&mut cipher, cipher_data, &headers, false, &conn, &nt, UpdateType::CipherCreate)
.await
.ok();
update_cipher_from_data(&mut cipher, cipher_data, &headers, false, &conn, &nt, UpdateType::None).await.ok();
cipher
})
.collect::<Vec<Cipher>>()