fix(gen): send CORS headers for OPTIONS requests

Currently CORS validation fails, due to OPTIONS Requests having a 405 response code. This commit corrects this by sending the proper CORS headers and a success status code on an OPTIONS request.
ogen-go · Nov 27, 2023 · 2012d2a · 2012d2a
1 parent 78b0432
commit 2012d2a
Show file tree

Hide file tree

Showing 34 changed files with 306 additions and 68 deletions.
diff --git a/examples/ex_2ch/oas_cfg_gen.go b/examples/ex_2ch/oas_cfg_gen.go
diff --git a/examples/ex_ent/oas_cfg_gen.go b/examples/ex_ent/oas_cfg_gen.go
diff --git a/examples/ex_firecracker/oas_cfg_gen.go b/examples/ex_firecracker/oas_cfg_gen.go
diff --git a/examples/ex_github/oas_cfg_gen.go b/examples/ex_github/oas_cfg_gen.go
diff --git a/examples/ex_gotd/oas_cfg_gen.go b/examples/ex_gotd/oas_cfg_gen.go
diff --git a/examples/ex_k8s/oas_cfg_gen.go b/examples/ex_k8s/oas_cfg_gen.go
diff --git a/examples/ex_manga/oas_cfg_gen.go b/examples/ex_manga/oas_cfg_gen.go
diff --git a/examples/ex_oauth2/oas_cfg_gen.go b/examples/ex_oauth2/oas_cfg_gen.go
diff --git a/examples/ex_openai/oas_cfg_gen.go b/examples/ex_openai/oas_cfg_gen.go
diff --git a/examples/ex_petstore/oas_cfg_gen.go b/examples/ex_petstore/oas_cfg_gen.go
diff --git a/examples/ex_petstore_expanded/oas_cfg_gen.go b/examples/ex_petstore_expanded/oas_cfg_gen.go
diff --git a/examples/ex_route_params/oas_cfg_gen.go b/examples/ex_route_params/oas_cfg_gen.go
diff --git a/examples/ex_telegram/oas_cfg_gen.go b/examples/ex_telegram/oas_cfg_gen.go
diff --git a/examples/ex_test_format/oas_cfg_gen.go b/examples/ex_test_format/oas_cfg_gen.go
diff --git a/examples/ex_tinkoff/oas_cfg_gen.go b/examples/ex_tinkoff/oas_cfg_gen.go
diff --git a/gen/_template/cfg.tmpl b/gen/_template/cfg.tmpl
@@ -75,8 +75,15 @@ func newServerConfig(opts ...ServerOption) serverConfig {
 	cfg := serverConfig{
 		NotFound: http.NotFound,
 		MethodNotAllowed: func(w http.ResponseWriter, r *http.Request, allowed string) {
-			w.Header().Set("Allow", allowed)
-			w.WriteHeader(http.StatusMethodNotAllowed)
+			status := http.StatusMethodNotAllowed
+			if r.Method == "OPTIONS" {
+				w.Header().Set("Access-Control-Allow-Methods", allowed)
+				w.Header().Set("Access-Control-Allow-Headers", "Content-Type")
+				status = http.StatusNoContent
+			} else {
+				w.Header().Set("Allow", allowed)
+			}
+			w.WriteHeader(status)
 		},
 		ErrorHandler: ogenerrors.DefaultErrorHandler,
 		Middleware:   nil,

diff --git a/internal/integration/referenced_path_item/oas_cfg_gen.go b/internal/integration/referenced_path_item/oas_cfg_gen.go
diff --git a/internal/integration/sample_api/oas_cfg_gen.go b/internal/integration/sample_api/oas_cfg_gen.go
diff --git a/internal/integration/sample_api_nc/oas_cfg_gen.go b/internal/integration/sample_api_nc/oas_cfg_gen.go
diff --git a/internal/integration/sample_api_no_otel/oas_cfg_gen.go b/internal/integration/sample_api_no_otel/oas_cfg_gen.go
diff --git a/internal/integration/sample_err/oas_cfg_gen.go b/internal/integration/sample_err/oas_cfg_gen.go
diff --git a/internal/integration/techempower/oas_cfg_gen.go b/internal/integration/techempower/oas_cfg_gen.go