Merge branch 'main' of github.com:bitwarden/sdk-internal into arch/remove-wasm-vault

Author: Hinton

.github/workflows/rust-test.yml

@@ -74,7 +74,7 @@ jobs:
         run: cargo install wasm-bindgen-cli --version 0.2.100
 
       - name: Test WASM
-        run: cargo test --target wasm32-unknown-unknown -p bitwarden-wasm-internal -p bitwarden-threading -p bitwarden-error --all-features
+        run: cargo test --target wasm32-unknown-unknown -p bitwarden-wasm-internal -p bitwarden-threading -p bitwarden-error -p bitwarden-uuid --all-features
 
   coverage:
     name: Coverage

Cargo.lock

@@ -70,6 +70,7 @@ validator = { version = ">=0.18.1, <0.20", 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"
 
 # 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.

Cargo.toml

@@ -22,5 +22,7 @@ workspace = true
 
 [dev-dependencies]
 serde = { workspace = true }
+serde-wasm-bindgen = { workspace = true }
 serde_json = { workspace = true }
 uuid = { workspace = true }
+wasm-bindgen-test = { workspace = true }

crates/bitwarden-uuid/Cargo.toml

@@ -42,3 +42,18 @@ fn test_deserialize() {
 
     assert_eq!(id, deserialized);
 }
+
+#[wasm_bindgen_test::wasm_bindgen_test]
+#[allow(dead_code)]
+fn test_wasm_serialize() {
+    let id: TestId = "d4a722ff-ce51-47f1-ba42-c2216f547851"
+        .parse()
+        .expect("Test");
+
+    let serialized = serde_wasm_bindgen::to_value(&id).expect("Test");
+
+    assert_eq!(
+        serialized.as_string().expect("Test"),
+        "d4a722ff-ce51-47f1-ba42-c2216f547851"
+    );
+}

crates/bitwarden-uuid/tests/uuid.rs

@@ -9,7 +9,7 @@ use wasm_bindgen::prelude::*;
 
 use crate::{
     Attachment, AttachmentEncryptResult, AttachmentFile, AttachmentFileView, AttachmentView,
-    Cipher, DecryptError, EncryptError, VaultClient,
+    Cipher, DecryptError, EncryptError,
 };
 
 #[cfg_attr(feature = "wasm", wasm_bindgen)]
@@ -100,12 +100,3 @@ impl AttachmentsClient {
         Ok(())
     }
 }
-
-#[cfg_attr(feature = "wasm", wasm_bindgen)]
-impl VaultClient {
-    pub fn attachments(&self) -> AttachmentsClient {
-        AttachmentsClient {
-            client: self.client.clone(),
-        }
-    }
-}

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

@@ -4,9 +4,7 @@ use bitwarden_crypto::IdentifyKey;
 use wasm_bindgen::prelude::*;
 
 use super::EncryptionContext;
-use crate::{
-    Cipher, CipherError, CipherListView, CipherView, DecryptError, EncryptError, VaultClient,
-};
+use crate::{Cipher, CipherError, CipherListView, CipherView, DecryptError, EncryptError};
 
 #[cfg_attr(feature = "wasm", wasm_bindgen)]
 pub struct CiphersClient {
@@ -85,15 +83,6 @@ impl CiphersClient {
     }
 }
 
-#[cfg_attr(feature = "wasm", wasm_bindgen)]
-impl VaultClient {
-    pub fn ciphers(&self) -> CiphersClient {
-        CiphersClient {
-            client: self.client.clone(),
-        }
-    }
-}
-
 #[cfg(test)]
 mod tests {
 

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

@@ -1,6 +1,6 @@
 use bitwarden_core::Client;
 
-use crate::{error::DecryptError, Collection, CollectionView, VaultClient};
+use crate::{error::DecryptError, Collection, CollectionView};
 
 pub struct CollectionsClient {
     pub(crate) client: Client,
@@ -23,14 +23,6 @@ impl CollectionsClient {
     }
 }
 
-impl VaultClient {
-    pub fn collections(&self) -> CollectionsClient {
-        CollectionsClient {
-            client: self.client.clone(),
-        }
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use bitwarden_core::client::test_accounts::test_bitwarden_com_account;

crates/bitwarden-vault/src/collection_client.rs

@@ -4,7 +4,7 @@ use wasm_bindgen::prelude::*;
 
 use crate::{
     error::{DecryptError, EncryptError},
-    Folder, FolderView, VaultClient,
+    Folder, FolderView,
 };
 
 #[cfg_attr(feature = "wasm", wasm_bindgen)]
@@ -32,12 +32,3 @@ impl FoldersClient {
         Ok(views)
     }
 }
-
-#[cfg_attr(feature = "wasm", wasm_bindgen)]
-impl VaultClient {
-    pub fn folders(&self) -> FoldersClient {
-        FoldersClient {
-            client: self.client.clone(),
-        }
-    }
-}

crates/bitwarden-vault/src/folder_client.rs

@@ -1,6 +1,6 @@
 use bitwarden_core::Client;
 
-use crate::{DecryptError, EncryptError, PasswordHistory, PasswordHistoryView, VaultClient};
+use crate::{DecryptError, EncryptError, PasswordHistory, PasswordHistoryView};
 
 pub struct PasswordHistoryClient {
     pub(crate) client: Client,
@@ -25,11 +25,3 @@ impl PasswordHistoryClient {
         Ok(history_view)
     }
 }
-
-impl VaultClient {
-    pub fn password_history(&self) -> PasswordHistoryClient {
-        PasswordHistoryClient {
-            client: self.client.clone(),
-        }
-    }
-}