1 files changed, 10 insertions, 36 deletions
diff --git a/src/login/app.rs b/src/login/app.rs
index cd65f35..c82da1a 100644
--- a/src/login/app.rs
+++ b/src/login/app.rs
@@ -1,13 +1,15 @@
-use argon2::Argon2;
-use password_hash::{PasswordHash, PasswordHasher, PasswordVerifier, SaltString};
-use rand_core::OsRng;
 use sqlx::sqlite::SqlitePool;
 
-use super::repo::{
-    logins::{Login, Provider as _},
-    tokens::Provider as _,
+use super::repo::auth::Provider as _;
+use crate::{
+    clock::DateTime,
+    error::BoxedError,
+    password::StoredHash,
+    repo::{
+        login::{Login, Provider as _},
+        token::Provider as _,
+    },
 };
-use crate::{clock::DateTime, error::BoxedError};
 
 pub struct Logins<'a> {
     db: &'a SqlitePool,
@@ -26,7 +28,7 @@ impl<'a> Logins<'a> {
     ) -> Result<Option<String>, BoxedError> {
         let mut tx = self.db.begin().await?;
 
-        let login = if let Some((login, stored_hash)) = tx.logins().for_login(name).await? {
+        let login = if let Some((login, stored_hash)) = tx.auth().for_name(name).await? {
             if stored_hash.verify(password)? {
                 // Password verified; use the login.
                 Some(login)
@@ -75,31 +77,3 @@ impl<'a> Logins<'a> {
         Ok(())
     }
 }
-
-#[derive(Debug, sqlx::Type)]
-#[sqlx(transparent)]
-pub struct StoredHash(String);
-
-impl StoredHash {
-    fn new(password: &str) -> Result<Self, password_hash::Error> {
-        let salt = SaltString::generate(&mut OsRng);
-        let argon2 = Argon2::default();
-        let hash = argon2
-            .hash_password(password.as_bytes(), &salt)?
-            .to_string();
-        Ok(Self(hash))
-    }
-
-    fn verify(&self, password: &str) -> 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),
-        }
-    }
-}