Merge pull request #178 from Watson-Sei/main

support preflight request
twitchdev · Oct 12, 2022 · 99ede5e · 99ede5e
2 parents e62dad9 + fd34911
commit 99ede5e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/internal/mock_api/endpoints/users/users.go b/internal/mock_api/endpoints/users/users.go
@@ -19,6 +19,7 @@ var userMethodsSupported = map[string]bool{
 	http.MethodDelete: false,
 	http.MethodPatch:  false,
 	http.MethodPut:    true,
+	"OPTIONS": true,
 }
 
 var userScopesByMethod = map[string][]string{
@@ -27,6 +28,7 @@ var userScopesByMethod = map[string][]string{
 	http.MethodDelete: {},
 	http.MethodPatch:  {},
 	http.MethodPut:    {"user:edit"},
+	"OPTIONS": {},
 }
 
 type User struct {
@@ -62,6 +64,8 @@ func (e UsersEndpoint) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	switch r.Method {
 	case http.MethodGet:
 		getUsers(w, r)
+	case "OPTIONS":
+		getUsers(w, r)
 	case http.MethodPut:
 		putUsers(w, r)
 	default:

diff --git a/internal/mock_api/mock_server/server.go b/internal/mock_api/mock_server/server.go
@@ -100,9 +100,16 @@ func RegisterHandlers(m *http.ServeMux) {
 func loggerMiddleware(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		log.Printf("%v %v", r.Method, r.URL.Path)
+
+		w.Header().Set("Access-Control-Allow-Headers", "*")
 		w.Header().Set("Content-Type", "application/json")
 		w.Header().Set("Access-Control-Allow-Origin", "*")
 
+		if r.Method == "OPTIONS" {
+			w.WriteHeader(200)
+			return
+		}
+
 		next.ServeHTTP(w, r)
 	})
 }