Merge branch 'main' into ChangelogUpdateFor1.0Release

crates/bitwarden-core/src/mobile/crypto.rs

@@ -6,6 +6,8 @@ use bitwarden_crypto::{
 };
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
+#[cfg(feature = "wasm")]
+use {tsify_next::Tsify, wasm_bindgen::prelude::*};
 
 use crate::{
     client::{encryption_settings::EncryptionSettingsError, LoginMethod, UserLoginMethod},
@@ -16,6 +18,7 @@ use crate::{
 #[derive(Serialize, Deserialize, Debug, JsonSchema)]
 #[serde(rename_all = "camelCase", deny_unknown_fields)]
 #[cfg_attr(feature = "uniffi", derive(uniffi::Record))]
+#[cfg_attr(feature = "wasm", derive(Tsify), tsify(into_wasm_abi, from_wasm_abi))]
 pub struct InitUserCryptoRequest {
     /// The user's KDF parameters, as received from the prelogin request
     pub kdf_params: Kdf,
@@ -30,6 +33,7 @@ pub struct InitUserCryptoRequest {
 #[derive(Serialize, Deserialize, Debug, JsonSchema)]
 #[serde(rename_all = "camelCase", deny_unknown_fields)]
 #[cfg_attr(feature = "uniffi", derive(uniffi::Enum))]
+#[cfg_attr(feature = "wasm", derive(Tsify), tsify(into_wasm_abi, from_wasm_abi))]
 pub enum InitUserCryptoMethod {
     Password {
         /// The user's master password
@@ -73,6 +77,7 @@ pub enum InitUserCryptoMethod {
 #[derive(Serialize, Deserialize, Debug, JsonSchema)]
 #[serde(rename_all = "camelCase", deny_unknown_fields)]
 #[cfg_attr(feature = "uniffi", derive(uniffi::Enum))]
+#[cfg_attr(feature = "wasm", derive(Tsify), tsify(into_wasm_abi, from_wasm_abi))]
 pub enum AuthRequestMethod {
     UserKey {
         /// User Key protected by the private key provided in `AuthRequestResponse`.
@@ -185,6 +190,7 @@ pub async fn initialize_user_crypto(
 #[derive(Serialize, Deserialize, Debug, JsonSchema)]
 #[serde(rename_all = "camelCase", deny_unknown_fields)]
 #[cfg_attr(feature = "uniffi", derive(uniffi::Record))]
+#[cfg_attr(feature = "wasm", derive(Tsify), tsify(into_wasm_abi, from_wasm_abi))]
 pub struct InitOrgCryptoRequest {
     /// The encryption keys for all the organizations the user is a part of
     pub organization_keys: HashMap<uuid::Uuid, AsymmetricEncString>,

crates/bitwarden-crypto/Cargo.toml

@@ -15,6 +15,7 @@ keywords.workspace = true
 
 [features]
 default = []
+wasm = ["dep:tsify-next", "dep:wasm-bindgen"] # WASM support
 
 uniffi = ["dep:uniffi"]  # Uniffi bindings
 no-memory-hardening = [] # Disable memory hardening features
@@ -42,8 +43,10 @@ sha1 = ">=0.10.5, <0.11"
 sha2 = ">=0.10.6, <0.11"
 subtle = ">=2.5.0, <3.0"
 thiserror = { workspace = true }
+tsify-next = { workspace = true, optional = true }
 uniffi = { workspace = true, optional = true }
 uuid = { workspace = true }
+wasm-bindgen = { workspace = true, optional = true }
 zeroize = { version = ">=1.7.0, <2.0", features = ["derive", "aarch64"] }
 
 [dev-dependencies]

crates/bitwarden-crypto/src/enc_string/asymmetric.rs

@@ -11,11 +11,16 @@ use crate::{
     rsa::encrypt_rsa2048_oaep_sha1,
     AsymmetricCryptoKey, AsymmetricEncryptable, KeyDecryptable,
 };
-
 // This module is a workaround to avoid deprecated warnings that come from the ZeroizeOnDrop
 // macro expansion
 #[allow(deprecated)]
 mod internal {
+    #[cfg(feature = "wasm")]
+    #[wasm_bindgen::prelude::wasm_bindgen(typescript_custom_section)]
+    const TS_CUSTOM_TYPES: &'static str = r#"
+    export type AsymmetricEncString = string;
+    "#;
+
     /// # Encrypted string primitive
     ///
     /// [AsymmetricEncString] is a Bitwarden specific primitive that represents an asymmetrically

crates/bitwarden-crypto/src/enc_string/symmetric.rs

@@ -11,6 +11,12 @@ use crate::{
     KeyDecryptable, KeyEncryptable, LocateKey, SymmetricCryptoKey,
 };
 
+#[cfg(feature = "wasm")]
+#[wasm_bindgen::prelude::wasm_bindgen(typescript_custom_section)]
+const TS_CUSTOM_TYPES: &'static str = r#"
+export type EncString = string;
+"#;
+
 /// # Encrypted string primitive
 ///
 /// [EncString] is a Bitwarden specific primitive that represents a symmetrically encrypted string.

crates/bitwarden-crypto/src/keys/master_key.rs

@@ -5,6 +5,8 @@ use generic_array::{typenum::U32, GenericArray};
 use rand::Rng;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
+#[cfg(feature = "wasm")]
+use {tsify_next::Tsify, wasm_bindgen::prelude::*};
 
 use super::utils::{derive_kdf_key, stretch_kdf_key};
 use crate::{util, CryptoError, EncString, KeyDecryptable, Result, SymmetricCryptoKey, UserKey};
@@ -16,6 +18,7 @@ use crate::{util, CryptoError, EncString, KeyDecryptable, Result, SymmetricCrypt
 #[derive(Serialize, Deserialize, Debug, JsonSchema, Clone)]
 #[serde(rename_all = "camelCase", deny_unknown_fields)]
 #[cfg_attr(feature = "uniffi", derive(uniffi::Enum))]
+#[cfg_attr(feature = "wasm", derive(Tsify), tsify(into_wasm_abi, from_wasm_abi))]
 pub enum Kdf {
     PBKDF2 {
         iterations: NonZeroU32,

crates/bitwarden-vault/Cargo.toml

@@ -19,6 +19,7 @@ uniffi = [
     "bitwarden-crypto/uniffi",
     "dep:uniffi",
 ] # Uniffi bindings
+wasm = ["dep:tsify-next", "dep:wasm-bindgen"] # WASM support
 
 [dependencies]
 base64 = ">=0.22.1, <0.23"
@@ -38,6 +39,8 @@ sha2 = ">=0.10.6, <0.11"
 thiserror = { workspace = true }
 uniffi = { version = "=0.28.1", optional = true }
 uuid = { workspace = true }
+tsify-next = { workspace = true, optional = true }
+wasm-bindgen = { workspace = true, optional = true }
 
 [dev-dependencies]
 tokio = { workspace = true, features = ["rt"] }

crates/bitwarden-vault/src/folder.rs

@@ -7,12 +7,15 @@ use chrono::{DateTime, Utc};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use uuid::Uuid;
+#[cfg(feature = "wasm")]
+use {tsify_next::Tsify, wasm_bindgen::prelude::*};
 
 use crate::VaultParseError;
 
 #[derive(Serialize, Deserialize, Debug, JsonSchema)]
 #[serde(rename_all = "camelCase")]
 #[cfg_attr(feature = "uniffi", derive(uniffi::Record))]
+#[cfg_attr(feature = "wasm", derive(Tsify), tsify(into_wasm_abi, from_wasm_abi))]
 pub struct Folder {
     id: Option<Uuid>,
     name: EncString,
@@ -22,6 +25,7 @@ pub struct Folder {
 #[derive(Serialize, Deserialize, Debug, JsonSchema)]
 #[serde(rename_all = "camelCase")]
 #[cfg_attr(feature = "uniffi", derive(uniffi::Record))]
+#[cfg_attr(feature = "wasm", derive(Tsify), tsify(into_wasm_abi, from_wasm_abi))]
 pub struct FolderView {
     pub id: Option<Uuid>,
     pub name: String,

crates/bitwarden-wasm-internal/Cargo.toml

@@ -16,6 +16,8 @@ crate-type = ["cdylib"]
 
 [dependencies]
 bitwarden-core = { workspace = true, features = ["wasm", "internal"] }
+bitwarden-crypto = { workspace = true, features = ["wasm"] }
+bitwarden-vault = { workspace = true, features = ["wasm"] }
 console_error_panic_hook = "0.1.7"
 console_log = { version = "1.0.0", features = ["color"] }
 js-sys = "0.3.68"

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

@@ -5,6 +5,8 @@ use bitwarden_core::{Client, ClientSettings};
 use log::{set_max_level, Level};
 use wasm_bindgen::prelude::*;
 
+use crate::{vault::ClientVault, ClientCrypto};
+
 #[wasm_bindgen]
 pub enum LogLevel {
     Trace,
@@ -27,7 +29,7 @@ fn convert_level(level: LogLevel) -> Level {
 // Rc<...> is to avoid needing to take ownership of the Client during our async run_command
 // function https://github.com/rustwasm/wasm-bindgen/issues/2195#issuecomment-799588401
 #[wasm_bindgen]
-pub struct BitwardenClient(Rc<Client>);
+pub struct BitwardenClient(pub(crate) Rc<Client>);
 
 #[wasm_bindgen]
 impl BitwardenClient {
@@ -47,11 +49,23 @@ impl BitwardenClient {
         msg
     }
 
+    pub fn throw(&self, msg: String) -> Result<(), crate::error::GenericError> {
+        Err(crate::error::GenericError(msg))
+    }
+
     /// Test method, calls http endpoint
     pub async fn http_get(&self, url: String) -> Result<String, String> {
         let client = self.0.internal.get_http_client();
         let res = client.get(&url).send().await.map_err(|e| e.to_string())?;
 
         res.text().await.map_err(|e| e.to_string())
     }
+
+    pub fn crypto(&self) -> ClientCrypto {
+        ClientCrypto::new(self.0.clone())
+    }
+
+    pub fn vault(&self) -> ClientVault {
+        ClientVault::new(self.0.clone())
+    }
 }