From d1f8e461b1353565fd53ade5677cb533a40e5156 Mon Sep 17 00:00:00 2001
From: Xiretza <xiretza@xiretza.xyz>
Date: Tue, 20 Feb 2024 21:00:08 +0000
Subject: [PATCH] db: rename methods to clarify token kind

---
 src/auth/mod.rs |  8 ++++----
 src/db.rs       | 26 ++++++++++++++++++++------
 2 files changed, 24 insertions(+), 10 deletions(-)

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<Option<UserTokenEntry>, sqlx::Error>;
+    async fn get_user_token(
+        &mut self,
+        username: &str,
+    ) -> Result<Option<UserTokenEntry>, sqlx::Error>;
 
-    async fn save_token(&mut self, username: &str, token: &UserToken) -> Result<(), sqlx::Error>;
+    async fn save_user_token(
+        &mut self,
+        username: &str,
+        token: &UserToken,
+    ) -> Result<(), sqlx::Error>;
 
-    async fn update_token_last_used(
+    async fn update_user_token_last_used(
         &mut self,
         username: &str,
         token: &UserToken,
@@ -77,7 +84,10 @@ impl SqliteDatabase {
 #[async_trait]
 impl Database for SqliteDatabase {
     #[instrument]
-    async fn get_token(&mut self, username: &str) -> Result<Option<UserTokenEntry>, sqlx::Error> {
+    async fn get_user_token(
+        &mut self,
+        username: &str,
+    ) -> Result<Option<UserTokenEntry>, sqlx::Error> {
         struct TokenRow {
             token: String,
             valid: bool,
@@ -110,7 +120,11 @@ impl Database for SqliteDatabase {
     }
 
     #[instrument]
-    async fn save_token(&mut self, username: &str, token: &UserToken) -> Result<(), sqlx::Error> {
+    async fn save_user_token(
+        &mut self,
+        username: &str,
+        token: &UserToken,
+    ) -> Result<(), sqlx::Error> {
         let token_inner = token.0.expose_secret();
         query!(
             "INSERT INTO user_tokens
@@ -128,7 +142,7 @@ impl Database for SqliteDatabase {
     }
 
     #[instrument]
-    async fn update_token_last_used(
+    async fn update_user_token_last_used(
         &mut self,
         username: &str,
         token: &UserToken,