From 3de7ee4c7ba8c328e4c034af03965c946748d642 Mon Sep 17 00:00:00 2001 From: Paul Makles Date: Tue, 7 Jun 2022 17:18:16 +0100 Subject: [PATCH] fix: cors needs to be attached --- crates/delta/src/main.rs | 6 +++++- crates/quark/src/web/cors.rs | 2 +- docker-compose.yml | 6 ++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/crates/delta/src/main.rs b/crates/delta/src/main.rs index 24ebdd92..1851101e 100644 --- a/crates/delta/src/main.rs +++ b/crates/delta/src/main.rs @@ -34,6 +34,9 @@ async fn rocket() -> _ { // Launch background task workers. async_std::task::spawn(revolt_quark::tasks::start_workers(db.clone())); + // Configure CORS + let cors = revolt_quark::web::cors::new(); + // Configure Rocket let rocket = rocket::build(); routes::mount(rocket) @@ -42,6 +45,7 @@ async fn rocket() -> _ { .mount("/swagger/", revolt_quark::web::swagger::routes()) .manage(rauth) .manage(db) + .manage(cors.clone()) .attach(revolt_quark::web::ratelimiter::RatelimitFairing) - .attach(revolt_quark::web::cors::fairing()) + .attach(cors) } diff --git a/crates/quark/src/web/cors.rs b/crates/quark/src/web/cors.rs index 27e38fe4..6ce5ec0d 100644 --- a/crates/quark/src/web/cors.rs +++ b/crates/quark/src/web/cors.rs @@ -3,7 +3,7 @@ use std::str::FromStr; pub use rocket_cors::catch_all_options_routes; use rocket_cors::{AllowedOrigins, Cors}; -pub fn fairing() -> Cors { +pub fn new() -> Cors { rocket_cors::CorsOptions { allowed_origins: AllowedOrigins::All, allowed_methods: [ diff --git a/docker-compose.yml b/docker-compose.yml index 6b536602..0a1dd11b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,3 +10,9 @@ services: - "27017:27017" volumes: - ./.data/db:/data/db + mongo-express: + image: mongo-express + ports: + - "8081:8081" + environment: + - ME_CONFIG_MONGODB_SERVER=database