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

clean code with clippy

Browse Source
This commit is contained in:
philipp
2023-07-25 13:22:11 +02:00
parent 3765541674
commit a7789af713
10 changed files with 243 additions and 463 deletions
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> {
Log::create(db, format!("User '{name}' is trying to login...").into()).await;
Log::create(db, format!("User '{name}' is trying to login...")).await;
let name = name.trim(); // just to make sure...
let Some(user) = User::find_by_name(db, name).await else {
Log::create(db, format!("Username ({name}) not found").into()).await;
Log::create(db, format!("Username ({name}) not found")).await;
return Err(LoginError::InvalidAuthenticationCombo); // Username not found
};
if user.deleted {
Log::create(db, format!("User ({name}) already deleted.").into()).await;
Log::create(db, format!("User ({name}) already deleted.")).await;
return Err(LoginError::InvalidAuthenticationCombo); //User existed sometime ago; has
//been deleted
}
@ -165,10 +165,10 @@ ORDER BY last_access DESC
Some(user_pw) => {
let password_hash = &Self::get_hashed_pw(pw);
if password_hash == user_pw {
Log::create(db, format!("User {name} successfully logged in").into()).await;
Log::create(db, format!("User {name} successfully logged in")).await;
return Ok(user);
}
Log::create(db, format!("User {name} supplied the wrong PW").into()).await;
Log::create(db, format!("User {name} supplied the wrong PW")).await;
Err(LoginError::InvalidAuthenticationCombo)
}
None => {