Small update to update account command

grafana @ a0036179

-Subproject commit 64f98d2409152a2bfa34b6f032d21e6bb18b97f8
+Subproject commit a0036179d500366e28552d2c332fd50f534913a3

pkg/api/account.go

@@ -18,14 +18,7 @@ func GetAccount(c *middleware.Context) {
 	c.JSON(200, query.Result)
 	c.JSON(200, query.Result)
 }
 }
 
 
-func UpdateAccount(c *middleware.Context) {
-	cmd := m.UpdateAccountCommand{}
-
-	if !c.JsonBody(&cmd) {
-		c.JsonApiErr(400, "Invalid request", nil)
-		return
-	}
-
+func UpdateAccount(c *middleware.Context, cmd m.UpdateAccountCommand) {
 	cmd.AccountId = c.AccountId
 	cmd.AccountId = c.AccountId
 
 
 	if err := bus.Dispatch(&cmd); err != nil {
 	if err := bus.Dispatch(&cmd); err != nil {

pkg/api/api.go

@@ -40,7 +40,7 @@ func Register(r *macaron.Macaron) {
 		// account
 		// account
 		r.Group("/account", func() {
 		r.Group("/account", func() {
 			r.Get("/", GetAccount)
 			r.Get("/", GetAccount)
-			r.Post("/", UpdateAccount)
+			r.Post("/", bind(m.UpdateAccountCommand{}), UpdateAccount)
 			r.Put("/collaborators", bind(m.AddCollaboratorCommand{}), AddCollaborator)
 			r.Put("/collaborators", bind(m.AddCollaboratorCommand{}), AddCollaborator)
 			r.Get("/collaborators", GetCollaborators)
 			r.Get("/collaborators", GetCollaborators)
 			r.Delete("/collaborators/:id", RemoveCollaborator)
 			r.Delete("/collaborators/:id", RemoveCollaborator)

pkg/middleware/middleware.go

@@ -58,6 +58,7 @@ func GetContextHandler() macaron.Handler {
 
 
 				// api key role
 				// api key role
 				ctx.UserRole = tokenInfo.Role
 				ctx.UserRole = tokenInfo.Role
+				ctx.ApiKeyId = tokenInfo.Id
 				ctx.UsingAccountId = ctx.AccountId
 				ctx.UsingAccountId = ctx.AccountId
 				ctx.UsingAccountName = ctx.UserName
 				ctx.UsingAccountName = ctx.UserName
 			}
 			}

pkg/models/account.go

@@ -42,7 +42,7 @@ type CreateAccountCommand struct {
 }
 }
 
 
 type UpdateAccountCommand struct {
 type UpdateAccountCommand struct {
-	Email string `json:"email" binding:"required"`
+	Email string `json:"email" binding:"Required"`
 	Login string `json:"login"`
 	Login string `json:"login"`
 	Name  string `json:"name"`
 	Name  string `json:"name"`
 
 
@@ -100,6 +100,7 @@ type SignedInUser struct {
 	UserLogin        string
 	UserLogin        string
 	UserName         string
 	UserName         string
 	UserEmail        string
 	UserEmail        string
+	ApiKeyId         int64
 	IsGrafanaAdmin   bool
 	IsGrafanaAdmin   bool
 }
 }