From 2c6434e0b89e93ab6bdddb28bcd059b48638cb0d Mon Sep 17 00:00:00 2001
From: Santo Cariotti <santo@dcariotti.me>
Date: Sat, 3 Sep 2022 12:10:20 +0200
Subject: Users has username and use it for login

---
 src/routes/auth.rs | 10 +++++-----
 src/routes/user.rs |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/routes')

diff --git a/src/routes/auth.rs b/src/routes/auth.rs
index 37c41b2..b667b97 100644
--- a/src/routes/auth.rs
+++ b/src/routes/auth.rs
@@ -1,7 +1,7 @@
 use crate::errors::AppError;
 use crate::models::{
-    auth::{AuthBody, Claims},
-    user::{User, UserCreate},
+    auth::{AuthBody, Claims, LoginCredentials},
+    user::User,
 };
 use axum::{routing::post, Json, Router};
 
@@ -12,14 +12,14 @@ pub fn create_route() -> Router {
 
 /// Make login. Check if a user with the email and password passed in request body exists into the
 /// database
-async fn make_login(Json(payload): Json<UserCreate>) -> Result<Json<AuthBody>, AppError> {
-    let user = User::new(payload.email, payload.password);
+async fn make_login(Json(payload): Json<LoginCredentials>) -> Result<Json<AuthBody>, AppError> {
+    let user = User::new(String::new(), payload.username, payload.password);
     match User::find(user).await {
         Ok(user) => {
             let claims = Claims::new(user.id);
             let token = claims.get_token()?;
             Ok(Json(AuthBody::new(token)))
         }
-        Err(_) => Err(AppError::NotFound),
+        Err(_) => Err(AppError::NotFound("User not found".to_string())),
     }
 }
diff --git a/src/routes/user.rs b/src/routes/user.rs
index d44df66..3dfb73a 100644
--- a/src/routes/user.rs
+++ b/src/routes/user.rs
@@ -24,7 +24,7 @@ async fn create_user(
     Json(payload): Json<UserCreate>,
     _: Claims,
 ) -> Result<Json<UserList>, AppError> {
-    let user = User::new(payload.email, payload.password);
+    let user = User::new(payload.email, payload.username, payload.password);
     let user_new = User::create(user).await?;
 
     Ok(Json(user_new))
@@ -34,6 +34,6 @@ async fn create_user(
 async fn get_user(Path(user_id): Path<i32>, _: Claims) -> Result<Json<UserList>, AppError> {
     match User::find_by_id(user_id).await {
         Ok(user) => Ok(Json(user)),
-        Err(_) => Err(AppError::NotFound),
+        Err(_) => Err(AppError::NotFound("User not found".to_string())),
     }
 }
-- 
cgit v1.2.3-71-g8e6c