Lift mobile crypto into key_management, and rename error

Author: dani-garcia

crates/bitwarden-core/src/auth/auth_request.rs

@@ -140,9 +140,9 @@ mod tests {
     use bitwarden_crypto::{Kdf, MasterKey};
 
     use super::*;
-    use crate::{
-        key_management::SymmetricKeyId,
-        mobile::crypto::{AuthRequestMethod, InitUserCryptoMethod, InitUserCryptoRequest},
+    use crate::key_management::{
+        crypto::{AuthRequestMethod, InitUserCryptoMethod, InitUserCryptoRequest},
+        SymmetricKeyId,
     };
 
     #[test]

crates/bitwarden-core/src/auth/login/auth_request.rs

@@ -12,7 +12,7 @@ use crate::{
         auth_request::new_auth_request,
     },
     client::{LoginMethod, UserLoginMethod},
-    mobile::crypto::{AuthRequestMethod, InitUserCryptoMethod, InitUserCryptoRequest},
+    key_management::crypto::{AuthRequestMethod, InitUserCryptoMethod, InitUserCryptoRequest},
     require, ApiError, Client,
 };
 

crates/bitwarden-core/src/client/test_accounts.rs

@@ -4,7 +4,7 @@ use std::collections::HashMap;
 use bitwarden_crypto::Kdf;
 
 use crate::{
-    mobile::crypto::{
+    key_management::crypto::{
         initialize_org_crypto, initialize_user_crypto, InitOrgCryptoRequest, InitUserCryptoMethod,
         InitUserCryptoRequest,
     },

crates/bitwarden-core/src/mobile/crypto.rs renamed to crates/bitwarden-core/src/key_management/crypto.rs

@@ -27,7 +27,7 @@ use crate::{
 #[allow(missing_docs)]
 #[bitwarden_error(flat)]
 #[derive(Debug, thiserror::Error)]
-pub enum MobileCryptoError {
+pub enum CryptoClientError {
     #[error(transparent)]
     NotAuthenticated(#[from] NotAuthenticatedError),
     #[error(transparent)]
@@ -248,7 +248,7 @@ pub(crate) async fn initialize_org_crypto(
     Ok(())
 }
 
-pub(super) async fn get_user_encryption_key(client: &Client) -> Result<String, MobileCryptoError> {
+pub(super) async fn get_user_encryption_key(client: &Client) -> Result<String, CryptoClientError> {
     let key_store = client.internal.get_key_store();
     let ctx = key_store.context();
     // This is needed because the mobile clients need access to the user encryption key
@@ -273,7 +273,7 @@ pub struct UpdatePasswordResponse {
 pub(super) fn update_password(
     client: &Client,
     new_password: String,
-) -> Result<UpdatePasswordResponse, MobileCryptoError> {
+) -> Result<UpdatePasswordResponse, CryptoClientError> {
     let key_store = client.internal.get_key_store();
     let ctx = key_store.context();
     // FIXME: [PM-18099] Once MasterKey deals with KeyIds, this should be updated
@@ -323,7 +323,7 @@ pub struct DerivePinKeyResponse {
 pub(super) fn derive_pin_key(
     client: &Client,
     pin: String,
-) -> Result<DerivePinKeyResponse, MobileCryptoError> {
+) -> Result<DerivePinKeyResponse, CryptoClientError> {
     let key_store = client.internal.get_key_store();
     let ctx = key_store.context();
     // FIXME: [PM-18099] Once PinKey deals with KeyIds, this should be updated
@@ -346,7 +346,7 @@ pub(super) fn derive_pin_key(
 pub(super) fn derive_pin_user_key(
     client: &Client,
     encrypted_pin: EncString,
-) -> Result<EncString, MobileCryptoError> {
+) -> Result<EncString, CryptoClientError> {
     let key_store = client.internal.get_key_store();
     let ctx = key_store.context();
     // FIXME: [PM-18099] Once PinKey deals with KeyIds, this should be updated
@@ -366,7 +366,7 @@ fn derive_pin_protected_user_key(
     pin: &str,
     login_method: &LoginMethod,
     user_key: &SymmetricCryptoKey,
-) -> Result<EncString, MobileCryptoError> {
+) -> Result<EncString, CryptoClientError> {
     use bitwarden_crypto::PinKey;
 
     let derived_key = match login_method {

crates/bitwarden-core/src/mobile/crypto_client.rs renamed to crates/bitwarden-core/src/key_management/crypto_client.rs

@@ -5,12 +5,12 @@ use bitwarden_crypto::{EncString, UnsignedSharedKey};
 use wasm_bindgen::prelude::*;
 
 use super::crypto::{
-    derive_key_connector, make_key_pair, verify_asymmetric_keys, DeriveKeyConnectorError,
-    DeriveKeyConnectorRequest, EnrollAdminPasswordResetError, MakeKeyPairResponse,
-    MobileCryptoError, VerifyAsymmetricKeysRequest, VerifyAsymmetricKeysResponse,
+    derive_key_connector, make_key_pair, verify_asymmetric_keys, CryptoClientError,
+    DeriveKeyConnectorError, DeriveKeyConnectorRequest, EnrollAdminPasswordResetError,
+    MakeKeyPairResponse, VerifyAsymmetricKeysRequest, VerifyAsymmetricKeysResponse,
 };
 #[cfg(feature = "internal")]
-use crate::mobile::crypto::{
+use crate::key_management::crypto::{
     derive_pin_key, derive_pin_user_key, enroll_admin_password_reset, get_user_encryption_key,
     initialize_org_crypto, initialize_user_crypto, update_password, DerivePinKeyResponse,
     InitOrgCryptoRequest, InitUserCryptoRequest, UpdatePasswordResponse,
@@ -63,7 +63,7 @@ impl CryptoClient {
 impl CryptoClient {
     /// Get the uses's decrypted encryption key. Note: It's very important
     /// to keep this key safe, as it can be used to decrypt all of the user's data
-    pub async fn get_user_encryption_key(&self) -> Result<String, MobileCryptoError> {
+    pub async fn get_user_encryption_key(&self) -> Result<String, CryptoClientError> {
         get_user_encryption_key(&self.client).await
     }
 
@@ -72,14 +72,14 @@ impl CryptoClient {
     pub fn update_password(
         &self,
         new_password: String,
-    ) -> Result<UpdatePasswordResponse, MobileCryptoError> {
+    ) -> Result<UpdatePasswordResponse, CryptoClientError> {
         update_password(&self.client, new_password)
     }
 
     /// Generates a PIN protected user key from the provided PIN. The result can be stored and later
     /// used to initialize another client instance by using the PIN and the PIN key with
     /// `initialize_user_crypto`.
-    pub fn derive_pin_key(&self, pin: String) -> Result<DerivePinKeyResponse, MobileCryptoError> {
+    pub fn derive_pin_key(&self, pin: String) -> Result<DerivePinKeyResponse, CryptoClientError> {
         derive_pin_key(&self.client, pin)
     }
 
@@ -88,7 +88,7 @@ impl CryptoClient {
     pub fn derive_pin_user_key(
         &self,
         encrypted_pin: EncString,
-    ) -> Result<EncString, MobileCryptoError> {
+    ) -> Result<EncString, CryptoClientError> {
         derive_pin_user_key(&self.client, encrypted_pin)
     }
 

crates/bitwarden-core/src/key_management/mod.rs

@@ -9,6 +9,11 @@
 //!   [Encryptable](bitwarden_crypto::Encryptable) and [Decryptable](bitwarden_crypto::Encryptable).
 use bitwarden_crypto::{key_ids, KeyStore, SymmetricCryptoKey};
 
+pub mod crypto;
+mod crypto_client;
+
+pub use crypto_client::CryptoClient;
+
 key_ids! {
     #[symmetric]
     pub enum SymmetricKeyId {

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

@@ -3,11 +3,8 @@
 //! This module consists of stop-gap functionality for the mobile clients until the SDK owns it's
 //! own state.
 
-pub mod crypto;
 mod kdf;
 
 mod client_kdf;
-mod crypto_client;
 
 pub use client_kdf::KdfClient;
-pub use crypto_client::CryptoClient;

crates/bitwarden-core/tests/register.rs

@@ -7,7 +7,7 @@ async fn test_register_initialize_crypto() {
     use std::num::NonZeroU32;
 
     use bitwarden_core::{
-        mobile::crypto::{InitUserCryptoMethod, InitUserCryptoRequest},
+        key_management::crypto::{InitUserCryptoMethod, InitUserCryptoRequest},
         Client,
     };
     use bitwarden_crypto::Kdf;

crates/bitwarden-uniffi/src/crypto.rs

@@ -1,4 +1,4 @@
-use bitwarden_core::mobile::crypto::{
+use bitwarden_core::key_management::crypto::{
     DeriveKeyConnectorRequest, DerivePinKeyResponse, InitOrgCryptoRequest, InitUserCryptoRequest,
     UpdatePasswordResponse,
 };
@@ -7,7 +7,7 @@ use bitwarden_crypto::{EncString, UnsignedSharedKey};
 use crate::error::{Error, Result};
 
 #[derive(uniffi::Object)]
-pub struct CryptoClient(pub(crate) bitwarden_core::mobile::CryptoClient);
+pub struct CryptoClient(pub(crate) bitwarden_core::key_management::CryptoClient);
 
 #[uniffi::export(async_runtime = "tokio")]
 impl CryptoClient {

crates/bitwarden-uniffi/src/error.rs

@@ -40,15 +40,17 @@ pub enum Error {
     #[error(transparent)]
     Api(#[from] bitwarden_core::ApiError),
     #[error(transparent)]
-    DeriveKeyConnector(#[from] bitwarden_core::mobile::crypto::DeriveKeyConnectorError),
+    DeriveKeyConnector(#[from] bitwarden_core::key_management::crypto::DeriveKeyConnectorError),
     #[error(transparent)]
     EncryptionSettings(
         #[from] bitwarden_core::client::encryption_settings::EncryptionSettingsError,
     ),
     #[error(transparent)]
-    EnrollAdminPasswordReset(#[from] bitwarden_core::mobile::crypto::EnrollAdminPasswordResetError),
+    EnrollAdminPasswordReset(
+        #[from] bitwarden_core::key_management::crypto::EnrollAdminPasswordResetError,
+    ),
     #[error(transparent)]
-    MobileCrypto(#[from] bitwarden_core::mobile::crypto::MobileCryptoError),
+    MobileCrypto(#[from] bitwarden_core::key_management::crypto::CryptoClientError),
     #[error(transparent)]
     AuthValidate(#[from] bitwarden_core::auth::AuthValidateError),
     #[error(transparent)]