diff --git a/pkg/api/login.go b/pkg/api/login.go index d2818d7a5b6..dc0b67a10ce 100644 --- a/pkg/api/login.go +++ b/pkg/api/login.go @@ -171,11 +171,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, }) }() diff --git a/pkg/api/login_test.go b/pkg/api/login_test.go index a84668bfda8..cbdeb9c0b80 100644 --- a/pkg/api/login_test.go +++ b/pkg/api/login_test.go @@ -652,6 +652,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) diff --git a/pkg/models/user_auth.go b/pkg/models/user_auth.go index 80cd730a3a5..9ac44ce8612 100644 --- a/pkg/models/user_auth.go +++ b/pkg/models/user_auth.go @@ -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 } // ----------------------