public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Plugins: Rename externalServiceAuthentication to iam (#78686)

Browse Source 
Plugins: Rename externalServiceAuthentication to iam
This commit is contained in:
Gabriel MABILLE
2023-12-04 13:14:21 +01:00
committed by GitHub
parent 0825b63b79
commit 5b70130e6c
14 changed files with 53 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/api/plugins.go
+2 -2
View File
@@ -519,13 +519,13 @@ func (hs *HTTPServer) hasPluginRequestedPermissions(c *contextmodel.ReqContext,
}
// No registration => Early return
if plugin.JSONData.ExternalServiceRegistration == nil || len(plugin.JSONData.ExternalServiceRegistration.Permissions) == 0 {
if plugin.JSONData.IAM == nil || len(plugin.JSONData.IAM.Permissions) == 0 {
hs.log.Debug("plugin did not request permissions on Grafana", "pluginID", pluginID)
return
}
hs.log.Debug("check installer's permissions, plugin wants to register an external service")
evaluator := evalAllPermissions(plugin.JSONData.ExternalServiceRegistration.Permissions)
evaluator := evalAllPermissions(plugin.JSONData.IAM.Permissions)
hasAccess := ac.HasGlobalAccess(hs.AccessControl, hs.accesscontrolService, c)
if hs.Cfg.RBACSingleOrganization {
// In a single organization setup, no need for a global check