Migrate folder create and edit

.vscode/settings.json

@@ -27,6 +27,7 @@
     "spki",
     "totp",
     "uniffi",
+    "wiremock",
     "wordlist",
     "XCHACHA",
     "Zeroize",

Cargo.toml

@@ -31,10 +31,11 @@ bitwarden-fido = { path = "crates/bitwarden-fido", version = "=1.0.0" }
 bitwarden-generators = { path = "crates/bitwarden-generators", version = "=1.0.0" }
 bitwarden-ipc = { path = "crates/bitwarden-ipc", version = "=1.0.0" }
 bitwarden-send = { path = "crates/bitwarden-send", version = "=1.0.0" }
-bitwarden-state = { path = "crates/bitwarden-state", version = "=1.0.0" }
-bitwarden-threading = { path = "crates/bitwarden-threading", version = "=1.0.0" }
 bitwarden-sm = { path = "bitwarden_license/bitwarden-sm", version = "=1.0.0" }
 bitwarden-ssh = { path = "crates/bitwarden-ssh", version = "=1.0.0" }
+bitwarden-state = { path = "crates/bitwarden-state", version = "=1.0.0" }
+bitwarden-test = { path = "crates/bitwarden-test", version = "=1.0.0" }
+bitwarden-threading = { path = "crates/bitwarden-threading", version = "=1.0.0" }
 bitwarden-uuid = { path = "crates/bitwarden-uuid", version = "=1.0.0" }
 bitwarden-uuid-macro = { path = "crates/bitwarden-uuid-macro", version = "=1.0.0" }
 bitwarden-vault = { path = "crates/bitwarden-vault", version = "=1.0.0" }
@@ -60,6 +61,7 @@ serde = { version = ">=1.0, <2.0", features = ["derive"] }
 serde_json = ">=1.0.96, <2.0"
 serde_qs = ">=0.12.0, <0.16"
 serde_repr = ">=0.1.12, <0.2"
+serde-wasm-bindgen = ">=0.6.0, <0.7"
 syn = ">=2.0.87, <3"
 thiserror = ">=1.0.40, <3"
 tokio = { version = "1.36.0", features = ["macros"] }
@@ -72,7 +74,7 @@ validator = { version = ">=0.18.1, <0.21", features = ["derive"] }
 wasm-bindgen = { version = ">=0.2.91, <0.3", features = ["serde-serialize"] }
 wasm-bindgen-futures = "0.4.41"
 wasm-bindgen-test = "0.3.45"
-serde-wasm-bindgen = ">=0.6.0, <0.7"
+wiremock = ">=0.6.0, <0.7"
 
 # There is an incompatibility when using pkcs5 and chacha20 on wasm builds. This can be removed once a new
 # rustcrypto-formats crate version is released since the fix has been upstreamed.

bitwarden_license/bitwarden-sm/Cargo.toml

@@ -28,7 +28,7 @@ validator = { workspace = true }
 
 [dev-dependencies]
 tokio = { workspace = true, features = ["rt"] }
-wiremock = "0.6.0"
+wiremock = { workspace = true }
 
 [lints]
 workspace = true

crates/bitwarden-generators/Cargo.toml

@@ -39,7 +39,7 @@ wasm-bindgen = { workspace = true, optional = true }
 [dev-dependencies]
 rand_chacha = "0.3.1"
 tokio = { workspace = true, features = ["rt"] }
-wiremock = "0.6.0"
+wiremock = { workspace = true }
 
 [lints]
 workspace = true

crates/bitwarden-test/Cargo.toml

@@ -0,0 +1,25 @@
+[package]
+name = "bitwarden-test"
+description = """
+Internal crate for the bitwarden crate. Do not use.
+"""
+
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+readme.workspace = true
+homepage.workspace = true
+repository.workspace = true
+license-file.workspace = true
+keywords.workspace = true
+
+[dependencies]
+async-trait = { workspace = true }
+bitwarden-api-api.workspace = true
+bitwarden-state = { workspace = true }
+reqwest = { workspace = true }
+wiremock = { workspace = true }
+
+[lints]
+workspace = true

crates/bitwarden-test/README.md

