From 02f29f3a994831e4f77d31c2b3d0dbaaddd051bf Mon Sep 17 00:00:00 2001 From: Rogier Reerink Date: Sun, 11 Oct 2026 08:16:10 +0200 Subject: [PATCH] Neater extractor imports. --- server/src/error.rs | 5 +---- server/src/routes/accounts.rs | 2 +- server/src/routes/auth_token.rs | 2 +- server/src/routes/extractors.rs | 16 +++++++++++----- server/src/routes/extractors/auth.rs | 3 ++- server/src/routes/scheduled_transactions.rs | 2 +- server/src/routes/transactions.rs | 2 +- server/src/routes/user_app_secrets.rs | 2 +- server/src/routes/user_apps.rs | 2 +- server/src/routes/users.rs | 2 +- 10 files changed, 21 insertions(+), 17 deletions(-) diff --git a/server/src/error.rs b/server/src/error.rs index 36430ed..a0f5efd 100644 --- a/server/src/error.rs +++ b/server/src/error.rs @@ -8,10 +8,7 @@ use axum::{ use crate::{ domain::DomainError, repository::RepositoryError, - routes::extractors::{ - ExtractorError, - auth::{AuthError, AuthHeaderError, BearerError}, - }, + routes::extractors::{AuthError, AuthHeaderError, BearerError, ExtractorError}, }; #[derive(Debug, thiserror::Error)] diff --git a/server/src/routes/accounts.rs b/server/src/routes/accounts.rs index 85b4115..b66adc5 100644 --- a/server/src/routes/accounts.rs +++ b/server/src/routes/accounts.rs @@ -5,7 +5,7 @@ use uuid::Uuid; use super::{ dtos::account::{AccountRequest, AccountResponse}, - extractors::{auth::Auth, json::Json, path::Path, query::Query}, + extractors::{Auth, Json, Path, Query}, }; use crate::{error::AppError, repository}; diff --git a/server/src/routes/auth_token.rs b/server/src/routes/auth_token.rs index b5fec36..9438a3a 100644 --- a/server/src/routes/auth_token.rs +++ b/server/src/routes/auth_token.rs @@ -10,7 +10,7 @@ use crate::{ repository, routes::{ dtos::token::{TokenRequest, TokenResponse, TokenRevocationRequest, TokenType}, - extractors::{form::Form, json::Json}, + extractors::{Form, Json}, }, }; diff --git a/server/src/routes/extractors.rs b/server/src/routes/extractors.rs index 026c30e..8f8ce0b 100644 --- a/server/src/routes/extractors.rs +++ b/server/src/routes/extractors.rs @@ -2,11 +2,17 @@ use axum::response::IntoResponse; use crate::error::AppError; -pub mod auth; -pub mod form; -pub mod json; -pub mod path; -pub mod query; +mod auth; +mod form; +mod json; +mod path; +mod query; + +pub use auth::*; +pub use form::*; +pub use json::*; +pub use path::*; +pub use query::*; #[derive(Debug, thiserror::Error)] pub enum ExtractorError { diff --git a/server/src/routes/extractors/auth.rs b/server/src/routes/extractors/auth.rs index 69853b7..9d37925 100644 --- a/server/src/routes/extractors/auth.rs +++ b/server/src/routes/extractors/auth.rs @@ -8,7 +8,8 @@ pub use bearer::*; pub use header::*; pub use principal::*; -use crate::{repository::RepositoryError, routes::extractors::ExtractorError}; +use super::ExtractorError; +use crate::repository::RepositoryError; #[derive(Debug)] pub struct Auth(pub Principal); diff --git a/server/src/routes/scheduled_transactions.rs b/server/src/routes/scheduled_transactions.rs index dddd4fe..3f86b76 100644 --- a/server/src/routes/scheduled_transactions.rs +++ b/server/src/routes/scheduled_transactions.rs @@ -10,7 +10,7 @@ use super::{ dtos::scheduled_transaction::{ RecurringTransactionResponse, ScheduledTransactionRequest, ScheduledTransactionResponse, }, - extractors::{auth::Auth, json::Json, path::Path, query::Query}, + extractors::{Auth, Json, Path, Query}, }; use crate::{ domain, diff --git a/server/src/routes/transactions.rs b/server/src/routes/transactions.rs index 31431fc..25816c7 100644 --- a/server/src/routes/transactions.rs +++ b/server/src/routes/transactions.rs @@ -7,7 +7,7 @@ use uuid::Uuid; use super::{ dtos::transaction::{TransactionRequest, TransactionResponse}, - extractors::{auth::Auth, json::Json, path::Path, query::Query}, + extractors::{Auth, Json, Path, Query}, }; use crate::{ domain, diff --git a/server/src/routes/user_app_secrets.rs b/server/src/routes/user_app_secrets.rs index 12e9b46..a20e148 100644 --- a/server/src/routes/user_app_secrets.rs +++ b/server/src/routes/user_app_secrets.rs @@ -7,7 +7,7 @@ use super::{ dtos::user_app_secret::{ CreatedUserAppSecretResponse, UserAppSecretRequest, UserAppSecretResponse, }, - extractors::{auth::Auth, json::Json, path::Path, query::Query}, + extractors::{Auth, Json, Path, Query}, }; use crate::{ crypto::{generate_secret, hash_secret}, diff --git a/server/src/routes/user_apps.rs b/server/src/routes/user_apps.rs index 48dfd52..0f457dc 100644 --- a/server/src/routes/user_apps.rs +++ b/server/src/routes/user_apps.rs @@ -5,7 +5,7 @@ use uuid::Uuid; use super::{ dtos::user_app::{UserAppRequest, UserAppResponse}, - extractors::{auth::Auth, json::Json, path::Path, query::Query}, + extractors::{Auth, Json, Path, Query}, }; use crate::{ error::AppError, diff --git a/server/src/routes/users.rs b/server/src/routes/users.rs index faf19e0..9a3a024 100644 --- a/server/src/routes/users.rs +++ b/server/src/routes/users.rs @@ -5,7 +5,7 @@ use uuid::Uuid; use super::{ dtos::user::{UserRequest, UserResponse}, - extractors::{auth::Auth, json::Json, path::Path, query::Query}, + extractors::{Auth, Json, Path, Query}, }; use crate::{error::AppError, repository};