Added login and updated register function

server/src/routes/auth.rs

@@ -1,15 +1,13 @@
 use axum::{extract::State, routing::post, Json, Router};
 
+use crate::auth::verify_password_hash;
 use crate::database::model::member::SearchMember;
 use crate::database::model::Member as DbMember;
 use crate::database::model::Session as DbSession;
 use crate::database::model::User as DbUser;
 use crate::database::model::UserMember as DbUserMember;
 use crate::model::session::Session;
-use crate::{
-    auth::{generate_password_hash, Permissions},
-    AppState,
-};
+use crate::{auth::generate_password_hash, AppState};
 
 pub fn routes() -> Router<AppState> {
     Router::new()
@@ -17,16 +15,36 @@ pub fn routes() -> Router<AppState> {
         .route("/auth/register", post(register))
 }
 
+#[derive(serde::Deserialize)]
+pub struct LoginRequest {
+    email: String,
+    password: String,
+}
+
 pub async fn login<'a>(
     State(state): State<AppState>,
-    permissions: Permissions<'a>,
-    body: String,
-) -> Result<(), crate::Error> {
-    Ok(())
+    Json(login_request): Json<LoginRequest>,
+) -> Result<String, crate::Error> {
+    let db_user = DbUser::get_from_email(&state.pool, login_request.email).await?;
+
+    match verify_password_hash(&login_request.password, &db_user.password).await {
+        Ok(_) => (),
+        Err(_err) => return Err(crate::Error::Auth(crate::auth::AuthError::InvalidPassword)),
+    };
+
+    // Create session
+    let mut transaction = state.pool.begin().await?;
+
+    let db_session: DbSession = Session::new(db_user.user_id).into();
+    db_session.insert(&mut transaction).await?;
+
+    transaction.commit().await?;
+
+    Ok(db_session.token)
 }
 
 #[derive(serde::Deserialize)]
-pub struct AuthRequest {
+pub struct RegisterRequest {
     email: String,
     password: String,
     registration_tokens: Vec<String>,
@@ -34,8 +52,7 @@ pub struct AuthRequest {
 
 pub async fn register<'a>(
     State(state): State<AppState>,
-    permissions: Permissions<'a>,
-    Json(auth_request): Json<AuthRequest>,
+    Json(auth_request): Json<RegisterRequest>,
 ) -> Result<String, crate::Error> {
     // Get all the members to link with the user
     let members = DbMember::search(

server/src/routes/member.rs

@@ -6,8 +6,8 @@ pub mod migrate;
 
 pub fn routes() -> Router<AppState> {
     Router::new()
-    // .route("/members/migrate_request", post(migrate::migrate_request))
-    // .route("/members/migrate_confirm", post(migrate::migrate_confirm))
+        .route("/members/migrate_request", post(migrate::migrate_request))
+        .route("/members/migrate_confirm", post(migrate::migrate_confirm))
 }
 
 pub async fn get_members<'a>(