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

Add collaborator now handles role, added macaron-contrib/binding for binding and validation

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-01-16 11:54:19 +01:00
parent cd5843e977
commit f858f6b621
11 changed files with 81 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/api/api.go
+40 -37
View File
@@ -2,76 +2,79 @@ package api
import (
"github.com/Unknwon/macaron"
"github.com/macaron-contrib/binding"
"github.com/torkelo/grafana-pro/pkg/api/dtos"
"github.com/torkelo/grafana-pro/pkg/middleware"
m "github.com/torkelo/grafana-pro/pkg/models"
"github.com/torkelo/grafana-pro/pkg/setting"
)
// Register adds http routes
func Register(m *macaron.Macaron) {
func Register(r *macaron.Macaron) {
reqSignedIn := middleware.Auth(&middleware.AuthOptions{ReqSignedIn: true})
reqAdmin := middleware.Auth(&middleware.AuthOptions{ReqSignedIn: true, ReqAdmin: true})
bind := binding.Bind
// not logged in views
m.Get("/", reqSignedIn, Index)
m.Post("/logout", LogoutPost)
m.Post("/login", LoginPost)
m.Get("/login/:name", OAuthLogin)
m.Get("/login", Index)
r.Get("/", reqSignedIn, Index)
r.Post("/logout", LogoutPost)
r.Post("/login", LoginPost)
r.Get("/login/:name", OAuthLogin)
r.Get("/login", Index)
// authed views
m.Get("/account/", reqSignedIn, Index)
m.Get("/account/datasources/", reqSignedIn, Index)
m.Get("/admin", reqSignedIn, Index)
m.Get("/dashboard/*", reqSignedIn, Index)
r.Get("/account/", reqSignedIn, Index)
r.Get("/account/datasources/", reqSignedIn, Index)
r.Get("/admin", reqSignedIn, Index)
r.Get("/dashboard/*", reqSignedIn, Index)
// sign up
m.Get("/signup", Index)
m.Post("/api/account/signup", SignUp)
r.Get("/signup", Index)
r.Post("/api/account/signup", SignUp)
// authed api
m.Group("/api", func() {
r.Group("/api", func() {
// account
m.Group("/account", func() {
m.Get("/", GetAccount)
m.Post("/", UpdateAccount)
m.Put("/collaborators", AddCollaborator)
m.Get("/collaborators", GetCollaborators)
m.Delete("/collaborators/:id", RemoveCollaborator)
m.Post("/using/:id", SetUsingAccount)
m.Get("/others", GetOtherAccounts)
r.Group("/account", func() {
r.Get("/", GetAccount)
r.Post("/", UpdateAccount)
r.Put("/collaborators", bind(m.AddCollaboratorCommand{}), AddCollaborator)
r.Get("/collaborators", GetCollaborators)
r.Delete("/collaborators/:id", RemoveCollaborator)
r.Post("/using/:id", SetUsingAccount)
r.Get("/others", GetOtherAccounts)
})
// Token
m.Group("/tokens", func() {
m.Combo("/").Get(GetTokens).Put(AddToken).Post(UpdateToken)
m.Delete("/:id", DeleteToken)
r.Group("/tokens", func() {
r.Combo("/").Get(GetTokens).Put(AddToken).Post(UpdateToken)
r.Delete("/:id", DeleteToken)
})
// Data sources
m.Group("/datasources", func() {
m.Combo("/").Get(GetDataSources).Put(AddDataSource).Post(UpdateDataSource)
m.Delete("/:id", DeleteDataSource)
m.Any("/proxy/:id/*", reqSignedIn, ProxyDataSourceRequest)
r.Group("/datasources", func() {
r.Combo("/").Get(GetDataSources).Put(AddDataSource).Post(UpdateDataSource)
r.Delete("/:id", DeleteDataSource)
r.Any("/proxy/:id/*", reqSignedIn, ProxyDataSourceRequest)
})
// Dashboard
m.Group("/dashboard", func() {
m.Combo("/:slug").Get(GetDashboard).Delete(DeleteDashboard)
m.Post("/", PostDashboard)
r.Group("/dashboard", func() {
r.Combo("/:slug").Get(GetDashboard).Delete(DeleteDashboard)
r.Post("/", PostDashboard)
})
// Search
m.Get("/search/", Search)
r.Get("/search/", Search)
// metrics
m.Get("/metrics/test", GetTestMetrics)
r.Get("/metrics/test", GetTestMetrics)
}, reqSignedIn)
// admin api
m.Group("/api/admin", func() {
m.Get("/accounts", AdminSearchAccounts)
r.Group("/api/admin", func() {
r.Get("/accounts", AdminSearchAccounts)
}, reqAdmin)
// rendering
m.Get("/render/*", reqSignedIn, RenderToPng)
r.Get("/render/*", reqSignedIn, RenderToPng)
m.NotFound(NotFound)
r.NotFound(NotFound)
}
func setIndexViewData(c *middleware.Context) error {
pkg/api/collaborators.go
+2 -9
View File
@@ -6,15 +6,9 @@ import (
m "github.com/torkelo/grafana-pro/pkg/models"
)
func AddCollaborator(c *middleware.Context) {
var cmd m.AddCollaboratorCommand
func AddCollaborator(c *middleware.Context, cmd m.AddCollaboratorCommand) {
if !c.JsonBody(&cmd) {
c.JsonApiErr(400, "Invalid request", nil)
return
}
userQuery := m.GetAccountByLoginQuery{Login: cmd.Email}
userQuery := m.GetAccountByLoginQuery{LoginOrEmail: cmd.LoginOrEmail}
err := bus.Dispatch(&userQuery)
if err != nil {
c.JsonApiErr(404, "Collaborator not found", nil)
@@ -30,7 +24,6 @@ func AddCollaborator(c *middleware.Context) {
cmd.AccountId = c.UserAccount.Id
cmd.CollaboratorId = accountToAdd.Id
cmd.Role = m.ROLE_READ_WRITE
err = bus.Dispatch(&cmd)
if err != nil {
pkg/api/login.go
+1 -1
View File
@@ -23,7 +23,7 @@ func LoginPost(c *middleware.Context) {
return
}
userQuery := m.GetAccountByLoginQuery{Login: loginModel.Email}
userQuery := m.GetAccountByLoginQuery{LoginOrEmail: loginModel.Email}
err := bus.Dispatch(&userQuery)
if err != nil {
pkg/api/login_oauth.go
+1 -1
View File
@@ -51,7 +51,7 @@ func OAuthLogin(ctx *middleware.Context) {
log.Info("login.OAuthLogin(social login): %s", userInfo)
userQuery := m.GetAccountByLoginQuery{Login: userInfo.Email}
userQuery := m.GetAccountByLoginQuery{LoginOrEmail: userInfo.Email}
err = bus.Dispatch(&userQuery)
// create account if missing
pkg/api/token.go
+4 -4
View File
@@ -49,10 +49,10 @@ func AddToken(c *middleware.Context) {
return
}
if cmd.Role != m.ROLE_READ_WRITE && cmd.Role != m.ROLE_READ {
c.JsonApiErr(400, "Invalid role specified", nil)
return
}
// if cmd.Role != m.ROLE_READ_WRITE && cmd.Role != m.ROLE_READ {
// c.JsonApiErr(400, "Invalid role specified", nil)
// return
// }
cmd.AccountId = c.Account.Id
cmd.Token = util.GetRandomString(64)