Open platform to collect and prioritize feedback
move everything to context
goenning1a4b0a39ff3b
diff --git a/app/handlers/feedback.go b/app/handlers/feedback.goindex 530a5e003..13eb345b9 100644--- a/app/handlers/feedback.go+++ b/app/handlers/feedback.go@@ -5,24 +5,13 @@ import ("github.com/getfider/fider/app""github.com/getfider/fider/app/pkg/web"- "github.com/getfider/fider/app/storage""github.com/labstack/echo")-// AllHandlers contains multiple feedback HTTP handlers-type AllHandlers struct {- ideas storage.Idea-}--// Handlers handles feedback based page-func Handlers(ideas storage.Idea) AllHandlers {- return AllHandlers{ideas}-}--// List all tenant ideas-func (h AllHandlers) List() web.HandlerFunc {+// Index is the default home page+func Index() web.HandlerFunc {return func(c web.Context) error {- ideas, err := h.ideas.GetAll(c.Tenant().ID)+ ideas, err := c.Services().Ideas.GetAll(c.Tenant().ID)if err != nil {return c.Failure(err)}@@ -39,7 +28,7 @@ type newIdeaInput struct {}// PostIdea creates a new idea on current tenant-func (h AllHandlers) PostIdea() web.HandlerFunc {+func PostIdea() web.HandlerFunc {return func(c web.Context) error {input := new(newIdeaInput)if err := c.Bind(input); err != nil {@@ -52,12 +41,13 @@ func (h AllHandlers) PostIdea() web.HandlerFunc {})}- idea, err := h.ideas.Save(c.Tenant().ID, c.User().ID, input.Title, input.Description)+ ideas := c.Services().Ideas+ idea, err := ideas.Save(c.Tenant().ID, c.User().ID, input.Title, input.Description)if err != nil {return c.Failure(err)}- if err := h.ideas.AddSupporter(c.Tenant().ID, c.User().ID, idea.ID); err != nil {+ if err := ideas.AddSupporter(c.Tenant().ID, c.User().ID, idea.ID); err != nil {return c.Failure(err)}@@ -65,8 +55,8 @@ func (h AllHandlers) PostIdea() web.HandlerFunc {}}-// Details shows details of given Idea by id-func (h AllHandlers) Details() web.HandlerFunc {+// IdeaDetails shows details of given Idea by id+func IdeaDetails() web.HandlerFunc {return func(c web.Context) error {tenant := c.Tenant()@@ -75,7 +65,8 @@ func (h AllHandlers) Details() web.HandlerFunc {return c.Failure(err)}- idea, err := h.ideas.GetByNumber(tenant.ID, number)+ ideas := c.Services().Ideas+ idea, err := ideas.GetByNumber(tenant.ID, number)if err != nil {if err == app.ErrNotFound {return c.NotFound()@@ -83,7 +74,7 @@ func (h AllHandlers) Details() web.HandlerFunc {return c.Failure(err)}- comments, err := h.ideas.GetCommentsByIdeaID(tenant.ID, idea.ID)+ comments, err := ideas.GetCommentsByIdeaID(tenant.ID, idea.ID)if err != nil {return c.Failure(err)}@@ -100,7 +91,7 @@ type newCommentInput struct {}// PostComment creates a new comment on given idea-func (h AllHandlers) PostComment() web.HandlerFunc {+func PostComment() web.HandlerFunc {return func(c web.Context) error {input := new(newCommentInput)if err := c.Bind(input); err != nil {@@ -118,7 +109,8 @@ func (h AllHandlers) PostComment() web.HandlerFunc {return c.Failure(err)}- idea, err := h.ideas.GetByNumber(c.Tenant().ID, ideaNumber)+ ideas := c.Services().Ideas+ idea, err := ideas.GetByNumber(c.Tenant().ID, ideaNumber)if err != nil {if err == app.ErrNotFound {return c.NotFound()@@ -126,7 +118,7 @@ func (h AllHandlers) PostComment() web.HandlerFunc {return c.Failure(err)}- _, err = h.ideas.AddComment(c.User().ID, idea.ID, input.Content)+ _, err = ideas.AddComment(c.User().ID, idea.ID, input.Content)if err != nil {return c.Failure(err)}@@ -141,7 +133,7 @@ type setResponseInput struct {}// SetResponse changes current idea staff response-func (h AllHandlers) SetResponse() web.HandlerFunc {+func SetResponse() web.HandlerFunc {return func(c web.Context) error {input := new(setResponseInput)if err := c.Bind(input); err != nil {@@ -153,7 +145,8 @@ func (h AllHandlers) SetResponse() web.HandlerFunc {return c.Failure(err)}- idea, err := h.ideas.GetByNumber(c.Tenant().ID, ideaNumber)+ ideas := c.Services().Ideas+ idea, err := ideas.GetByNumber(c.Tenant().ID, ideaNumber)if err != nil {if err == app.ErrNotFound {return c.NotFound()@@ -161,7 +154,7 @@ func (h AllHandlers) SetResponse() web.HandlerFunc {return c.Failure(err)}- err = h.ideas.SetResponse(c.Tenant().ID, idea.ID, input.Text, c.User().ID, input.Status)+ err = ideas.SetResponse(c.Tenant().ID, idea.ID, input.Text, c.User().ID, input.Status)if err != nil {return c.Failure(err)}@@ -171,26 +164,26 @@ func (h AllHandlers) SetResponse() web.HandlerFunc {}// AddSupporter adds current user to given idea list of supporters-func (h AllHandlers) AddSupporter() web.HandlerFunc {+func AddSupporter() web.HandlerFunc {return func(c web.Context) error {- return addOrRemoveSupporter(c, h, h.ideas.AddSupporter)+ return addOrRemoveSupporter(c, c.Services().Ideas.AddSupporter)}}// RemoveSupporter removes current user from given idea list of supporters-func (h AllHandlers) RemoveSupporter() web.HandlerFunc {+func RemoveSupporter() web.HandlerFunc {return func(c web.Context) error {- return addOrRemoveSupporter(c, h, h.ideas.RemoveSupporter)+ return addOrRemoveSupporter(c, c.Services().Ideas.RemoveSupporter)}}-func addOrRemoveSupporter(c web.Context, h AllHandlers, addOrRemove func(tenantId, userId, ideaId int) error) error {+func addOrRemoveSupporter(c web.Context, addOrRemove func(tenantId, userId, ideaId int) error) error {ideaNumber, err := c.ParamAsInt("number")if err != nil {return c.Failure(err)}- idea, err := h.ideas.GetByNumber(c.Tenant().ID, ideaNumber)+ idea, err := c.Services().Ideas.GetByNumber(c.Tenant().ID, ideaNumber)if err != nil {if err == app.ErrNotFound {return c.NotFound()diff --git a/app/handlers/feedback_test.go b/app/handlers/feedback_test.goindex 45b6c4b3e..b6f9080d1 100644--- a/app/handlers/feedback_test.go+++ b/app/handlers/feedback_test.go@@ -5,6 +5,7 @@ import ("strconv"+ "github.com/getfider/fider/app""github.com/getfider/fider/app/handlers""github.com/getfider/fider/app/mock""github.com/getfider/fider/app/models"@@ -12,15 +13,16 @@ import (. "github.com/onsi/gomega")-func TestListHandler(t *testing.T) {+func TestIndexHandler(t *testing.T) {RegisterTestingT(t)ideas := &inmemory.IdeaStorage{}server := mock.NewServer()+ server.Context.SetServices(&app.Services{Ideas: ideas})server.Context.SetTenant(&models.Tenant{ID: 1, Name: "Any Tenant"})server.Context.SetUser(&models.User{ID: 1, Name: "Jon"})- code, _ := server.Execute(handlers.Handlers(ideas).List())+ code, _ := server.Execute(handlers.Index())Expect(code).To(Equal(200))}@@ -31,12 +33,13 @@ func TestDetailsHandler(t *testing.T) {ideas := &inmemory.IdeaStorage{}idea, _ := ideas.Save(1, 1, "My Idea", "My Idea Description")server := mock.NewServer()+ server.Context.SetServices(&app.Services{Ideas: ideas})server.Context.SetTenant(&models.Tenant{ID: 1, Name: "Any Tenant"})server.Context.SetUser(&models.User{ID: 1, Name: "Jon"})server.Context.SetParamNames("number")server.Context.SetParamValues(strconv.Itoa(idea.Number))- code, _ := server.Execute(handlers.Handlers(ideas).Details())+ code, _ := server.Execute(handlers.IdeaDetails())Expect(code).To(Equal(200))}@@ -46,12 +49,13 @@ func TestDetailsHandler_NotFound(t *testing.T) {ideas := &inmemory.IdeaStorage{}server := mock.NewServer()+ server.Context.SetServices(&app.Services{Ideas: ideas})server.Context.SetTenant(&models.Tenant{ID: 1, Name: "Any Tenant"})server.Context.SetUser(&models.User{ID: 1, Name: "Jon"})server.Context.SetParamNames("number")server.Context.SetParamValues("99")- code, _ := server.Execute(handlers.Handlers(ideas).Details())+ code, _ := server.Execute(handlers.IdeaDetails())Expect(code).To(Equal(404))}@@ -61,10 +65,10 @@ func TestPostIdeaHandler(t *testing.T) {ideas := &inmemory.IdeaStorage{}server := mock.NewServer()+ server.Context.SetServices(&app.Services{Ideas: ideas})server.Context.SetTenant(&models.Tenant{ID: 1, Name: "Any Tenant"})server.Context.SetUser(&models.User{ID: 1, Name: "Jon"})- handler := handlers.Handlers(ideas).PostIdea()- code, _ := server.ExecutePost(handler, `{ "title": "My newest idea :)" }`)+ code, _ := server.ExecutePost(handlers.PostIdea(), `{ "title": "My newest idea :)" }`)idea, err := ideas.GetByID(1, 1)Expect(code).To(Equal(200))@@ -78,10 +82,10 @@ func TestPostIdeaHandler_WithoutTitle(t *testing.T) {ideas := &inmemory.IdeaStorage{}server := mock.NewServer()+ server.Context.SetServices(&app.Services{Ideas: ideas})server.Context.SetTenant(&models.Tenant{ID: 1, Name: "Any Tenant"})server.Context.SetUser(&models.User{ID: 1, Name: "Jon"})- handler := handlers.Handlers(ideas).PostIdea()- code, _ := server.ExecutePost(handler, `{ "title": "" }`)+ code, _ := server.ExecutePost(handlers.PostIdea(), `{ "title": "" }`)_, err := ideas.GetByID(1, 1)Expect(code).To(Equal(400))@@ -94,11 +98,12 @@ func TestPostCommentHandler(t *testing.T) {ideas := &inmemory.IdeaStorage{}ideas.Save(1, 1, "Title", "Description")server := mock.NewServer()+ server.Context.SetServices(&app.Services{Ideas: ideas})server.Context.SetTenant(&models.Tenant{ID: 1, Name: "Any Tenant"})server.Context.SetUser(&models.User{ID: 1, Name: "Jon"})server.Context.SetParamNames("number")server.Context.SetParamValues("1")- handler := handlers.Handlers(ideas).PostComment()+ handler := handlers.PostComment()code, _ := server.ExecutePost(handler, `{ "content": "This is a comment!" }`)Expect(code).To(Equal(200))@@ -109,11 +114,12 @@ func TestPostCommentHandler_WithoutContent(t *testing.T) {ideas := &inmemory.IdeaStorage{}server := mock.NewServer()+ server.Context.SetServices(&app.Services{Ideas: ideas})server.Context.SetTenant(&models.Tenant{ID: 1, Name: "Any Tenant"})server.Context.SetUser(&models.User{ID: 1, Name: "Jon"})server.Context.SetParamNames("number")server.Context.SetParamValues("1")- handler := handlers.Handlers(ideas).PostComment()+ handler := handlers.PostComment()code, _ := server.ExecutePost(handler, `{ "content": "" }`)Expect(code).To(Equal(400))@@ -126,12 +132,13 @@ func TestAddSupporterHandler(t *testing.T) {ideas.Save(1, 1, "The Idea #1", "The Description #1")ideas.Save(1, 1, "The Idea #2", "The Description #2")server := mock.NewServer()+ server.Context.SetServices(&app.Services{Ideas: ideas})server.Context.SetTenant(&models.Tenant{ID: 1, Name: "Any Tenant"})server.Context.SetUser(&models.User{ID: 2, Name: "Arya"})server.Context.SetParamNames("number")server.Context.SetParamValues("2")- code, _ := server.Execute(handlers.Handlers(ideas).AddSupporter())+ code, _ := server.Execute(handlers.AddSupporter())first, _ := ideas.GetByNumber(1, 1)second, _ := ideas.GetByNumber(1, 2)@@ -145,12 +152,13 @@ func TestAddSupporterHandler_InvalidIdea(t *testing.T) {ideas := &inmemory.IdeaStorage{}server := mock.NewServer()+ server.Context.SetServices(&app.Services{Ideas: ideas})server.Context.SetTenant(&models.Tenant{ID: 1, Name: "Any Tenant"})server.Context.SetUser(&models.User{ID: 1, Name: "Jon"})server.Context.SetParamNames("number")server.Context.SetParamValues("1")- code, _ := server.Execute(handlers.Handlers(ideas).AddSupporter())+ code, _ := server.Execute(handlers.AddSupporter())Expect(code).To(Equal(404))}@@ -164,12 +172,13 @@ func TestRemoveSupporterHandler(t *testing.T) {ideas.AddSupporter(1, 2, 1)ideas.AddSupporter(1, 3, 1)server := mock.NewServer()+ server.Context.SetServices(&app.Services{Ideas: ideas})server.Context.SetTenant(&models.Tenant{ID: 1, Name: "Any Tenant"})server.Context.SetUser(&models.User{ID: 2, Name: "Arya"})server.Context.SetParamNames("number")server.Context.SetParamValues("1")- code, _ := server.Execute(handlers.Handlers(ideas).RemoveSupporter())+ code, _ := server.Execute(handlers.RemoveSupporter())idea, _ := ideas.GetByNumber(1, 1)Expect(code).To(Equal(200))diff --git a/app/handlers/identity.go b/app/handlers/identity.goindex 4a39ab1de..d27a626f8 100644--- a/app/handlers/identity.go+++ b/app/handlers/identity.go@@ -8,9 +8,7 @@ import ("github.com/getfider/fider/app""github.com/getfider/fider/app/models""github.com/getfider/fider/app/pkg/jwt"- "github.com/getfider/fider/app/pkg/oauth""github.com/getfider/fider/app/pkg/web"- "github.com/getfider/fider/app/storage")type oauthUserProfile struct {@@ -19,20 +17,8 @@ type oauthUserProfile struct {Email string}-// OAuthHandlers contains multiple oauth HTTP handlers-type OAuthHandlers struct {- tenants storage.Tenant- oauth oauth.Service- users storage.User-}--// OAuth creates a new OAuthHandlers-func OAuth(tenants storage.Tenant, oauth oauth.Service, users storage.User) OAuthHandlers {- return OAuthHandlers{tenants, oauth, users}-}--// Callback handles OAuth callbacks-func (h OAuthHandlers) Callback(provider string) web.HandlerFunc {+// OAuthCallback handles OAuth callbacks+func OAuthCallback(provider string) web.HandlerFunc {return func(c web.Context) error {redirect := c.QueryParam("state")@@ -51,18 +37,19 @@ func (h OAuthHandlers) Callback(provider string) web.HandlerFunc {// should get from context// Single/Multi middleware should handle auth endpoint properly// .Set("AuthEndpoint") is not good as well- tenant, err = h.tenants.GetByDomain(stripPort(redirectURL.Host))+ tenant, err = c.Services().Tenants.GetByDomain(stripPort(redirectURL.Host))if err != nil {return c.Failure(err)}}- oauthUser, err := h.oauth.GetProfile(c.AuthEndpoint(), provider, code)+ oauthUser, err := c.Services().OAuth.GetProfile(c.AuthEndpoint(), provider, code)if err != nil {return c.Failure(err)}- user, err := h.users.GetByEmail(tenant.ID, oauthUser.Email)+ users := c.Services().Users+ user, err := users.GetByEmail(tenant.ID, oauthUser.Email)if err != nil {if err == app.ErrNotFound {user = &models.User{@@ -78,7 +65,7 @@ func (h OAuthHandlers) Callback(provider string) web.HandlerFunc {},}- err = h.users.Register(user)+ err = users.Register(user)if err != nil {return c.Failure(err)}@@ -86,7 +73,7 @@ func (h OAuthHandlers) Callback(provider string) web.HandlerFunc {return c.Failure(err)}} else if !user.HasProvider(provider) {- err = h.users.RegisterProvider(user.ID, &models.UserProvider{+ err = users.RegisterProvider(user.ID, &models.UserProvider{UID: oauthUser.ID,Name: provider,})@@ -115,9 +102,9 @@ func (h OAuthHandlers) Callback(provider string) web.HandlerFunc {}// Login handles OAuth logins-func (h OAuthHandlers) Login(provider string) web.HandlerFunc {+func Login(provider string) web.HandlerFunc {return func(c web.Context) error {- authURL := h.oauth.GetAuthURL(c.AuthEndpoint(), provider, c.QueryParam("redirect"))+ authURL := c.Services().OAuth.GetAuthURL(c.AuthEndpoint(), provider, c.QueryParam("redirect"))return c.Redirect(http.StatusTemporaryRedirect, authURL)}}diff --git a/app/handlers/identity_test.go b/app/handlers/identity_test.goindex 72ade49af..811df3edf 100644--- a/app/handlers/identity_test.go+++ b/app/handlers/identity_test.go@@ -7,6 +7,7 @@ import ("net/url"+ "github.com/getfider/fider/app""github.com/getfider/fider/app/handlers""github.com/getfider/fider/app/mock""github.com/getfider/fider/app/models"@@ -15,18 +16,18 @@ import (. "github.com/onsi/gomega")-var (- oauthService = &oauth.MockOAuthService{}- tenants = &inmemory.TenantStorage{}- users = &inmemory.UserStorage{}- oauthHandlers = handlers.OAuth(tenants, oauthService, users)-)+var services = &app.Services{+ Tenants: &inmemory.TenantStorage{},+ Users: &inmemory.UserStorage{},+ OAuth: &oauth.MockOAuthService{},+}func TestLoginHandler(t *testing.T) {RegisterTestingT(t)server := mock.NewServer()- code, response := server.Execute(oauthHandlers.Login(oauth.FacebookProvider))+ server.Context.SetServices(services)+ code, response := server.Execute(handlers.Login(oauth.FacebookProvider))Expect(code).To(Equal(http.StatusTemporaryRedirect))Expect(response.Header().Get("Location")).To(Equal("http://orange.test.canherayou.com/oauth/token?provider=facebook&redirect="))@@ -36,8 +37,9 @@ func TestCallbackHandler_InvalidState(t *testing.T) {RegisterTestingT(t)server := mock.NewServer()+ server.Context.SetServices(services)server.Context.Request().URL, _ = url.Parse("http://login.test.canherayou.com/oauth/callback?state=abc")- code, _ := server.Execute(oauthHandlers.Callback(oauth.FacebookProvider))+ code, _ := server.Execute(handlers.OAuthCallback(oauth.FacebookProvider))Expect(code).To(Equal(http.StatusInternalServerError))}@@ -46,8 +48,9 @@ func TestCallbackHandler_InvalidCode(t *testing.T) {RegisterTestingT(t)server := mock.NewServer()+ server.Context.SetServices(services)server.Context.Request().URL, _ = url.Parse("http://login.test.canherayou.com/oauth/callback?state=http://orange.test.fider.io")- code, response := server.Execute(oauthHandlers.Callback(oauth.FacebookProvider))+ code, response := server.Execute(handlers.OAuthCallback(oauth.FacebookProvider))Expect(code).To(Equal(http.StatusTemporaryRedirect))Expect(response.Header().Get("Location")).To(Equal("http://orange.test.fider.io"))@@ -57,9 +60,9 @@ func TestCallbackHandler_ExistingUserAndProvider(t *testing.T) {RegisterTestingT(t)tenant := &models.Tenant{ID: 1, Name: "Demonstration", Subdomain: "demo"}- tenants.Add(tenant)+ services.Tenants.Add(tenant)- users.Register(&models.User{+ services.Users.Register(&models.User{ID: 300,Name: "Jon Snow",Email: "[email protected]",@@ -70,8 +73,9 @@ func TestCallbackHandler_ExistingUserAndProvider(t *testing.T) {})server := mock.NewServer()+ server.Context.SetServices(services)server.Context.Request().URL, _ = url.Parse("http://demo.test.canherayou.com/oauth/callback?state=http://demo.test.fider.io&code=123")- code, response := server.Execute(oauthHandlers.Callback(oauth.FacebookProvider))+ code, response := server.Execute(handlers.OAuthCallback(oauth.FacebookProvider))Expect(code).To(Equal(http.StatusTemporaryRedirect))Expect(response.Header().Get("Location")).To(Equal("http://demo.test.fider.io?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjozMDAsInVzZXIvbmFtZSI6IkpvbiBTbm93IiwidXNlci9lbWFpbCI6Impvbi5zbm93QGdvdC5jb20ifQ.6_dLZrulH37ymBtqy-l7bhCti9hBv0lgEhH8tLm07CI"))@@ -80,13 +84,14 @@ func TestCallbackHandler_ExistingUserAndProvider(t *testing.T) {func TestCallbackHandler_NewUser(t *testing.T) {RegisterTestingT(t)tenant := &models.Tenant{ID: 2, Name: "Orange", Subdomain: "orange"}- tenants.Add(tenant)+ services.Tenants.Add(tenant)server := mock.NewServer()+ server.Context.SetServices(services)server.Context.Request().URL, _ = url.Parse("http://login.test.canherayou.com/oauth/callback?state=http://orange.test.fider.io&code=456")- code, response := server.Execute(oauthHandlers.Callback(oauth.FacebookProvider))+ code, response := server.Execute(handlers.OAuthCallback(oauth.FacebookProvider))- user, err := users.GetByEmail(tenant.ID, "[email protected]")+ user, err := services.Users.GetByEmail(tenant.ID, "[email protected]")Expect(err).To(BeNil())Expect(user.Name).To(Equal("Some Facebook Guy"))@@ -98,11 +103,12 @@ func TestCallbackHandler_ExistingUser_NewProvider(t *testing.T) {RegisterTestingT(t)server := mock.NewServer()+ server.Context.SetServices(services)server.Context.Request().URL, _ = url.Parse("http://login.test.canherayou.com/oauth/callback?state=http://demo.test.fider.io&code=123")- code, response := server.Execute(oauthHandlers.Callback(oauth.GoogleProvider))+ code, response := server.Execute(handlers.OAuthCallback(oauth.GoogleProvider))- tenant, _ := tenants.GetByDomain("demo")- user, err := users.GetByEmail(tenant.ID, "[email protected]")+ tenant, _ := services.Tenants.GetByDomain("demo")+ user, err := services.Users.GetByEmail(tenant.ID, "[email protected]")Expect(err).To(BeNil())Expect(len(user.Providers)).To(Equal(2))diff --git a/app/handlers/status.go b/app/handlers/status.goindex 2212f378a..c924ca183 100644--- a/app/handlers/status.go+++ b/app/handlers/status.go@@ -9,22 +9,14 @@ import ("github.com/labstack/echo")-type statusHandler struct {- settings *models.AppSettings-}--// Status creates a new Status HTTP handler+//Status returns some useful informationfunc Status(settings *models.AppSettings) web.HandlerFunc {- return statusHandler{settings}.get()-}--func (h statusHandler) get() web.HandlerFunc {return func(c web.Context) error {return c.JSON(http.StatusOK, echo.Map{- "build": h.settings.BuildTime,- "version": h.settings.Version,- "env": h.settings.Environment,- "compiler": h.settings.Compiler,+ "build": settings.BuildTime,+ "version": settings.Version,+ "env": settings.Environment,+ "compiler": settings.Compiler,"now": time.Now().Format("2006.01.02.150405"),})}diff --git a/app/middlewares/domain.go b/app/middlewares/domain.goindex ac21019a3..aecae0c9b 100644--- a/app/middlewares/domain.go+++ b/app/middlewares/domain.go@@ -8,21 +8,21 @@ import ("github.com/getfider/fider/app/models""github.com/getfider/fider/app/pkg/env""github.com/getfider/fider/app/pkg/web"- "github.com/getfider/fider/app/storage")// Tenant adds either SingleTenant or MultiTenant to the pipeline-func Tenant(tenants storage.Tenant) web.MiddlewareFunc {+func Tenant() web.MiddlewareFunc {if env.IsSingleHostMode() {- return SingleTenant(tenants)+ return SingleTenant()}- return MultiTenant(tenants)+ return MultiTenant()}// SingleTenant inject default tenant into current context-func SingleTenant(tenants storage.Tenant) web.MiddlewareFunc {+func SingleTenant() web.MiddlewareFunc {return func(next web.HandlerFunc) web.HandlerFunc {return func(c web.Context) error {+ tenants := c.Services().Tenantstenant, err := tenants.First()if err == app.ErrNotFound {tenant = &models.Tenant{@@ -39,9 +39,10 @@ func SingleTenant(tenants storage.Tenant) web.MiddlewareFunc {}// MultiTenant extract tenant information from hostname and inject it into current context-func MultiTenant(tenants storage.Tenant) web.MiddlewareFunc {+func MultiTenant() web.MiddlewareFunc {return func(next web.HandlerFunc) web.HandlerFunc {return func(c web.Context) error {+ tenants := c.Services().Tenantshostname := stripPort(c.Request().Host)u, err := url.Parse(c.AuthEndpoint())if err != nil {diff --git a/app/middlewares/domain_test.go b/app/middlewares/domain_test.goindex e17706340..52ee76330 100644--- a/app/middlewares/domain_test.go+++ b/app/middlewares/domain_test.go@@ -4,6 +4,7 @@ import ("net/http""testing"+ "github.com/getfider/fider/app""github.com/getfider/fider/app/middlewares""github.com/getfider/fider/app/mock""github.com/getfider/fider/app/models"@@ -45,8 +46,11 @@ func TestMultiTenant(t *testing.T) {server := mock.NewServer()server.Context.Request().Host = host+ server.Context.SetServices(&app.Services{+ Tenants: tenants,+ })- server.Use(middlewares.MultiTenant(tenants))+ server.Use(middlewares.MultiTenant())status, response := server.Execute(func(c web.Context) error {return c.String(http.StatusOK, c.Tenant().Name)})@@ -63,8 +67,11 @@ func TestMultiTenant_AuthDomain(t *testing.T) {tenants := &inmemory.TenantStorage{}server := mock.NewServer()server.Context.Request().Host = "login.test.fider.io"+ server.Context.SetServices(&app.Services{+ Tenants: tenants,+ })- server.Use(middlewares.MultiTenant(tenants))+ server.Use(middlewares.MultiTenant())status, _ := server.Execute(func(c web.Context) error {if c.Tenant() == nil {return c.NoContent(http.StatusOK)@@ -81,8 +88,11 @@ func TestMultiTenant_UnknownDomain(t *testing.T) {tenants := &inmemory.TenantStorage{}server := mock.NewServer()server.Context.Request().Host = "somedomain.com"+ server.Context.SetServices(&app.Services{+ Tenants: tenants,+ })- server.Use(middlewares.MultiTenant(tenants))+ server.Use(middlewares.MultiTenant())status, _ := server.Execute(func(c web.Context) error {return c.String(http.StatusOK, c.Tenant().Name)})@@ -96,8 +106,11 @@ func TestSingleTenant(t *testing.T) {tenants := &inmemory.TenantStorage{}server := mock.NewServer()server.Context.Request().Host = "somedomain.com"+ server.Context.SetServices(&app.Services{+ Tenants: tenants,+ })- server.Use(middlewares.SingleTenant(tenants))+ server.Use(middlewares.SingleTenant())status, _ := server.Execute(func(c web.Context) error {return c.NoContent(http.StatusOK)})diff --git a/app/middlewares/jwt.go b/app/middlewares/jwt.goindex ab4805536..fd6f52268 100644--- a/app/middlewares/jwt.go+++ b/app/middlewares/jwt.go@@ -7,16 +7,16 @@ import ("github.com/getfider/fider/app/pkg/jwt""github.com/getfider/fider/app/pkg/web"- "github.com/getfider/fider/app/storage")// JwtGetter gets JWT token from cookie and add into context-func JwtGetter(users storage.User) web.MiddlewareFunc {+func JwtGetter() web.MiddlewareFunc {return func(next web.HandlerFunc) web.HandlerFunc {return func(c web.Context) error {if cookie, err := c.Cookie("auth"); err == nil {if claims, err := jwt.Decode(cookie.Value); err == nil {+ users := c.Services().Usersif user, err := users.GetByID(claims.UserID); err == nil {if user.Tenant.ID == c.Tenant().ID {c.SetUser(user)diff --git a/app/middlewares/jwt_test.go b/app/middlewares/jwt_test.goindex 8309595b8..872c0d112 100644--- a/app/middlewares/jwt_test.go+++ b/app/middlewares/jwt_test.go@@ -6,6 +6,7 @@ import ("net/url"+ "github.com/getfider/fider/app""github.com/getfider/fider/app/middlewares""github.com/getfider/fider/app/mock""github.com/getfider/fider/app/models"@@ -19,7 +20,7 @@ func TestJwtGetter_NoCookie(t *testing.T) {RegisterTestingT(t)server := mock.NewServer()- server.Use(middlewares.JwtGetter(nil))+ server.Use(middlewares.JwtGetter())status, _ := server.Execute(func(c web.Context) error {if c.IsAuthenticated() {return c.NoContent(http.StatusOK)@@ -48,13 +49,16 @@ func TestJwtGetter_WithCookie(t *testing.T) {users := &inmemory.UserStorage{}users.Register(user)server := mock.NewServer()+ server.Context.SetServices(&app.Services{+ Users: users,+ })server.Context.SetTenant(tenant)server.Context.Request().AddCookie(&http.Cookie{Name: "auth",Value: token,})- server.Use(middlewares.JwtGetter(users))+ server.Use(middlewares.JwtGetter())status, response := server.Execute(func(c web.Context) error {return c.String(http.StatusOK, c.User().Name)})@@ -74,12 +78,15 @@ func TestJwtGetter_WithCookie_DifferentTenant(t *testing.T) {users := &inmemory.UserStorage{}server := mock.NewServer()server.Context.SetTenant(&models.Tenant{ID: 400})+ server.Context.SetServices(&app.Services{+ Users: users,+ })server.Context.Request().AddCookie(&http.Cookie{Name: "auth",Value: token,})- server.Use(middlewares.JwtGetter(users))+ server.Use(middlewares.JwtGetter())status, _ := server.Execute(func(c web.Context) error {if c.User() == nil {return c.NoContent(http.StatusNoContent)diff --git a/app/middlewares/setup.go b/app/middlewares/setup.gonew file mode 100644index 000000000..661192766--- /dev/null+++ b/app/middlewares/setup.go@@ -0,0 +1,49 @@+package middlewares++import (+ "fmt"++ "github.com/getfider/fider/app"+ "github.com/getfider/fider/app/pkg/dbx"+ "github.com/getfider/fider/app/pkg/oauth"+ "github.com/getfider/fider/app/pkg/web"+ "github.com/getfider/fider/app/storage/postgres"+)++//Setup current context with some services+func Setup(db *dbx.Database) web.MiddlewareFunc {+ return func(next web.HandlerFunc) web.HandlerFunc {+ return func(c web.Context) error {+ tx, err := db.Begin()+ if err != nil {+ return err+ }++ c.SetServices(&app.Services{+ OAuth: &oauth.HTTPService{},+ Ideas: &postgres.IdeaStorage{DB: db},+ Users: &postgres.UserStorage{DB: db},+ Tenants: &postgres.TenantStorage{DB: db},+ })++ defer func() {+ if r := recover(); r != nil {+ var err error+ switch r := r.(type) {+ case error:+ err = r+ default:+ err = fmt.Errorf("%v", r)+ }+ c.Error(err)+ }+ }()+ err = next(c)+ if err == nil {+ return tx.Commit()+ }+ tx.Rollback()+ return err+ }+ }+}diff --git a/app/pkg/web/context.go b/app/pkg/web/context.goindex b829769f9..a06421f06 100644--- a/app/pkg/web/context.go+++ b/app/pkg/web/context.go@@ -4,6 +4,7 @@ import ("net/http""strconv"+ "github.com/getfider/fider/app""github.com/getfider/fider/app/models""github.com/getfider/fider/app/pkg/env""github.com/labstack/echo"@@ -14,6 +15,7 @@ var (tenantContextKey = preffixKey + "TENANT"userContextKey = preffixKey + "USER"authEndpointContextKey = preffixKey + "AUTH_ENDPOINT"+ servicesContextKey = preffixKey + "SERVICES")//Context wraps echo.context to provide userful information@@ -69,6 +71,16 @@ func (ctx *Context) SetUser(claims *models.User) {ctx.Set(userContextKey, claims)}+//Services returns current app.Services from context+func (ctx *Context) Services() *app.Services {+ return ctx.Get(servicesContextKey).(*app.Services)+}++//SetServices update current context with app.Services+func (ctx *Context) SetServices(services *app.Services) {+ ctx.Set(servicesContextKey, services)+}+//BaseURL returns base URL as stringfunc (ctx *Context) BaseURL() string {protocol := "http"diff --git a/app/services.go b/app/services.gonew file mode 100644index 000000000..8ecb3899e--- /dev/null+++ b/app/services.go@@ -0,0 +1,14 @@+package app++import (+ "github.com/getfider/fider/app/pkg/oauth"+ "github.com/getfider/fider/app/storage"+)++// Services holds reference to all Fider services+type Services struct {+ OAuth oauth.Service+ Users storage.User+ Tenants storage.Tenant+ Ideas storage.Idea+}diff --git a/main.go b/main.goindex 8398f8f9f..b42182024 100644--- a/main.go+++ b/main.go@@ -8,8 +8,6 @@ import ("github.com/getfider/fider/app/models""github.com/getfider/fider/app/pkg/dbx""github.com/getfider/fider/app/pkg/env"- "github.com/getfider/fider/app/pkg/oauth"- "github.com/getfider/fider/app/storage/postgres"_ "github.com/lib/pq"_ "github.com/mattes/migrate/database/postgres"_ "github.com/mattes/migrate/source/file"@@ -28,19 +26,13 @@ func main() {}db.Migrate()- ctx := &AppServices{- OAuth: &oauth.HTTPService{},- Idea: &postgres.IdeaStorage{DB: db},- User: &postgres.UserStorage{DB: db},- Tenant: &postgres.TenantStorage{DB: db},- Settings: &models.AppSettings{- BuildTime: buildtime,- Version: version,- Compiler: runtime.Version(),- Environment: env.Current(),- },+ settings := &models.AppSettings{+ BuildTime: buildtime,+ Version: version,+ Compiler: runtime.Version(),+ Environment: env.Current(),}- e := GetMainEngine(ctx)+ e := GetMainEngine(settings, db)e.Start(":" + env.GetEnvOrDefault("PORT", "3000"))}diff --git a/router.go b/router.goindex 2a1f7e340..96736db31 100644--- a/router.go+++ b/router.go@@ -4,6 +4,7 @@ import ("github.com/getfider/fider/app/handlers""github.com/getfider/fider/app/middlewares""github.com/getfider/fider/app/models"+ "github.com/getfider/fider/app/pkg/dbx""github.com/getfider/fider/app/pkg/oauth""github.com/getfider/fider/app/pkg/web""github.com/getfider/fider/app/storage"@@ -20,8 +21,8 @@ type AppServices struct {}// GetMainEngine returns main HTTP engine-func GetMainEngine(ctx *AppServices) *web.Engine {- r := web.New(ctx.Settings)+func GetMainEngine(settings *models.AppSettings, db *dbx.Database) *web.Engine {+ r := web.New(settings)assets := r.Group("/assets"){@@ -31,46 +32,49 @@ func GetMainEngine(ctx *AppServices) *web.Engine {public := r.Group(""){- public.Use(middlewares.Tenant(ctx.Tenant))- public.Use(middlewares.JwtGetter(ctx.User))+ public.Use(middlewares.Setup(db))+ public.Use(middlewares.Tenant())+ public.Use(middlewares.JwtGetter())public.Use(middlewares.JwtSetter())- public.Get("/", handlers.Handlers(ctx.Idea).List())- public.Get("/ideas/:number", handlers.Handlers(ctx.Idea).Details())- public.Get("/ideas/:number/*", handlers.Handlers(ctx.Idea).Details())+ public.Get("/", handlers.Index())+ public.Get("/ideas/:number", handlers.IdeaDetails())+ public.Get("/ideas/:number/*", handlers.IdeaDetails())public.Get("/logout", handlers.Logout())- public.Get("/api/status", handlers.Status(ctx.Settings))+ public.Get("/api/status", handlers.Status(settings))}private := r.Group(""){- private.Use(middlewares.Tenant(ctx.Tenant))- private.Use(middlewares.JwtGetter(ctx.User))+ private.Use(middlewares.Setup(db))+ private.Use(middlewares.Tenant())+ private.Use(middlewares.JwtGetter())private.Use(middlewares.JwtSetter())private.Use(middlewares.IsAuthenticated())- private.Post("/api/ideas", handlers.Handlers(ctx.Idea).PostIdea())- private.Post("/api/ideas/:number/comments", handlers.Handlers(ctx.Idea).PostComment())- private.Post("/api/ideas/:number/status", handlers.Handlers(ctx.Idea).SetResponse())- private.Post("/api/ideas/:number/support", handlers.Handlers(ctx.Idea).AddSupporter())- private.Post("/api/ideas/:number/unsupport", handlers.Handlers(ctx.Idea).RemoveSupporter())+ private.Post("/api/ideas", handlers.PostIdea())+ private.Post("/api/ideas/:number/comments", handlers.PostComment())+ private.Post("/api/ideas/:number/status", handlers.SetResponse())+ private.Post("/api/ideas/:number/support", handlers.AddSupporter())+ private.Post("/api/ideas/:number/unsupport", handlers.RemoveSupporter())}auth := r.Group("/oauth"){- auth.Use(middlewares.Tenant(ctx.Tenant))- authHandlers := handlers.OAuth(ctx.Tenant, ctx.OAuth, ctx.User)+ auth.Use(middlewares.Setup(db))+ auth.Use(middlewares.Tenant())- auth.Get("/facebook", authHandlers.Login(oauth.FacebookProvider))- auth.Get("/facebook/callback", authHandlers.Callback(oauth.FacebookProvider))- auth.Get("/google", authHandlers.Login(oauth.GoogleProvider))- auth.Get("/google/callback", authHandlers.Callback(oauth.GoogleProvider))+ auth.Get("/facebook", handlers.Login(oauth.FacebookProvider))+ auth.Get("/facebook/callback", handlers.OAuthCallback(oauth.FacebookProvider))+ auth.Get("/google", handlers.Login(oauth.GoogleProvider))+ auth.Get("/google/callback", handlers.OAuthCallback(oauth.GoogleProvider))}admin := r.Group("/admin"){- admin.Use(middlewares.Tenant(ctx.Tenant))- admin.Use(middlewares.JwtGetter(ctx.User))+ admin.Use(middlewares.Setup(db))+ admin.Use(middlewares.Tenant())+ admin.Use(middlewares.JwtGetter())admin.Use(middlewares.JwtSetter())admin.Use(middlewares.IsAuthenticated())admin.Use(middlewares.IsAuthorized(models.RoleMember, models.RoleAdministrator))diff --git a/router_test.go b/router_test.goindex dbf6701d5..95f5ecd49 100644--- a/router_test.go+++ b/router_test.go@@ -9,6 +9,6 @@ import (func TestGetMainEngine(t *testing.T) {RegisterTestingT(t)- r := GetMainEngine(&AppServices{})+ r := GetMainEngine(nil, nil)Expect(r).ToNot(BeNil())}