diff --git a/docs/docs.go b/docs/docs.go index ee6388c79c..a5eef8bcbe 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -1,6 +1,6 @@ // Package docs GENERATED BY THE COMMAND ABOVE; DO NOT EDIT // This file was generated by swaggo/swag at -// 2022-06-02 19:28:58.995148499 +0100 WAT m=+73.525265348 +// 2022-06-06 11:38:37.857024107 +0100 WAT m=+90.788952526 package docs import ( diff --git a/server/route.go b/server/route.go index e29a46bbde..60f7819b96 100644 --- a/server/route.go +++ b/server/route.go @@ -314,17 +314,17 @@ func buildRoutes(app *applicationHandler) http.Handler { }) }) - uiRouter.Route("/subscriptions", func(subsriptionRouter chi.Router) { - subsriptionRouter.Use(requireGroup(app.groupRepo, app.cache)) - subsriptionRouter.Use(rateLimitByGroupID(app.limiter)) - subsriptionRouter.Use(requirePermission(auth.RoleAdmin)) - - subsriptionRouter.Post("/", app.CreateSubscription) - subsriptionRouter.With(pagination).Get("/", app.GetSubscriptions) - subsriptionRouter.Delete("/", app.DeleteSubscription) - subsriptionRouter.Get("/{subscriptionID}", app.GetSubscription) - subsriptionRouter.Put("/{subscriptionID}", app.UpdateSubscription) - }) + uiRouter.Route("/subscriptions", func(subsriptionRouter chi.Router) { + subsriptionRouter.Use(requireGroup(app.groupRepo, app.cache)) + subsriptionRouter.Use(rateLimitByGroupID(app.limiter)) + subsriptionRouter.Use(requirePermission(auth.RoleAdmin)) + + subsriptionRouter.Post("/", app.CreateSubscription) + subsriptionRouter.With(pagination).Get("/", app.GetSubscriptions) + subsriptionRouter.Delete("/", app.DeleteSubscription) + subsriptionRouter.Get("/{subscriptionID}", app.GetSubscription) + subsriptionRouter.Put("/{subscriptionID}", app.UpdateSubscription) + }) uiRouter.Route("/sources", func(sourceRouter chi.Router) { sourceRouter.Use(requireGroup(app.groupRepo, app.cache)) @@ -384,7 +384,7 @@ func buildRoutes(app *applicationHandler) http.Handler { subsriptionRouter.Post("/", app.CreateSubscription) subsriptionRouter.With(pagination).Get("/", app.GetSubscriptions) - subsriptionRouter.Delete("/", app.DeleteSubscription) + subsriptionRouter.Delete("/{subscriptionID}", app.DeleteSubscription) subsriptionRouter.Get("/{subscriptionID}", app.GetSubscription) subsriptionRouter.Put("/{subscriptionID}", app.UpdateSubscription) }) @@ -412,17 +412,6 @@ func buildRoutes(app *applicationHandler) http.Handler { }) }) }) - - portalRouter.Route("/subscriptions", func(subsriptionRouter chi.Router) { - subsriptionRouter.Use(requireAppPortalApplication(app.appRepo)) - subsriptionRouter.Use(requireAppPortalPermission(auth.RoleUIAdmin)) - - subsriptionRouter.Post("/", app.CreateSubscription) - subsriptionRouter.With(pagination).Get("/", app.GetSubscriptions) - subsriptionRouter.Delete("/", app.DeleteSubscription) - subsriptionRouter.Get("/{subscriptionID}", app.GetSubscription) - subsriptionRouter.Put("/{subscriptionID}", app.UpdateSubscription) - }) }) router.Handle("/v1/metrics", promhttp.Handler())