Merge branch 'main' into ChangelogUpdateFor1.0Release

.github/workflows/build-rust-crates.yml

@@ -49,12 +49,6 @@ jobs:
         env:
           RUSTFLAGS: "-D warnings"
 
-      - name: Build Internal
-        if: ${{ matrix.package == 'bitwarden' }}
-        run: cargo build -p ${{ matrix.package }} --features internal --release
-        env:
-          RUSTFLAGS: "-D warnings"
-
   release-dry-run:
     name: Release dry-run
     runs-on: ubuntu-latest

.github/workflows/build-wasm-internal.yml

@@ -46,7 +46,7 @@ jobs:
           key: wasm-cargo-cache
 
       - name: Install wasm-bindgen-cli
-        run: cargo install wasm-bindgen-cli
+        run: cargo install wasm-bindgen-cli --version 0.2.95
 
       - name: Build
         run: ./build.sh -r

.github/workflows/build-wasm.yml

@@ -46,7 +46,7 @@ jobs:
           key: wasm-cargo-cache
 
       - name: Install wasm-bindgen-cli
-        run: cargo install wasm-bindgen-cli
+        run: cargo install wasm-bindgen-cli --version 0.2.95
 
       - name: Build
         run: ./build.sh -r

crates/bitwarden-json/Cargo.toml

@@ -16,8 +16,7 @@ repository.workspace = true
 license-file.workspace = true
 
 [features]
-internal = ["bitwarden/internal"] # Internal testing methods
-secrets = ["bitwarden/secrets"]   # Secrets manager API
+secrets = ["bitwarden/secrets"] # Secrets manager API
 
 [dependencies]
 bitwarden = { workspace = true }

crates/bitwarden-json/src/client.rs

