From b8b8d5713fdef52538a612d4a042b38e21749938 Mon Sep 17 00:00:00 2001 From: Vitor Hideyoshi Nakazone Batista Date: Sun, 25 Feb 2024 02:11:17 -0300 Subject: [PATCH] Reformats Code --- src/config/config_auth.rs | 11 ++++------- src/config/config_server.rs | 18 ++++++++---------- src/config/mod.rs | 2 +- src/handler/health.rs | 1 - src/handler/message.rs | 8 +++++--- src/main.rs | 10 +++++----- src/middleware/auth_middleware.rs | 17 ++++++++++------- src/middleware/mod.rs | 2 +- src/model/mod.rs | 2 +- src/route.rs | 13 ++++++++----- src/service/auth_service.rs | 12 +++++++----- src/service/email_service.rs | 2 +- src/service/mod.rs | 2 +- 13 files changed, 52 insertions(+), 48 deletions(-) diff --git a/src/config/config_auth.rs b/src/config/config_auth.rs index 571858d..2e3bbcf 100644 --- a/src/config/config_auth.rs +++ b/src/config/config_auth.rs @@ -1,5 +1,5 @@ -use std::env; use cached::proc_macro::cached; +use std::env; #[derive(Clone)] pub struct ConfigAuth { @@ -8,10 +8,7 @@ pub struct ConfigAuth { #[cached] pub fn get_config_auth() -> ConfigAuth { - let url = env::var("AUTH_URL") - .expect("AUTH_URL must be set"); + let url = env::var("AUTH_URL").expect("AUTH_URL must be set"); - ConfigAuth { - auth_url: url, - } -} \ No newline at end of file + ConfigAuth { auth_url: url } +} diff --git a/src/config/config_server.rs b/src/config/config_server.rs index 2daf1a2..02c7bf1 100644 --- a/src/config/config_server.rs +++ b/src/config/config_server.rs @@ -1,5 +1,5 @@ -use std::env; use cached::proc_macro::cached; +use std::env; #[derive(Clone)] pub struct ConfigServer { @@ -9,14 +9,12 @@ pub struct ConfigServer { #[cached] pub fn get_config_server() -> ConfigServer { - let h = option_env!("HOST") - .unwrap_or("localhost").to_string(); + let h = option_env!("HOST").unwrap_or("localhost").to_string(); - let p = option_env!("PORT").unwrap_or("8500") - .parse::().unwrap(); + let p = option_env!("PORT") + .unwrap_or("8500") + .parse::() + .unwrap(); - ConfigServer { - host: h, - port: p, - } -} \ No newline at end of file + ConfigServer { host: h, port: p } +} diff --git a/src/config/mod.rs b/src/config/mod.rs index 632fda3..e52aa14 100644 --- a/src/config/mod.rs +++ b/src/config/mod.rs @@ -1,2 +1,2 @@ +pub mod config_auth; pub mod config_server; -pub mod config_auth; \ No newline at end of file diff --git a/src/handler/health.rs b/src/handler/health.rs index a13ec8d..2d58860 100644 --- a/src/handler/health.rs +++ b/src/handler/health.rs @@ -1,7 +1,6 @@ use crate::model::generic_response::GenericResponse; use axum::{http::StatusCode, response::IntoResponse, Json}; - pub async fn health_check() -> impl IntoResponse { const MESSAGE: &str = "Server is running"; let response = GenericResponse { diff --git a/src/handler/message.rs b/src/handler/message.rs index 93eaeef..8fb4c42 100644 --- a/src/handler/message.rs +++ b/src/handler/message.rs @@ -1,9 +1,11 @@ use crate::model::send_message::{MessageAuthor, SendMessage}; -use axum::{http::StatusCode, response::IntoResponse, Json, Extension}; use axum::extract::State; +use axum::{http::StatusCode, response::IntoResponse, Extension, Json}; - -pub async fn send_message(Extension(auther): Extension, Json(payload): Json) -> impl IntoResponse { +pub async fn send_message( + Extension(auther): Extension, + Json(payload): Json, +) -> impl IntoResponse { let mut response = payload.clone(); response.author = Some(auther).clone(); diff --git a/src/main.rs b/src/main.rs index b52f29a..af6fa53 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,13 +1,12 @@ +mod config; mod handler; mod middleware; mod model; mod route; -mod config; mod service; use crate::config::config_server; - #[tokio::main] async fn main() { dotenv::dotenv().ok(); @@ -16,8 +15,9 @@ async fn main() { let app = route::create_route(); println!("🚀 Server started successfully"); - let listener = tokio::net::TcpListener::bind( - format!("{}:{}", server_config.host, server_config.port) - ).await.unwrap(); + let listener = + tokio::net::TcpListener::bind(format!("{}:{}", server_config.host, server_config.port)) + .await + .unwrap(); axum::serve(listener, app).await.unwrap(); } diff --git a/src/middleware/auth_middleware.rs b/src/middleware/auth_middleware.rs index ff73ded..79414e8 100644 --- a/src/middleware/auth_middleware.rs +++ b/src/middleware/auth_middleware.rs @@ -1,17 +1,20 @@ -use axum::{response::Response, middleware::Next, extract::Request, http::StatusCode, Extension}; use crate::service::auth_service::AuthService; +use axum::{extract::Request, http::StatusCode, middleware::Next, response::Response, Extension}; - -pub async fn auth_middleware(Extension(auth_service): Extension, mut request: Request, next: Next) -> Result { +pub async fn auth_middleware( + Extension(auth_service): Extension, + mut request: Request, + next: Next, +) -> Result { let token = get_token(&request).ok_or(StatusCode::UNAUTHORIZED)?; return match auth_service.validate_token(&token).await { Some(author) => { request.extensions_mut().insert(author); Ok(next.run(request).await) - }, - None => Err(StatusCode::UNAUTHORIZED) - } + } + None => Err(StatusCode::UNAUTHORIZED), + }; } fn get_token(req: &Request) -> Option { @@ -19,4 +22,4 @@ fn get_token(req: &Request) -> Option { .get(http::header::AUTHORIZATION) .and_then(|header| header.to_str().ok()) .map(|header| header.replace("Bearer ", "")) -} \ No newline at end of file +} diff --git a/src/middleware/mod.rs b/src/middleware/mod.rs index e12d527..2a709c0 100644 --- a/src/middleware/mod.rs +++ b/src/middleware/mod.rs @@ -1 +1 @@ -pub mod auth_middleware; \ No newline at end of file +pub mod auth_middleware; diff --git a/src/model/mod.rs b/src/model/mod.rs index b4941c6..7b02dcc 100644 --- a/src/model/mod.rs +++ b/src/model/mod.rs @@ -1,2 +1,2 @@ pub mod generic_response; -pub mod send_message; \ No newline at end of file +pub mod send_message; diff --git a/src/route.rs b/src/route.rs index de174e2..87da588 100644 --- a/src/route.rs +++ b/src/route.rs @@ -1,14 +1,18 @@ +use crate::config::config_auth; use crate::handler::health::health_check; use crate::handler::message::send_message; -use axum::{routing::{get, post}, Router, middleware, Extension}; -use crate::config::config_auth; use crate::middleware::auth_middleware::auth_middleware; use crate::service::auth_service::AuthService; use crate::service::email_service::EmailService; - +use axum::{ + middleware, + routing::{get, post}, + Extension, Router, +}; fn configure_message_endpoint(router: Router) -> Router { - router.route("/message", post(send_message)) + router + .route("/message", post(send_message)) .layer(middleware::from_fn(auth_middleware)) .layer(Extension(AuthService::new(config_auth::get_config_auth()))) .layer(Extension(EmailService::new())) @@ -18,7 +22,6 @@ fn configure_health_endpoint(router: Router) -> Router { router.route("/health", get(health_check)) } - pub fn create_route() -> Router { let mut router = Router::new(); diff --git a/src/service/auth_service.rs b/src/service/auth_service.rs index 46fe3a8..e8aa4d0 100644 --- a/src/service/auth_service.rs +++ b/src/service/auth_service.rs @@ -1,7 +1,6 @@ -use reqwest::header::AUTHORIZATION; use crate::config::config_auth::ConfigAuth; use crate::model::send_message::MessageAuthor; - +use reqwest::header::AUTHORIZATION; #[derive(Clone)] pub struct AuthService { @@ -21,9 +20,12 @@ impl AuthService { let validation_url = format!("{}/user/login/validate", self.auth_url); let client = reqwest::Client::new(); - let response = client.post(validation_url.as_str()) + let response = client + .post(validation_url.as_str()) .header(AUTHORIZATION, format!("Bearer {}", token)) - .send().await.unwrap(); + .send() + .await + .unwrap(); if response.status().is_success() { let text = response.text().await.unwrap(); @@ -32,4 +34,4 @@ impl AuthService { None } -} \ No newline at end of file +} diff --git a/src/service/email_service.rs b/src/service/email_service.rs index 1db94fa..9845ab4 100644 --- a/src/service/email_service.rs +++ b/src/service/email_service.rs @@ -5,4 +5,4 @@ impl EmailService { pub fn new() -> Self { EmailService {} } -} \ No newline at end of file +} diff --git a/src/service/mod.rs b/src/service/mod.rs index b236267..0645f02 100644 --- a/src/service/mod.rs +++ b/src/service/mod.rs @@ -1,2 +1,2 @@ pub mod auth_service; -pub mod email_service; \ No newline at end of file +pub mod email_service;