public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tokens small fixes

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-01-16 12:28:35 +01:00
parent 9feb8a73fd
commit aa9ca68883
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
grafana
+1 -1
Submodule grafana updated: d3cc6e518d...aaa717aac2
pkg/api/api.go
+2
View File
@@ -25,6 +25,8 @@ func Register(r *macaron.Macaron) {
// authed views // authed views
r.Get("/account/", reqSignedIn, Index) r.Get("/account/", reqSignedIn, Index)
r.Get("/account/datasources/", reqSignedIn, Index) r.Get("/account/datasources/", reqSignedIn, Index)
r.Get("/account/collaborators/", reqSignedIn, Index)
r.Get("/account/apikeys/", reqSignedIn, Index)
r.Get("/admin", reqSignedIn, Index) r.Get("/admin", reqSignedIn, Index)
r.Get("/dashboard/*", reqSignedIn, Index) r.Get("/dashboard/*", reqSignedIn, Index)
pkg/api/token.go
+3 -3
View File
@@ -8,7 +8,7 @@ import (
) )
func GetTokens(c *middleware.Context) { func GetTokens(c *middleware.Context) {
query := m.GetTokensQuery{AccountId: c.Account.Id} query := m.GetTokensQuery{AccountId: c.UserAccount.Id}
err := bus.Dispatch(&query) err := bus.Dispatch(&query)
if err != nil { if err != nil {
@@ -47,7 +47,7 @@ func AddToken(c *middleware.Context, cmd m.AddTokenCommand) {
return return
} }
cmd.AccountId = c.Account.Id cmd.AccountId = c.UserAccount.Id
cmd.Token = util.GetRandomString(64) cmd.Token = util.GetRandomString(64)
if err := bus.Dispatch(&cmd); err != nil { if err := bus.Dispatch(&cmd); err != nil {
@@ -71,7 +71,7 @@ func UpdateToken(c *middleware.Context, cmd m.UpdateTokenCommand) {
return return
} }
cmd.AccountId = c.Account.Id cmd.AccountId = c.UserAccount.Id
err := bus.Dispatch(&cmd) err := bus.Dispatch(&cmd)
if err != nil { if err != nil {
pkg/models/account.go
-1
View File
@@ -6,7 +6,6 @@ import (
) )
// Typed errors // Typed errors
var ( var (
ErrAccountNotFound = errors.New("Account not found") ErrAccountNotFound = errors.New("Account not found")
) )