From 50cbd71a00e51d30353902b1b652ecb0f0d24dfd Mon Sep 17 00:00:00 2001 From: Denis Arh Date: Wed, 13 Mar 2019 07:19:26 +0100 Subject: [PATCH] Serve /permissions/effective (crm, messagign) without any middleware checks --- crm/rest/router.go | 7 +++++-- messaging/rest/router.go | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/crm/rest/router.go b/crm/rest/router.go index c89ff8c62..4881f7528 100644 --- a/crm/rest/router.go +++ b/crm/rest/router.go @@ -9,7 +9,6 @@ import ( func MountRoutes() func(chi.Router) { var ( - permissions = Permissions{}.New() module = Module{}.New() record = Record{}.New() page = Page{}.New() @@ -23,12 +22,16 @@ func MountRoutes() func(chi.Router) { // Initialize handlers & controllers. return func(r chi.Router) { + + r.Group(func(r chi.Router) { + handlers.NewPermissions(Permissions{}.New()).MountRoutes(r) + }) + // Protect all _private_ routes r.Group(func(r chi.Router) { r.Use(auth.MiddlewareValidOnly) r.Use(middlewareAllowedAccess) - handlers.NewPermissions(permissions).MountRoutes(r) handlers.NewPage(page).MountRoutes(r) handlers.NewModule(module).MountRoutes(r) handlers.NewRecord(record).MountRoutes(r) diff --git a/messaging/rest/router.go b/messaging/rest/router.go index 664dfb88d..84657851b 100644 --- a/messaging/rest/router.go +++ b/messaging/rest/router.go @@ -15,12 +15,15 @@ func MountRoutes() func(chi.Router) { handlers.NewAttachmentDownloadable(Attachment{}.New()).MountRoutes(r) }) + r.Group(func(r chi.Router) { + handlers.NewPermissions(Permissions{}.New()).MountRoutes(r) + }) + // Protect all _private_ routes r.Group(func(r chi.Router) { r.Use(auth.MiddlewareValidOnly) r.Use(middlewareAllowedAccess) - handlers.NewPermissions(Permissions{}.New()).MountRoutes(r) handlers.NewChannel(Channel{}.New()).MountRoutes(r) handlers.NewMessage(Message{}.New()).MountRoutes(r) handlers.NewSearch(Search{}.New()).MountRoutes(r)