feat: refacto auth

Cargo.toml

@@ -9,7 +9,8 @@ async-trait = "0.1.89"
 base64 = "0.22.1"
 chrono = { version = "0.4", features = ["serde"] }
 futures-util = "0.3"
-mairie360_api_lib = "0.6.0"
+lettre = { version = "0.11", default-features = false, features = ["smtp-transport", "tokio1-rustls", "ring", "webpki-roots", "builder"] }
+mairie360_api_lib = "0.7.0"
 rand = "0.10"
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.140"
@@ -24,7 +25,6 @@ uuid = { version = "1.0", features = ["v4", "serde"] }
 serial_test = "3.3.1"
 once_cell = "1.21.3"
 
-
 [profile.dev]
 opt-level = 0
 

docker-compose.yml

@@ -42,7 +42,7 @@ x-service: &service-template
 
 services:
   postgres:
-    image: ghcr.io/mairie360/database:dev-c3cce15
+    image: ghcr.io/mairie360/database:dev-e9990d6
     restart: always
     container_name: mairie360-db-core-api
     environment:
@@ -62,7 +62,7 @@ services:
       retries: 5
 
   liquibase:
-    image: ghcr.io/mairie360/liquibase-migrations:dev-c3cce15
+    image: ghcr.io/mairie360/liquibase-migrations:dev-e9990d6
     container_name: mairie360-liquibase-core-api
     depends_on:
       postgres:
@@ -100,6 +100,7 @@ services:
     build:
       context: .
       dockerfile: development.Dockerfile
+    restart: always
     develop:
       watch:
         - action: sync
@@ -125,6 +126,11 @@ services:
       PUBLIC_URL: http://core.development.mairie360.fr
       JWT_SECRET: b"secret"
       JWT_TIMEOUT: 3600
+      SMTP_HOST: "mailpit" # Nom du service docker
+      SMTP_PORT: "1025" # Port SMTP de mailpit
+      SMTP_USERNAME: "" # Pas besoin d'authentification en local
+      SMTP_PASSWORD: "" # Pas besoin d'authentification en local
+      EMAIL_FROM: "noreply.mairie360@dev.local"
     depends_on:
       liquibase:
         condition: service_completed_successfully
@@ -137,6 +143,19 @@ services:
       retries: 5
       start_period: 90s
 
+  mailpit:
+    image: axllent/mailpit:v1.15
+    container_name: mairie360-mailpit
+    restart: always
+    ports:
+      - "8025:8025" # Interface Web pour voir les mails (http://localhost:8025)
+      - "1025:1025" # Le port SMTP pour ton code Rust
+    networks:
+      - backend
+    depends_on:
+      core:
+        condition: service_healthy
+
   nginx:
     image: nginx:1.29.1-bookworm
     restart: always
@@ -147,5 +166,5 @@ services:
     networks:
       - backend
     depends_on:
-      core:
+      mailpit:
         condition: service_healthy

entrypoint.sh

@@ -5,4 +5,4 @@ set -e
 cd /usr/src/core
 
 # Lancer cargo watch
-exec cargo watch -w src -i target -x run
+exec cargo watch --poll -w src -i target -x run

src/database/auth/change_password/mod.rs

@@ -0,0 +1,5 @@
+mod query;
+pub use query::change_password_query;
+
+mod view;
+pub use view::ChangePasswordQueryView;

src/database/auth/change_password/query.rs

@@ -0,0 +1,18 @@
+use mairie360_api_lib::database::db_interface::DatabaseQueryView;
+use mairie360_api_lib::database::errors::DatabaseError;
+use sqlx::PgPool;
+
+use crate::database::auth::change_password::ChangePasswordQueryView;
+
+pub async fn change_password_query(
+    view: ChangePasswordQueryView,
+    pool: PgPool,
+) -> Result<(), DatabaseError> {
+    sqlx::query(&view.get_request())
+        .bind(view.get_password())
+        .bind(view.get_user_id() as i32)
+        .execute(&pool)
+        .await?;
+
+    Ok(())
+}

