Skip to content

Commit e6c7c91

Browse files
authored
Merge pull request #12 from shion1305/issue/11
テスト用関数の分離 / CORSテスト対応
2 parents 2458ab1 + 2c97bf1 commit e6c7c91

File tree

4 files changed

+15
-6
lines changed

4 files changed

+15
-6
lines changed

svc/cmd/dev/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
func main() {
1111
engine := gin.New()
1212
apiV1 := engine.Group("/api/v1")
13-
err := runner.Implement(apiV1)
13+
err := runner.Implement(apiV1, true)
1414
if err != nil {
1515
log.Fatalf("Failed to start server... %v", err)
1616
return

svc/pkg/domain/model/user/gender.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const (
1111
)
1212

1313
func NewGender(gender int) (Gender, error) {
14-
switch gender {
14+
switch Gender(gender) {
1515
case GenderMan:
1616
return GenderMan, nil
1717
case GenderWoman:

svc/runner/server.go

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"ynufes-mypage-backend/svc/pkg/registry"
99
)
1010

11-
func Implement(rg *gin.RouterGroup) error {
11+
func Implement(rg *gin.RouterGroup, devTool bool) error {
1212
rgst, err := registry.New()
1313
if err != nil {
1414
return err
@@ -17,8 +17,17 @@ func Implement(rg *gin.RouterGroup) error {
1717
rg.Handle("GET", "/auth/line/callback", lineAuth.VerificationHandler())
1818
rg.Handle("GET", "/auth/line/state", lineAuth.StateIssuer())
1919

20-
//method for development purpose
21-
rg.Handle("GET", "/auth/line/dev", lineAuth.DevAuth())
20+
if devTool {
21+
//method for development purpose
22+
rg.Handle("GET", "/auth/line/dev", lineAuth.DevAuth())
23+
rg.OPTIONS("/*any", func(c *gin.Context) {
24+
c.Writer.Header().Set("Access-Control-Allow-Origin", "*")
25+
c.Writer.Header().Set("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, OPTIONS")
26+
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")
27+
c.Writer.Header().Set("Access-Control-Allow-Credentials", "true")
28+
c.AbortWithStatus(200)
29+
})
30+
}
2231

2332
middlewareAuth := middleware.NewAuth(*rgst)
2433

svc/runner/server_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ func TestImplement(t *testing.T) {
1313
r := gin.Default()
1414
w := httptest.NewRecorder()
1515
rg := r.Group("/api/v1")
16-
err := Implement(rg)
16+
err := Implement(rg, true)
1717
assert.NoError(t, err)
1818
req, _ := http.NewRequest("GET", "/api/v1/auth/line/state", nil)
1919
r.ServeHTTP(w, req)

0 commit comments

Comments
 (0)