root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 236 Packages Projects Releases Wiki Activity

pkg/middleware/middleware.go: Fix empty branch warning. 

See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=megacheck ./...
pkg/middleware/middleware.go:46:3⚠️ empty branch (SA9003) (megacheck)
This commit is contained in:
Mario Trangoni 2018-10-15 21:13:03 +02:00
parent abb6b135a3
commit e673337cb9
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/middleware/middleware.go
View File

@ -43,12 +43,13 @@ func GetContextHandler() macaron.Handler {
// then init session and look for userId in session // then init session and look for userId in session
// then look for api key in session (special case for render calls via api) // then look for api key in session (special case for render calls via api)
// then test if anonymous access is enabled // then test if anonymous access is enabled
if initContextWithRenderAuth(ctx) || switch {
initContextWithApiKey(ctx) || case initContextWithRenderAuth(ctx):
initContextWithBasicAuth(ctx, orgId) || case initContextWithApiKey(ctx):
initContextWithAuthProxy(ctx, orgId) || case initContextWithBasicAuth(ctx, orgId):
initContextWithUserSessionCookie(ctx, orgId) || case initContextWithAuthProxy(ctx, orgId):
initContextWithAnonymousUser(ctx) { case initContextWithUserSessionCookie(ctx, orgId):
case initContextWithAnonymousUser(ctx):
} }
ctx.Logger = log.New("context", "userId", ctx.UserId, "orgId", ctx.OrgId, "uname", ctx.Login) ctx.Logger = log.New("context", "userId", ctx.UserId, "orgId", ctx.OrgId, "uname", ctx.Login)