Merge branch 'main' into sm/add-sm-owner

bitwarden · Jun 28, 2024 · 62308ff · 62308ff
2 parents dfc3841 + adeb707
commit 62308ff
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 72 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/bitwarden-core/Cargo.toml b/crates/bitwarden-core/Cargo.toml
@@ -61,7 +61,7 @@ thiserror = ">=1.0.40, <2.0"
 uniffi = { version = "=0.27.2", optional = true, features = ["tokio"] }
 uuid = { version = ">=1.3.3, <2.0", features = ["serde"] }
 zeroize = { version = ">=1.7.0, <2.0", features = ["derive", "aarch64"] }
-zxcvbn = ">= 2.2.2, <3.0"
+zxcvbn = ">=3.0.1, <4.0"
 
 [target.'cfg(all(not(target_os = "android"), not(target_arch="wasm32")))'.dependencies]
 # By default, we use rustls as the TLS stack and rust-platform-verifier to support user-installed root certificates

diff --git a/crates/bitwarden-core/src/auth/password/strength.rs b/crates/bitwarden-core/src/auth/password/strength.rs
@@ -13,7 +13,7 @@ pub(crate) fn password_strength(
     let mut arr: Vec<_> = inputs.iter().map(String::as_str).collect();
     arr.extend(GLOBAL_INPUTS);
 
-    zxcvbn(&password, &arr).map_or(0, |e| e.score())
+    zxcvbn(&password, &arr).score().into()
 }
 
 fn email_to_user_inputs(email: &str) -> Vec<String> {