Merge branch 'main' into wip/mobile

1 files changed, 4 insertions, 3 deletions

diff --git a/src/login/password.rs b/src/login/password.rs
index 14fd981..c27c950 100644
--- a/src/login/password.rs
+++ b/src/login/password.rs
@@ -4,6 +4,8 @@ use argon2::Argon2;
 use password_hash::{PasswordHash, PasswordHasher, PasswordVerifier, SaltString};
 use rand_core::OsRng;
 
+use crate::normalize::nfc;
+
 #[derive(sqlx::Type)]
 #[sqlx(transparent)]
 pub struct StoredHash(String);
@@ -31,7 +33,7 @@ impl fmt::Debug for StoredHash {
 
 #[derive(serde::Deserialize)]
 #[serde(transparent)]
-pub struct Password(String);
+pub struct Password(nfc::String);
 
 impl Password {
     pub fn hash(&self) -> Result<StoredHash, password_hash::Error> {
@@ -56,9 +58,8 @@ impl fmt::Debug for Password {
     }
 }
 
-#[cfg(test)]
 impl From<String> for Password {
     fn from(password: String) -> Self {
-        Self(password)
+        Password(password.into())
     }
 }