summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Jacobson <owen@grimoire.ca>2024-09-20 15:39:37 -0400
committerOwen Jacobson <owen@grimoire.ca>2024-09-20 15:39:37 -0400
commit8fe54f09aad3121d1cb9418087e46dc3a617463a (patch)
treeae018121a757040980427c810fa8359f1c98ab85
parent0497433c5fad26e8ba27080da6978fc305bc3af9 (diff)
Less Option calisthenic
-rw-r--r--src/login/app.rs7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/login/app.rs b/src/login/app.rs
index c972cce..637d852 100644
--- a/src/login/app.rs
+++ b/src/login/app.rs
@@ -31,17 +31,16 @@ impl<'a> Logins<'a> {
let login = if let Some((login, stored_hash)) = tx.auth().for_name(name).await? {
if stored_hash.verify(password)? {
// Password verified; use the login.
- Some(login)
+ login
} else {
// Password NOT verified.
- None
+ return Err(LoginError::Rejected);
}
} else {
let password_hash = StoredHash::new(password)?;
- Some(tx.logins().create(name, &password_hash).await?)
+ tx.logins().create(name, &password_hash).await?
};
- let login = login.ok_or(LoginError::Rejected)?;
let token = tx.tokens().issue(&login, login_at).await?;
tx.commit().await?;