fix: fixed OPTIONS catchers with rocket_cors (#245)

ActivityWatch · Jul 15, 2021 · 25b2032 · 25b2032
1 parent 3ebdf06
commit 25b2032
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/aw-server/src/endpoints/mod.rs b/aw-server/src/endpoints/mod.rs
@@ -77,7 +77,12 @@ pub fn build_rocket(server_state: ServerState, config: AWConfig) -> rocket::Rock
         "Starting aw-server-rust at {}:{}",
         config.address, config.port
     );
+    let cors = cors::cors(&config);
     rocket::custom(config.to_rocket_config())
+        .attach(cors.clone())
+        .manage(cors)
+        .manage(server_state)
+        .manage(config)
         .mount(
             "/",
             routes![
@@ -120,7 +125,5 @@ pub fn build_rocket(server_state: ServerState, config: AWConfig) -> rocket::Rock
                 settings::setting_delete
             ],
         )
-        .attach(cors::cors(&config))
-        .manage(server_state)
-        .manage(config)
+        .mount("/", rocket_cors::catch_all_options_routes())
 }
diff --git a/aw-server/tests/api.rs b/aw-server/tests/api.rs
@@ -655,4 +655,17 @@ mod api_tests {
         let res = client.get("/api/0/settings/test_key").dispatch();
         assert_eq!(res.status(), rocket::http::Status::NotFound);
     }
+
+    #[test]
+    fn test_cors_catching() {
+        let server = setup_testserver();
+        let client = rocket::local::Client::new(server).expect("valid instance");
+
+        let mut res = client
+            .options("/api/0/buckets/")
+            .header(ContentType::JSON)
+            .dispatch();
+        debug!("{:?}", res.body_string());
+        assert_eq!(res.status(), rocket::http::Status::Ok);
+    }
 }