restructured cipher client to sub folders

Author: gbubemismith

crates/bitwarden-vault/src/cipher/create.rs renamed to crates/bitwarden-vault/src/cipher/cipher_client/create.rs

@@ -13,6 +13,7 @@ use tsify::Tsify;
 #[cfg(feature = "wasm")]
 use wasm_bindgen::prelude::*;
 
+use super::CiphersClient;
 use crate::{Cipher, CipherView, VaultParseError};
 
 #[allow(missing_docs)]
@@ -104,7 +105,7 @@ impl IdentifyKey<SymmetricKeyId> for CipherAddEditRequest {
     }
 }
 
-pub(super) async fn create_cipher<R: Repository<Cipher> + ?Sized>(
+async fn create_cipher<R: Repository<Cipher> + ?Sized>(
     key_store: &KeyStore<KeyIds>,
     api_config: &bitwarden_api_api::apis::configuration::Configuration,
     repository: &R,
@@ -124,6 +125,22 @@ pub(super) async fn create_cipher<R: Repository<Cipher> + ?Sized>(
     Ok(key_store.decrypt(&cipher)?)
 }
 
+impl CiphersClient {
+    /// Create a new [Cipher] and save it to the server.
+    pub async fn create(
+        &self,
+        mut request: CipherAddEditRequest,
+    ) -> Result<CipherView, CreateCipherError> {
+        let key_store = self.client.internal.get_key_store();
+        let config = self.client.internal.get_api_configurations().await;
+        let repository = self.get_repository()?;
+
+        request.encrypted_for = self.client.internal.get_user_id();
+
+        create_cipher(key_store, &config.api, repository.as_ref(), request).await
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use bitwarden_api_api::models::CipherResponseModel;

crates/bitwarden-vault/src/cipher/edit.rs renamed to crates/bitwarden-vault/src/cipher/cipher_client/edit.rs

@@ -5,7 +5,11 @@ use bitwarden_error::bitwarden_error;
 use bitwarden_state::repository::{Repository, RepositoryError};
 use thiserror::Error;
 
-use crate::{create::CipherAddEditRequest, Cipher, CipherView, ItemNotFoundError, VaultParseError};
+use super::CiphersClient;
+use crate::{
+    cipher_client::create::CipherAddEditRequest, Cipher, CipherView, ItemNotFoundError,
+    VaultParseError,
+};
 
 #[allow(missing_docs)]
 #[bitwarden_error(flat)]
@@ -27,7 +31,7 @@ pub enum EditCipherError {
     Uuid(#[from] uuid::Error),
 }
 
-pub(super) async fn edit_cipher<R: Repository<Cipher> + ?Sized>(
+async fn edit_cipher<R: Repository<Cipher> + ?Sized>(
     key_store: &KeyStore<KeyIds>,
     api_config: &bitwarden_api_api::apis::configuration::Configuration,
     repository: &R,
@@ -58,6 +62,30 @@ pub(super) async fn edit_cipher<R: Repository<Cipher> + ?Sized>(
     Ok(key_store.decrypt(&cipher)?)
 }
 
+impl CiphersClient {
+    /// Edit an existing [Cipher] and save it to the server.
+    pub async fn edit(
+        &self,
+        cipher_id: &str,
+        mut request: CipherAddEditRequest,
+    ) -> Result<CipherView, EditCipherError> {
+        let key_store = self.client.internal.get_key_store();
+        let config = self.client.internal.get_api_configurations().await;
+        let repository = self.get_repository()?;
+
+        request.encrypted_for = self.client.internal.get_user_id();
+
+        edit_cipher(
+            key_store,
+            &config.api,
+            repository.as_ref(),
+            cipher_id,
+            request,
+        )
+        .await
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use bitwarden_api_api::{

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

@@ -0,0 +1,82 @@
+use bitwarden_core::key_management::KeyIds;
+use bitwarden_crypto::{CryptoError, KeyStore};
+use bitwarden_error::bitwarden_error;
+use bitwarden_state::repository::{Repository, RepositoryError};
+use thiserror::Error;
+
+use super::CiphersClient;
+use crate::{cipher::cipher::DecryptCipherListResult, Cipher, CipherView, ItemNotFoundError};
+
+#[allow(missing_docs)]
+#[bitwarden_error(flat)]
+#[derive(Debug, Error)]
+pub enum GetCipherError {
+    #[error(transparent)]
+    ItemNotFound(#[from] ItemNotFoundError),
+    #[error(transparent)]
+    Crypto(#[from] CryptoError),
+    #[error(transparent)]
+    RepositoryError(#[from] RepositoryError),
+}
+
+async fn get_cipher(
+    store: &KeyStore<KeyIds>,
+    repository: &dyn Repository<Cipher>,
+    id: &str,
+) -> Result<CipherView, GetCipherError> {
+    let cipher = repository
+        .get(id.to_string())
+        .await?
+        .ok_or(ItemNotFoundError)?;
+
+    Ok(store.decrypt(&cipher)?)
+}
+
+async fn list_ciphers(
+    store: &KeyStore<KeyIds>,
+    repository: &dyn Repository<Cipher>,
+) -> Result<Vec<CipherView>, GetCipherError> {
+    let ciphers = repository.list().await?;
+    let views = store.decrypt_list(&ciphers)?;
+    Ok(views)
+}
+
+async fn list_ciphers_with_failures(
+    store: &KeyStore<KeyIds>,
+    repository: &dyn Repository<Cipher>,
+) -> Result<DecryptCipherListResult, GetCipherError> {
+    let ciphers = repository.list().await?;
+    let (successes, failures) = store.decrypt_list_with_failures(&ciphers);
+    Ok(DecryptCipherListResult {
+        successes,
+        failures: failures.into_iter().cloned().collect(),
+    })
+}
+
+impl CiphersClient {
+    /// Get all ciphers from state and decrypt them to a list of [CipherView].
+    pub async fn list(&self) -> Result<Vec<CipherView>, GetCipherError> {
+        let key_store = self.client.internal.get_key_store();
+        let repository = self.get_repository()?;
+
+        list_ciphers(key_store, repository.as_ref()).await
+    }
+
+    /// Get all ciphers from state and decrypt them, returning both successes and failures.
+    /// This method will not fail when some ciphers fail to decrypt, allowing for graceful
+    /// handling of corrupted or problematic cipher data.
+    pub async fn list_with_failures(&self) -> Result<DecryptCipherListResult, GetCipherError> {
+        let key_store = self.client.internal.get_key_store();
+        let repository = self.get_repository()?;
+
+        list_ciphers_with_failures(key_store, repository.as_ref()).await
+    }
+
+    /// Get [Cipher] by ID from state and decrypt it to a [CipherView].
+    pub async fn get(&self, cipher_id: &str) -> Result<CipherView, GetCipherError> {
+        let key_store = self.client.internal.get_key_store();
+        let repository = self.get_repository()?;
+
+        get_cipher(key_store, repository.as_ref(), cipher_id).await
+    }
+}

crates/bitwarden-vault/src/cipher/cipher_client.rs renamed to crates/bitwarden-vault/src/cipher/cipher_client/mod.rs

@@ -10,14 +10,14 @@ use wasm_bindgen::prelude::*;
 
 use super::EncryptionContext;
 use crate::{
-    cipher::cipher::DecryptCipherListResult,
-    create::{create_cipher, CipherAddEditRequest, CreateCipherError},
-    edit::{edit_cipher, EditCipherError},
-    get_list::{get_cipher, list_ciphers, list_ciphers_with_failures, GetCipherError},
-    Cipher, CipherError, CipherListView, CipherView, DecryptError, EncryptError,
-    Fido2CredentialFullView,
+    cipher::cipher::DecryptCipherListResult, Cipher, CipherError, CipherListView, CipherView,
+    DecryptError, EncryptError, Fido2CredentialFullView,
 };
 
+pub mod create;
+pub mod edit;
+pub mod get;
+
 #[allow(missing_docs)]
 #[cfg_attr(feature = "wasm", wasm_bindgen)]
 pub struct CiphersClient {
@@ -181,68 +181,6 @@ impl CiphersClient {
         let decrypted_key = cipher_view.decrypt_fido2_private_key(&mut key_store.context())?;
         Ok(decrypted_key)
     }
-
-    /// Get all ciphers from state and decrypt them to a list of [CipherView].
-    pub async fn list(&self) -> Result<Vec<CipherView>, GetCipherError> {
-        let key_store = self.client.internal.get_key_store();
-        let repository = self.get_repository()?;
-
-        list_ciphers(key_store, repository.as_ref()).await
-    }
-
-    /// Get all ciphers from state and decrypt them, returning both successes and failures.
-    /// This method will not fail when some ciphers fail to decrypt, allowing for graceful
-    /// handling of corrupted or problematic cipher data.
-    pub async fn list_with_failures(&self) -> Result<DecryptCipherListResult, GetCipherError> {
-        let key_store = self.client.internal.get_key_store();
-        let repository = self.get_repository()?;
-
-        list_ciphers_with_failures(key_store, repository.as_ref()).await
-    }
-
-    /// Get [Cipher] by ID from state and decrypt it to a [CipherView].
-    pub async fn get(&self, cipher_id: &str) -> Result<CipherView, GetCipherError> {
-        let key_store = self.client.internal.get_key_store();
-        let repository = self.get_repository()?;
-
-        get_cipher(key_store, repository.as_ref(), cipher_id).await
-    }
-
-    /// Create a new [Cipher] and save it to the server.
-    pub async fn create(
-        &self,
-        mut request: CipherAddEditRequest,
-    ) -> Result<CipherView, CreateCipherError> {
-        let key_store = self.client.internal.get_key_store();
-        let config = self.client.internal.get_api_configurations().await;
-        let repository = self.get_repository()?;
-
-        request.encrypted_for = self.client.internal.get_user_id();
-
-        create_cipher(key_store, &config.api, repository.as_ref(), request).await
-    }
-
-    /// Edit an existing [Cipher] and save it to the server.
-    pub async fn edit(
-        &self,
-        cipher_id: &str,
-        mut request: CipherAddEditRequest,
-    ) -> Result<CipherView, EditCipherError> {
-        let key_store = self.client.internal.get_key_store();
-        let config = self.client.internal.get_api_configurations().await;
-        let repository = self.get_repository()?;
-
-        request.encrypted_for = self.client.internal.get_user_id();
-
-        edit_cipher(
-            key_store,
-            &config.api,
-            repository.as_ref(),
-            cipher_id,
-            request,
-        )
-        .await
-    }
 }
 
 impl CiphersClient {

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

@@ -5,10 +5,7 @@ pub(crate) mod card;
 pub(crate) mod cipher;
 pub(crate) mod cipher_client;
 pub(crate) mod cipher_permissions;
-pub(crate) mod create;
-pub(crate) mod edit;
 pub(crate) mod field;
-pub(crate) mod get_list;
 pub(crate) mod identity;
 pub(crate) mod linked_id;
 pub(crate) mod local_data;