Made suggestive changes

DiceDB · Oct 4, 2024 · a92f311 · a92f311
1 parent f3e2d0c
commit a92f311
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/config/config.go b/config/config.go
@@ -26,11 +26,11 @@ func LoadConfig() *Config {
 	}
 
 	return &Config{
-		DiceAddr:       getEnv("DICE_ADDR", "localhost:7379"),                                  // Default Dice address
-		ServerPort:     getEnv("SERVER_PORT", ":8080"),                                         // Default server port
-		RequestLimit:   getEnvInt("REQUEST_LIMIT", 1000),                                       // Default request limit
-		RequestWindow:  getEnvFloat64("REQUEST_WINDOW", 60),                                    // Default request window in float64
-		AllowedOrigins: getEnvArray("ALLOWED_ORIGINS", []string{"*", "http://localhost:8080"}), // Default allowed origins
+		DiceAddr:       getEnv("DICE_ADDR", "localhost:7379"),                             // Default Dice address
+		ServerPort:     getEnv("SERVER_PORT", ":8080"),                                    // Default server port
+		RequestLimit:   getEnvInt("REQUEST_LIMIT", 1000),                                  // Default request limit
+		RequestWindow:  getEnvFloat64("REQUEST_WINDOW", 60),                               // Default request window in float64
+		AllowedOrigins: getEnvArray("ALLOWED_ORIGINS", []string{"http://localhost:8080"}), // Default allowed origins
 	}
 }
 

diff --git a/go.mod b/go.mod
@@ -13,6 +13,5 @@ require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/stretchr/objx v0.5.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -14,8 +14,6 @@ github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
 github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
-github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=

diff --git a/internal/middleware/cors.go b/internal/middleware/cors.go
@@ -21,16 +21,14 @@ func enableCors(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	w.Header().Set("Access-Control-Allow-Origin", origin)
+	w.Header().Set("Access-Control-Allow-Methods", "GET, POST, OPTIONS, PUT, DELETE, PATCH")
+	w.Header().Set("Access-Control-Allow-Headers", "Content-Type, Authorization, Content-Length")
+
 	if r.Method == http.MethodOptions {
-		w.Header().Set("Access-Control-Allow-Origin", origin)
-		w.Header().Set("Access-Control-Allow-Methods", "GET, POST, OPTIONS, PUT, DELETE, PATCH")
-		w.Header().Set("Access-Control-Allow-Headers", "Content-Type, Authorization, Content-Length")
 		w.Header().Set("Access-Control-Max-Age", "86400")
 		w.WriteHeader(http.StatusOK)
 		return
 	}
 	w.Header().Set("Content-Type", "application/json")
-	w.Header().Set("Access-Control-Allow-Origin", origin)
-	w.Header().Set("Access-Control-Allow-Headers", "Content-Type, Authorization, Content-Length")
-	w.Header().Set("Access-Control-Allow-Methods", "GET, POST, OPTIONS, PUT, DELETE, PATCH")
 }