Ruderverein-Donau-Linz/rowt
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects Wiki Activity

even show who's logging in

Browse Source
This commit is contained in:
philipp 2023-07-25 11:36:36 +02:00
parent 1436feaffd
commit 3765541674
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/model/user.rs
View File

@ -148,15 +148,15 @@ ORDER BY last_access DESC
} }
pub async fn login(db: &SqlitePool, name: &str, pw: &str) -> Result<Self, LoginError> { pub async fn login(db: &SqlitePool, name: &str, pw: &str) -> Result<Self, LoginError> {
Log::create(db, "User '{name}' is trying to login...".into()).await; Log::create(db, format!("User '{name}' is trying to login...").into()).await;
let name = name.trim(); // just to make sure... let name = name.trim(); // just to make sure...
let Some(user) = User::find_by_name(db, name).await else { let Some(user) = User::find_by_name(db, name).await else {
Log::create(db, "Username ({name}) not found".into()).await; Log::create(db, format!("Username ({name}) not found").into()).await;
return Err(LoginError::InvalidAuthenticationCombo); // Username not found return Err(LoginError::InvalidAuthenticationCombo); // Username not found
}; };
if user.deleted { if user.deleted {
Log::create(db, "User ({name}) already deleted.".into()).await; Log::create(db, format!("User ({name}) already deleted.").into()).await;
return Err(LoginError::InvalidAuthenticationCombo); //User existed sometime ago; has return Err(LoginError::InvalidAuthenticationCombo); //User existed sometime ago; has
//been deleted //been deleted
} }
@ -165,10 +165,10 @@ ORDER BY last_access DESC
Some(user_pw) => { Some(user_pw) => {
let password_hash = &Self::get_hashed_pw(pw); let password_hash = &Self::get_hashed_pw(pw);
if password_hash == user_pw { if password_hash == user_pw {
Log::create(db, "User {name} successfully logged in".into()).await; Log::create(db, format!("User {name} successfully logged in").into()).await;
return Ok(user); return Ok(user);
} }
Log::create(db, "User {name} supplied the wrong PW".into()).await; Log::create(db, format!("User {name} supplied the wrong PW").into()).await;
Err(LoginError::InvalidAuthenticationCombo) Err(LoginError::InvalidAuthenticationCombo)
} }
None => { None => {