From 4ca7300612d11c732e08919aecb2a1b07a81d095 Mon Sep 17 00:00:00 2001 From: varnit goyal Date: Tue, 15 Oct 2024 16:20:42 +0530 Subject: [PATCH 1/3] TP-55555 cybertron qa collection --- internal/transport/server.go | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/internal/transport/server.go b/internal/transport/server.go index 5f61406..028a8d3 100644 --- a/internal/transport/server.go +++ b/internal/transport/server.go @@ -44,16 +44,12 @@ func (s *Server) router() { func (s *Server) Start() { s.gin.Use(ginzap.Ginzap(s.dependencies.Logger, time.RFC3339, false)) - s.gin.Use(cors.New(cors.Config{ - AllowOrigins: []string{"*"}, - AllowMethods: []string{"PUT", "PATCH", "GET", "POST", "OPTIONS"}, - AllowHeaders: []string{"*", "x-session-token"}, - ExposeHeaders: []string{"Content-Length"}, - AllowCredentials: true, - MaxAge: 24 * time.Hour, - })) + var AllowOrigins = []string{"http://google.com"} + corsConfig := cors.DefaultConfig() + corsConfig.AllowOrigins = AllowOrigins + s.gin.Use(cors.New(corsConfig)) s.gin.Use(middleware.MetricMiddleware()) - //s.gin.Use(middleware.PermissionMiddleware(s.dependencies.Service.AuthService)) + s.gin.Use(middleware.PermissionMiddleware(s.dependencies.Service.AuthService)) s.router() metrics.AdminHandler() From b8a16355d668baba70d353f185d1beb5beeaddf9 Mon Sep 17 00:00:00 2001 From: varnit goyal Date: Tue, 15 Oct 2024 16:21:37 +0530 Subject: [PATCH 2/3] TP-55555 cybertron qa collection --- internal/transport/server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/transport/server.go b/internal/transport/server.go index 028a8d3..c33672a 100644 --- a/internal/transport/server.go +++ b/internal/transport/server.go @@ -44,7 +44,7 @@ func (s *Server) router() { func (s *Server) Start() { s.gin.Use(ginzap.Ginzap(s.dependencies.Logger, time.RFC3339, false)) - var AllowOrigins = []string{"http://google.com"} + var AllowOrigins = []string{"*"} corsConfig := cors.DefaultConfig() corsConfig.AllowOrigins = AllowOrigins s.gin.Use(cors.New(corsConfig)) From 7622e3df72f4bdacb00f7cdbde1fbe6700773ca5 Mon Sep 17 00:00:00 2001 From: varnit goyal Date: Tue, 15 Oct 2024 16:26:52 +0530 Subject: [PATCH 3/3] TP-55555 cybertron qa collection --- .../transport/middleware/cors_middleware.go | 19 +++++++++++++++++++ internal/transport/server.go | 4 ++-- 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 internal/transport/middleware/cors_middleware.go diff --git a/internal/transport/middleware/cors_middleware.go b/internal/transport/middleware/cors_middleware.go new file mode 100644 index 0000000..23d62cc --- /dev/null +++ b/internal/transport/middleware/cors_middleware.go @@ -0,0 +1,19 @@ +package middleware + +import "github.com/gin-gonic/gin" + +func CORSMiddleware() gin.HandlerFunc { + return func(c *gin.Context) { + c.Writer.Header().Set("Access-Control-Allow-Origin", "*") + c.Writer.Header().Set("Access-Control-Allow-Credentials", "true") + c.Writer.Header().Set("Access-Control-Allow-Headers", "Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization, accept, origin, Cache-Control, X-Requested-With") + c.Writer.Header().Set("Access-Control-Allow-Methods", "POST, OPTIONS, GET, PUT") + + if c.Request.Method == "OPTIONS" { + c.AbortWithStatus(204) + return + } + + c.Next() + } +} diff --git a/internal/transport/server.go b/internal/transport/server.go index c33672a..f166268 100644 --- a/internal/transport/server.go +++ b/internal/transport/server.go @@ -47,9 +47,9 @@ func (s *Server) Start() { var AllowOrigins = []string{"*"} corsConfig := cors.DefaultConfig() corsConfig.AllowOrigins = AllowOrigins - s.gin.Use(cors.New(corsConfig)) + s.gin.Use(middleware.CORSMiddleware()) s.gin.Use(middleware.MetricMiddleware()) - s.gin.Use(middleware.PermissionMiddleware(s.dependencies.Service.AuthService)) + //s.gin.Use(middleware.PermissionMiddleware(s.dependencies.Service.AuthService)) s.router() metrics.AdminHandler()