src/database/auth/change_password/view.rs

@@ -0,0 +1,68 @@
+use mairie360_api_lib::database::db_interface::DatabaseQueryView;
+use std::fmt::Display;
+
+pub struct ChangePasswordQueryView {
+    password: String,
+    user_id: u64,
+}
+
+impl ChangePasswordQueryView {
+    pub fn new(password: &str, user_id: u64) -> Self {
+        Self {
+            password: password.to_string(),
+            user_id,
+        }
+    }
+
+    pub fn get_password(&self) -> &str {
+        &self.password
+    }
+
+    pub fn get_user_id(&self) -> u64 {
+        self.user_id
+    }
+}
+
+impl DatabaseQueryView for ChangePasswordQueryView {
+    fn get_request(&self) -> String {
+        "UPDATE users SET password = $1 WHERE id = $2".to_string()
+    }
+}
+
+impl Display for ChangePasswordQueryView {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "ChangePasswordQueryView: password = [PROTECTED]")
+    }
+}
+
+#[derive(Debug, sqlx::FromRow, PartialEq, Eq)]
+pub struct LoginUserQueryResultView {
+    #[sqlx(rename = "id")]
+    user_id: i32,
+    #[sqlx(rename = "password")]
+    password: String,
+    #[sqlx(rename = "first_connect")]
+    first_connect: bool,
+}
+
+impl LoginUserQueryResultView {
+    pub fn new(user_id: i32, password: String, first_connect: bool) -> Self {
+        Self {
+            user_id,
+            password,
+            first_connect,
+        }
+    }
+
+    pub fn password(&self) -> &str {
+        &self.password
+    }
+
+    pub fn user_id(&self) -> i32 {
+        self.user_id
+    }
+
+    pub fn first_connect(&self) -> bool {
+        self.first_connect
+    }
+}

src/database/auth/is_first_time/mod.rs

@@ -0,0 +1,5 @@
+mod query;
+pub use query::is_first_time_query;
+
+mod view;
+pub use view::IsFirstTimeQueryView;

src/database/auth/is_first_time/query.rs

@@ -0,0 +1,16 @@
+use crate::database::auth::is_first_time::IsFirstTimeQueryView;
+use mairie360_api_lib::database::db_interface::DatabaseQueryView;
+use mairie360_api_lib::database::errors::DatabaseError;
+use sqlx::PgPool;
+
+pub async fn is_first_time_query(
+    view: IsFirstTimeQueryView,
+    pool: PgPool,
+) -> Result<bool, DatabaseError> {
+    let result = sqlx::query_scalar::<_, bool>(&view.get_request())
+        .bind(view.user_id() as i32)
+        .fetch_one(&pool)
+        .await?;
+
+    Ok(result)
+}

src/database/auth/is_first_time/view.rs

@@ -0,0 +1,28 @@
+use mairie360_api_lib::database::db_interface::DatabaseQueryView;
+use std::fmt::Display;
+
+pub struct IsFirstTimeQueryView {
+    user_id: u64,
+}
+
+impl IsFirstTimeQueryView {
+    pub fn new(user_id: u64) -> Self {
+        Self { user_id }
+    }
+
+    pub fn user_id(&self) -> u64 {
+        self.user_id
+    }
+}
+
+impl DatabaseQueryView for IsFirstTimeQueryView {
+    fn get_request(&self) -> String {
+        "SELECT EXISTS(SELECT 1 FROM users WHERE id = $1) AS first_connect".to_string()
+    }
+}
+
+impl Display for IsFirstTimeQueryView {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "IsFirstTimeQueryView: user_id = {}", self.user_id)
+    }
+}

src/database/auth/login/mod.rs

@@ -2,7 +2,4 @@ mod query;
 pub use query::login_query;
 
 mod view;
