diff --git a/src/auth/mod.rs b/src/auth/mod.rs
index 5e73ce6..f6cae38 100644
--- a/src/auth/mod.rs
+++ b/src/auth/mod.rs
@@ -113,13 +113,13 @@ impl UserAuthenticator {
let mut db = self.db.lock().await;
let token =
- if let Some(UserTokenEntry::Valid(old_token, _, _)) = db.get_token(&username).await? {
+ if let Some(UserTokenEntry::Valid(old_token, _, _)) = db.get_user_token(&username).await? {
old_token
} else {
let new_token =
UserToken::from(Alphanumeric.sample_string(&mut thread_rng(), Self::TOKEN_LEN));
- db.save_token(&username, &new_token).await?;
+ db.save_user_token(&username, &new_token).await?;
new_token
};
@@ -138,9 +138,9 @@ impl UserAuthenticator {
) -> Result<(), AuthenticationError> {
let mut db = self.db.lock().await;
- if let Some(UserTokenEntry::Valid(user_token, ..)) = &db.get_token(username).await? {
+ if let Some(UserTokenEntry::Valid(user_token, ..)) = &db.get_user_token(username).await? {
if token == user_token {
- db.update_token_last_used(username, token).await?;
+ db.update_user_token_last_used(username, token).await?;
return Ok(());
}
}
diff --git a/src/db.rs b/src/db.rs
index a146b4e..502a2f9 100644
--- a/src/db.rs
+++ b/src/db.rs
@@ -25,11 +25,18 @@ pub enum UserTokenEntry {
#[async_trait]
pub trait Database: Debug {
- async fn get_token(&mut self, username: &str) -> Result