fix: use permissive cors like actix

bigcommerce · Feb 29, 2024 · d7cb4ef · d7cb4ef
1 parent a1fbbe8
commit d7cb4ef
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/apps/server/src/routes/bigcommerce.rs b/apps/server/src/routes/bigcommerce.rs
@@ -34,7 +34,7 @@ enum InstallError {
 }
 
 impl IntoResponse for InstallError {
-    fn into_response(self) -> axum::response::Response {
+    fn into_response(self) -> Response {
         match self {
             Self::UnexpectedError(_) => StatusCode::INTERNAL_SERVER_ERROR.into_response(),
         }

diff --git a/apps/server/src/routes/widget.rs b/apps/server/src/routes/widget.rs
@@ -15,7 +15,10 @@ use tower_http::cors::{Any, CorsLayer};
 use anyhow::Context;
 use axum::{
     extract::{Query, State},
-    http::{Method, StatusCode},
+    http::{
+        header::{ACCEPT, AUTHORIZATION},
+        Method, StatusCode,
+    },
     response::{IntoResponse, Response},
     routing::{delete, get, post},
     Json, Router,
@@ -30,9 +33,7 @@ pub fn router() -> Router<SharedState> {
         .route("/publish", delete(remove_widget))
         .route("/preview", get(preview_widget));
 
-    let cors = CorsLayer::new()
-        .allow_methods([Method::GET, Method::POST])
-        .allow_origin(Any);
+    let cors = CorsLayer::permissive();
 
     let v2_router = Router::new()
         .layer(cors)

diff --git a/apps/server/src/startup.rs b/apps/server/src/startup.rs
@@ -26,7 +26,7 @@ impl Application {
             .local_addr()
             .expect("listener does not have an address")
             .port();
-        let server = run(listener, configuration.get_app_state());
+        let server = build_server(listener, configuration.get_app_state());
 
         Ok(Self { port, server })
     }
@@ -52,7 +52,7 @@ pub fn get_connection_pool(configuration: &Database) -> PgPool {
 
 #[allow(clippy::default_constructed_unit_structs)]
 // reason = "`OtelInResponseLayer` struct is an external dependency that might change"
-pub fn run(listener: TcpListener, shared_state: SharedState) -> Serve<Router, Router> {
+pub fn build_server(listener: TcpListener, shared_state: SharedState) -> Serve<Router, Router> {
     let app = Router::new()
         .merge(routes::router())
         .layer(OtelInResponseLayer::default())