Move SignedInUser to user service and RoleType and Roles to org (#53445)
* Move SignedInUser to user service and RoleType and Roles to org * Use go naming convention for roles * Fix some imports and leftovers * Fix ldap debug test * Fix lint * Fix lint 2 * Fix lint 3 * Fix type and not needed conversion * Clean up messages in api tests * Clean up api tests 2
This commit is contained in:
@@ -10,6 +10,7 @@ import (
|
||||
"github.com/grafana/grafana/pkg/api/response"
|
||||
"github.com/grafana/grafana/pkg/api/routing"
|
||||
"github.com/grafana/grafana/pkg/models"
|
||||
"github.com/grafana/grafana/pkg/services/user"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
@@ -87,7 +88,7 @@ func TestServerClient(t *testing.T) {
|
||||
t.Run("Making a request with user 1 should return user 1 as signed in user", func(t *testing.T) {
|
||||
req := s.NewRequest(http.MethodGet, "/test", nil)
|
||||
req = RequestWithWebContext(req, &models.ReqContext{
|
||||
SignedInUser: &models.SignedInUser{
|
||||
SignedInUser: &user.SignedInUser{
|
||||
UserId: 1,
|
||||
},
|
||||
})
|
||||
@@ -99,7 +100,7 @@ func TestServerClient(t *testing.T) {
|
||||
require.NoError(t, err)
|
||||
require.NoError(t, resp.Body.Close())
|
||||
|
||||
var user models.SignedInUser
|
||||
var user user.SignedInUser
|
||||
err = json.Unmarshal(bytes, &user)
|
||||
require.NoError(t, err)
|
||||
require.NotNil(t, user)
|
||||
@@ -109,7 +110,7 @@ func TestServerClient(t *testing.T) {
|
||||
t.Run("Making a request with user 2 should return user 2 as signed in user", func(t *testing.T) {
|
||||
req := s.NewRequest(http.MethodGet, "/test", nil)
|
||||
req = RequestWithWebContext(req, &models.ReqContext{
|
||||
SignedInUser: &models.SignedInUser{
|
||||
SignedInUser: &user.SignedInUser{
|
||||
UserId: 2,
|
||||
},
|
||||
})
|
||||
@@ -121,7 +122,7 @@ func TestServerClient(t *testing.T) {
|
||||
require.NoError(t, err)
|
||||
require.NoError(t, resp.Body.Close())
|
||||
|
||||
var user models.SignedInUser
|
||||
var user user.SignedInUser
|
||||
err = json.Unmarshal(bytes, &user)
|
||||
require.NoError(t, err)
|
||||
require.NotNil(t, user)
|
||||
|
||||
Reference in New Issue
Block a user