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

Refactoring get account by id and by login to queries

Browse Source
This commit is contained in:
Torkel Ödegaard
2014-12-19 13:40:02 +01:00
parent 5dcf6ff2d3
commit 22bf20a135
8 changed files with 58 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/middleware/auth.go
View File

@@ -7,7 +7,8 @@ import (
"github.com/Unknwon/macaron"
"github.com/macaron-contrib/session"
"github.com/torkelo/grafana-pro/pkg/models"
"github.com/torkelo/grafana-pro/pkg/bus"
m "github.com/torkelo/grafana-pro/pkg/models"
)
func authGetRequestAccountId(c *Context, sess session.Store) (int64, error) {
@@ -40,19 +41,21 @@ func Auth() macaron.Handler {
return
}
account, err := models.GetAccount(accountId)
userQuery := m.GetAccountByIdQuery{Id: accountId}
err = bus.Dispatch(&userQuery)
if err != nil {
authDenied(c)
return
}
usingAccount, err := models.GetAccount(account.UsingAccountId)
usingQuery := m.GetAccountByIdQuery{Id: userQuery.Result.UsingAccountId}
err = bus.Dispatch(&usingQuery)
if err != nil {
authDenied(c)
return
}
c.UserAccount = account
c.Account = usingAccount
c.UserAccount = userQuery.Result
c.Account = usingQuery.Result
}
}