diff --git a/src/lib.rs b/src/lib.rs index f99fbf7..fa9de13 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,3 +1,4 @@ pub mod dto; pub mod errors; +pub mod middlewares; pub mod providers; diff --git a/src/main.rs b/src/main.rs index 4ca9145..ee262c1 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,7 +1,7 @@ -mod auth; mod docs; mod dto; mod errors; +mod middlewares; mod providers; mod routes; mod state; diff --git a/src/auth/jwt.rs b/src/middlewares/auth/jwt.rs similarity index 100% rename from src/auth/jwt.rs rename to src/middlewares/auth/jwt.rs diff --git a/src/auth/keycloak.rs b/src/middlewares/auth/keycloak.rs similarity index 100% rename from src/auth/keycloak.rs rename to src/middlewares/auth/keycloak.rs diff --git a/src/auth/middleware.rs b/src/middlewares/auth/middleware.rs similarity index 97% rename from src/auth/middleware.rs rename to src/middlewares/auth/middleware.rs index 2ae7be8..18313fc 100644 --- a/src/auth/middleware.rs +++ b/src/middlewares/auth/middleware.rs @@ -1,6 +1,6 @@ use axum::{extract::Request, http::StatusCode, middleware::Next, response::Response}; -use crate::auth::{ +use crate::middlewares::auth::{ jwt::validate_token, keycloak::{get_jwks, refresh_jwks}, }; diff --git a/src/auth/mod.rs b/src/middlewares/auth/mod.rs similarity index 57% rename from src/auth/mod.rs rename to src/middlewares/auth/mod.rs index 2370243..f09dc4f 100644 --- a/src/auth/mod.rs +++ b/src/middlewares/auth/mod.rs @@ -1,3 +1,5 @@ pub mod jwt; pub mod keycloak; pub mod middleware; + +pub use middleware::auth_middleware; diff --git a/src/middlewares/mod.rs b/src/middlewares/mod.rs new file mode 100644 index 0000000..0e4a05d --- /dev/null +++ b/src/middlewares/mod.rs @@ -0,0 +1 @@ +pub mod auth; diff --git a/src/routes/v1/mod.rs b/src/routes/v1/mod.rs index a4b3028..dcaa7cc 100644 --- a/src/routes/v1/mod.rs +++ b/src/routes/v1/mod.rs @@ -1,8 +1,8 @@ pub mod chat; pub mod models; -use crate::auth::middleware::auth_middleware; use crate::docs::ApiDoc; +use crate::middlewares::auth::auth_middleware; use crate::state::app_state::AppState; use axum::{Json, Router, middleware, routing::get, routing::post}; use utoipa::OpenApi;