Make tokio optional

crates/bitwarden-core/Cargo.toml

@@ -26,7 +26,7 @@ uniffi = [
     "dep:p256",
 ] # Uniffi bindings
 secrets = [] # Secrets manager API
-state = ["dep:bitwarden-db"] # Persistent state
+state = ["dep:bitwarden-db", "dep:tokio"] # Persistent state
 
 [dependencies]
 async-trait = ">=0.1.80, <0.2"
@@ -60,7 +60,7 @@ serde_repr = ">=0.1.12, <0.2"
 sha1 = ">=0.10.5, <0.11"
 sha2 = ">=0.10.6, <0.11"
 thiserror = ">=1.0.40, <2.0"
-tokio = { workspace = true }
+tokio = { workspace = true, optional = true }
 uniffi = { version = "=0.28.0", optional = true, features = ["tokio"] }
 uuid = { version = ">=1.3.3, <2.0", features = ["serde"] }
 validator = { version = "0.18.1", features = ["derive"] }
@@ -90,8 +90,8 @@ reqwest = { version = ">=0.12.5, <0.13", features = [
 security-framework = { version = "=2.10" }
 
 [dev-dependencies]
-bitwarden-crypto = { workspace = true }
 rand_chacha = "0.3.1"
+tokio = { workspace = true }
 wiremock = "0.6.0"
 zeroize = { version = ">=1.7.0, <2.0", features = ["derive", "aarch64"] }
 

crates/bitwarden-core/src/client/client.rs

@@ -3,7 +3,7 @@ use std::sync::{Arc, RwLock};
 #[cfg(feature = "state")]
 use bitwarden_db::{Database, Migration, Migrator};
 use reqwest::header::{self, HeaderValue};
-#[cfg(feature = "internal")]
+#[cfg(feature = "state")]
 use tokio::sync::Mutex;
 
 use super::internal::InternalClient;

crates/bitwarden-core/src/client/internal.rs

@@ -7,7 +7,7 @@ use bitwarden_crypto::{AsymmetricEncString, EncString, Kdf, MasterKey, PinKey};
 #[cfg(feature = "state")]
 use bitwarden_db::Database;
 use chrono::Utc;
-#[cfg(feature = "internal")]
+#[cfg(feature = "state")]
 use tokio::sync::Mutex;
 use uuid::Uuid;
 

crates/bitwarden-vault/Cargo.toml

@@ -19,7 +19,7 @@ uniffi = [
     "bitwarden-crypto/uniffi",
     "dep:uniffi",
 ] # Uniffi bindings
-state = ["bitwarden-core/state"] # Persistent state
+state = ["bitwarden-core/state", "dep:tokio"] # Persistent state
 
 [dependencies]
 base64 = ">=0.22.1, <0.23"
@@ -41,9 +41,12 @@ serde_repr = ">=0.1.12, <0.2"
 sha1 = ">=0.10.5, <0.11"
 sha2 = ">=0.10.6, <0.11"
 thiserror = ">=1.0.40, <2.0"
-tokio = { workspace = true }
+tokio = { workspace = true, optional = true }
 uniffi = { version = "=0.28.0", optional = true }
 uuid = { version = ">=1.3.3, <2.0", features = ["serde"] }
 
+[dev-dependencies]
+tokio = { workspace = true }
+
 [lints]
 workspace = true

crates/bitwarden-vault/src/cipher/mod.rs

@@ -7,6 +7,7 @@ pub(crate) mod identity;
 pub(crate) mod linked_id;
 pub(crate) mod local_data;
 pub(crate) mod login;
+#[cfg(feature = "state")]
 pub(crate) mod repository;
 pub(crate) mod secure_note;
 

crates/bitwarden-vault/src/cipher/repository.rs

@@ -1,5 +1,6 @@
 use std::sync::Arc;
 
+use bitwarden_core::{require, MissingFieldError};
 use bitwarden_db::{named_params, params, Database, DatabaseError, DatabaseTrait};
 use thiserror::Error;
 use tokio::sync::Mutex;
@@ -16,6 +17,8 @@ struct CipherRow {
 
 #[derive(Debug, Error)]
 pub enum CipherRepositoryError {
+    #[error(transparent)]
+    MissingFieldError(#[from] MissingFieldError),
     #[error(transparent)]
     DatabaseError(#[from] DatabaseError),
     #[error(transparent)]
@@ -32,8 +35,8 @@ impl CipherRepository {
     }
 
     pub async fn save(&self, cipher: &Cipher) -> Result<(), CipherRepositoryError> {
-        let id = cipher.id.unwrap();
-        let serialized = serde_json::to_string(cipher).unwrap();
+        let id = require!(cipher.id);
+        let serialized = serde_json::to_string(cipher)?;
 
         let guard = self.db.lock().await;
 
@@ -58,7 +61,7 @@ impl CipherRepository {
 
         for cipher in ciphers {
             let id = cipher.id.unwrap();
-            let serialized = serde_json::to_string(&cipher).unwrap();
+            let serialized = serde_json::to_string(&cipher)?;
 
             guard
                 .execute(
@@ -84,7 +87,7 @@ impl CipherRepository {
     pub async fn get_all(&self) -> Result<Vec<Cipher>, CipherRepositoryError> {
         let guard = self.db.lock().await;
 
-        let rows = guard
+        let rows: Result<Vec<Cipher>, _> = guard
             .query_map(
                 "SELECT id, value FROM ciphers",
                 [],
@@ -97,10 +100,10 @@ impl CipherRepository {
             )
             .await?
             .iter()
-            .map(|row| serde_json::from_str(&row.value).unwrap())
+            .map(|row| serde_json::from_str(&row.value))
             .collect();
 
-        Ok(rows)
+        Ok(rows?)
     }
 }
 

crates/bitwarden-vault/src/client_vault.rs

@@ -1,22 +1,24 @@
 use bitwarden_core::Client;
 
+#[cfg(feature = "state")]
+use crate::repository::CipherRepository;
 use crate::{
-    repository::CipherRepository,
     sync::{sync, SyncError},
     SyncRequest, SyncResponse,
 };
 
 pub struct ClientVault<'a> {
     pub(crate) client: &'a Client,
+    #[cfg(feature = "state")]
     pub cipher_repository: CipherRepository,
 }
 
 impl<'a> ClientVault<'a> {
     pub fn new(client: &'a Client) -> Self {
-        let t = client.internal.db.clone();
         Self {
             client,
-            cipher_repository: CipherRepository::new(t),
+            #[cfg(feature = "state")]
+            cipher_repository: CipherRepository::new(client.internal.db.clone()),
         }
     }
 

crates/bitwarden-vault/src/sync.rs

@@ -9,7 +9,7 @@ use serde::{Deserialize, Serialize};
 use thiserror::Error;
 use uuid::Uuid;
 
-use crate::{Cipher, ClientVaultExt, Collection, Folder, GlobalDomains, VaultParseError};
+use crate::{Cipher, Collection, Folder, GlobalDomains, VaultParseError};
 
 #[derive(Debug, Error)]
 pub enum SyncError {
@@ -48,15 +48,6 @@ pub(crate) async fn sync(client: &Client, input: &SyncRequest) -> Result<SyncRes
 
     let res = SyncResponse::process_response(sync, &enc)?;
 
-    let ciphers = res.ciphers.as_slice();
-
-    client
-        .vault()
-        .cipher_repository
-        .replace_all(ciphers)
-        .await
-        .unwrap();
-
     Ok(res)
 }