From 8526d2cb71a19c9b842b975f9ed46a73b9bde3f1 Mon Sep 17 00:00:00 2001 From: Karl Persson Date: Thu, 1 Sep 2022 15:08:10 +0200 Subject: [PATCH] Correlations: Use correct fallback handlers (#54511) (#54569) * Correlations: Use correct fallback handlers * Add signed in middleware to all routes (cherry picked from commit be6b8d91eb089f9634d28a2b836ebbaa2ed22222) --- pkg/services/correlations/api.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkg/services/correlations/api.go b/pkg/services/correlations/api.go index e2f7c02f8b1..06f64d79774 100644 --- a/pkg/services/correlations/api.go +++ b/pkg/services/correlations/api.go @@ -10,7 +10,6 @@ import ( "github.com/grafana/grafana/pkg/models" ac "github.com/grafana/grafana/pkg/services/accesscontrol" "github.com/grafana/grafana/pkg/services/datasources" - "github.com/grafana/grafana/pkg/web" ) @@ -19,10 +18,10 @@ func (s *CorrelationsService) registerAPIEndpoints() { authorize := ac.Middleware(s.AccessControl) s.RouteRegister.Group("/api/datasources/uid/:uid/correlations", func(entities routing.RouteRegister) { - entities.Post("/", middleware.ReqSignedIn, authorize(ac.ReqOrgAdmin, ac.EvalPermission(datasources.ActionWrite, uidScope)), routing.Wrap(s.createHandler)) - entities.Delete("/:correlationUID", middleware.ReqSignedIn, authorize(ac.ReqOrgAdmin, ac.EvalPermission(datasources.ActionWrite, uidScope)), routing.Wrap(s.deleteHandler)) - entities.Patch("/:correlationUID", middleware.ReqSignedIn, authorize(ac.ReqOrgAdmin, ac.EvalPermission(datasources.ActionWrite, uidScope)), routing.Wrap(s.updateHandler)) - }) + entities.Post("/", authorize(middleware.ReqOrgAdmin, ac.EvalPermission(datasources.ActionWrite, uidScope)), routing.Wrap(s.createHandler)) + entities.Delete("/:correlationUID", authorize(middleware.ReqOrgAdmin, ac.EvalPermission(datasources.ActionWrite, uidScope)), routing.Wrap(s.deleteHandler)) + entities.Patch("/:correlationUID", authorize(middleware.ReqOrgAdmin, ac.EvalPermission(datasources.ActionWrite, uidScope)), routing.Wrap(s.updateHandler)) + }, middleware.ReqSignedIn) } // swagger:route POST /datasources/uid/{sourceUID}/correlations correlations createCorrelation