[PM-11764] Implement account switching and sdk initialization

.editorconfig

@@ -12,17 +12,17 @@ insert_final_newline = true
 indent_style = space
 indent_size = 2
 
-[*.{ts}]
+[*.ts]
 quote_type = single
 
-[*.{rs}]
+[*.rs]
 indent_style = space
 indent_size = 4
 
 [*.{kt,java,xml,gradle}]
 indent_style = space
 indent_size = 4
 
-[*.{xml}]
+[*.xml]
 # VS Code XML extension removes the final newline
 insert_final_newline = false

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

@@ -6,6 +6,8 @@
 };
 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 @@
 #[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 @@
 #[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 @@
 #[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 @@
 #[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 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 @@
 #[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-napi/src-ts/bitwarden_client/index.ts

@@ -1,5 +1,5 @@
-import * as rust from "../../binding";
-import { LogLevel } from "../../binding";
+import * as rust from '../../binding';
+import { LogLevel } from '../../binding';
 import {
   Convert,
   ClientSettings,
@@ -11,19 +11,19 @@ import {
   SecretsDeleteResponse,
   SecretsResponse,
   SecretsSyncResponse,
-} from "./schemas";
+} from './schemas';
 
 function handleResponse<T>(response: {
   success: boolean;
   errorMessage?: string | null;
   data?: T | null;
 }): T {
   if (!response.success) {
-    throw new Error(response.errorMessage || "");
+    throw new Error(response.errorMessage || '');
   }
 
   if (response.data === null) {
-    throw new Error(response.errorMessage || "SDK response data is null");
+    throw new Error(response.errorMessage || 'SDK response data is null');
   }
 
   return response.data as T;

crates/bitwarden-napi/src-ts/index.ts

@@ -1,3 +1,3 @@
-export * from "./bitwarden_client/index";
-export * from "./bitwarden_client/schemas";
-export { LogLevel } from "../binding";
+export * from './bitwarden_client/index';
+export * from './bitwarden_client/schemas';
+export { LogLevel } from '../binding';

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 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 @@
 #[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,9 @@ crate-type = ["cdylib"]
 
 [dependencies]
 bitwarden = { workspace = true, features = ["internal", "wasm"] }
+bitwarden-core = { workspace = true, features = ["wasm"] }
+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 log::{set_max_level, Level};
 use wasm_bindgen::prelude::*;
 
+use crate::{vault::ClientVault, ClientCrypto};
+
 #[wasm_bindgen]
 pub enum LogLevel {
     Trace,
@@ -27,7 +29,7 @@
 // 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 {
@@ -54,4 +56,12 @@
 
         res.text().await.map_err(|e| e.to_string())
     }
+
+    pub fn crypto(&self) -> ClientCrypto {
+        ClientCrypto(self.0.clone())
+    }
+
+    pub fn vault(&self) -> ClientVault {
+        ClientVault(self.0.clone())
+    }
 }

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

@@ -0,0 +1,37 @@
+use std::rc::Rc;
+
+use bitwarden::{
+    mobile::crypto::{InitOrgCryptoRequest, InitUserCryptoRequest},
+    Client,
+};
+use wasm_bindgen::prelude::*;
+
+use crate::error::Result;
+
+#[wasm_bindgen]
+pub struct ClientCrypto(pub(crate) Rc<Client>);
+
+#[wasm_bindgen]
+impl ClientCrypto {
+    /// Initialization method for the user crypto. Needs to be called before any other crypto
+    /// operations.
+    pub async fn initialize_user_crypto(&self, req: InitUserCryptoRequest) -> Result<()> {
+        Ok(self
+            .0
+            .crypto()
+            .initialize_user_crypto(req)
+            .await
+            .map_err(bitwarden_core::Error::EncryptionSettings)?)
+    }
+
+    /// Initialization method for the organization crypto. Needs to be called after
+    /// `initialize_user_crypto` but before any other crypto operations.
+    pub async fn initialize_org_crypto(&self, req: InitOrgCryptoRequest) -> Result<()> {
+        Ok(self
+            .0
+            .crypto()
+            .initialize_org_crypto(req)
+            .await
+            .map_err(bitwarden_core::Error::EncryptionSettings)?)
+    }
+}

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

@@ -0,0 +1,22 @@
+/// This file contains custom TypeScript for types defined by external crates.
+/// Everything in the string below is appended to the generated TypeScript definition file.
+#[wasm_bindgen::prelude::wasm_bindgen(typescript_custom_section)]
+const TS_CUSTOM_TYPES: &'static str = r#"
+export type Uuid = string;
+
+/**
+ * RFC3339 compliant date-time string.
+ * @typeParam T - Not used in JavaScript.
+ */
+export type DateTime<T = unknown> = string;
+
+/**
+ * UTC date-time string. Not used in JavaScript.
+ */
+export type Utc = unknown;
+
+/**
+ * An integer that is known not to equal zero.
+ */
+export type NonZeroU32 = number;
+"#;

crates/bitwarden-wasm-internal/src/error.js

@@ -0,0 +1,11 @@
+/**
+ * Error thrown by the WASM module.
+ * @param {string} message - Error message.
+ * @extends Error
+ */
+export class WasmError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "WasmError";
+  }
+}

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

@@ -0,0 +1,33 @@
+use wasm_bindgen::prelude::*;
+
+// Importing an error class defined in JavaScript instead of defining it in Rust
+// allows us to extend the `Error` class. It also provides much better console output.
+#[wasm_bindgen(module = "/src/error.js")]
+extern "C" {
+    type WasmError;
+
+    #[wasm_bindgen(constructor)]
+    fn new(message: String) -> WasmError;
+}
+
+pub type Result<T, E = Error> = std::result::Result<T, E>;
+
+pub struct Error(bitwarden::error::Error);
+
+impl From<bitwarden::error::Error> for Error {
+    fn from(error: bitwarden::error::Error) -> Self {
+        Self(error)
+    }
+}
+
+impl From<bitwarden::Error> for Error {
+    fn from(error: bitwarden::Error) -> Self {
+        Self(error.into())
+    }
+}
+
+impl From<Error> for JsValue {
+    fn from(error: Error) -> Self {
+        WasmError::new(error.0.to_string()).into()
+    }
+}

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

@@ -1 +1,9 @@
 mod client;
+mod crypto;
+mod custom_types;
+mod error;
+mod vault;
+
+pub use client::BitwardenClient;
+pub use crypto::ClientCrypto;
+pub use vault::{folders::ClientFolders, ClientVault};