refactor: rename files to match new names

Author: tangowithfoxtrot

crates/bitwarden-core/src/auth/client_auth.rs renamed to crates/bitwarden-core/src/auth/auth_client.rs

@@ -3,7 +3,7 @@ use bitwarden_crypto::{HashPurpose, Kdf, MasterKey};
 
 mod access_token;
 pub(super) mod api;
-pub mod client_auth;
+pub mod auth_client;
 mod jwt_token;
 pub mod login;
 #[cfg(feature = "internal")]

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

@@ -1,8 +1,8 @@
 pub mod crypto;
 pub mod kdf;
 
-mod client_crypto;
 mod client_kdf;
+mod crypto_client;
 
-pub use client_crypto::CryptoClient;
 pub use client_kdf::ClientKdf;
+pub use crypto_client::CryptoClient;

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

@@ -1,6 +1,6 @@
-pub mod client_platform;
 mod generate_fingerprint;
 mod get_user_api_key;
+pub mod platform_client;
 mod secret_verification_request;
 
 pub use generate_fingerprint::{FingerprintRequest, FingerprintResponse};

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

@@ -6,11 +6,11 @@ use crate::{
     ExportError, ExportFormat,
 };
 
-pub struct ExporterClients<'a> {
+pub struct ExporterClient<'a> {
     client: &'a Client,
 }
 
