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
@@ -1,8 +1,8 @@
package manager
import (
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/accesscontrol"
"github.com/grafana/grafana/pkg/services/org"
"github.com/grafana/grafana/pkg/services/serviceaccounts"
)
@@ -20,7 +20,7 @@ func RegisterRoles(ac accesscontrol.AccessControl) error {
},
},
},
Grants: []string{string(models.ROLE_ADMIN)},
Grants: []string{string(org.RoleAdmin)},
}
saCreator := accesscontrol.RoleRegistration{
@@ -35,7 +35,7 @@ func RegisterRoles(ac accesscontrol.AccessControl) error {
},
},
},
Grants: []string{string(models.ROLE_ADMIN)},
Grants: []string{string(org.RoleAdmin)},
}
saWriter := accesscontrol.RoleRegistration{
@@ -66,7 +66,7 @@ func RegisterRoles(ac accesscontrol.AccessControl) error {
},
}),
},
Grants: []string{string(models.ROLE_ADMIN)},
Grants: []string{string(org.RoleAdmin)},
}
if err := ac.DeclareFixedRoles(saReader, saCreator, saWriter); err != nil {