diff --git a/back_end/src/main.rs b/back_end/src/main.rs index e34b272..55702c6 100644 --- a/back_end/src/main.rs +++ b/back_end/src/main.rs @@ -45,8 +45,9 @@ async fn main() { start_db_handler_thread(db_rx, SQLITE_DB_PATH.into(), s_helper_tx.clone()); - let route = warp::body::content_length_limit(1024 * 32) - .and(warp::body::bytes()) + let route = //warp::body::content_length_limit(1024 * 32) + //.and(warp::body::bytes()) + warp::body::bytes() .and_then(move |bytes: bytes::Bytes| { let db_tx_clone = db_tx_clone.clone(); let s_helper_tx_clone = s_helper_tx.clone(); @@ -55,24 +56,48 @@ async fn main() { if let Ok(body_str) = body_str_result { let json_result = serde_json::from_str(body_str); if let Ok(json_value) = json_result { - Ok(warp::reply::with_header( + let reply = warp::reply::with_header( json_handlers::handle_json(json_value, db_tx_clone, s_helper_tx_clone) .unwrap_or_else(|e| e), "Content-Type", "application/json", + ); + let reply = warp::reply::with_header( + reply, + "Access-Control-Allow-Headers", + "*", + ); + Ok::, Rejection>(Box::new( + warp::reply::with_header(reply, "Access-Control-Allow-Origin", "*"), )) } else { - Ok(warp::reply::with_header( + let reply = warp::reply::with_header( String::from("{\"type\": \"invalid_syntax\"}"), "Content-Type", "application/json", + ); + let reply = warp::reply::with_header( + reply, + "Access-Control-Allow-Headers", + "*", + ); + Ok::, Rejection>(Box::new( + warp::reply::with_header(reply, "Access-Control-Allow-Origin", "*"), )) } } else { - Ok::, Rejection>(warp::reply::with_header( + let reply = warp::reply::with_header( String::from("{\"type\": \"invalid_syntax\"}"), "Content-Type", "application/json", + ); + let reply = warp::reply::with_header( + reply, + "Access-Control-Allow-Headers", + "*", + ); + Ok::, Rejection>(Box::new( + warp::reply::with_header(reply, "Access-Control-Allow-Origin", "*"), )) } } diff --git a/front_end/src/constants.rs b/front_end/src/constants.rs index b693223..89281e4 100644 --- a/front_end/src/constants.rs +++ b/front_end/src/constants.rs @@ -37,7 +37,7 @@ pub const BACKEND_PHRASE_MAX_LENGTH: usize = 128; // TODO: Change this to "https://asdm.seodisparate.com/api" when backend is installed #[allow(dead_code)] #[cfg(debug_assertions)] -pub const BACKEND_URL: &str = "http://testlocalhost/api"; +pub const BACKEND_URL: &str = "http://localhost:1237/"; #[allow(dead_code)] #[cfg(not(debug_assertions))]