From 7cac6d5aae9ff8b0ab673533dcec1879f21ed623 Mon Sep 17 00:00:00 2001
From: phoenix <kundeng00@pm.me>
Date: Mon, 7 Apr 2025 12:31:58 -0400
Subject: [PATCH] Code refactor

---
 src/callers/login.rs | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/callers/login.rs b/src/callers/login.rs
index 4724a88..76a4272 100644
--- a/src/callers/login.rs
+++ b/src/callers/login.rs
@@ -42,23 +42,19 @@ pub mod endpoint {
         axum::Extension(pool): axum::Extension<sqlx::PgPool>,
         Json(payload): Json<request::Request>,
     ) -> (StatusCode, Json<response::Response>) {
-        let usr = icarus_models::user::User {
-            username: payload.username,
-            password: payload.password,
-            ..Default::default()
-        };
-
         // Check if user exists
-        // match repo::user::exists(&pool, &usr.username).await {
-        match repo::user::get(&pool, &usr.username).await {
+        match repo::user::get(&pool, &payload.username).await {
             Ok(user) => {
                 let salt = repo::salt::get(&pool, &user.salt_id).await.unwrap();
                 let salt_str = hashing::get_salt(&salt.salt).unwrap();
+                let unhashed_password = payload.password;
 
                 // Check if password is correct
-                match hashing::hash_password(&usr.password, &salt_str) {
+                match hashing::hash_password(&unhashed_password, &salt_str) {
                     Ok(hash_password) => {
-                        if hashing::verify_password(&usr.password, hash_password.clone()).unwrap() {
+                        if hashing::verify_password(&unhashed_password, hash_password.clone())
+                            .unwrap()
+                        {
                             // Create token
                             let key = token_stuff::get_key().unwrap();
                             let (token_literal, duration) =
@@ -94,7 +90,5 @@ pub mod endpoint {
                 return not_found(&err.to_string()).await;
             }
         }
-
-        // let user = repo::user::get(&pool, &usr.username).await.unwrap();
     }
 }