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

ApiUser: Fix response when enabling, disabling or deleting a nonexistent user (#21391)

Browse Source 
* ApiUser: Fix response when enabling, disabling or deleting a nonexistent user
This commit is contained in:
Pavlos Daoglou
2020-01-10 12:43:44 +02:00
committed by Arve Knudsen
parent bb649489c8
commit 53007e07e3
3 changed files with 102 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/api/admin_users.go
View File

@@ -108,6 +108,10 @@ func AdminDeleteUser(c *models.ReqContext) {
cmd := models.DeleteUserCommand{UserId: userID}
if err := bus.Dispatch(&cmd); err != nil {
if err == models.ErrUserNotFound {
c.JsonApiErr(404, models.ErrUserNotFound.Error(), nil)
return
}
c.JsonApiErr(500, "Failed to delete user", err)
return
}
@@ -127,6 +131,9 @@ func (server *HTTPServer) AdminDisableUser(c *models.ReqContext) Response {
disableCmd := models.DisableUserCommand{UserId: userID, IsDisabled: true}
if err := bus.Dispatch(&disableCmd); err != nil {
if err == models.ErrUserNotFound {
return Error(404, models.ErrUserNotFound.Error(), nil)
}
return Error(500, "Failed to disable user", err)
}
@@ -150,6 +157,9 @@ func AdminEnableUser(c *models.ReqContext) Response {
disableCmd := models.DisableUserCommand{UserId: userID, IsDisabled: false}
if err := bus.Dispatch(&disableCmd); err != nil {
if err == models.ErrUserNotFound {
return Error(404, models.ErrUserNotFound.Error(), nil)
}
return Error(500, "Failed to enable user", err)
}