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:
@@ -7,6 +7,7 @@ import (
|
||||
|
||||
"github.com/grafana/grafana/pkg/infra/log"
|
||||
"github.com/grafana/grafana/pkg/models"
|
||||
"github.com/grafana/grafana/pkg/services/org"
|
||||
"github.com/grafana/grafana/pkg/services/serviceaccounts"
|
||||
"github.com/grafana/grafana/pkg/services/serviceaccounts/database"
|
||||
"github.com/grafana/grafana/pkg/services/sqlstore"
|
||||
@@ -37,7 +38,7 @@ type OSSCrawlerAuthSetupService struct {
|
||||
type CrawlerAuth interface {
|
||||
GetUserId(orgId int64) int64
|
||||
GetLogin(orgId int64) string
|
||||
GetOrgRole() models.RoleType
|
||||
GetOrgRole() org.RoleType
|
||||
}
|
||||
|
||||
func (o *OSSCrawlerAuthSetupService) findAllOrgIds(ctx context.Context) ([]int64, error) {
|
||||
@@ -58,10 +59,10 @@ func (o *OSSCrawlerAuthSetupService) findAllOrgIds(ctx context.Context) ([]int64
|
||||
type crawlerAuth struct {
|
||||
accountIdByOrgId map[int64]int64
|
||||
loginByOrgId map[int64]string
|
||||
orgRole models.RoleType
|
||||
orgRole org.RoleType
|
||||
}
|
||||
|
||||
func (o *crawlerAuth) GetOrgRole() models.RoleType {
|
||||
func (o *crawlerAuth) GetOrgRole() org.RoleType {
|
||||
return o.orgRole
|
||||
}
|
||||
|
||||
@@ -79,9 +80,9 @@ func (o *OSSCrawlerAuthSetupService) Setup(ctx context.Context) (CrawlerAuth, er
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// userId:0 and ROLE_ADMIN grants the crawler process permissions to view all dashboards in all folders & orgs
|
||||
// userId:0 and RoleAdmin grants the crawler process permissions to view all dashboards in all folders & orgs
|
||||
// the process doesn't and shouldn't actually need to edit/modify any resources from the UI
|
||||
orgRole := models.ROLE_ADMIN
|
||||
orgRole := org.RoleAdmin
|
||||
|
||||
accountIdByOrgId := make(map[int64]int64)
|
||||
loginByOrgId := make(map[int64]string)
|
||||
|
||||
Reference in New Issue
Block a user