diff --git a/src/model/user.rs b/src/model/user.rs index 0100ab6..905b0cf 100644 --- a/src/model/user.rs +++ b/src/model/user.rs @@ -14,7 +14,7 @@ use serde::{Deserialize, Serialize}; use serde_json::json; use sqlx::{FromRow, SqlitePool}; -use super::{tripdetails::TripDetails, Day}; +use super::{log::Log, tripdetails::TripDetails, Day}; #[derive(FromRow, Debug, Serialize, Deserialize)] pub struct User { @@ -148,15 +148,15 @@ ORDER BY last_access DESC } pub async fn login(db: &SqlitePool, name: &str, pw: &str) -> Result { - info!("User '{name}' is trying to login..."); + Log::create(db, "User '{name}' is trying to login...".into()).await; let name = name.trim(); // just to make sure... let Some(user) = User::find_by_name(db, name).await else { - info!("Username ({name}) not found"); + Log::create(db, "Username ({name}) not found".into()).await; return Err(LoginError::InvalidAuthenticationCombo); // Username not found }; if user.deleted { - info!("User ({name}) already deleted."); + Log::create(db, "User ({name}) already deleted.".into()).await; return Err(LoginError::InvalidAuthenticationCombo); //User existed sometime ago; has //been deleted } @@ -165,11 +165,10 @@ ORDER BY last_access DESC Some(user_pw) => { let password_hash = &Self::get_hashed_pw(pw); if password_hash == user_pw { - info!("User {name} successfully logged in"); + Log::create(db, "User {name} successfully logged in".into()).await; return Ok(user); } - info!("User {name} supplied the wrong PW"); - + Log::create(db, "User {name} supplied the wrong PW".into()).await; Err(LoginError::InvalidAuthenticationCombo) } None => {