@@ -1,5 +1,3 @@
-#[cfg(feature = "internal")]
-use bitwarden::vault::ClientVaultExt;
 use bitwarden::ClientSettings;
 #[cfg(feature = "secrets")]
 use bitwarden::{
@@ -54,22 +52,10 @@ impl Client {
         let client = &self.0;
 
         match cmd {
-            #[cfg(feature = "internal")]
-            Command::PasswordLogin(req) => client.auth().login_password(&req).await.into_string(),
             #[cfg(feature = "secrets")]
             Command::LoginAccessToken(req) => {
                 client.auth().login_access_token(&req).await.into_string()
             }
-            #[cfg(feature = "internal")]
-            Command::GetUserApiKey(req) => {
-                client.platform().get_user_api_key(req).await.into_string()
-            }
-            #[cfg(feature = "internal")]
-            Command::ApiKeyLogin(req) => client.auth().login_api_key(&req).await.into_string(),
-            #[cfg(feature = "internal")]
-            Command::Sync(req) => client.vault().sync(&req).await.into_string(),
-            #[cfg(feature = "internal")]
-            Command::Fingerprint(req) => client.platform().fingerprint(&req).into_string(),
 
             #[cfg(feature = "secrets")]
             Command::Secrets(cmd) => match cmd {

crates/bitwarden-json/src/command.rs

@@ -13,38 +13,12 @@ use bitwarden::{
         },
     },
 };
-#[cfg(feature = "internal")]
-use bitwarden::{
-    auth::login::{ApiKeyLoginRequest, PasswordLoginRequest},
-    platform::{FingerprintRequest, SecretVerificationRequest},
-    vault::SyncRequest,
-};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, JsonSchema, Debug)]
 #[serde(rename_all = "camelCase", deny_unknown_fields)]
 pub enum Command {
-    #[cfg(feature = "internal")]
-    /// Login with username and password
-    ///
-    /// This command is for initiating an authentication handshake with Bitwarden.
-    /// Authorization may fail due to requiring 2fa or captcha challenge completion
-    /// despite accurate credentials.
-    ///
-    /// This command is not capable of handling authentication requiring 2fa or captcha.
-    ///
-    /// Returns: [PasswordLoginResponse](bitwarden::auth::login::PasswordLoginResponse)
-    PasswordLogin(PasswordLoginRequest),
-
-    #[cfg(feature = "internal")]
-    /// Login with API Key
-    ///
-    /// This command is for initiating an authentication handshake with Bitwarden.
-    ///
-    /// Returns: [ApiKeyLoginResponse](bitwarden::auth::login::ApiKeyLoginResponse)
-    ApiKeyLogin(ApiKeyLoginRequest),
-
     #[cfg(feature = "secrets")]
     /// Login with Secrets Manager Access Token
     ///
@@ -53,26 +27,6 @@ pub enum Command {
     /// Returns: [ApiKeyLoginResponse](bitwarden::auth::login::ApiKeyLoginResponse)
     LoginAccessToken(AccessTokenLoginRequest),
 
-    #[cfg(feature = "internal")]
-    /// > Requires Authentication
-    /// Get the API key of the currently authenticated user
-    ///
-    /// Returns: [UserApiKeyResponse](bitwarden::platform::UserApiKeyResponse)
-    GetUserApiKey(SecretVerificationRequest),
-
-    #[cfg(feature = "internal")]
-    /// Get the user's passphrase
-    ///
-    /// Returns: String
-    Fingerprint(FingerprintRequest),
-
-    #[cfg(feature = "internal")]
-    /// > Requires Authentication
-    /// Retrieve all user data, ciphers and organizations the user is a part of
-    ///
-    /// Returns: [SyncResponse](bitwarden::vault::SyncResponse)
-    Sync(SyncRequest),
-
     #[cfg(feature = "secrets")]
     Secrets(SecretsCommand),
     #[cfg(feature = "secrets")]

crates/bitwarden-uniffi/Cargo.toml

@@ -11,15 +11,13 @@ repository.workspace = true
 license-file.workspace = true
 
 [features]
-docs = ["dep:schemars"] # Docs
 
 [lib]
 crate-type = ["lib", "staticlib", "cdylib"]
 bench = false
 
 [dependencies]
 async-trait = "0.1.80"
-bitwarden = { workspace = true, features = ["internal", "uniffi"] }
 bitwarden-core = { workspace = true, features = ["uniffi"] }
 bitwarden-crypto = { workspace = true, features = ["uniffi"] }
 bitwarden-exporters = { workspace = true, features = ["uniffi"] }
@@ -28,8 +26,8 @@ bitwarden-generators = { workspace = true, features = ["uniffi"] }
 bitwarden-send = { workspace = true, features = ["uniffi"] }
 bitwarden-vault = { workspace = true, features = ["uniffi"] }
 chrono = { workspace = true, features = ["std"] }
-log = { workspace = true }
 env_logger = "0.11.1"
+log = { workspace = true }
 schemars = { workspace = true, optional = true }
 thiserror = { workspace = true }
 uniffi = { workspace = true }

crates/bitwarden-uniffi/src/auth/mod.rs

@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use bitwarden::{
+use bitwarden_core::{
     auth::{
         password::MasterPasswordPolicyOptions, AuthRequestResponse, KeyConnectorResponse,
         RegisterKeyResponse, RegisterTdeKeyResponse,

crates/bitwarden-uniffi/src/crypto.rs

@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use bitwarden::{
+use bitwarden_core::{
     mobile::crypto::{
         DeriveKeyConnectorRequest, DerivePinKeyResponse, InitOrgCryptoRequest,
         InitUserCryptoRequest, UpdatePasswordResponse,

crates/bitwarden-uniffi/src/error.rs

@@ -1,21 +1,24 @@
 use std::fmt::{Display, Formatter};
 
+use bitwarden_exporters::ExportError;
+use bitwarden_generators::{PassphraseError, PasswordError, UsernameError};
+
 // Name is converted from *Error to *Exception, so we can't just name the enum Error because
 // Exception already exists
 #[derive(uniffi::Error, Debug)]
 #[uniffi(flat_error)]
 pub enum BitwardenError {
-    E(bitwarden::error::Error),
+    E(Error),
 }
 
-impl From<bitwarden::Error> for BitwardenError {
-    fn from(e: bitwarden::Error) -> Self {
+impl From<bitwarden_core::Error> for BitwardenError {
+    fn from(e: bitwarden_core::Error) -> Self {
         Self::E(e.into())
     }
 }
 
-impl From<bitwarden::error::Error> for BitwardenError {
-    fn from(e: bitwarden::error::Error) -> Self {
+impl From<Error> for BitwardenError {
+    fn from(e: Error) -> Self {
         Self::E(e)
     }
 }
@@ -37,3 +40,42 @@ impl std::error::Error for BitwardenError {
 }
 
 pub type Result<T, E = BitwardenError> = std::result::Result<T, E>;
+
+#[derive(thiserror::Error, Debug)]
+pub enum Error {
+    #[error(transparent)]
+    Core(#[from] bitwarden_core::Error),
+
+    // Generators
+    #[error(transparent)]
+    UsernameError(#[from] UsernameError),
+    #[error(transparent)]
+    PassphraseError(#[from] PassphraseError),
+    #[error(transparent)]
+    PasswordError(#[from] PasswordError),
+
+    // Vault
+    #[error(transparent)]
+    Cipher(#[from] bitwarden_vault::CipherError),
+    #[error(transparent)]
+    Totp(#[from] bitwarden_vault::TotpError),
+
+    #[error(transparent)]
+    ExportError(#[from] ExportError),
+
+    // Fido
+    #[error(transparent)]
+    MakeCredential(#[from] bitwarden_fido::MakeCredentialError),
+    #[error(transparent)]
+    GetAssertion(#[from] bitwarden_fido::GetAssertionError),
+    #[error(transparent)]
+    SilentlyDiscoverCredentials(#[from] bitwarden_fido::SilentlyDiscoverCredentialsError),
+    #[error(transparent)]
+    CredentialsForAutofillError(#[from] bitwarden_fido::CredentialsForAutofillError),
+    #[error(transparent)]
+    DecryptFido2AutofillCredentialsError(
+        #[from] bitwarden_fido::DecryptFido2AutofillCredentialsError,
+    ),
+    #[error(transparent)]
+    Fido2Client(#[from] bitwarden_fido::Fido2ClientError),
+}

crates/bitwarden-uniffi/src/lib.rs

@@ -3,7 +3,7 @@ uniffi::setup_scaffolding!();
 use std::sync::Arc;
 
 use auth::ClientAuth;
-use bitwarden::ClientSettings;
+use bitwarden_core::ClientSettings;
 
 pub mod auth;
 pub mod crypto;
@@ -23,7 +23,7 @@ use tool::{ClientExporters, ClientGenerators, ClientSends};
 use vault::ClientVault;
 
 #[derive(uniffi::Object)]
-pub struct Client(bitwarden::Client);
+pub struct Client(bitwarden_core::Client);
 
 #[uniffi::export(async_runtime = "tokio")]
 impl Client {
@@ -35,7 +35,7 @@ impl Client {
         #[cfg(target_os = "android")]
         android_support::init();
 
-        Arc::new(Self(bitwarden::Client::new(settings)))
+        Arc::new(Self(bitwarden_core::Client::new(settings)))
     }
 
     /// Crypto operations
@@ -84,9 +84,9 @@ impl Client {
             .get(&url)
             .send()
             .await
-            .map_err(bitwarden::Error::Reqwest)?;
+            .map_err(bitwarden_core::Error::Reqwest)?;
 
-        Ok(res.text().await.map_err(bitwarden::Error::Reqwest)?)
+        Ok(res.text().await.map_err(bitwarden_core::Error::Reqwest)?)
     }
 }