IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-08-13 06:34:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Auth: Logout disabled user (#17166)

Browse Source 
* Feature: revoke user token when disabled

* Chore: fix linter error
This commit is contained in:
Alexander Zobnin
2019-05-23 15:54:47 +03:00
committed by GitHub
parent c87b2c9913
commit a3a7916597
3 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/api/admin_users.go
+13 -12
View File
@@ -112,43 +112,44 @@ func AdminDeleteUser(c *models.ReqContext) {
}
// POST /api/admin/users/:id/disable
func AdminDisableUser(c *models.ReqContext) {
func (server *HTTPServer) AdminDisableUser(c *models.ReqContext) Response {
userID := c.ParamsInt64(":id")
// External users shouldn't be disabled from API
authInfoQuery := &models.GetAuthInfoQuery{UserId: userID}
if err := bus.Dispatch(authInfoQuery); err != models.ErrUserNotFound {
c.JsonApiErr(500, "Could not disable external user", nil)
return
return Error(500, "Could not disable external user", nil)
}
disableCmd := models.DisableUserCommand{UserId: userID, IsDisabled: true}
if err := bus.Dispatch(&disableCmd); err != nil {
c.JsonApiErr(500, "Failed to disable user", err)
return
return Error(500, "Failed to disable user", err)
}
c.JsonOK("User disabled")
err := server.AuthTokenService.RevokeAllUserTokens(c.Req.Context(), userID)
if err != nil {
return Error(500, "Failed to disable user", err)
}
return Success("User disabled")
}
// POST /api/admin/users/:id/enable
func AdminEnableUser(c *models.ReqContext) {
func AdminEnableUser(c *models.ReqContext) Response {
userID := c.ParamsInt64(":id")
// External users shouldn't be disabled from API
authInfoQuery := &models.GetAuthInfoQuery{UserId: userID}
if err := bus.Dispatch(authInfoQuery); err != models.ErrUserNotFound {
c.JsonApiErr(500, "Could not enable external user", nil)
return
return Error(500, "Could not enable external user", nil)
}
disableCmd := models.DisableUserCommand{UserId: userID, IsDisabled: false}
if err := bus.Dispatch(&disableCmd); err != nil {
c.JsonApiErr(500, "Failed to enable user", err)
return
return Error(500, "Failed to enable user", err)
}
c.JsonOK("User enabled")
return Success("User enabled")
}
// POST /api/admin/users/:id/logout