-impl<'a> ExporterClients<'a> {
+impl<'a> ExporterClient<'a> {
     fn new(client: &'a Client) -> Self {
         Self { client }
     }
@@ -34,12 +34,12 @@ impl<'a> ExporterClients<'a> {
     }
 }
 
-pub trait ExporterClientsExt<'a> {
-    fn exporters(&'a self) -> ExporterClients<'a>;
+pub trait ExporterClientExt<'a> {
+    fn exporters(&'a self) -> ExporterClient<'a>;
 }
 
-impl<'a> ExporterClientsExt<'a> for Client {
-    fn exporters(&'a self) -> ExporterClients<'a> {
-        ExporterClients::new(self)
+impl<'a> ExporterClientExt<'a> for Client {
+    fn exporters(&'a self) -> ExporterClient<'a> {
+        ExporterClient::new(self)
     }
 }

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

@@ -7,12 +7,12 @@ use uuid::Uuid;
 #[cfg(feature = "uniffi")]
 uniffi::setup_scaffolding!();
 
-mod client_exporter;
 mod csv;
 mod encrypted_json;
+mod exporter_client;
 mod json;
 mod models;
-pub use client_exporter::{ExporterClients, ExporterClientsExt};
+pub use exporter_client::{ExporterClient, ExporterClientExt};
 mod error;
 mod export;
 pub use error::ExportError;

crates/bitwarden-core/src/platform/client_platform.rs renamed to crates/bitwarden-core/src/platform/platform_client.rs

@@ -1,6 +1,6 @@
-mod client_generator;
+mod generator_client;
 mod username_forwarders;
-pub use client_generator::{GeneratorClient, GeneratorClientsExt};
+pub use generator_client::{GeneratorClient, GeneratorClientsExt};
 pub(crate) mod passphrase;
 pub use passphrase::{PassphraseError, PassphraseGeneratorRequest};
 pub(crate) mod password;

crates/bitwarden-exporters/src/client_exporter.rs renamed to crates/bitwarden-exporters/src/exporter_client.rs

@@ -5,7 +5,7 @@ mod uniffi_support;
 
 mod error;
 pub use error::SendParseError;
-mod client_sends;
-pub use client_sends::{SendClients, SendClientsExt};
+mod send_client;
+pub use send_client::{SendClient, SendClientExt};
 mod send;
 pub use send::{Send, SendListView, SendView};

crates/bitwarden-exporters/src/lib.rs

@@ -5,11 +5,11 @@ use bitwarden_crypto::{EncString, KeyDecryptable, KeyEncryptable};
 
 use crate::{Send, SendListView, SendView};
 
-pub struct SendClients<'a> {
+pub struct SendClient<'a> {
     client: &'a Client,
 }
 
-impl<'a> SendClients<'a> {
+impl<'a> SendClient<'a> {
     fn new(client: &'a Client) -> Self {
         Self { client }
     }
@@ -84,12 +84,12 @@ impl<'a> SendClients<'a> {
     }
 }
 
-pub trait SendClientsExt<'a> {
-    fn sends(&'a self) -> SendClients<'a>;
+pub trait SendClientExt<'a> {
+    fn sends(&'a self) -> SendClient<'a>;
 }
 
-impl<'a> SendClientsExt<'a> for Client {
-    fn sends(&'a self) -> SendClients<'a> {
-        SendClients::new(self)
+impl<'a> SendClientExt<'a> for Client {
+    fn sends(&'a self) -> SendClient<'a> {
+        SendClient::new(self)
     }
 }

crates/bitwarden-generators/src/client_generator.rs renamed to crates/bitwarden-generators/src/generator_client.rs

@@ -19,7 +19,7 @@ mod android_support;
 use crypto::CryptoClient;
 use error::Result;
 use platform::PlatformClient;
-use tool::{ExporterClients, GeneratorClients, SendClients};
+use tool::{ExporterClient, GeneratorClients, SendClient};
 use vault::VaultClient;
 
 #[derive(uniffi::Object)]
@@ -58,13 +58,13 @@ impl Client {
     }
 
     /// Exporters
-    pub fn exporters(self: Arc<Self>) -> Arc<ExporterClients> {
-        Arc::new(ExporterClients(self))
+    pub fn exporters(self: Arc<Self>) -> Arc<ExporterClient> {
+        Arc::new(ExporterClient(self))
     }
 
     /// Sends operations
-    pub fn sends(self: Arc<Self>) -> Arc<SendClients> {
-        Arc::new(SendClients(self))
+    pub fn sends(self: Arc<Self>) -> Arc<SendClient> {
+        Arc::new(SendClient(self))
     }
 
     /// Auth operations

crates/bitwarden-generators/src/lib.rs

@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use bitwarden_exporters::{ExportFormat, ExporterClientsExt};
+use bitwarden_exporters::{ExportFormat, ExporterClientExt};
 use bitwarden_generators::{
     GeneratorClientsExt, PassphraseGeneratorRequest, PasswordGeneratorRequest,
     UsernameGeneratorRequest,
@@ -13,7 +13,7 @@ use crate::{
 };
 
 mod sends;
-pub use sends::SendClients;
+pub use sends::SendClient;
 
 #[derive(uniffi::Object)]
 pub struct GeneratorClients(pub(crate) Arc<Client>);
@@ -53,10 +53,10 @@ impl GeneratorClients {
 }
 
 #[derive(uniffi::Object)]
-pub struct ExporterClients(pub(crate) Arc<Client>);
+pub struct ExporterClient(pub(crate) Arc<Client>);
 
 #[uniffi::export]
-impl ExporterClients {
+impl ExporterClient {
     /// **API Draft:** Export user vault
     pub fn export_vault(
         &self,

crates/bitwarden-send/src/lib.rs

@@ -1,14 +1,14 @@
 use std::{path::Path, sync::Arc};
 
-use bitwarden_send::{Send, SendClientsExt, SendListView, SendView};
+use bitwarden_send::{Send, SendClientExt, SendListView, SendView};
 
 use crate::{Client, Result};
 
 #[derive(uniffi::Object)]
-pub struct SendClients(pub Arc<Client>);
+pub struct SendClient(pub Arc<Client>);
 
 #[uniffi::export]
-impl SendClients {
+impl SendClient {
     /// Encrypt send
     pub fn encrypt(&self, send: SendView) -> Result<Send> {
         Ok(self.0 .0.sends().encrypt(send)?)

crates/bitwarden-send/src/client_sends.rs renamed to crates/bitwarden-send/src/send_client.rs

@@ -17,9 +17,9 @@ mod totp;
 pub use totp::{generate_totp, generate_totp_cipher_view, TotpError, TotpResponse};
 mod error;
 pub use error::VaultParseError;
-mod client_vault;
-pub use client_vault::{VaultClient, VaultClientExt};
-mod client_totp;
+mod vault_client;
+pub use vault_client::{VaultClient, VaultClientExt};
 mod mobile;
 mod sync;
+mod totp_client;
 pub use sync::{SyncRequest, SyncResponse};

crates/bitwarden-uniffi/src/lib.rs

@@ -1,5 +1,5 @@
-mod client_attachments;
-mod client_ciphers;
-mod client_collection;
-mod client_folders;
-mod client_password_history;
+mod attachment_client;
+mod cipher_client;
+mod collection_client;
+mod folder_client;
+mod password_history_client;