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

API: add login username in SendLoginLogCommand (#28544)

Browse Source 
* API: add login username in Login actions

* LoginUser -> LoginUsername

* fix test
This commit is contained in:
Agnès Toulet 2020-10-26 15:47:01 +01:00 committed by GitHub
parent 96e6524a7d
commit 65b5086a59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/api/login.go
View File

@ -181,6 +181,7 @@ func (hs *HTTPServer) LoginPost(c *models.ReqContext, cmd dtos.LoginCommand) Res
ReqContext: c, ReqContext: c,
LogAction: action, LogAction: action,
User: user, User: user,
LoginUsername: cmd.User,
HTTPStatus: response.status, HTTPStatus: response.status,
Error: err, Error: err,
}) })

1
pkg/api/login_test.go
View File

@ -687,6 +687,7 @@ func TestLoginPostSendLoginLog(t *testing.T) {
cmd := testReceiver.cmd cmd := testReceiver.cmd
assert.Equal(t, c.cmd.LogAction, cmd.LogAction) 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.HTTPStatus, cmd.HTTPStatus)
assert.Equal(t, c.cmd.Error, cmd.Error) assert.Equal(t, c.cmd.Error, cmd.Error)

1
pkg/models/user_auth.go
View File

@ -70,6 +70,7 @@ type SendLoginLogCommand struct {
LogAction string LogAction string
User *User User *User
ExternalUser *ExternalUserInfo ExternalUser *ExternalUserInfo
LoginUsername string
HTTPStatus int HTTPStatus int
Error error Error error
} }