diff --git a/server/src/main.rs b/server/src/main.rs index acd7036..ddf5813 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -10,6 +10,7 @@ mod domain; mod error; mod repository; mod routes; +mod state; #[tokio::main] #[tracing::instrument] @@ -32,6 +33,9 @@ async fn main() -> anyhow::Result<()> { .await .context("failed to run database migrations")?; + let state = state::AppState::new(pool); + let router = routes::create_router(state); + let host = env::var("HOST").context("HOST must be set")?; let port = env::var("PORT").context("PORT must be set")?; let addr = format!("{}:{}", host, port); @@ -40,7 +44,7 @@ async fn main() -> anyhow::Result<()> { .context(format!("failed to bind to address: {}", addr))?; tracing::info!(%addr, "starting server"); - axum::serve(listener, routes::create_router(pool).into_make_service()) + axum::serve(listener, router.into_make_service()) .await .context("server stopped unexpectedly")?; diff --git a/server/src/routes.rs b/server/src/routes.rs index fccbd92..8172fe7 100644 --- a/server/src/routes.rs +++ b/server/src/routes.rs @@ -1,6 +1,6 @@ use axum::{http::StatusCode, routing::get}; -use crate::error::AppError; +use crate::{error::AppError, state::AppState}; mod account_members; mod accounts; @@ -15,7 +15,7 @@ mod user_app_secrets; mod user_apps; mod users; -pub fn create_router(pool: sqlx::PgPool) -> axum::Router { +pub fn create_router(state: AppState) -> axum::Router { let api = axum::Router::new() .nest("/auth/passkey", auth_passkey::create_router()) .nest("/auth/token", auth_token::create_router()) @@ -40,5 +40,5 @@ pub fn create_router(pool: sqlx::PgPool) -> axum::Router { .nest("/api", api) .route("/health", get(async || StatusCode::NO_CONTENT)) .fallback(async || AppError::NotFound) - .with_state(pool) + .with_state(state) } diff --git a/server/src/routes/account_members.rs b/server/src/routes/account_members.rs index ab83b38..eebae7a 100644 --- a/server/src/routes/account_members.rs +++ b/server/src/routes/account_members.rs @@ -12,7 +12,7 @@ use crate::{ repository::{self, RepositoryError}, }; -pub fn create_router() -> axum::Router { +pub fn create_router() -> axum::Router { axum::Router::new() .route("/", axum::routing::get(list_account_members)) .route( diff --git a/server/src/routes/accounts.rs b/server/src/routes/accounts.rs index f35a36d..35bc5d6 100644 --- a/server/src/routes/accounts.rs +++ b/server/src/routes/accounts.rs @@ -9,7 +9,7 @@ use super::{ }; use crate::{domain::AccountMember, error::AppError, repository}; -pub fn create_router() -> axum::Router { +pub fn create_router() -> axum::Router { axum::Router::new() .route("/", axum::routing::get(list_accounts)) .route( diff --git a/server/src/routes/auth_passkey.rs b/server/src/routes/auth_passkey.rs index aa3fd63..af19c70 100644 --- a/server/src/routes/auth_passkey.rs +++ b/server/src/routes/auth_passkey.rs @@ -1,9 +1,8 @@ use axum::routing::post; -use sqlx::PgPool; -use crate::error::AppError; +use crate::{error::AppError, state::AppState}; -pub fn create_router() -> axum::Router { +pub fn create_router() -> axum::Router { axum::Router::new() .route("/options", post(get_challenge_options)) .route("/verify", post(verify_challenge_response)) diff --git a/server/src/routes/auth_token.rs b/server/src/routes/auth_token.rs index 46f9063..ed1f091 100644 --- a/server/src/routes/auth_token.rs +++ b/server/src/routes/auth_token.rs @@ -17,7 +17,7 @@ use crate::{ const ACCESS_TOKEN_LIFETIME_SECONDS: i64 = 3600; const REFRESH_TOKEN_LIFETIME_SECONDS: i64 = 30 * 24 * 60 * 60; -pub fn create_router() -> axum::Router { +pub fn create_router() -> axum::Router { axum::Router::new() .route("/", post(issue_token)) .route("/revoke", post(revoke_token)) diff --git a/server/src/routes/scheduled_transactions.rs b/server/src/routes/scheduled_transactions.rs index bcfcc8d..d7e4857 100644 --- a/server/src/routes/scheduled_transactions.rs +++ b/server/src/routes/scheduled_transactions.rs @@ -14,7 +14,7 @@ use super::{ }; use crate::{domain, error::AppError, repository}; -pub fn create_router() -> axum::Router { +pub fn create_router() -> axum::Router { axum::Router::new() .route("/", axum::routing::get(list_scheduled_transactions)) .route( diff --git a/server/src/routes/transactions.rs b/server/src/routes/transactions.rs index 289dcd8..3fde8fd 100644 --- a/server/src/routes/transactions.rs +++ b/server/src/routes/transactions.rs @@ -11,7 +11,7 @@ use super::{ }; use crate::{domain, error::AppError, repository}; -pub fn create_router() -> axum::Router { +pub fn create_router() -> axum::Router { axum::Router::new() .route("/", axum::routing::get(list_transactions)) .route( diff --git a/server/src/routes/user_app_secrets.rs b/server/src/routes/user_app_secrets.rs index 5ed4b81..106834e 100644 --- a/server/src/routes/user_app_secrets.rs +++ b/server/src/routes/user_app_secrets.rs @@ -16,7 +16,7 @@ use crate::{ repository, }; -pub fn create_router() -> axum::Router { +pub fn create_router() -> axum::Router { axum::Router::new() .route("/", axum::routing::get(list_user_app_secrets)) .route( diff --git a/server/src/routes/user_apps.rs b/server/src/routes/user_apps.rs index 0b32180..5e356f7 100644 --- a/server/src/routes/user_apps.rs +++ b/server/src/routes/user_apps.rs @@ -9,7 +9,7 @@ use super::{ }; use crate::{error::AppError, repository}; -pub fn create_router() -> axum::Router { +pub fn create_router() -> axum::Router { axum::Router::new() .route("/", axum::routing::get(list_user_apps)) .route( diff --git a/server/src/routes/users.rs b/server/src/routes/users.rs index 1fe0a89..cee0f38 100644 --- a/server/src/routes/users.rs +++ b/server/src/routes/users.rs @@ -9,7 +9,7 @@ use super::{ }; use crate::{error::AppError, repository}; -pub fn create_router() -> axum::Router { +pub fn create_router() -> axum::Router { axum::Router::new() .route("/", axum::routing::get(list_users)) .route( diff --git a/server/src/state.rs b/server/src/state.rs new file mode 100644 index 0000000..86de28f --- /dev/null +++ b/server/src/state.rs @@ -0,0 +1,13 @@ +use axum::extract::FromRef; +use sqlx::PgPool; + +#[derive(Clone, FromRef)] +pub struct AppState { + pub pool: PgPool, +} + +impl AppState { + pub fn new(pool: PgPool) -> Self { + Self { pool } + } +}