@@ -0,0 +1,7 @@
+# Bitwarden Test
+
+<div class="warning">
+This crate should only be used in tests and should not be included in production builds.
+</div>
+
+Contains test utilities for Bitwarden.

crates/bitwarden-test/src/api.rs

@@ -0,0 +1,24 @@
+use bitwarden_api_api::apis::configuration::Configuration;
+
+/// Helper for testing the Bitwarden API using wiremock.
+///
+/// Warning: when using `Mock::expected` ensure `server` is not dropped before the test completes,
+pub async fn start_api_mock(mocks: Vec<wiremock::Mock>) -> (wiremock::MockServer, Configuration) {
+    let server = wiremock::MockServer::start().await;
+
+    for mock in mocks {
+        server.register(mock).await;
+    }
+
+    let config = Configuration {
+        base_path: server.uri(),
+        user_agent: Some("test-agent".to_string()),
+        client: reqwest::Client::new(),
+        basic_auth: None,
+        oauth_access_token: None,
+        bearer_access_token: None,
+        api_key: None,
+    };
+
+    (server, config)
+}

crates/bitwarden-test/src/lib.rs

@@ -0,0 +1,7 @@
+#![doc = include_str!("../README.md")]
+
+mod api;
+pub use api::*;
+
+mod repository;
+pub use repository::*;

crates/bitwarden-test/src/repository.rs

@@ -0,0 +1,54 @@
+use bitwarden_state::repository::{Repository, RepositoryError, RepositoryItem};
+
+/// A simple in-memory repository implementation. The data is only stored in memory and will not
+/// persist beyond the lifetime of the repository instance.
+///
+/// Primary use case is for unit and integration tests.
+pub struct MemoryRepository<V: RepositoryItem> {
+    store: std::sync::Mutex<std::collections::HashMap<String, V>>,
+}
+
+impl<V: RepositoryItem + Clone> Default for MemoryRepository<V> {
+    fn default() -> Self {
+        Self {
+            store: std::sync::Mutex::new(std::collections::HashMap::new()),
+        }
+    }
+}
+
+#[async_trait::async_trait]
+impl<V: RepositoryItem + Clone> Repository<V> for MemoryRepository<V> {
+    async fn get(&self, key: String) -> Result<Option<V>, RepositoryError> {
+        let store = self
+            .store
+            .lock()
+            .map_err(|e| RepositoryError::Internal(e.to_string()))?;
+        Ok(store.get(&key).cloned())
+    }
+
+    async fn list(&self) -> Result<Vec<V>, RepositoryError> {
+        let store = self
+            .store
+            .lock()
+            .map_err(|e| RepositoryError::Internal(e.to_string()))?;
+        Ok(store.values().cloned().collect())
+    }
+
+    async fn set(&self, key: String, value: V) -> Result<(), RepositoryError> {
+        let mut store = self
+            .store
+            .lock()
+            .map_err(|e| RepositoryError::Internal(e.to_string()))?;
+        store.insert(key, value);
+        Ok(())
+    }
+
+    async fn remove(&self, key: String) -> Result<(), RepositoryError> {
+        let mut store = self
+            .store
+            .lock()
+            .map_err(|e| RepositoryError::Internal(e.to_string()))?;
+        store.remove(&key);
+        Ok(())
+    }
+}

crates/bitwarden-vault/Cargo.toml

@@ -23,7 +23,8 @@ uniffi = [
 wasm = [
     "bitwarden-core/wasm",
     "dep:tsify-next",
-    "dep:wasm-bindgen"
+    "dep:wasm-bindgen",
+    "dep:wasm-bindgen-futures"
 ] # WASM support
 
 [dependencies]
@@ -48,9 +49,12 @@ tsify-next = { workspace = true, optional = true }
 uniffi = { workspace = true, optional = true }
 uuid = { workspace = true }
 wasm-bindgen = { workspace = true, optional = true }
+wasm-bindgen-futures = { workspace = true, optional = true }
 
 [dev-dependencies]
+bitwarden-test = { workspace = true }
 tokio = { workspace = true, features = ["rt"] }
+wiremock = { workspace = true }
 
 [lints]
 workspace = true