diff --git a/Cargo.toml b/Cargo.toml index e46bf28..70a8350 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ sqlx = { version = "0.8.6", features = [ ] } tokio = { version = "1", features = ["full"] } tower = "0.5" -tower-http = { version = "0.6", features = ["trace", "cors"] } +tower-http = { version = "0.6", features = ["trace"] } tracing = "0.1" tracing-subscriber = { version = "0.3", features = ["env-filter"] } uuid = { version = "1.22.0", features = ["v4"] } diff --git a/docker-compose.yml b/docker-compose.yml index 4f36e63..5a55b89 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,12 +1,12 @@ services: db: image: postgres:16 - container_name: upvoters_db + container_name: uprs_db restart: always environment: - POSTGRES_USER: upvoters + POSTGRES_USER: uprs POSTGRES_PASSWORD: password123 - POSTGRES_DB: upvoters + POSTGRES_DB: uprs volumes: - pgdata:/var/lib/postgresql/data - ./db/migrations:/docker-entrypoint-initdb.d # run initial schema @@ -15,11 +15,10 @@ services: app: build: . - container_name: upvoters_app + container_name: uprs_app restart: always environment: - POSTGRES_CONNECTION_STRING: postgres://upvoters:password123@db:5432/upvoters - ALLOWED_ORIGINS: http://localhost:1313 + POSTGRES_CONNECTION_STRING: postgres://uprs:password123@db:5432/uprs ports: - "3000:3000" depends_on: diff --git a/src/env.rs b/src/env.rs index 5b44f38..3222dc5 100644 --- a/src/env.rs +++ b/src/env.rs @@ -3,8 +3,6 @@ use std::env; #[derive(Clone)] pub struct Env { pub postgres_connection_string: String, - pub allowed_origins: Vec, - pub port: String, } impl Env { @@ -12,19 +10,8 @@ impl Env { let postgres_connection_string = env::var("POSTGRES_CONNECTION_STRING") .expect("Missing POSTGRES_CONNECTION_STRING as an environment variable"); - let allowed_origins = env::var("ALLOWED_ORIGINS") - .expect("Missing ALLOWED_ORIGINS as an environment variable") - .split(',') - .map(|s| s.trim().to_string()) - .collect(); - - let port = env::var("PORT") - .unwrap_or_else(|_| "3000".to_string()); - Env { postgres_connection_string, - allowed_origins, - port, } } } diff --git a/src/lib.rs b/src/lib.rs index d8d7450..de4b4f6 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -5,25 +5,9 @@ pub mod test_helpers; pub mod votes; use axum::Router; -use axum::http::{HeaderValue, Method, header}; use state::AppState; -use tower_http::cors::CorsLayer; use tower_http::trace::TraceLayer; pub fn app(state: AppState) -> Router { - let origins: Vec = state - .env - .allowed_origins - .iter() - .map(|o| o.parse().expect("Invalid origin in ALLOWED_ORIGINS")) - .collect(); - let cors = CorsLayer::new() - .allow_origin(origins) - .allow_methods([Method::GET, Method::POST, Method::DELETE]) - .allow_headers([header::CONTENT_TYPE]) - .allow_credentials(true); - - routes::router(state) - .layer(TraceLayer::new_for_http()) - .layer(cors) + routes::router(state).layer(TraceLayer::new_for_http()) } diff --git a/src/main.rs b/src/main.rs index f7280c3..0514583 100644 --- a/src/main.rs +++ b/src/main.rs @@ -12,11 +12,9 @@ async fn main() { .with(tracing_subscriber::fmt::layer()) .init(); - let state = AppState::new().await; - let port = &state.env.port; - let listener = tokio::net::TcpListener::bind(format!("0.0.0.0:{port}")).await.unwrap(); + let listener = tokio::net::TcpListener::bind("0.0.0.0:3000").await.unwrap(); tracing::info!("listening on {}", listener.local_addr().unwrap()); - axum::serve(listener, upvoters::app(state)) + axum::serve(listener, upvoters::app(AppState::new().await)) .await .unwrap(); } diff --git a/src/test_helpers.rs b/src/test_helpers.rs index ba20ce3..1ea5d68 100644 --- a/src/test_helpers.rs +++ b/src/test_helpers.rs @@ -3,7 +3,7 @@ pub mod db { use sqlx::PgPool; const DEFAULT_CONNECTION_STRING: &str = - "postgres://upvoters:password123@localhost:5432/upvoters"; + "postgres://uprs:password123@localhost:5432/uprs"; pub async fn test_pool() -> PgPool { let conn = std::env::var("POSTGRES_CONNECTION_STRING") diff --git a/src/votes/handlers.rs b/src/votes/handlers.rs index ced29a9..3eeb713 100644 --- a/src/votes/handlers.rs +++ b/src/votes/handlers.rs @@ -141,8 +141,6 @@ mod tests { db, env: Env { postgres_connection_string: String::new(), - allowed_origins: vec![], - port: "3000".to_string(), }, } }