refactor

Author: pemattern

docker-compose.yml

@@ -33,19 +33,19 @@ services:
       timeout: 5s
       retries: 5
 
-  open-erase-iso-builder:
-    container_name: open-erase-iso-builder
-    image: open-erase-iso-builder
-    cap_add:
-      - SYS_ADMIN
-    stdin_open: true
-    build:
-      context: .
-      dockerfile: iso-builder.Dockerfile
-    volumes:
-      - iso:/iso/out
-    command: >
-      sh -c "ls -a && mkarchiso -v -w /tmp/archiso-tmp -o /iso/out /iso"
+  # open-erase-iso-builder:
+  #   container_name: open-erase-iso-builder
+  #   image: open-erase-iso-builder
+  #   cap_add:
+  #     - SYS_ADMIN
+  #   stdin_open: true
+  #   build:
+  #     context: .
+  #     dockerfile: iso-builder.Dockerfile
+  #   volumes:
+  #     - iso:/iso/out
+  #   command: >
+  #     sh -c "ls -a && mkarchiso -v -w /tmp/archiso-tmp -o /iso/out /iso"
 
 volumes:
   db:

server/Cargo.toml

@@ -13,6 +13,7 @@ chrono = { version = "0.4.42", features = ["serde"] }
 getrandom = "0.3.4"
 jsonwebtoken = "9.3.1"
 serde = { version = "1.0.228", features = ["derive"] }
+serde_json = "1.0.145"
 sqlx = { version = "0.8.6", features = [
   "chrono",
   "postgres",
@@ -37,4 +38,3 @@ utoipa-swagger-ui = { version = "9.0.2", features = ["axum"] }
 uuid = { version = "1.18.1", features = ["serde"] }
 
 [dev-dependencies]
-serde_json = "1.0.145"

server/src/error.rs

@@ -58,6 +58,7 @@ pub enum ServiceError {
     Hash(argon2::password_hash::Error),
     Token(jsonwebtoken::errors::Error),
     Uuid(uuid::Error),
+    Serialization(serde_json::Error),
 }
 
 impl IntoResponse for ServiceError {
@@ -92,6 +93,12 @@ impl From<uuid::Error> for ServiceError {
     }
 }
 
+impl From<serde_json::Error> for ServiceError {
+    fn from(value: serde_json::Error) -> Self {
+        Self::Serialization(value)
+    }
+}
+
 #[allow(dead_code)]
 #[derive(Debug)]
 pub enum RepositoryError {
@@ -118,6 +125,7 @@ impl From<ServiceError> for ErrorResponse {
             ServiceError::Hash(_error) => ErrorResponse::unauthorized(),
             ServiceError::Token(_error) => ErrorResponse::internal_server_error(),
             ServiceError::Uuid(_error) => ErrorResponse::internal_server_error(),
+            ServiceError::Serialization(_error) => ErrorResponse::internal_server_error(),
         }
     }
 }

server/src/handlers/auth.rs

@@ -1,9 +1,9 @@
-use axum::{Extension, extract::State};
+use axum::{Extension, Json, extract::State};
 
 use crate::{
     error::AppResult,
     models::User,
-    schemas::token::{LoginResponse, RefreshResponse},
+    schemas::token::{LoginResponse, RefreshRequest, RefreshResponse},
     state::AppState,
 };
 
@@ -23,6 +23,7 @@ pub async fn login(
 pub async fn refresh(
     State(state): State<AppState>,
     Extension(user): Extension<User>,
+    Json(refresh_request): Json<RefreshRequest>,
 ) -> AppResult<RefreshResponse> {
     let access_token = state.auth_service.generate_access_token(&user)?;
     Ok(RefreshResponse::new(access_token))

server/src/middleware/auth.rs

@@ -42,15 +42,15 @@ pub async fn validate_basic_auth(
     next: Next,
 ) -> AppResult<impl IntoResponse> {
     let authorization_header = header_result.map_err(|_| ClientError::Unauthorized)?;
+
     let user = state
-        .user_service
-        .find_user_by_email(authorization_header.username())
+        .auth_service
+        .validate_basic_auth(
+            authorization_header.username(),
+            authorization_header.password(),
+        )
         .await?
         .ok_or(ClientError::Unauthorized)?;
-    state
-        .auth_service
-        .verify_password(authorization_header.password(), &user.password_hash)
-        .map_err(|_| ClientError::Unauthorized)?;
     request.extensions_mut().insert(user);
     Ok(next.run(request).await)
 }

server/src/models/refresh_token.rs

@@ -1,4 +1,4 @@
-use chrono::{DateTime, Local};
+use chrono::{DateTime, Utc};
 use sqlx::FromRow;
 use uuid::Uuid;
 
@@ -7,6 +7,6 @@ pub struct RefreshToken {
     pub id: Uuid,
     pub user_id: Uuid,
     pub refresh_token_hash: String,
-    pub created_at: DateTime<Local>,
-    pub updated_at: DateTime<Local>,
+    pub created_at: DateTime<Utc>,
+    pub updated_at: DateTime<Utc>,
 }

server/src/models/user.rs

@@ -1,4 +1,4 @@
-use chrono::{DateTime, Local};
+use chrono::{DateTime, Utc};
 use sqlx::prelude::FromRow;
 use uuid::Uuid;
 
@@ -7,6 +7,6 @@ pub struct User {
     pub id: Uuid,
     pub email: String,
     pub password_hash: String,
-    pub created_at: DateTime<Local>,
-    pub updated_at: DateTime<Local>,
+    pub created_at: DateTime<Utc>,
+    pub updated_at: DateTime<Utc>,
 }

server/src/repositories/mocks/refresh_token.rs

@@ -1,7 +1,7 @@
 use std::sync::{Arc, Mutex};
 
 use async_trait::async_trait;
-use chrono::{DateTime, Local};
+use chrono::DateTime;
 use uuid::Uuid;
 
 use crate::{

server/src/schemas/mod.rs

@@ -1,2 +1,10 @@
+use serde::Serialize;
+
+use crate::error::ServiceResult;
+
 pub mod token;
 pub mod user;
+
+fn json<T: Serialize>(val: T) -> ServiceResult<String> {
+    Ok(serde_json::to_string_pretty(&val)?)
+}

server/src/schemas/token.rs

@@ -1,9 +1,11 @@
 use axum::{
-    Json,
     http::{StatusCode, header},
     response::{IntoResponse, Response},
 };
 use serde::{Deserialize, Serialize};
+use utoipa::ToSchema;
+
+use crate::schemas::json;
 
 #[derive(Serialize)]
 pub struct LoginResponse {
@@ -35,13 +37,13 @@ impl IntoResponse for LoginResponse {
                     &refresh_token_cookie(&self.refresh_token),
                 ),
             ],
-            Json(self),
+            json(self),
         )
             .into_response()
     }
 }
 
-#[derive(Deserialize)]
+#[derive(Deserialize, ToSchema)]
 pub struct RefreshRequest {
     pub access_token: String,
 }
@@ -70,7 +72,7 @@ impl IntoResponse for RefreshResponse {
                 (header::CACHE_CONTROL, "no-store"),
                 (header::PRAGMA, "no-cache"),
             ],
-            Json(self),
+            json(self),
         )
             .into_response()
     }