Merge pull request #94 from yanosea/93-add-cors-configuration-for-loc…

…al-development-environment
yanosea · Jan 27, 2025 · 28659fe · 28659fe
2 parents f048247 + 5d0617f
commit 28659fe
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 1 deletion.
diff --git a/app/presentation/api/jrp-server/main_test.go b/app/presentation/api/jrp-server/main_test.go
@@ -35,6 +35,7 @@ func Test_main(t *testing.T) {
 				mockEcho := proxy.NewMockEcho(mockCtrl)
 				mockEcho.EXPECT().Use(gomock.Any())
 				mockEcho.EXPECT().Use(gomock.Any())
+				mockEcho.EXPECT().Use(gomock.Any())
 				mockEcho.EXPECT().Group("/api").Return(mockGroup)
 				mockEcho.EXPECT().Start(":8080")
 				mockEcho.EXPECT().Get("/swagger/*", gomock.Any())

diff --git a/app/presentation/api/jrp-server/server/server.go b/app/presentation/api/jrp-server/server/server.go
@@ -3,6 +3,7 @@ package server
 import (
 	"errors"
 
+	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
 
 	"github.com/yanosea/jrp/v2/app/infrastructure/database"
@@ -65,6 +66,12 @@ func (s *server) Init(
 	}
 
 	s.Port = conf.JrpPort
+	if s.Port == "8080" {
+		s.Route.Use(middleware.CORSWithConfig(middleware.CORSConfig{
+			AllowOrigins: []string{"*"},
+			AllowMethods: []string{echo.GET},
+		}))
+	}
 
 	if s.ConnectionManager == nil {
 		s.ConnectionManager = database.NewConnectionManager(sql)

diff --git a/app/presentation/api/jrp-server/server/server_test.go b/app/presentation/api/jrp-server/server/server_test.go
@@ -212,6 +212,7 @@ func Test_server_Init(t *testing.T) {
 				mockEcho := proxy.NewMockEcho(mockCtrl)
 				mockEcho.EXPECT().Use(gomock.Any())
 				mockEcho.EXPECT().Use(gomock.Any())
+				mockEcho.EXPECT().Use(gomock.Any())
 				mockEcho.EXPECT().Group(gomock.Any()).Return(mockGroup)
 				mockEcho.EXPECT().Get("/swagger/*", gomock.Any())
 				mockLogger := proxy.NewMockLogger(mockCtrl)
@@ -274,6 +275,7 @@ func Test_server_Init(t *testing.T) {
 				mockEcho := proxy.NewMockEcho(mockCtrl)
 				mockEcho.EXPECT().Use(gomock.Any())
 				mockEcho.EXPECT().Use(gomock.Any())
+				mockEcho.EXPECT().Use(gomock.Any())
 				mockEcho.EXPECT().Group(gomock.Any()).Return(mockGroup)
 				mockEcho.EXPECT().Get("/swagger/*", gomock.Any())
 				mockLogger := proxy.NewMockLogger(mockCtrl)

diff --git a/docs/coverage.html b/docs/coverage.html
@@ -2263,6 +2263,7 @@
 import (
         "errors"
 
+        "github.com/labstack/echo/v4"
         "github.com/labstack/echo/v4/middleware"
 
         "github.com/yanosea/jrp/v2/app/infrastructure/database"
@@ -2325,8 +2326,14 @@
         }</span>
 
         <span class="cov8" title="1">s.Port = conf.JrpPort
+        if s.Port == "8080" </span><span class="cov8" title="1">{
+                s.Route.Use(middleware.CORSWithConfig(middleware.CORSConfig{
+                        AllowOrigins: []string{"*"},
+                        AllowMethods: []string{echo.GET},
+                }))
+        }</span>
 
-        if s.ConnectionManager == nil </span><span class="cov8" title="1">{
+        <span class="cov8" title="1">if s.ConnectionManager == nil </span><span class="cov8" title="1">{
                 s.ConnectionManager = database.NewConnectionManager(sql)
         }</span>