removed uneeded cors handler funcs

This commit is contained in:
0ceanSlim 2024-08-01 10:48:24 -04:00
parent 62fac57c6f
commit 78ab44a11f
2 changed files with 4 additions and 39 deletions

10
main.go
View File

@ -46,16 +46,14 @@ func main() {
func setupRoutes() *http.ServeMux { func setupRoutes() *http.ServeMux {
mux := http.NewServeMux() mux := http.NewServeMux()
mux.HandleFunc("/", utils.WithCORS(ListenAndServe)) mux.HandleFunc("/", ListenAndServe)
mux.Handle("/static/", utils.WithCORSHandler(http.StripPrefix("/static/", http.FileServer(http.Dir("app/static"))))) mux.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.Dir("app/static"))))
mux.HandleFunc("/favicon.ico", utils.WithCORS(func(w http.ResponseWriter, r *http.Request) { mux.HandleFunc("/favicon.ico", func(w http.ResponseWriter, r *http.Request) {
http.ServeFile(w, r, "app/static/img/favicon.ico") http.ServeFile(w, r, "app/static/img/favicon.ico")
})) })
return mux return mux
} }
func startServer(config *configTypes.ServerConfig, mux *http.ServeMux) { func startServer(config *configTypes.ServerConfig, mux *http.ServeMux) {
server := &http.Server{ server := &http.Server{
Addr: config.Server.Port, Addr: config.Server.Port,

View File

@ -1,33 +0,0 @@
package utils
import "net/http"
func WithCORS(h http.HandlerFunc) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Access-Control-Allow-Origin", "*")
w.Header().Set("Access-Control-Allow-Headers", "Authorization, Content-Type")
w.Header().Set("Access-Control-Allow-Methods", "GET, PUT, DELETE, POST, OPTIONS")
if r.Method == http.MethodOptions {
w.WriteHeader(http.StatusOK)
return
}
h(w, r)
}
}
func WithCORSHandler(h http.Handler) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Access-Control-Allow-Origin", "*")
w.Header().Set("Access-Control-Allow-Headers", "Authorization, Content-Type")
w.Header().Set("Access-Control-Allow-Methods", "GET, PUT, DELETE, POST, OPTIONS")
if r.Method == http.MethodOptions {
w.WriteHeader(http.StatusOK)
return
}
h.ServeHTTP(w, r)
}
}