Access control: refactor RBAC checks (#48107)

* refactor RBAC checks * fix a test * another test fix * and another
2022-04-25 10:42:09 +02:00
parent 2e599643f6
commit 68ca5b2e05
13 changed files with 27 additions and 29 deletions
@@ -733,7 +733,7 @@ func (hs *HTTPServer) setIndexViewData(c *models.ReqContext) (*dtos.IndexViewDat
 		LoadingLogo:             "public/img/grafana_icon.svg",
 	}

-	if hs.Features.IsEnabled(featuremgmt.FlagAccesscontrol) {
+	if !hs.AccessControl.IsDisabled() {
 		userPermissions, err := hs.AccessControl.GetUserPermissions(c.Req.Context(), c.SignedInUser, ac.Options{ReloadCache: false})
 		if err != nil {
 			return nil, err