API should follow RequireSignInView (#8654) (#8661)

lunny · web-flow · commit ffff835b7338 · 2019-10-24T14:57:24.000+08:00
diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
@@ -845,7 +845,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 		m.Group("/topics", func() {
 			m.Get("/search", repo.TopicSearch)
 		})
-	}, securityHeaders(), context.APIContexter(), sudo())
+	}, securityHeaders(), reqTokenBySetting(), context.APIContexter(), sudo())
 }
 
 func securityHeaders() macaron.Handler {
@@ -857,3 +857,10 @@ func securityHeaders() macaron.Handler {
 		})
 	}
 }
+
+func reqTokenBySetting() macaron.Handler {
+	if setting.Service.RequireSignInView {
+		return reqToken()
+	}
+	return func(ctx *macaron.Context) {}
+}

Original file line number	Diff line number	Diff line change
`@@ -845,7 +845,7 @@ func RegisterRoutes(m *macaron.Macaron) {`
`845`	`845`	`m.Group("/topics", func() {`
`846`	`846`	`m.Get("/search", repo.TopicSearch)`
`847`	`847`	`})`
`848`		`- }, securityHeaders(), context.APIContexter(), sudo())`
	`848`	`+ }, securityHeaders(), reqTokenBySetting(), context.APIContexter(), sudo())`
`849`	`849`	`}`
`850`	`850`
`851`	`851`	`func securityHeaders() macaron.Handler {`
`@@ -857,3 +857,10 @@ func securityHeaders() macaron.Handler {`
`857`	`857`	`})`
`858`	`858`	`}`
`859`	`859`	`}`
	`860`	`+`
	`861`	`+func reqTokenBySetting() macaron.Handler {`
	`862`	`+ if setting.Service.RequireSignInView {`
	`863`	`+ return reqToken()`
	`864`	`+ }`
	`865`	`+ return func(ctx *macaron.Context) {}`
	`866`	`+}`