From e7bc53f8588527680505e9dcddaaf3167409aefc Mon Sep 17 00:00:00 2001
From: JustTemmie <47639983+JustTemmie@users.noreply.github.com>
Date: Mon, 14 Jul 2025 01:02:03 +0200
Subject: [PATCH] feat: try reading the device name from the table

---
 src/api/v1/auth/refresh.rs                    | 27 +++++++------------
 src/{word_list.rs => generate_device_name.rs} |  0
 2 files changed, 9 insertions(+), 18 deletions(-)
 rename src/{word_list.rs => generate_device_name.rs} (100%)

diff --git a/src/api/v1/auth/refresh.rs b/src/api/v1/auth/refresh.rs
index e9a444b..a89efbc 100644
--- a/src/api/v1/auth/refresh.rs
+++ b/src/api/v1/auth/refresh.rs
@@ -5,13 +5,10 @@ use log::error;
 use std::time::{SystemTime, UNIX_EPOCH};
 
 use crate::{
-    Data,
-    error::Error,
-    schema::{
+    error::Error, schema::{
         access_tokens::{self, dsl},
-        refresh_tokens::{self, dsl as rdsl},
-    },
-    utils::{generate_token, new_refresh_token_cookie},
+        refresh_tokens::{self, device_name, dsl as rdsl},
+    }, utils::{generate_token, new_refresh_token_cookie}, Data
 };
 
 use super::Response;
@@ -53,6 +50,7 @@ pub async fn res(req: HttpRequest, data: web::Data<Data>) -> Result<HttpResponse
         }
 
         let current_time = SystemTime::now().duration_since(UNIX_EPOCH)?.as_secs() as i64;
+        let existing_device_name: String;
 
         if lifetime > 1987200 {
             let new_refresh_token = generate_token::<32>()?;
@@ -63,11 +61,13 @@ pub async fn res(req: HttpRequest, data: web::Data<Data>) -> Result<HttpResponse
                     rdsl::token.eq(&new_refresh_token),
                     rdsl::created_at.eq(current_time),
                 ))
-                .execute(&mut conn)
+                .returning(rdsl::device_name)
+                .get_result::<String>(&mut conn)
                 .await
             {
-                Ok(_) => {
+                Ok(device_name) => {
                     refresh_token = new_refresh_token;
+                    existing_device_name = device_name.to_string();
                 }
                 Err(error) => {
                     error!("{error}");
@@ -77,15 +77,6 @@ pub async fn res(req: HttpRequest, data: web::Data<Data>) -> Result<HttpResponse
 
         let access_token = generate_token::<16>()?;
 
-        let device_name: String;
-        
-        // fix me tomorrow
-        // let devices: Vec<Device> = dsl::refresh_tokens
-        //     .filter(dsl::uuid.eq(uuid))
-        //     .select(Device::as_select())
-        //     .get_results(&mut conn)
-        //     .await?;
-
         update(access_tokens::table)
             .filter(dsl::refresh_token.eq(&refresh_token))
             .set((
@@ -97,7 +88,7 @@ pub async fn res(req: HttpRequest, data: web::Data<Data>) -> Result<HttpResponse
 
         return Ok(HttpResponse::Ok()
             .cookie(new_refresh_token_cookie(&data.config, refresh_token))
-            .json(Response { access_token, device_name }));
+            .json(Response { access_token, existing_device_name }));
     }
 
     refresh_token_cookie.make_removal();
diff --git a/src/word_list.rs b/src/generate_device_name.rs
similarity index 100%
rename from src/word_list.rs
rename to src/generate_device_name.rs