IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

mini code cleanup of in auth

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-01-14 10:14:07 +01:00
parent 7b17e38f5d
commit ced5e5500e
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/middleware/auth.go
View File

@@ -47,14 +47,13 @@ func authByToken(c *Context) {
} }
token := parts[1] token := parts[1]
userQuery := m.GetAccountByTokenQuery{Token: token} userQuery := m.GetAccountByTokenQuery{Token: token}
err := bus.Dispatch(&userQuery)
if err != nil { if err := bus.Dispatch(&userQuery); err != nil {
return return
} }
usingQuery := m.GetAccountByIdQuery{Id: userQuery.Result.UsingAccountId} usingQuery := m.GetAccountByIdQuery{Id: userQuery.Result.UsingAccountId}
err = bus.Dispatch(&usingQuery) if err := bus.Dispatch(&usingQuery); err != nil {
if err != nil {
return return
} }
@@ -71,15 +70,13 @@ func authBySession(c *Context, sess session.Store) {
} }
userQuery := m.GetAccountByIdQuery{Id: accountId} userQuery := m.GetAccountByIdQuery{Id: accountId}
err = bus.Dispatch(&userQuery) if err := bus.Dispatch(&userQuery); err != nil {
if err != nil {
authDenied(c) authDenied(c)
return return
} }
usingQuery := m.GetAccountByIdQuery{Id: userQuery.Result.UsingAccountId} usingQuery := m.GetAccountByIdQuery{Id: userQuery.Result.UsingAccountId}
err = bus.Dispatch(&usingQuery) if err := bus.Dispatch(&usingQuery); err != nil {
if err != nil {
authDenied(c) authDenied(c)
return return
} }