mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2026-04-30 12:04:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(bindings): Allow setting the store without a passphrase

Browse Source
This commit is contained in:
Damir Jelić
2022-10-18 11:28:11 +02:00
parent 8a720af215
commit 52d96ceb60
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
bindings/matrix-sdk-crypto-js/src/machine.rs
View File

@@ -66,6 +66,7 @@ impl OlmMachine {
#[cfg(target_arch = "wasm32")]
(Some(store_name), Some(mut store_passphrase)) => {
use std::sync::Arc;
use zeroize::Zeroize;
let store = Some(
@@ -82,9 +83,22 @@ impl OlmMachine {
store
}
(Some(_), None) => return Err(anyhow::Error::msg("The `store_name` has been set, and so, it expects a `store_passphrase`, which is not set; please provide one")),
#[cfg(target_arch = "wasm32")]
(Some(store_name), None) => {
use std::sync::Arc;
Some(
matrix_sdk_indexeddb::IndexeddbCryptoStore::open_with_name(&store_name)
.await
.map(Arc::new)?,
)
}
(None, Some(_)) => return Err(anyhow::Error::msg("The `store_passphrase` has been set, but it has an effect only if `store_name` is set, which is not; please provide one")),
(None, Some(_)) => {
return Err(anyhow::Error::msg(
"The `store_passphrase` has been set, but it has an effect only if \
`store_name` is set, which is not; please provide one",
))
}
_ => None,
};