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:
idafurjes
2022-08-10 11:56:48 +02:00
committed by GitHub
parent 46004037e2
commit 6afad51761
278 changed files with 1758 additions and 1543 deletions
+4 -4
View File
@@ -4,7 +4,7 @@ import (
"time"
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/user"
)
const (
@@ -156,7 +156,7 @@ type UpdateSecretFn func() error
type GetDataSourcesQuery struct {
OrgId int64
DataSourceLimit int
User *models.SignedInUser
User *user.SignedInUser
Result []*DataSource
}
@@ -172,7 +172,7 @@ type GetDataSourcesByTypeQuery struct {
type GetDefaultDataSourceQuery struct {
OrgId int64
User *models.SignedInUser
User *user.SignedInUser
Result *DataSource
}
@@ -214,7 +214,7 @@ func (p DsPermissionType) String() string {
}
type DatasourcesPermissionFilterQuery struct {
User *models.SignedInUser
User *user.SignedInUser
Datasources []*DataSource
Result []*DataSource
}