From fd6a74e8ca1f5ded2a760b8ac644124862d80d54 Mon Sep 17 00:00:00 2001
From: Owen Jacobson <owen@grimoire.ca>
Date: Sun, 24 Aug 2025 01:12:06 -0400
Subject: Hoist `password` out to the top level.

Having this buried under `crate::user` makes it hard to split up the roles `user` fulfils right now. Moving it out to its own module makes it a bit tidier to reuse it in a separate, authentication-only way.
---
 src/user/password.rs | 65 ----------------------------------------------------
 1 file changed, 65 deletions(-)
 delete mode 100644 src/user/password.rs

(limited to 'src/user/password.rs')

diff --git a/src/user/password.rs b/src/user/password.rs
deleted file mode 100644
index e1d164e..0000000
--- a/src/user/password.rs
+++ /dev/null
@@ -1,65 +0,0 @@
-use std::fmt;
-
-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);
-
-impl StoredHash {
-    pub fn verify(&self, password: &Password) -> Result<bool, password_hash::Error> {
-        let hash = PasswordHash::new(&self.0)?;
-
-        match Argon2::default().verify_password(password.as_bytes(), &hash) {
-            // Successful authentication, not an error
-            Ok(()) => Ok(true),
-            // Unsuccessful authentication, also not an error
-            Err(password_hash::errors::Error::Password) => Ok(false),
-            // Password validation failed for some other reason, treat as an error
-            Err(err) => Err(err),
-        }
-    }
-}
-
-impl fmt::Debug for StoredHash {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_tuple("StoredHash").field(&"********").finish()
-    }
-}
-
-#[derive(Clone, serde::Deserialize)]
-#[serde(transparent)]
-pub struct Password(nfc::String);
-
-impl Password {
-    pub fn hash(&self) -> Result<StoredHash, password_hash::Error> {
-        let Self(password) = self;
-        let salt = SaltString::generate(&mut OsRng);
-        let argon2 = Argon2::default();
-        let hash = argon2
-            .hash_password(password.as_bytes(), &salt)?
-            .to_string();
-        Ok(StoredHash(hash))
-    }
-
-    fn as_bytes(&self) -> &[u8] {
-        let Self(value) = self;
-        value.as_bytes()
-    }
-}
-
-impl fmt::Debug for Password {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_tuple("Password").field(&"********").finish()
-    }
-}
-
-impl From<String> for Password {
-    fn from(password: String) -> Self {
-        Password(password.into())
-    }
-}
-- 
cgit v1.2.3