Sprint 5 into 6 update

auth-service/Cargo.toml

@@ -36,4 +36,4 @@ reqwest = { version = "0.12.24", default-features = false, features = ["json", "
 fake = "=4.4.0"
 quickcheck = "1.0.3"
 quickcheck_macros = "1.1.0"
-wiremock = "0.6.5"
+wiremock = "0.6.5"

auth-service/src/domain/data_stores.rs

@@ -3,14 +3,17 @@ use rand::Rng;
 use secrecy::{ExposeSecret, SecretString};
 use thiserror::Error;
 
-use super::{Email, Password, User};
+use super::{Email, User};
 
 #[async_trait::async_trait]
 pub trait UserStore {
     async fn add_user(&mut self, user: User) -> Result<(), UserStoreError>;
     async fn get_user(&self, email: &Email) -> Result<User, UserStoreError>;
-    async fn validate_user(&self, email: &Email, password: &Password)
-        -> Result<(), UserStoreError>;
+    async fn validate_user(
+        &self,
+        email: &Email,
+        raw_password: &SecretString,
+    ) -> Result<(), UserStoreError>;
 }
 
 #[derive(Debug, Error)]
@@ -101,9 +104,9 @@ impl LoginAttemptId {
 
 impl Default for LoginAttemptId {
     fn default() -> Self {
-        Self(
-            SecretString::new(uuid::Uuid::new_v4().to_string().into_boxed_str())
-        )
+        Self(SecretString::new(
+            uuid::Uuid::new_v4().to_string().into_boxed_str(),
+        ))
     }
 }
 
@@ -135,8 +138,12 @@ impl TwoFACode {
 
 impl Default for TwoFACode {
     fn default() -> Self {
-        Self(SecretString::new(rand::rng().
-            random_range(100_000..=999_999).to_string().into_boxed_str()))
+        Self(SecretString::new(
+            rand::rng()
+                .random_range(100_000..=999_999)
+                .to_string()
+                .into_boxed_str(),
+        ))
     }
 }
 

auth-service/src/domain/email.rs

@@ -1,7 +1,6 @@
-use std::hash::Hash;
-
 use color_eyre::eyre::{eyre, Result};
 use secrecy::{ExposeSecret, SecretString};
+use std::hash::Hash;
 use validator::ValidateEmail;
 
 #[derive(Debug, Clone)]