mirrors/zero-to-production
1
0
Fork 0
mirror of https://github.com/LukeMathWalker/zero-to-production.git synced 2025-05-02 14:44:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge 2a6c7a566a into 970987c5f7

Browse source
This commit is contained in:
Jiyuan Zheng 2024-09-02 08:29:20 +08:00 committed by GitHub
commit 51aa0d4780
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/authentication/password.rs
View file

@ -58,11 +58,24 @@ pub async fn validate_credentials(
expected_password_hash = stored_password_hash; expected_password_hash = stored_password_hash;
} }
spawn_blocking_with_tracing(move || { match spawn_blocking_with_tracing(move || {
verify_password_hash(expected_password_hash, credentials.password) verify_password_hash(expected_password_hash, credentials.password)
}) })
.await .await
.context("Failed to spawn blocking task.")??; .context("Failed to spawn blocking task.")?
{
Ok(_) => Ok(()),
Err(e) => match e {
AuthError::InvalidCredentials(_) => {
if user_id.is_none() {
Ok(())
} else {
Err(e)
}
}
_ => Err(e),
},
}?;
user_id user_id
.ok_or_else(|| anyhow::anyhow!("Unknown username.")) .ok_or_else(|| anyhow::anyhow!("Unknown username."))