Rename all clients to follow Domain Client (#224)

Renames all clients except for Fido2Client since it has an internal
conflict. SM clients and traits have aliases to maintain backwards
compatibility.

Author: Hinton

bitwarden_license/bitwarden-sm/src/client_projects.rs

@@ -9,11 +9,14 @@ use crate::{
     },
 };
 
-pub struct ClientProjects {
+/// Aliases to maintain backward compatibility
+pub type ClientProjects = ProjectsClient;
+
+pub struct ProjectsClient {
     pub client: Client,
 }
 
-impl ClientProjects {
+impl ProjectsClient {
     pub fn new(client: Client) -> Self {
         Self { client }
     }
@@ -54,12 +57,23 @@ impl ClientProjects {
     }
 }
 
+/// This trait is for backward compatibility
 pub trait ClientProjectsExt {
     fn projects(&self) -> ClientProjects;
 }
 
 impl ClientProjectsExt for Client {
     fn projects(&self) -> ClientProjects {
-        ClientProjects::new(self.clone())
+        ProjectsClient::new(self.clone())
+    }
+}
+
+pub trait ProjectsClientExt {
+    fn projects(&self) -> ProjectsClient;
+}
+
+impl ProjectsClientExt for Client {
+    fn projects(&self) -> ProjectsClient {
+        ProjectsClient::new(self.clone())
     }
 }

bitwarden_license/bitwarden-sm/src/client_secrets.rs

@@ -12,11 +12,14 @@ use crate::{
     },
 };
 
-pub struct ClientSecrets {
+/// Aliases to maintain backward compatibility
+pub type ClientSecrets = SecretsClient;
+
+pub struct SecretsClient {
     client: Client,
 }
 
-impl ClientSecrets {
+impl SecretsClient {
     pub fn new(client: Client) -> Self {
         Self { client }
     }
@@ -78,12 +81,23 @@ impl ClientSecrets {
     }
 }
 
+/// This trait is for backward compatibility
 pub trait ClientSecretsExt {
     fn secrets(&self) -> ClientSecrets;
 }
 
 impl ClientSecretsExt for Client {
     fn secrets(&self) -> ClientSecrets {
-        ClientSecrets::new(self.clone())
+        SecretsClient::new(self.clone())
+    }
+}
+
+pub trait SecretsClientExt {
+    fn secrets(&self) -> SecretsClient;
+}
+
+impl SecretsClientExt for Client {
+    fn secrets(&self) -> SecretsClient {
+        SecretsClient::new(self.clone())
     }
 }

bitwarden_license/bitwarden-sm/src/lib.rs

@@ -4,5 +4,5 @@ mod error;
 pub mod projects;
 pub mod secrets;
 
-pub use client_projects::{ClientProjects, ClientProjectsExt};
-pub use client_secrets::{ClientSecrets, ClientSecretsExt};
+pub use client_projects::{ClientProjects, ClientProjectsExt, ProjectsClient, ProjectsClientExt};
+pub use client_secrets::{ClientSecrets, ClientSecretsExt, SecretsClient, SecretsClientExt};

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

@@ -3,11 +3,11 @@ use bitwarden_crypto::{CryptoError, HashPurpose, Kdf};
 use crate::{mobile::kdf::hash_password, Client};
 
 /// A client for the KDF operations.
-pub struct ClientKdf {
+pub struct KdfClient {
     pub(crate) _client: crate::Client,
 }
 
-impl ClientKdf {
+impl KdfClient {
     /// Hashes the password using the provided KDF parameters and purpose.
     pub async fn hash_password(
         &self,
@@ -22,8 +22,8 @@ impl ClientKdf {
 
 impl Client {
     /// Access to KDF functionality.
-    pub fn kdf(&self) -> ClientKdf {
-        ClientKdf {
+    pub fn kdf(&self) -> KdfClient {
+        KdfClient {
             _client: self.clone(),
         }
     }

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

@@ -9,5 +9,5 @@ mod kdf;
 mod client_kdf;
 mod crypto_client;
 
-pub use client_kdf::ClientKdf;
+pub use client_kdf::KdfClient;
 pub use crypto_client::CryptoClient;

crates/bitwarden-uniffi/src/vault/attachments.rs

@@ -5,10 +5,10 @@ use bitwarden_vault::{Attachment, AttachmentEncryptResult, AttachmentView, Ciphe
 use crate::{error::Error, Result};
 
 #[derive(uniffi::Object)]
-pub struct ClientAttachments(pub(crate) bitwarden_vault::ClientAttachments);
+pub struct AttachmentsClient(pub(crate) bitwarden_vault::AttachmentsClient);
 
 #[uniffi::export]
-impl ClientAttachments {
+impl AttachmentsClient {
     /// Encrypt an attachment file in memory
     pub fn encrypt_buffer(
         &self,

crates/bitwarden-uniffi/src/vault/ciphers.rs

@@ -4,10 +4,10 @@ use uuid::Uuid;
 use crate::{error::Error, Result};
 
 #[derive(uniffi::Object)]
-pub struct ClientCiphers(pub(crate) bitwarden_vault::ClientCiphers);
+pub struct CiphersClient(pub(crate) bitwarden_vault::CiphersClient);
 
 #[uniffi::export]
-impl ClientCiphers {
+impl CiphersClient {
     /// Encrypt cipher
     pub fn encrypt(&self, cipher_view: CipherView) -> Result<Cipher> {
         Ok(self.0.encrypt(cipher_view).map_err(Error::Encrypt)?)

crates/bitwarden-uniffi/src/vault/collections.rs

@@ -3,10 +3,10 @@ use bitwarden_vault::{Collection, CollectionView};
 use crate::{error::Error, Result};
 
 #[derive(uniffi::Object)]
-pub struct ClientCollections(pub(crate) bitwarden_vault::ClientCollections);
+pub struct CollectionsClient(pub(crate) bitwarden_vault::CollectionsClient);
 
 #[uniffi::export]
-impl ClientCollections {
+impl CollectionsClient {
     /// Decrypt collection
     pub fn decrypt(&self, collection: Collection) -> Result<CollectionView> {
         Ok(self.0.decrypt(collection).map_err(Error::Decrypt)?)

crates/bitwarden-uniffi/src/vault/folders.rs

@@ -3,10 +3,10 @@ use bitwarden_vault::{Folder, FolderView};
 use crate::{error::Error, Result};
 
 #[derive(uniffi::Object)]
-pub struct ClientFolders(pub(crate) bitwarden_vault::ClientFolders);
+pub struct FoldersClient(pub(crate) bitwarden_vault::FoldersClient);
 
 #[uniffi::export]
-impl ClientFolders {
+impl FoldersClient {
     /// Encrypt folder
     pub fn encrypt(&self, folder: FolderView) -> Result<Folder> {
         Ok(self.0.encrypt(folder).map_err(Error::Encrypt)?)

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

@@ -15,28 +15,28 @@ pub struct VaultClient(pub(crate) bitwarden_vault::VaultClient);
 #[uniffi::export]
 impl VaultClient {
     /// Folder operations
-    pub fn folders(&self) -> folders::ClientFolders {
-        folders::ClientFolders(self.0.folders())
+    pub fn folders(&self) -> folders::FoldersClient {
+        folders::FoldersClient(self.0.folders())
     }
 
     /// Collections operations
-    pub fn collections(&self) -> collections::ClientCollections {
-        collections::ClientCollections(self.0.collections())
+    pub fn collections(&self) -> collections::CollectionsClient {
+        collections::CollectionsClient(self.0.collections())
     }
 
     /// Ciphers operations
-    pub fn ciphers(&self) -> ciphers::ClientCiphers {
-        ciphers::ClientCiphers(self.0.ciphers())
+    pub fn ciphers(&self) -> ciphers::CiphersClient {
+        ciphers::CiphersClient(self.0.ciphers())
     }
 
     /// Password history operations
-    pub fn password_history(&self) -> password_history::ClientPasswordHistory {
-        password_history::ClientPasswordHistory(self.0.password_history())
+    pub fn password_history(&self) -> password_history::PasswordHistoryClient {
+        password_history::PasswordHistoryClient(self.0.password_history())
     }
 
     /// Attachment file operations
-    pub fn attachments(&self) -> attachments::ClientAttachments {
-        attachments::ClientAttachments(self.0.attachments())
+    pub fn attachments(&self) -> attachments::AttachmentsClient {
+        attachments::AttachmentsClient(self.0.attachments())
     }
 
     /// Generate a TOTP code from a provided key.