From 66221e504c0eee368801309404f7fea51a811308 Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 13 Dec 2025 15:18:06 -0500 Subject: [PATCH] tsk-10: Got it working --- cmd/api/main.go | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/cmd/api/main.go b/cmd/api/main.go index 03494f3..8430d1d 100644 --- a/cmd/api/main.go +++ b/cmd/api/main.go @@ -12,7 +12,7 @@ import ( "github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5/middleware" - "github.com/rs/cors" + "github.com/go-chi/cors" "github.com/swaggo/http-swagger/v2" _ "git.kundeng.us/phoenix/textsender-auth/docs" @@ -83,6 +83,15 @@ func main() { router := chi.NewRouter() + // Configure CORS + router.Use(cors.Handler(cors.Options{ + AllowedOrigins: []string{fmt.Sprintf("http://localhost:%s", config.Port), "http://localhost:5173", "https://textsender.com"}, + AllowedMethods: []string{"GET", "POST", "PUT", "DELETE", "OPTIONS", "PATCH"}, + AllowedHeaders: []string{"Accept", "Authorization", "Content-Type", "X-CSRF-Token"}, + ExposedHeaders: []string{"Link", "X-Total-Count"}, + AllowCredentials: true, + MaxAge: 300, // 5 minutes + })) router.Use(middleware.Logger) router.Use(middleware.Recoverer) router.Use(middleware.Timeout(60 * time.Second)) @@ -98,23 +107,10 @@ func main() { httpSwagger.URL(fmt.Sprintf("http://localhost:%s/swagger/doc.json", config.Port)), )) - - // Configure CORS - c := cors.New(cors.Options{ - AllowedOrigins: []string{fmt.Sprintf("http://localhost:%s", config.Port), "https://textsender.com"}, - AllowedMethods: []string{"GET", "POST", "PUT", "DELETE", "OPTIONS", "PATCH"}, - AllowedHeaders: []string{"Accept", "Authorization", "Content-Type", "X-CSRF-Token"}, - ExposedHeaders: []string{"Link", "X-Total-Count"}, - AllowCredentials: true, - MaxAge: 300, // 5 minutes - }) - - rr := c.Handler(router) - // Start server server := &http.Server{ Addr: ":" + cfg.ServerPort, - Handler: rr, + Handler: router, ReadTimeout: 15 * time.Second, WriteTimeout: 15 * time.Second, IdleTimeout: 60 * time.Second,