opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-03 02:42:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Return correct disabled status when looking up a user (#103182)

Browse Source
This commit is contained in:
Vardan Torosyan
2025-04-02 13:38:10 +02:00
committed by GitHub
parent 1164230df6
commit 26eab9981a
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/api/user.go
View File

@ -122,6 +122,7 @@ func (hs *HTTPServer) GetUserByLoginOrEmail(c *contextmodel.ReqContext) response
Login: usr.Login,
Theme: usr.Theme,
IsGrafanaAdmin: usr.IsAdmin,
IsDisabled: usr.IsDisabled,
OrgID: usr.OrgID,
UpdatedAt: usr.Updated,
CreatedAt: usr.Created,

10
pkg/api/user_test.go
View File

@ -93,10 +93,11 @@ func TestUserAPIEndpoint_userLoggedIn(t *testing.T) {
hs.userService = userSvc
createUserCmd := user.CreateUserCommand{
Email: fmt.Sprint("user", "@test.com"),
Name: "user",
Login: "loginuser",
IsAdmin: true,
Email: fmt.Sprint("user", "@test.com"),
Name: "user",
Login: "loginuser",
IsAdmin: true,
IsDisabled: true,
}
usr, err := userSvc.Create(context.Background(), &createUserCmd)
require.NoError(t, err)
@ -133,6 +134,7 @@ func TestUserAPIEndpoint_userLoggedIn(t *testing.T) {
Login: "loginuser",
OrgID: 1,
IsGrafanaAdmin: true,
IsDisabled: true,
AuthLabels: []string{},
CreatedAt: fakeNow,
UpdatedAt: fakeNow,