Login endpoint bug fix (#24)

Reviewed-on: #24
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>

src/callers/common.rs

@@ -1,30 +1,37 @@
-use axum::{Extension, Json, http::StatusCode};
+pub mod response {
+    use serde::{Deserialize, Serialize};
 
-use serde::{Deserialize, Serialize};
-
-#[derive(Deserialize, Serialize)]
-pub struct TestResult {
-    message: String,
-}
-
-// basic handler that responds with a static string
-pub async fn root() -> &'static str {
-    "Hello, World!"
-}
-
-pub async fn db_ping(Extension(pool): Extension<sqlx::PgPool>) -> (StatusCode, Json<TestResult>) {
-    match sqlx::query("SELECT 1").execute(&pool).await {
-        Ok(_) => {
-            let tr = TestResult {
-                message: String::from("This works"),
-            };
-            (StatusCode::OK, Json(tr))
-        }
-        Err(e) => (
-            StatusCode::BAD_REQUEST,
-            Json(TestResult {
-                message: e.to_string(),
-            }),
-        ),
+    #[derive(Deserialize, Serialize)]
+    pub struct TestResult {
+        pub message: String,
+    }
+}
+
+pub mod endpoint {
+    use super::*;
+    use axum::{Extension, Json, http::StatusCode};
+
+    // basic handler that responds with a static string
+    pub async fn root() -> &'static str {
+        "Hello, World!"
+    }
+
+    pub async fn db_ping(
+        Extension(pool): Extension<sqlx::PgPool>,
+    ) -> (StatusCode, Json<response::TestResult>) {
+        match sqlx::query("SELECT 1").execute(&pool).await {
+            Ok(_) => {
+                let tr = response::TestResult {
+                    message: String::from("This works"),
+                };
+                (StatusCode::OK, Json(tr))
+            }
+            Err(e) => (
+                StatusCode::BAD_REQUEST,
+                Json(response::TestResult {
+                    message: e.to_string(),
+                }),
+            ),
+        }
     }
 }

src/callers/login.rs

@@ -45,45 +45,30 @@ pub mod endpoint {
         // Check if user exists
         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;
+                if hashing::verify_password(&payload.password, user.password.clone()).unwrap() {
+                    // Create token
+                    let key = token_stuff::get_key().unwrap();
+                    let (token_literal, duration) = token_stuff::create_token(&key).unwrap();
 
-                // Check if password is correct
-                match hashing::hash_password(&unhashed_password, &salt_str) {
-                    Ok(hash_password) => {
-                        if hashing::verify_password(&unhashed_password, hash_password.clone())
-                            .unwrap()
-                        {
-                            // Create token
-                            let key = token_stuff::get_key().unwrap();
-                            let (token_literal, duration) =
-                                token_stuff::create_token(&key).unwrap();
-
-                            if token_stuff::verify_token(&key, &token_literal) {
-                                (
-                                    StatusCode::OK,
-                                    Json(response::Response {
-                                        message: String::from("Successful"),
-                                        data: vec![icarus_models::login_result::LoginResult {
-                                            id: user.id,
-                                            username: user.username,
-                                            token: token_literal,
-                                            token_type: String::from(token_stuff::TOKENTYPE),
-                                            expiration: duration,
-                                        }],
-                                    }),
-                                )
-                            } else {
-                                return not_found("Could not verify password").await;
-                            }
-                        } else {
-                            return not_found("Error Hashing").await;
-                        }
-                    }
-                    Err(err) => {
-                        return not_found(&err.to_string()).await;
+                    if token_stuff::verify_token(&key, &token_literal) {
+                        (
+                            StatusCode::OK,
+                            Json(response::Response {
+                                message: String::from("Successful"),
+                                data: vec![icarus_models::login_result::LoginResult {
+                                    id: user.id,
+                                    username: user.username,
+                                    token: token_literal,
+                                    token_type: String::from(token_stuff::TOKENTYPE),
+                                    expiration: duration,
+                                }],
+                            }),
+                        )
+                    } else {
+                        return not_found("Could not verify password").await;
                     }
+                } else {
+                    return not_found("Error Hashing").await;
                 }
             }
             Err(err) => {