opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-02 17:42:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

More refactoring of user http api, trying to reuse handlers for sign in user and admin operations

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-05-18 19:06:19 +02:00
parent 62e8841e8c
commit fbc6bb2112
6 changed files with 45 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
pkg/api/user.go
View File

@ -27,15 +27,31 @@ func getUserUserProfile(userId int64) Response {
return Json(200, query.Result)
}
func UpdateUser(c *middleware.Context, cmd m.UpdateUserCommand) {
// POST /api/user
func UpdateSignedInUser(c *middleware.Context, cmd m.UpdateUserCommand) Response {
cmd.UserId = c.UserId
return handleUpdateUser(cmd)
}
if err := bus.Dispatch(&cmd); err != nil {
c.JsonApiErr(400, "Failed to update user", err)
return
// POST /api/users/:id
func UpdateUser(c *middleware.Context, cmd m.UpdateUserCommand) Response {
cmd.UserId = c.ParamsInt64(":id")
return handleUpdateUser(cmd)
}
func handleUpdateUser(cmd m.UpdateUserCommand) Response {
if len(cmd.Login) == 0 {
cmd.Login = cmd.Email
if len(cmd.Login) == 0 {
return ApiError(400, "Validation error, need specify either username or email", nil)
}
}
c.JsonOK("User updated")
if err := bus.Dispatch(&cmd); err != nil {
return ApiError(500, "failed to update user", err)
}
return ApiSuccess("User updated")
}
// GET /api/user/orgs