Open platform to collect and prioritize feedback
cache middleware and limit query supported ideas for non-ajax requests
goenningf2a02b648ee3
diff --git a/app/middlewares/cache.go b/app/middlewares/cache.gonew file mode 100644index 000000000..9393959f1--- /dev/null+++ b/app/middlewares/cache.go@@ -0,0 +1,13 @@+package middlewares++import "github.com/getfider/fider/app/pkg/web"++// OneYearCache adds Cache-Control header for one year+func OneYearCache() web.MiddlewareFunc {+ return func(next web.HandlerFunc) web.HandlerFunc {+ return func(c web.Context) error {+ c.Response().Header().Add("Cache-Control", "public, max-age=30672000")+ return next(c)+ }+ }+}diff --git a/app/middlewares/cache_test.go b/app/middlewares/cache_test.gonew file mode 100644index 000000000..2d485ed10--- /dev/null+++ b/app/middlewares/cache_test.go@@ -0,0 +1,26 @@+package middlewares_test++import (+ "net/http"+ "testing"++ "github.com/getfider/fider/app/middlewares"+ "github.com/getfider/fider/app/mock"+ "github.com/getfider/fider/app/pkg/web"+ . "github.com/onsi/gomega"+)++func TestCache(t *testing.T) {+ RegisterTestingT(t)++ server := mock.NewServer()+ server.Use(middlewares.OneYearCache())+ handler := func(c web.Context) error {+ return c.NoContent(http.StatusOK)+ }++ status, response := server.Execute(handler)++ Expect(status).To(Equal(http.StatusOK))+ Expect(response.Header().Get("Cache-Control")).To(Equal("public, max-age=30672000"))+}diff --git a/app/middlewares/jwt.go b/app/middlewares/jwt.goindex def77dc42..13f6c8af3 100644--- a/app/middlewares/jwt.go+++ b/app/middlewares/jwt.go@@ -22,8 +22,10 @@ func JwtGetter() web.MiddlewareFunc {if user, err := services.Users.GetByID(claims.UserID); err == nil {if user.Tenant.ID == c.Tenant().ID {c.SetUser(user)- if ids, err := services.Ideas.SupportedBy(user.ID); err == nil {- c.AddRenderVar("supportedIdeas", ids)+ if !c.IsAjax() {+ if ids, err := services.Ideas.SupportedBy(user.ID); err == nil {+ c.AddRenderVar("supportedIdeas", ids)+ }}}}diff --git a/app/middlewares/jwt_test.go b/app/middlewares/jwt_test.goindex 872c0d112..b2bd07c53 100644--- a/app/middlewares/jwt_test.go+++ b/app/middlewares/jwt_test.go@@ -47,6 +47,7 @@ func TestJwtGetter_WithCookie(t *testing.T) {})users := &inmemory.UserStorage{}+users.Register(user)server := mock.NewServer()server.Context.SetServices(&app.Services{diff --git a/app/models/identity.go b/app/models/identity.goindex d5d71a4b5..1b68a8b6b 100644--- a/app/models/identity.go+++ b/app/models/identity.go@@ -15,9 +15,9 @@ type User struct {ID int `json:"id"`Name string `json:"name"`Email string `json:"email"`- Tenant *Tenant `json:"tenant"`+ Tenant *Tenant `json:"-"`Role int `json:"role"`- Providers []*UserProvider `json:"providers"`+ Providers []*UserProvider `json:"-"`}var (@@ -41,8 +41,8 @@ func (u *User) HasProvider(provider string) bool {//UserProvider represents the relashionship between an User and an Authentication providetype UserProvider struct {- Name string `json:"name"`- UID string `json:"uid"`+ Name string+ UID string}//FiderClaims represents what goes into JWT tokensdiff --git a/app/pkg/web/context.go b/app/pkg/web/context.goindex ac25459ca..70ac4858c 100644--- a/app/pkg/web/context.go+++ b/app/pkg/web/context.go@@ -4,6 +4,8 @@ import ("net/http""strconv"+ "strings"+"github.com/getfider/fider/app""github.com/getfider/fider/app/models""github.com/getfider/fider/app/pkg/dbx"@@ -45,6 +47,11 @@ func (ctx *Context) IsAuthenticated() bool {return ctx.Get(userContextKey) != nil}+//IsAjax returns true if request is AJAX+func (ctx *Context) IsAjax() bool {+ return strings.Contains(ctx.Request().Header.Get("Accept"), "application/json")+}+//NotFound returns a 404 pagefunc (ctx *Context) NotFound() error {return echo.NewHTTPError(http.StatusNotFound)diff --git a/router.go b/router.goindex 4c7233765..7ed89c195 100644--- a/router.go+++ b/router.go@@ -32,25 +32,20 @@ func GetMainEngine(settings *models.AppSettings) *web.Engine {assets := r.Group("/assets"){- assets.Use(func(next web.HandlerFunc) web.HandlerFunc {- return func(c web.Context) error {- c.Response().Header().Add("Cache-Control", "public, max-age=30672000")- return next(c)- }- })+ assets.Use(middlewares.OneYearCache())assets.Static("/favicon.ico", "favicon.ico")assets.Static("/", "dist")}- site := r.Group("")+ page := r.Group(""){- site.Use(middlewares.Setup(db))- site.Use(middlewares.Tenant())- site.Use(middlewares.AddServices())- site.Use(middlewares.JwtGetter())- site.Use(middlewares.JwtSetter())+ page.Use(middlewares.Setup(db))+ page.Use(middlewares.Tenant())+ page.Use(middlewares.AddServices())+ page.Use(middlewares.JwtGetter())+ page.Use(middlewares.JwtSetter())- public := site.Group("")+ public := page.Group(""){public.Get("/", handlers.Index())public.Get("/ideas/:number", handlers.IdeaDetails())@@ -59,7 +54,7 @@ func GetMainEngine(settings *models.AppSettings) *web.Engine {public.Get("/api/status", handlers.Status(settings))}- private := site.Group("")+ private := page.Group(""){private.Use(middlewares.IsAuthenticated())@@ -70,7 +65,7 @@ func GetMainEngine(settings *models.AppSettings) *web.Engine {private.Post("/api/ideas/:number/unsupport", handlers.RemoveSupporter())}- auth := site.Group("/oauth")+ auth := page.Group("/oauth"){auth.Get("/facebook", handlers.Login(oauth.FacebookProvider))auth.Get("/facebook/callback", handlers.OAuthCallback(oauth.FacebookProvider))@@ -78,7 +73,7 @@ func GetMainEngine(settings *models.AppSettings) *web.Engine {auth.Get("/google/callback", handlers.OAuthCallback(oauth.GoogleProvider))}- admin := site.Group("/admin")+ admin := page.Group("/admin"){admin.Use(middlewares.IsAuthenticated())admin.Use(middlewares.IsAuthorized(models.RoleMember, models.RoleAdministrator))