mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
API: add login username in SendLoginLogCommand (#28544)
* API: add login username in Login actions * LoginUser -> LoginUsername * fix test
This commit is contained in:
parent
96e6524a7d
commit
65b5086a59
@ -178,11 +178,12 @@ func (hs *HTTPServer) LoginPost(c *models.ReqContext, cmd dtos.LoginCommand) Res
|
||||
err = errors.New(response.errMessage)
|
||||
}
|
||||
hs.SendLoginLog(&models.SendLoginLogCommand{
|
||||
ReqContext: c,
|
||||
LogAction: action,
|
||||
User: user,
|
||||
HTTPStatus: response.status,
|
||||
Error: err,
|
||||
ReqContext: c,
|
||||
LogAction: action,
|
||||
User: user,
|
||||
LoginUsername: cmd.User,
|
||||
HTTPStatus: response.status,
|
||||
Error: err,
|
||||
})
|
||||
}()
|
||||
|
||||
|
@ -687,6 +687,7 @@ func TestLoginPostSendLoginLog(t *testing.T) {
|
||||
|
||||
cmd := testReceiver.cmd
|
||||
assert.Equal(t, c.cmd.LogAction, cmd.LogAction)
|
||||
assert.Equal(t, "admin", cmd.LoginUsername)
|
||||
assert.Equal(t, c.cmd.HTTPStatus, cmd.HTTPStatus)
|
||||
assert.Equal(t, c.cmd.Error, cmd.Error)
|
||||
|
||||
|
@ -66,12 +66,13 @@ type DeleteAuthInfoCommand struct {
|
||||
}
|
||||
|
||||
type SendLoginLogCommand struct {
|
||||
ReqContext *ReqContext
|
||||
LogAction string
|
||||
User *User
|
||||
ExternalUser *ExternalUserInfo
|
||||
HTTPStatus int
|
||||
Error error
|
||||
ReqContext *ReqContext
|
||||
LogAction string
|
||||
User *User
|
||||
ExternalUser *ExternalUserInfo
|
||||
LoginUsername string
|
||||
HTTPStatus int
|
||||
Error error
|
||||
}
|
||||
|
||||
// ----------------------
|
||||
|
Loading…
Reference in New Issue
Block a user