-pub use view::LoginUserQueryView;
-
-mod result_view;
-pub use result_view::LoginUserQueryResultView;
+pub use view::{LoginUserQueryResultView, LoginUserQueryView};

src/database/auth/login/view.rs

@@ -22,7 +22,7 @@ impl LoginUserQueryView {
 
 impl DatabaseQueryView for LoginUserQueryView {
     fn get_request(&self) -> String {
-        "SELECT id, password FROM users WHERE email = $1".to_string()
+        "SELECT id, password, first_connect FROM users WHERE email = $1".to_string()
     }
 }
 
@@ -35,3 +35,35 @@ impl Display for LoginUserQueryView {
         )
     }
 }
+
+#[derive(Debug, sqlx::FromRow, PartialEq, Eq)]
+pub struct LoginUserQueryResultView {
+    #[sqlx(rename = "id")]
+    user_id: i32,
+    #[sqlx(rename = "password")]
+    password: String,
+    #[sqlx(rename = "first_connect")]
+    first_connect: bool,
+}
+
+impl LoginUserQueryResultView {
+    pub fn new(user_id: i32, password: String, first_connect: bool) -> Self {
+        Self {
+            user_id,
+            password,
+            first_connect,
+        }
+    }
+
+    pub fn password(&self) -> &str {
+        &self.password
+    }
+
+    pub fn user_id(&self) -> i32 {
+        self.user_id
+    }
+
+    pub fn first_connect(&self) -> bool {
+        self.first_connect
+    }
+}

src/database/auth/mod.rs

@@ -1,2 +1,5 @@
+pub mod change_password;
+pub mod is_first_time;
 pub mod login;
 pub mod register;
+pub mod unset_first_connection;

src/database/auth/unset_first_connection/mod.rs

@@ -0,0 +1,5 @@
+mod query;
+pub use query::unset_first_connection_query;
+
+mod view;
+pub use view::UnsetFirstConnectionQueryView;

src/database/auth/unset_first_connection/query.rs

@@ -0,0 +1,16 @@
+use crate::database::auth::unset_first_connection::UnsetFirstConnectionQueryView;
+use mairie360_api_lib::database::{db_interface::DatabaseQueryView, errors::DatabaseError};
+use sqlx::PgPool;
+
+pub async fn unset_first_connection_query(
+    view: UnsetFirstConnectionQueryView,
+    pool: PgPool,
+) -> Result<(), DatabaseError> {
+    sqlx::query(&view.get_request())
+        .bind(view.password())
+        .bind(view.user_id() as i32)
+        .execute(&pool)
+        .await?;
+
+    Ok(())
+}

src/database/auth/unset_first_connection/view.rs

@@ -0,0 +1,40 @@
+use mairie360_api_lib::database::db_interface::DatabaseQueryView;
+use std::fmt::Display;
+
+pub struct UnsetFirstConnectionQueryView {
+    user_id: u64,
+    password: String,
+}
+
+impl UnsetFirstConnectionQueryView {
+    pub fn new(user_id: u64, password: &str) -> Self {
+        Self {
+            user_id,
+            password: password.to_string(),
+        }
+    }
+
+    pub fn user_id(&self) -> u64 {
+        self.user_id
+    }
+
+    pub fn password(&self) -> &str {
+        &self.password
+    }
+}
+
+impl DatabaseQueryView for UnsetFirstConnectionQueryView {
+    fn get_request(&self) -> String {
+        "UPDATE users SET first_connect = false AND password = $1 WHERE id = $2".to_string()
+    }
+}
+
+impl Display for UnsetFirstConnectionQueryView {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "UnsetFirstConnectionQueryView: user_id = {}, password = [PROTECTED]",
+            self.user_id
+        )
+    }
+}

src/database/get_user_id/mod.rs

@@ -0,0 +1,5 @@
+mod query;
+pub use query::get_user_id_query;
+
+mod view;
+pub use view::GetUserIdQueryView;