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

Auth: Add authentication config frontend routes to api.go (#66931)

Browse Source 
* Add auth config frontend routes to api.go

* Remove SAML related endpoints

* Fix routes

* Enable authconfig for Enterprise, Cloud Pro and Advanced

* Fix

* Update public/app/routes/routes.tsx

Co-authored-by: Alexander Zobnin <alexanderzobnin@gmail.com>

---------

Co-authored-by: Alexander Zobnin <alexanderzobnin@gmail.com>
This commit is contained in:
Misi 2023-04-25 13:13:55 +02:00 committed by GitHub
parent 9d7c3a101d
commit b3aaf544a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/api/api.go
View File

@ -224,6 +224,10 @@ func (hs *HTTPServer) registerRoutes() {
r.Get("/user/auth-tokens/rotate", routing.Wrap(hs.RotateUserAuthTokenRedirect)) r.Get("/user/auth-tokens/rotate", routing.Wrap(hs.RotateUserAuthTokenRedirect))
} }
if hs.License.FeatureEnabled("saml") && hs.Features.IsEnabled(featuremgmt.FlagAuthenticationConfigUI) {
r.Get("/admin/authentication/", authorize(reqGrafanaAdmin, ac.EvalPermission(ac.ActionSettingsRead, ac.ScopeSettingsAll)), hs.Index)
}
// authed api // authed api
r.Group("/api", func(apiRoute routing.RouteRegister) { r.Group("/api", func(apiRoute routing.RouteRegister) {
// user (signed in) // user (signed in)

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

@ -309,11 +309,12 @@ export function getAppRoutes(): RouteDescriptor[] {
// ADMIN // ADMIN
{ {
path: '/admin/authentication', path: '/admin/authentication',
component: config.featureToggles.authenticationConfigUI component:
? SafeDynamicImport( config.featureToggles.authenticationConfigUI && config.licenseInfo.enabledFeatures?.saml
() => import(/* webpackChunkName: "AdminAuthentication" */ 'app/features/auth-config/AuthConfigPage') ? SafeDynamicImport(
) () => import(/* webpackChunkName: "AdminAuthentication" */ 'app/features/auth-config/AuthConfigPage')
: () => <Redirect to="/admin" />, )
: () => <Redirect to="/admin" />,
}, },
{ {
path: '/admin', path: '/admin',