mirror of
https://github.com/grafana/grafana.git
synced 2024-11-23 09:26:43 -06:00
8505d90768
* admin: user page to react WIP * admin user page: basic view * admin user page: refactor, extract orgs and permissions components * admin user: change sessions actions styles * admin user: add disable button * user admin: add change grafana admin action * user admin: able to change org role and remove org * user admin: confirm force logout * user admin: change org button style * user admin: add confirm modals for critical actions * user admin: lock down ldap user info * user admin: align with latest design changes * user admin: add LDAP sync * admin user: confirm button * user admin: add to org modal * user admin: fix ConfirmButton story * admin user: handle grafana admin change * ConfirmButton: make styled component * ConfirmButton: completely styled component * User Admin: permissions section refactor * admin user: refactor (orgs and sessions) * ConfirmButton: able to set confirm variant * admin user: inline org removal * admin user: show ldap sync info only for ldap users * admin user: edit profile * ConfirmButton: some fixes after review * Chore: fix storybook build * admin user: rename handlers * admin user: remove LdapUserPage import from routes * Chore: fix ConfirmButton tests * Chore: fix user api endpoint tests * Chore: update failed test snapshots * admin user: redux actions WIP * admin user: use new ConfirmModal component for user profile * admin user: use new ConfirmModal component for sessions * admin user: use lockMessage * ConfirmButton: use primary button as default * admin user: fix ActionButton color * UI: use Icon component for Modal * UI: refactor ConfirmModal after Modal changes * UI: add link button variant * UI: able to use custom ConfirmButton * Chore: fix type errors after ConfirmButton refactor * Chore: revert Graph component changes (works with TS 3.7) * Chore: use Forms.Button instead of ActionButton * admin user: align items * admin user: align add to org modal * UI: organization picker component * admin user: use org picker for AddToOrgModal * admin user: org actions * admin user: connect sessions actions * admin user: updateUserPermissions action * admin user: enable delete user action * admin user: sync ldap user * Chore: refactor, remove unused code * Chore: refactor, move api calls to actions * admin user: set user password action * Chore: refactor, remove unused components * admin user: set input focus on edit * admin user: pass user into debug LDAP mapping * UserAdminPage: Ux changes * UserAdminPage: align buttons to the left * UserAdminPage: align delete user button * UserAdminPage: swap add to org modal buttons * UserAdminPage: set password field to empty when editing * UserAdminPage: fix tests * Updated button border * Chore: fix ConfirmButton after changes introduced in #21092 Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
213 lines
5.6 KiB
Go
213 lines
5.6 KiB
Go
package api
|
|
|
|
import (
|
|
"fmt"
|
|
"net/http"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/grafana/grafana/pkg/api/dtos"
|
|
"github.com/grafana/grafana/pkg/bus"
|
|
"github.com/grafana/grafana/pkg/components/simplejson"
|
|
"github.com/grafana/grafana/pkg/models"
|
|
. "github.com/smartystreets/goconvey/convey"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestUserApiEndpoint(t *testing.T) {
|
|
Convey("Given a user is logged in", t, func() {
|
|
mockResult := models.SearchUserQueryResult{
|
|
Users: []*models.UserSearchHitDTO{
|
|
{Name: "user1"},
|
|
{Name: "user2"},
|
|
},
|
|
TotalCount: 2,
|
|
}
|
|
|
|
loggedInUserScenario("When calling GET on", "api/users/:id", func(sc *scenarioContext) {
|
|
fakeNow := time.Date(2019, 2, 11, 17, 30, 40, 0, time.UTC)
|
|
bus.AddHandler("test", func(query *models.GetUserProfileQuery) error {
|
|
query.Result = models.UserProfileDTO{
|
|
Id: int64(1),
|
|
Email: "daniel@grafana.com",
|
|
Name: "Daniel",
|
|
Login: "danlee",
|
|
OrgId: int64(2),
|
|
IsGrafanaAdmin: true,
|
|
IsDisabled: false,
|
|
IsExternal: false,
|
|
UpdatedAt: fakeNow,
|
|
CreatedAt: fakeNow,
|
|
}
|
|
return nil
|
|
})
|
|
|
|
bus.AddHandler("test", func(query *models.GetAuthInfoQuery) error {
|
|
query.Result = &models.UserAuth{
|
|
AuthModule: models.AuthModuleLDAP,
|
|
}
|
|
return nil
|
|
})
|
|
|
|
sc.handlerFunc = GetUserByID
|
|
avatarUrl := dtos.GetGravatarUrl("daniel@grafana.com")
|
|
sc.fakeReqWithParams("GET", sc.url, map[string]string{}).exec()
|
|
|
|
expected := fmt.Sprintf(`
|
|
{
|
|
"id": 1,
|
|
"email": "daniel@grafana.com",
|
|
"name": "Daniel",
|
|
"login": "danlee",
|
|
"theme": "",
|
|
"orgId": 2,
|
|
"isGrafanaAdmin": true,
|
|
"isDisabled": false,
|
|
"isExternal": true,
|
|
"authLabels": [
|
|
"LDAP"
|
|
],
|
|
"avatarUrl": "%s",
|
|
"updatedAt": "2019-02-11T17:30:40Z",
|
|
"createdAt": "2019-02-11T17:30:40Z"
|
|
}
|
|
`, avatarUrl)
|
|
|
|
require.Equal(t, http.StatusOK, sc.resp.Code)
|
|
require.JSONEq(t, expected, sc.resp.Body.String())
|
|
})
|
|
|
|
loggedInUserScenario("When calling GET on", "/api/users/lookup", func(sc *scenarioContext) {
|
|
fakeNow := time.Date(2019, 2, 11, 17, 30, 40, 0, time.UTC)
|
|
bus.AddHandler("test", func(query *models.GetUserByLoginQuery) error {
|
|
require.Equal(t, "danlee", query.LoginOrEmail)
|
|
|
|
query.Result = &models.User{
|
|
Id: int64(1),
|
|
Email: "daniel@grafana.com",
|
|
Name: "Daniel",
|
|
Login: "danlee",
|
|
Theme: "light",
|
|
IsAdmin: true,
|
|
OrgId: int64(2),
|
|
IsDisabled: false,
|
|
Updated: fakeNow,
|
|
Created: fakeNow,
|
|
}
|
|
|
|
return nil
|
|
})
|
|
|
|
sc.handlerFunc = GetUserByLoginOrEmail
|
|
sc.fakeReqWithParams("GET", sc.url, map[string]string{"loginOrEmail": "danlee"}).exec()
|
|
|
|
expected := `
|
|
{
|
|
"id": 1,
|
|
"email": "daniel@grafana.com",
|
|
"name": "Daniel",
|
|
"login": "danlee",
|
|
"theme": "light",
|
|
"orgId": 2,
|
|
"isGrafanaAdmin": true,
|
|
"isDisabled": false,
|
|
"authLabels": null,
|
|
"isExternal": false,
|
|
"avatarUrl": "",
|
|
"updatedAt": "2019-02-11T17:30:40Z",
|
|
"createdAt": "2019-02-11T17:30:40Z"
|
|
}
|
|
`
|
|
|
|
require.Equal(t, http.StatusOK, sc.resp.Code)
|
|
require.JSONEq(t, expected, sc.resp.Body.String())
|
|
})
|
|
|
|
loggedInUserScenario("When calling GET on", "/api/users", func(sc *scenarioContext) {
|
|
var sentLimit int
|
|
var sendPage int
|
|
bus.AddHandler("test", func(query *models.SearchUsersQuery) error {
|
|
query.Result = mockResult
|
|
|
|
sentLimit = query.Limit
|
|
sendPage = query.Page
|
|
|
|
return nil
|
|
})
|
|
|
|
sc.handlerFunc = SearchUsers
|
|
sc.fakeReqWithParams("GET", sc.url, map[string]string{}).exec()
|
|
|
|
So(sentLimit, ShouldEqual, 1000)
|
|
So(sendPage, ShouldEqual, 1)
|
|
|
|
respJSON, err := simplejson.NewJson(sc.resp.Body.Bytes())
|
|
So(err, ShouldBeNil)
|
|
So(len(respJSON.MustArray()), ShouldEqual, 2)
|
|
})
|
|
|
|
loggedInUserScenario("When calling GET with page and limit querystring parameters on", "/api/users", func(sc *scenarioContext) {
|
|
var sentLimit int
|
|
var sendPage int
|
|
bus.AddHandler("test", func(query *models.SearchUsersQuery) error {
|
|
query.Result = mockResult
|
|
|
|
sentLimit = query.Limit
|
|
sendPage = query.Page
|
|
|
|
return nil
|
|
})
|
|
|
|
sc.handlerFunc = SearchUsers
|
|
sc.fakeReqWithParams("GET", sc.url, map[string]string{"perpage": "10", "page": "2"}).exec()
|
|
|
|
So(sentLimit, ShouldEqual, 10)
|
|
So(sendPage, ShouldEqual, 2)
|
|
})
|
|
|
|
loggedInUserScenario("When calling GET on", "/api/users/search", func(sc *scenarioContext) {
|
|
var sentLimit int
|
|
var sendPage int
|
|
bus.AddHandler("test", func(query *models.SearchUsersQuery) error {
|
|
query.Result = mockResult
|
|
|
|
sentLimit = query.Limit
|
|
sendPage = query.Page
|
|
|
|
return nil
|
|
})
|
|
|
|
sc.handlerFunc = SearchUsersWithPaging
|
|
sc.fakeReqWithParams("GET", sc.url, map[string]string{}).exec()
|
|
|
|
So(sentLimit, ShouldEqual, 1000)
|
|
So(sendPage, ShouldEqual, 1)
|
|
|
|
respJSON, err := simplejson.NewJson(sc.resp.Body.Bytes())
|
|
So(err, ShouldBeNil)
|
|
|
|
So(respJSON.Get("totalCount").MustInt(), ShouldEqual, 2)
|
|
So(len(respJSON.Get("users").MustArray()), ShouldEqual, 2)
|
|
})
|
|
|
|
loggedInUserScenario("When calling GET with page and perpage querystring parameters on", "/api/users/search", func(sc *scenarioContext) {
|
|
var sentLimit int
|
|
var sendPage int
|
|
bus.AddHandler("test", func(query *models.SearchUsersQuery) error {
|
|
query.Result = mockResult
|
|
|
|
sentLimit = query.Limit
|
|
sendPage = query.Page
|
|
|
|
return nil
|
|
})
|
|
|
|
sc.handlerFunc = SearchUsersWithPaging
|
|
sc.fakeReqWithParams("GET", sc.url, map[string]string{"perpage": "10", "page": "2"}).exec()
|
|
|
|
So(sentLimit, ShouldEqual, 10)
|
|
So(sendPage, ShouldEqual, 2)
|
|
})
|
|
})
|
|
}
|