Make password infallible by moving validation outside of it, moved Ch…

…arSets to BTreeSets and implemented Distribution on them
bitwarden · Nov 6, 2023 · f758ada · f758ada
1 parent 7a7a269
commit f758ada
Show file tree

Hide file tree

Showing 3 changed files with 283 additions and 199 deletions.
diff --git a/crates/bitwarden/src/tool/generators/client_generator.rs b/crates/bitwarden/src/tool/generators/client_generator.rs
@@ -27,7 +27,7 @@ impl<'a> ClientGenerator<'a> {
     ///         lowercase: true,
     ///         uppercase: true,
     ///         numbers: true,
-    ///         length: Some(20),
+    ///         length: 20,
     ///         ..Default::default()
     ///     };
     ///     let password = Client::new(None).generator().password(input).await.unwrap();
@@ -36,7 +36,8 @@ impl<'a> ClientGenerator<'a> {
     /// }
     /// ```
     pub async fn password(&self, input: PasswordGeneratorRequest) -> Result<String> {
-        password(input)
+        let charset = input.validate_options()?;
+        Ok(password(charset))
     }
 
     pub async fn passphrase(&self, input: PassphraseGeneratorRequest) -> Result<String> {