IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Auth: Change UI route, add frontend endpoints to api.go (#80671)

Browse Source 
Delete advanced from UI route, fix 404
This commit is contained in:
Misi 2024-01-19 11:53:37 +01:00 committed by GitHub
parent 4d6069583e
commit 6752a512f3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/api/api.go
View File

@ -107,7 +107,6 @@ func (hs *HTTPServer) registerRoutes() {
r.Get("/admin/orgs", authorizeInOrg(ac.UseGlobalOrg, ac.OrgsAccessEvaluator), hs.Index) r.Get("/admin/orgs", authorizeInOrg(ac.UseGlobalOrg, ac.OrgsAccessEvaluator), hs.Index)
r.Get("/admin/orgs/edit/:id", authorizeInOrg(ac.UseGlobalOrg, ac.OrgsAccessEvaluator), hs.Index) r.Get("/admin/orgs/edit/:id", authorizeInOrg(ac.UseGlobalOrg, ac.OrgsAccessEvaluator), hs.Index)
r.Get("/admin/stats", authorize(ac.EvalPermission(ac.ActionServerStatsRead)), hs.Index) r.Get("/admin/stats", authorize(ac.EvalPermission(ac.ActionServerStatsRead)), hs.Index)
r.Get("/admin/authentication/ldap", authorize(ac.EvalPermission(ac.ActionLDAPStatusRead)), hs.Index)
if hs.Features.IsEnabledGlobally(featuremgmt.FlagStorage) { if hs.Features.IsEnabledGlobally(featuremgmt.FlagStorage) {
r.Get("/admin/storage", reqSignedIn, hs.Index) r.Get("/admin/storage", reqSignedIn, hs.Index)
r.Get("/admin/storage/*", reqSignedIn, hs.Index) r.Get("/admin/storage/*", reqSignedIn, hs.Index)
@ -223,6 +222,11 @@ func (hs *HTTPServer) registerRoutes() {
} }
r.Get("/admin/authentication/", authorize(evalAuthenticationSettings()), hs.Index) r.Get("/admin/authentication/", authorize(evalAuthenticationSettings()), hs.Index)
r.Get("/admin/authentication/ldap", authorize(ac.EvalPermission(ac.ActionLDAPStatusRead)), hs.Index)
if hs.Features.IsEnabledGlobally(featuremgmt.FlagSsoSettingsApi) {
providerParam := ac.Parameter("provider")
r.Get("/admin/authentication/:provider", authorize(ac.EvalPermission(ac.ActionSettingsRead, ac.ScopeSettingsOAuth(providerParam))), hs.Index)
}
// authed api // authed api
r.Group("/api", func(apiRoute routing.RouteRegister) { r.Group("/api", func(apiRoute routing.RouteRegister) {

2
public/app/routes/routes.tsx
View File

@ -288,7 +288,7 @@ export function getAppRoutes(): RouteDescriptor[] {
: () => <Redirect to="/admin" />, : () => <Redirect to="/admin" />,
}, },
{ {
path: '/admin/authentication/advanced/:provider', path: '/admin/authentication/:provider',
roles: () => contextSrv.evaluatePermission([AccessControlAction.SettingsWrite]), roles: () => contextSrv.evaluatePermission([AccessControlAction.SettingsWrite]),
component: config.featureToggles.ssoSettingsApi component: config.featureToggles.ssoSettingsApi
? SafeDynamicImport( ? SafeDynamicImport(