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

Auth: Fix grafana-auth-app menu not being displayed (#90882)

Browse Source 
Auth: Fix grafana-auth-app menu not being displayed if user only has access to cloud access policies
This commit is contained in:
Jo
2024-07-24 15:10:19 +02:00
committed by GitHub
parent e5ff5e65df
commit 93a979d46d
3 changed files with 47 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/navtree/navtreeimpl/admin.go
+2 -3
View File
@@ -163,9 +163,8 @@ func (s *ServiceImpl) getAdminNode(c *contextmodel.ReqContext) (*navtree.NavLink
Children: accessNodeLinks,
}
if len(usersNode.Children) > 0 {
configNodes = append(configNodes, usersNode)
}
// Always append admin access as it's injected by grafana-auth-app.
configNodes = append(configNodes, usersNode)
if authConfigUIAvailable && hasAccess(ssoutils.EvalAuthenticationSettings(s.cfg)) ||
(hasAccess(ssoutils.OauthSettingsEvaluator(s.cfg)) && s.features.IsEnabled(ctx, featuremgmt.FlagSsoSettingsApi)) {