Remove GeneratorError and use explicit errors instead

crates/bitwarden-crypto/Cargo.toml

@@ -6,7 +6,7 @@ license-file = "LICENSE"
 repository = "https://github.com/bitwarden/sdk"
 homepage = "https://bitwarden.com"
 description = """
-Bitwarden Cryptographic primitives
+Internal crate for the bitwarden crate. Do not use.
 """
 keywords = ["bitwarden"]
 edition = "2021"

crates/bitwarden-crypto/README.md

@@ -0,0 +1,6 @@
+# Bitwarden Crypto
+
+This is an internal crate for the Bitwarden SDK do not depend on this directly and use the
+[`bitwarden`](https://crates.io/crates/bitwarden) crate instead.
+
+This crate does not follow semantic versioning and the public interface may change at any time.

crates/bitwarden-generators/Cargo.toml

@@ -1,8 +1,16 @@
 [package]
 name = "bitwarden-generators"
 version = "0.1.0"
+authors = ["Bitwarden Inc"]
+license-file = "LICENSE"
+repository = "https://github.com/bitwarden/sdk"
+homepage = "https://bitwarden.com"
+description = """
+Internal crate for the bitwarden crate. Do not use.
+"""
+keywords = ["bitwarden"]
 edition = "2021"
-
+rust-version = "1.57"
 
 [features]
 mobile = ["uniffi"] # Mobile-specific features

crates/bitwarden-generators/README.md

@@ -0,0 +1,6 @@
+# Bitwarden Generators
+
+This is an internal crate for the Bitwarden SDK do not depend on this directly and use the
+[`bitwarden`](https://crates.io/crates/bitwarden) crate instead.
+
+This crate does not follow semantic versioning and the public interface may change at any time.

crates/bitwarden-generators/src/lib.rs

@@ -1,12 +1,10 @@
 mod passphrase;
-pub use passphrase::{passphrase, PassphraseGeneratorRequest};
-mod error;
-mod util;
-pub use error::GeneratorError;
+pub use passphrase::{passphrase, PassphraseError, PassphraseGeneratorRequest};
 mod password;
-pub use password::{password, PasswordGeneratorRequest};
+mod util;
+pub use password::{password, PasswordError, PasswordGeneratorRequest};
 mod username;
-pub use username::{username, ForwarderServiceType, UsernameGeneratorRequest};
+pub use username::{username, ForwarderServiceType, UsernameError, UsernameGeneratorRequest};
 mod username_forwarders;
 
 #[cfg(feature = "mobile")]

crates/bitwarden-generators/src/passphrase.rs

@@ -4,7 +4,7 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
 
-use crate::{error::GeneratorError, util::capitalize_first_letter};
+use crate::util::capitalize_first_letter;
 
 #[derive(Debug, Error)]
 pub enum PassphraseError {
@@ -80,7 +80,7 @@ impl PassphraseGeneratorRequest {
 }
 
 /// Implementation of the random passphrase generator.
-pub fn passphrase(request: PassphraseGeneratorRequest) -> Result<String, GeneratorError> {
+pub fn passphrase(request: PassphraseGeneratorRequest) -> Result<String, PassphraseError> {
     let options = request.validate_options()?;
     Ok(passphrase_with_rng(rand::thread_rng(), options))
 }

crates/bitwarden-generators/src/password.rs

@@ -5,8 +5,6 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
 
-use crate::GeneratorError;
-
 #[derive(Debug, Error)]
 pub enum PasswordError {
     #[error("No character set enabled")]
@@ -218,7 +216,7 @@ impl PasswordGeneratorRequest {
 }
 
 /// Implementation of the random password generator.
-pub fn password(input: PasswordGeneratorRequest) -> Result<String, GeneratorError> {
+pub fn password(input: PasswordGeneratorRequest) -> Result<String, PasswordError> {
     let options = input.validate_options()?;
     Ok(password_with_rng(rand::thread_rng(), options))
 }

crates/bitwarden-generators/src/username.rs

@@ -5,7 +5,7 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
 
-use crate::{util::capitalize_first_letter, GeneratorError};
+use crate::util::capitalize_first_letter;
 
 #[derive(Debug, Error)]
 pub enum UsernameError {
@@ -134,7 +134,7 @@ impl ForwarderServiceType {
 pub async fn username(
     input: UsernameGeneratorRequest,
     http: &reqwest::Client,
-) -> Result<String, GeneratorError> {
+) -> Result<String, UsernameError> {
     use rand::thread_rng;
     use UsernameGeneratorRequest::*;
     match input {
@@ -144,7 +144,7 @@ pub async fn username(
         } => Ok(username_word(&mut thread_rng(), capitalize, include_number)),
         Subaddress { r#type, email } => Ok(username_subaddress(&mut thread_rng(), r#type, email)),
         Catchall { r#type, domain } => Ok(username_catchall(&mut thread_rng(), r#type, domain)),
-        Forwarded { service, website } => Ok(service.generate(http, website).await?),
+        Forwarded { service, website } => service.generate(http, website).await,
     }
 }
 

crates/bitwarden/src/error.rs

@@ -4,7 +4,7 @@ use std::{borrow::Cow, fmt::Debug};
 
 use bitwarden_api_api::apis::Error as ApiError;
 use bitwarden_api_identity::apis::Error as IdentityError;
-use bitwarden_generators::GeneratorError;
+use bitwarden_generators::{PassphraseError, PasswordError, UsernameError};
 use reqwest::StatusCode;
 use thiserror::Error;
 
@@ -51,7 +51,11 @@ pub enum Error {
     InvalidStateFile,
 
     #[error(transparent)]
-    GeneratorError(#[from] GeneratorError),
+    UsernameError(#[from] UsernameError),
+    #[error(transparent)]
+    PassphraseError(#[from] PassphraseError),
+    #[error(transparent)]
+    PasswordError(#[from] PasswordError),
 
     #[error("Internal error: {0}")]
     Internal(Cow<'static, str>),