Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

Moving e-mail delivery to background processors (#258)

Guilherme Oenning4ac4022e98ce
diff --git a/.example.env b/.example.env
index 53bcce0a0..09b1604d4 100644
--- a/.example.env
+++ b/.example.env
@@ -1,4 +1,5 @@
GO_ENV=development
+LOG_LEVEL=DEBUG
DATABASE_URL=postgres://fider:fider_pw@localhost:5555/fider?sslmode=disable
JWT_SECRET=hsjl]W;&ZcHxT&FK;s%bgIQF:#ch=~#Al4:5]N;7V<qPZ3e9lT4'%;go;LIkc%k
NOREPLY_EMAIL=
diff --git a/.test.env b/.test.env
index 688b4bc03..1970b8dae 100644
--- a/.test.env
+++ b/.test.env
@@ -1,4 +1,5 @@
GO_ENV=test
+LOG_LEVEL=DEBUG
HOST_MODE=multi
DATABASE_URL=postgres://fider_test:fider_test_pw@localhost:5566/fider_test?sslmode=disable
AUTH_ENDPOINT=http://login.test.fider.io:3000
diff --git a/app/handlers/common.go b/app/handlers/common.go
index 20217e32f..542bac7cc 100644
--- a/app/handlers/common.go
+++ b/app/handlers/common.go
@@ -2,6 +2,7 @@ package handlers
import (
"net/http"
+ "runtime"
"time"
"github.com/getfider/fider/app"
@@ -12,12 +13,19 @@ import (
//Status returns some useful information
func Status(settings *models.AppSettings) web.HandlerFunc {
return func(c web.Context) error {
+ memStats := &runtime.MemStats{}
+ runtime.ReadMemStats(memStats)
+
return c.Ok(web.Map{
- "build": settings.BuildTime,
- "version": settings.Version,
- "env": settings.Environment,
- "compiler": settings.Compiler,
- "now": time.Now().Format("2006.01.02.150405"),
+ "build": settings.BuildTime,
+ "version": settings.Version,
+ "env": settings.Environment,
+ "compiler": settings.Compiler,
+ "now": time.Now().Format("2006.01.02.150405"),
+ "goroutines": runtime.NumGoroutine(),
+ "workerQueue": c.Engine().Worker().Length(),
+ "heapInMB": memStats.HeapAlloc / 1048576,
+ "stackInMB": memStats.StackInuse / 1048576,
})
}
}
diff --git a/app/handlers/settings.go b/app/handlers/settings.go
index e93f8a4ca..6c825aa88 100644
--- a/app/handlers/settings.go
+++ b/app/handlers/settings.go
@@ -1,11 +1,11 @@
package handlers
import (
- "fmt"
"net/http"
"time"
"github.com/getfider/fider/app/models"
+ "github.com/getfider/fider/app/tasks"
"github.com/getfider/fider/app/actions"
"github.com/getfider/fider/app/pkg/web"
@@ -24,27 +24,7 @@ func ChangeUserEmail() web.HandlerFunc {
return c.Failure(err)
}
- subject := "Confirm your new e-mail"
- link := fmt.Sprintf("%s/change-email/verify?k=%s", c.BaseURL(), input.Model.VerificationKey)
- previous := c.User().Email
- if previous == "" {
- previous = "(empty)"
- }
- message := fmt.Sprintf(`
- Hi %s,
- <br /><br />
- Looks like you have requested to change your e-mail from %s to %s.
- <br />
- Click the link below to confirm this operation.
- <br /><br />
- <a href='%s'>%s</a>
- <br /><br />
- <span style="color:#b3b3b1;font-size:11px">This link will expire in 24 hours and can only be used once.</span>
- `, c.User().Name, c.User().Email, input.Model.Email, link, link)
- err = c.Services().Emailer.Send(c.Tenant().Name, input.Model.Email, subject, message)
- if err != nil {
- return c.Failure(err)
- }
+ c.Enqueue(tasks.SendChangeEmailConfirmation(input.Model, c.BaseURL()))
return c.Ok(web.Map{})
}
@@ -54,7 +34,7 @@ func ChangeUserEmail() web.HandlerFunc {
func VerifyChangeEmailKey() web.HandlerFunc {
return func(c web.Context) error {
result, err := validateKey(models.EmailVerificationKindChangeEmail, c)
- if err != nil {
+ if result == nil {
return err
}
diff --git a/app/handlers/signin.go b/app/handlers/signin.go
index 1257160a2..27fdafa1e 100644
--- a/app/handlers/signin.go
+++ b/app/handlers/signin.go
@@ -1,7 +1,6 @@
package handlers
import (
- "fmt"
"net/http"
"net/url"
"strings"
@@ -15,6 +14,7 @@ import (
"github.com/getfider/fider/app/pkg/env"
"github.com/getfider/fider/app/pkg/jwt"
"github.com/getfider/fider/app/pkg/web"
+ "github.com/getfider/fider/app/tasks"
)
type oauthUserProfile struct {
@@ -144,19 +144,7 @@ func SignInByEmail() web.HandlerFunc {
return c.Failure(err)
}
- subject := fmt.Sprintf("Sign in to %s", c.Tenant().Name)
- link := fmt.Sprintf("%s/signin/verify?k=%s", c.BaseURL(), input.Model.VerificationKey)
- message := fmt.Sprintf(`
- Click the link below to sign in.
- <br /><br />
- <a href='%s'>%s</a>
- <br /><br />
- <span style="color:#b3b3b1;font-size:11px">This link will expire in 15 minutes and can only be used once.</span>
- `, link, link)
- err = c.Services().Emailer.Send(c.Tenant().Name, input.Model.Email, subject, message)
- if err != nil {
- return c.Failure(err)
- }
+ c.Enqueue(tasks.SendSignInEmail(input.Model, c.BaseURL()))
return c.Ok(web.Map{})
}
diff --git a/app/handlers/signup.go b/app/handlers/signup.go
index a3e175238..9eaa295a5 100644
--- a/app/handlers/signup.go
+++ b/app/handlers/signup.go
@@ -1,7 +1,6 @@
package handlers
import (
- "fmt"
"net/http"
"time"
@@ -72,16 +71,10 @@ func CreateTenant() web.HandlerFunc {
return c.Failure(err)
}
- subject := "Confirm your new Fider instance"
- link := fmt.Sprintf("%s/signup/verify?k=%s", c.TenantBaseURL(tenant), input.Model.VerificationKey)
- message := fmt.Sprintf(`
- Click the link below to confirm your new Fider instance.
- <br /><br />
- <a href='%s'>%s</a>
- <br /><br />
- <span style="color:#b3b3b1;font-size:11px">This link will expire in 48 hours and can only be used once.</span>
- `, link, link)
- err = c.Services().Emailer.Send("Fider", user.Email, subject, message)
+ _, err = c.Services().Emailer.Send("Fider", user.Email, "signup_email", web.Map{
+ "baseURL": c.TenantBaseURL(tenant),
+ "verificationKey": input.Model.VerificationKey,
+ })
if err != nil {
return c.Failure(err)
}
diff --git a/app/middlewares/setup.go b/app/middlewares/setup.go
index acfebcdf7..27b5abdd4 100644
--- a/app/middlewares/setup.go
+++ b/app/middlewares/setup.go
@@ -3,9 +3,10 @@ package middlewares
import (
"fmt"
"runtime/debug"
+ "time"
- "github.com/getfider/fider/app/pkg/email"
"github.com/getfider/fider/app/pkg/log"
+ "github.com/getfider/fider/app/pkg/worker"
"github.com/getfider/fider/app"
"github.com/getfider/fider/app/pkg/dbx"
@@ -23,12 +24,58 @@ func Noop() web.MiddlewareFunc {
}
}
-//Setup current context with some services
-func Setup(db *dbx.Database, emailer email.Sender) web.MiddlewareFunc {
+//WorkerSetup current context with some services
+func WorkerSetup(logger log.Logger) worker.MiddlewareFunc {
+ db := dbx.NewWithLogger(logger)
+ emailer := app.NewEmailer(logger)
+ return func(next worker.Job) worker.Job {
+ return func(c *worker.Context) (err error) {
+ trx, err := db.Begin()
+ if err != nil {
+ return err
+ }
+
+ c.SetServices(&app.Services{
+ Tenants: postgres.NewTenantStorage(trx),
+ Users: postgres.NewUserStorage(trx),
+ Ideas: postgres.NewIdeaStorage(trx),
+ Tags: postgres.NewTagStorage(trx),
+ Emailer: emailer,
+ })
+
+ defer func() {
+ if r := recover(); r != nil {
+ err = fmt.Errorf("%v\n%v", r, string(debug.Stack()))
+
+ if trx != nil {
+ trx.Rollback()
+ }
+ }
+ }()
+
+ start := time.Now()
+ c.Logger().Infof("Task '%s' started on worker '%s'", log.Magenta(c.TaskName()), log.Magenta(c.WorkerID()))
+ if err = next(c); err != nil {
+ panic(err)
+ }
+ trx.Commit()
+ c.Logger().Infof("Task '%s' finished in %s", log.Magenta(c.TaskName()), log.Magenta(time.Since(start).String()))
+ return err
+ }
+ }
+}
+
+//WebSetup current context with some services
+func WebSetup(logger log.Logger) web.MiddlewareFunc {
+ db := dbx.NewWithLogger(logger)
+ db.Migrate()
+ emailer := app.NewEmailer(logger)
return func(next web.HandlerFunc) web.HandlerFunc {
return func(c web.Context) error {
- path := log.Reverse(log.Magenta(c.Request.Method + " " + c.Request.URL.String()))
- c.Logger().Debugf("Starting Request %s", path)
+ path := log.Magenta(c.Request.Method + " " + c.Request.URL.String())
+
+ start := time.Now()
+ c.Logger().Infof("%s started", path)
trx, err := db.Begin()
if err != nil {
@@ -49,25 +96,25 @@ func Setup(db *dbx.Database, emailer email.Sender) web.MiddlewareFunc {
defer func() {
if r := recover(); r != nil {
err := fmt.Errorf("%v\n%v", r, string(debug.Stack()))
-
+ c.Failure(err)
+ c.Logger().Infof("%s finished in %s", path, log.Magenta(time.Since(start).String()))
if trx != nil {
trx.Rollback()
}
- c.Failure(err)
- c.Logger().Debugf("Finished Request %s", path)
}
}()
- err = next(c)
- c.Logger().Debugf("Finished Request %s", path)
+ if err = next(c); err != nil {
+ panic(err)
+ }
- if err != nil {
- c.Logger().Debugf("Transaction rolled back")
- trx.Rollback()
- return err
+ if err = trx.Commit(); err != nil {
+ panic(err)
}
+
+ c.Logger().Infof("%s finished in %s", path, log.Magenta(time.Since(start).String()))
c.Logger().Debugf("Transaction committed")
- return trx.Commit()
+ return err
}
}
}
diff --git a/app/middlewares/setup_test.go b/app/middlewares/setup_test.go
index 2cf4cff70..c2f9d0cbc 100644
--- a/app/middlewares/setup_test.go
+++ b/app/middlewares/setup_test.go
@@ -5,23 +5,19 @@ import (
"net/http"
"testing"
- "github.com/getfider/fider/app/pkg/email"
-
"github.com/getfider/fider/app/middlewares"
- "github.com/getfider/fider/app/pkg/dbx"
+ "github.com/getfider/fider/app/pkg/log"
"github.com/getfider/fider/app/pkg/mock"
"github.com/getfider/fider/app/pkg/web"
+ "github.com/getfider/fider/app/pkg/worker"
. "github.com/onsi/gomega"
)
-func TestSetup(t *testing.T) {
+func TestWebSetup(t *testing.T) {
RegisterTestingT(t)
- db, _ := dbx.New()
- defer db.Close()
-
server, _ := mock.NewServer()
- server.Use(middlewares.Setup(db, email.NewNoopSender()))
+ server.Use(middlewares.WebSetup(log.NewNoopLogger()))
status, _ := server.Execute(func(c web.Context) error {
Expect(c.ActiveTransaction()).NotTo(BeNil())
return c.NoContent(http.StatusOK)
@@ -30,14 +26,11 @@ func TestSetup(t *testing.T) {
Expect(status).To(Equal(http.StatusOK))
}
-func TestSetup_Failure(t *testing.T) {
+func TestWebSetup_Failure(t *testing.T) {
RegisterTestingT(t)
- db, _ := dbx.New()
- defer db.Close()
-
server, _ := mock.NewServer()
- server.Use(middlewares.Setup(db, email.NewNoopSender()))
+ server.Use(middlewares.WebSetup(log.NewNoopLogger()))
status, _ := server.Execute(func(c web.Context) error {
return c.Failure(errors.New("Something went wrong..."))
})
@@ -45,17 +38,38 @@ func TestSetup_Failure(t *testing.T) {
Expect(status).To(Equal(http.StatusInternalServerError))
}
-func TestSetup_Panic(t *testing.T) {
+func TestWebSetup_Panic(t *testing.T) {
RegisterTestingT(t)
- db, _ := dbx.New()
- defer db.Close()
-
server, _ := mock.NewServer()
- server.Use(middlewares.Setup(db, email.NewNoopSender()))
+ server.Use(middlewares.WebSetup(log.NewNoopLogger()))
status, _ := server.Execute(func(c web.Context) error {
panic("Boom!")
})
Expect(status).To(Equal(http.StatusInternalServerError))
}
+
+func TestWorkerSetup(t *testing.T) {
+ RegisterTestingT(t)
+
+ c := worker.NewContext("0", "Any Task", log.NewNoopLogger())
+ mw := middlewares.WorkerSetup(log.NewNoopLogger())
+ err := mw(func(c *worker.Context) error {
+ Expect(c.Services()).NotTo(BeNil())
+ return nil
+ })(c)
+ Expect(err).To(BeNil())
+}
+
+func TestWorkerSetup_Failure(t *testing.T) {
+ RegisterTestingT(t)
+
+ c := worker.NewContext("0", "Any Task", log.NewNoopLogger())
+ mw := middlewares.WorkerSetup(log.NewNoopLogger())
+ err := mw(func(c *worker.Context) error {
+ Expect(c.Services()).NotTo(BeNil())
+ return errors.New("Not Found")
+ })(c)
+ Expect(err).NotTo(BeNil())
+}
diff --git a/app/pkg/dbx/dbx.go b/app/pkg/dbx/dbx.go
index 8f1465b3d..2c232b422 100644
--- a/app/pkg/dbx/dbx.go
+++ b/app/pkg/dbx/dbx.go
@@ -4,6 +4,7 @@ import (
"database/sql"
"io/ioutil"
"reflect"
+ "time"
"strings"
@@ -18,22 +19,21 @@ import (
_ "github.com/mattes/migrate/source/file"
)
-// New creates a new Database instance
-func New() (*Database, error) {
- return NewWithLogger(log.NewConsoleLogger())
+// New creates a new Database instance without logging
+func New() *Database {
+ return NewWithLogger(&log.NoopLogger{})
}
-// NewWithLogger creates a new Database instance with logging
-func NewWithLogger(logger log.Logger) (*Database, error) {
+// NewWithLogger creates a new Database instance with logging or panic
+func NewWithLogger(logger log.Logger) *Database {
conn, err := sql.Open("postgres", env.MustGet("DATABASE_URL"))
conn.SetMaxIdleConns(20)
conn.SetMaxOpenConns(50)
if err != nil {
- return nil, err
+ panic(err)
}
- db := &Database{conn, logger, NewRowMapper()}
- return db, nil
+ return &Database{conn, logger, NewRowMapper()}
}
// Database represents a connection to a SQL database
@@ -105,34 +105,45 @@ type Trx struct {
mapper RowMapper
}
+var formatter = strings.NewReplacer("\t", "", "\n", " ")
+
// QueryRow the database with given SQL command and returns only one row
func (trx Trx) QueryRow(command string, args ...interface{}) *sql.Row {
- command = formatCommand(command)
- trx.logger.Debugf("%s %v", log.Yellow(command), log.Blue(args))
+ if trx.logger.IsEnabled(log.DEBUG) {
+ command = formatter.Replace(command)
+ start := time.Now()
+ defer func() {
+ trx.logger.Debugf("%s %v in %s", log.Yellow(command), log.Blue(args), log.Magenta(time.Since(start).String()))
+ }()
+ }
return trx.tx.QueryRow(command, args...)
}
// Query the database with given SQL command
func (trx Trx) Query(command string, args ...interface{}) (*sql.Rows, error) {
- command = formatCommand(command)
- trx.logger.Debugf("%s %v", log.Yellow(command), log.Blue(args))
+ if trx.logger.IsEnabled(log.DEBUG) {
+ command = formatter.Replace(command)
+ start := time.Now()
+ defer func() {
+ trx.logger.Debugf("%s %v in %s", log.Yellow(command), log.Blue(args), log.Magenta(time.Since(start).String()))
+ }()
+ }
return trx.tx.Query(command, args...)
}
// Execute given SQL command
func (trx Trx) Execute(command string, args ...interface{}) error {
- command = formatCommand(command)
- trx.logger.Debugf("%s %v", log.Yellow(command), log.Blue(args))
+ if trx.logger.IsEnabled(log.DEBUG) {
+ command = formatter.Replace(command)
+ start := time.Now()
+ defer func() {
+ trx.logger.Debugf("%s %v in %s", log.Yellow(command), log.Blue(args), log.Magenta(time.Since(start).String()))
+ }()
+ }
_, err := trx.tx.Exec(command, args...)
return err
}
-func formatCommand(cmd string) string {
- cmd = strings.Replace(cmd, "\t", "", -1)
- cmd = strings.Replace(cmd, "\n", " ", -1)
- return cmd
-}
-
// Scalar returns first row and first column
func (trx Trx) Scalar(data interface{}, command string, args ...interface{}) error {
row := trx.QueryRow(command, args...)
diff --git a/app/pkg/dbx/dbx_test.go b/app/pkg/dbx/dbx_test.go
index 07b119b02..ede304d33 100644
--- a/app/pkg/dbx/dbx_test.go
+++ b/app/pkg/dbx/dbx_test.go
@@ -31,7 +31,7 @@ type tenant struct {
}
func TestMain(m *testing.M) {
- db, _ := dbx.New()
+ db := dbx.New()
db.Migrate()
db.Seed()
db.Close()
@@ -42,7 +42,7 @@ func TestMain(m *testing.M) {
func TestBind_SimpleStruct(t *testing.T) {
RegisterTestingT(t)
- db, _ := dbx.New()
+ db := dbx.New()
defer db.Close()
trx, _ := db.Begin()
@@ -58,7 +58,7 @@ func TestBind_SimpleStruct(t *testing.T) {
func TestBind_DeepNestedStruct(t *testing.T) {
RegisterTestingT(t)
- db, _ := dbx.New()
+ db := dbx.New()
defer db.Close()
trx, _ := db.Begin()
@@ -80,7 +80,7 @@ func TestBind_DeepNestedStruct(t *testing.T) {
func TestBind_SimpleStruct_SingleField(t *testing.T) {
RegisterTestingT(t)
- db, _ := dbx.New()
+ db := dbx.New()
defer db.Close()
trx, _ := db.Begin()
@@ -95,7 +95,7 @@ func TestBind_SimpleStruct_SingleField(t *testing.T) {
func TestBind_SimpleStruct_Multiple(t *testing.T) {
RegisterTestingT(t)
- db, _ := dbx.New()
+ db := dbx.New()
defer db.Close()
trx, _ := db.Begin()
@@ -112,7 +112,7 @@ func TestBind_SimpleStruct_Multiple(t *testing.T) {
func TestBind_NestedStruct(t *testing.T) {
RegisterTestingT(t)
- db, _ := dbx.New()
+ db := dbx.New()
defer db.Close()
trx, _ := db.Begin()
@@ -138,7 +138,7 @@ func TestBind_NestedStruct(t *testing.T) {
func TestBind_NestedStruct_Multiple(t *testing.T) {
RegisterTestingT(t)
- db, _ := dbx.New()
+ db := dbx.New()
defer db.Close()
trx, _ := db.Begin()
@@ -163,7 +163,7 @@ func TestBind_NestedStruct_Multiple(t *testing.T) {
func TestExists_True(t *testing.T) {
RegisterTestingT(t)
- db, _ := dbx.New()
+ db := dbx.New()
defer db.Close()
trx, _ := db.Begin()
@@ -176,7 +176,7 @@ func TestExists_True(t *testing.T) {
func TestExists_False(t *testing.T) {
RegisterTestingT(t)
- db, _ := dbx.New()
+ db := dbx.New()
defer db.Close()
trx, _ := db.Begin()
@@ -189,7 +189,7 @@ func TestExists_False(t *testing.T) {
func TestCount(t *testing.T) {
RegisterTestingT(t)
- db, _ := dbx.New()
+ db := dbx.New()
defer db.Close()
trx, _ := db.Begin()
@@ -202,7 +202,7 @@ func TestCount(t *testing.T) {
func TestCount_Empty(t *testing.T) {
RegisterTestingT(t)
- db, _ := dbx.New()
+ db := dbx.New()
defer db.Close()
trx, _ := db.Begin()
@@ -215,7 +215,7 @@ func TestCount_Empty(t *testing.T) {
func TestScalar(t *testing.T) {
RegisterTestingT(t)
- db, _ := dbx.New()
+ db := dbx.New()
defer db.Close()
trx, _ := db.Begin()
@@ -229,7 +229,7 @@ func TestScalar(t *testing.T) {
func TestArray(t *testing.T) {
RegisterTestingT(t)
- db, _ := dbx.New()
+ db := dbx.New()
defer db.Close()
trx, _ := db.Begin()
diff --git a/app/pkg/email/email.go b/app/pkg/email/email.go
index 739d12046..21881b07b 100644
--- a/app/pkg/email/email.go
+++ b/app/pkg/email/email.go
@@ -1,13 +1,52 @@
package email
-import "github.com/getfider/fider/app/pkg/env"
+import (
+ "bytes"
+ "fmt"
+ "html/template"
+ "strings"
+
+ "github.com/getfider/fider/app/pkg/env"
+)
+
+var cache = make(map[string]*template.Template, 0)
+
+// Message represents what is sent by e-mail
+type Message struct {
+ To string
+ From string
+ Subject string
+ Body string
+}
+
+// RenderMessage returns the HTML of an e-mail based on template and params
+func RenderMessage(templateName string, params map[string]interface{}) *Message {
+ tpl, ok := cache[templateName]
+ if !ok {
+ var err error
+ file := env.Path("/views/templates", templateName+".tpl")
+ tpl, err = template.ParseFiles(file)
+ if err != nil {
+ panic(err)
+ }
+ cache[templateName] = tpl
+ }
+
+ var bf bytes.Buffer
+ tpl.Execute(&bf, params)
+ lines := strings.Split(bf.String(), "\n")
+ return &Message{
+ Subject: strings.TrimLeft(lines[0], "subject: "),
+ Body: strings.TrimLeft(strings.Join(lines[2:], "\n"), " "),
+ }
+}
// NoReply is the default 'from' address
var NoReply = env.MustGet("NOREPLY_EMAIL")
// Sender is used to send e-mails
type Sender interface {
- Send(from, to, subject, message string) error
+ Send(from, to, templateName string, params map[string]interface{}) (*Message, error)
}
//NoopSender does not send e-mails
@@ -20,6 +59,9 @@ func NewNoopSender() *NoopSender {
}
//Send an e-mail
-func (s *NoopSender) Send(from, to, subject, message string) error {
- return nil
+func (s *NoopSender) Send(from, to, templateName string, params map[string]interface{}) (*Message, error) {
+ msg := RenderMessage(templateName, params)
+ msg.To = to
+ msg.From = fmt.Sprintf("%s <%s>", from, NoReply)
+ return msg, nil
}
diff --git a/app/pkg/email/email_test.go b/app/pkg/email/email_test.go
new file mode 100644
index 000000000..9d3dbba82
--- /dev/null
+++ b/app/pkg/email/email_test.go
@@ -0,0 +1,20 @@
+package email_test
+
+import (
+ "testing"
+
+ "github.com/getfider/fider/app/pkg/email"
+ "github.com/getfider/fider/app/pkg/web"
+
+ . "github.com/onsi/gomega"
+)
+
+func TestRenderMessage(t *testing.T) {
+ RegisterTestingT(t)
+
+ message := email.RenderMessage("echo_test", web.Map{
+ "name": "Fider",
+ })
+ Expect(message.Subject).To(Equal("Message to: Fider"))
+ Expect(message.Body).To(Equal("Hello World Fider!"))
+}
diff --git a/app/pkg/email/mailgun/mailgun.go b/app/pkg/email/mailgun/mailgun.go
index 85a9957eb..9cb7f82c4 100644
--- a/app/pkg/email/mailgun/mailgun.go
+++ b/app/pkg/email/mailgun/mailgun.go
@@ -7,39 +7,51 @@ import (
"strings"
"github.com/getfider/fider/app/pkg/email"
+ "github.com/getfider/fider/app/pkg/log"
)
var baseURL = "https://api.mailgun.net/v3/%s/messages"
//Sender is used to send e-mails
type Sender struct {
+ logger log.Logger
domain string
apiKey string
}
//NewSender creates a new mailgun e-mail sender
-func NewSender(domain, apiKey string) *Sender {
- return &Sender{domain, apiKey}
+func NewSender(logger log.Logger, domain, apiKey string) *Sender {
+ return &Sender{logger, domain, apiKey}
}
//Send an e-mail
-func (s *Sender) Send(from, to, subject, message string) error {
+func (s *Sender) Send(from, to, templateName string, params map[string]interface{}) (*email.Message, error) {
+ s.logger.Debugf("Sending e-mail to %s with template %s and params %s.", to, templateName, params)
+
+ message := email.RenderMessage(templateName, params)
+ message.From = fmt.Sprintf("%s <%s>", from, email.NoReply)
+ message.To = to
form := url.Values{}
- form.Add("from", fmt.Sprintf("%s <%s>", from, email.NoReply))
- form.Add("to", to)
- form.Add("subject", subject)
- form.Add("html", message)
+ form.Add("from", message.From)
+ form.Add("to", message.To)
+ form.Add("subject", message.Subject)
+ form.Add("html", message.Body)
url := fmt.Sprintf(baseURL, s.domain)
request, err := http.NewRequest("POST", url, strings.NewReader(form.Encode()))
if err != nil {
- return err
+ return nil, err
}
request.SetBasicAuth("api", s.apiKey)
request.Header.Set("Content-Type", "application/x-www-form-urlencoded")
- _, err = http.DefaultClient.Do(request)
- return err
+ resp, err := http.DefaultClient.Do(request)
+ if err == nil {
+ s.logger.Debugf("E-mail sent with response code %d.", resp.StatusCode)
+ return message, nil
+ }
+ s.logger.Errorf("Failed to send e-mail")
+ return nil, err
}
diff --git a/app/pkg/email/smtp/smtp.go b/app/pkg/email/smtp/smtp.go
index 695aa72db..e02ee7f3e 100644
--- a/app/pkg/email/smtp/smtp.go
+++ b/app/pkg/email/smtp/smtp.go
@@ -5,10 +5,12 @@ import (
gosmtp "net/smtp"
"github.com/getfider/fider/app/pkg/email"
+ "github.com/getfider/fider/app/pkg/log"
)
//Sender is used to send e-mails
type Sender struct {
+ logger log.Logger
host string
port string
username string
@@ -16,17 +18,21 @@ type Sender struct {
}
//NewSender creates a new mailgun e-mail sender
-func NewSender(host, port, username, password string) *Sender {
- return &Sender{host, port, username, password}
+func NewSender(logger log.Logger, host, port, username, password string) *Sender {
+ return &Sender{logger, host, port, username, password}
}
//Send an e-mail
-func (s *Sender) Send(from, to, subject, message string) error {
+func (s *Sender) Send(from, to, templateName string, params map[string]interface{}) (*email.Message, error) {
+ s.logger.Debugf("Sending e-mail to %s with template %s and params %s.", to, templateName, params)
+ message := email.RenderMessage(templateName, params)
+ message.From = fmt.Sprintf("%s <%s>", from, email.NoReply)
+ message.To = to
headers := make(map[string]string)
- headers["From"] = fmt.Sprintf("%s <%s>", from, email.NoReply)
- headers["To"] = to
- headers["Subject"] = subject
+ headers["From"] = message.From
+ headers["To"] = message.To
+ headers["Subject"] = message.Subject
headers["MIME-version"] = "1.0"
headers["Content-Type"] = "text/html; charset=\"UTF-8\""
@@ -34,9 +40,15 @@ func (s *Sender) Send(from, to, subject, message string) error {
for k, v := range headers {
body += fmt.Sprintf("%s: %s\r\n", k, v)
}
- body += "\r\n" + message
+ body += "\r\n" + message.Body
servername := fmt.Sprintf("%s:%s", s.host, s.port)
auth := gosmtp.PlainAuth("", s.username, s.password, s.host)
- return gosmtp.SendMail(servername, auth, email.NoReply, []string{to}, []byte(body))
+ err := gosmtp.SendMail(servername, auth, email.NoReply, []string{to}, []byte(body))
+ if err == nil {
+ s.logger.Debugf("E-mail sent.")
+ return message, nil
+ }
+ s.logger.Errorf("Failed to send e-mail")
+ return nil, err
}
diff --git a/app/pkg/log/logger.go b/app/pkg/log/logger.go
index 6ef8ab3b6..3334995cd 100644
--- a/app/pkg/log/logger.go
+++ b/app/pkg/log/logger.go
@@ -2,7 +2,12 @@ package log
import (
"fmt"
+ stdLog "log"
+ "os"
+ "strings"
"time"
+
+ "github.com/getfider/fider/app/pkg/env"
)
// Level defines all possible log levels
@@ -27,17 +32,33 @@ type Logger interface {
Warnf(format string, args ...interface{})
Errorf(format string, args ...interface{})
Error(err error)
+ IsEnabled(level Level) bool
Write(p []byte) (int, error)
}
// ConsoleLogger output messages to console
type ConsoleLogger struct {
- level Level
+ logger *stdLog.Logger
+ level Level
+ tag string
}
// NewConsoleLogger creates a new ConsoleLogger
-func NewConsoleLogger() *ConsoleLogger {
- return &ConsoleLogger{}
+func NewConsoleLogger(tag string) *ConsoleLogger {
+ logger := &ConsoleLogger{tag: tag, logger: stdLog.New(os.Stdout, "", 0)}
+ level := strings.ToUpper(env.GetEnvOrDefault("LOG_LEVEL", ""))
+
+ switch level {
+ case "DEBUG":
+ logger.SetLevel(DEBUG)
+ case "WARN":
+ logger.SetLevel(WARN)
+ case "ERROR":
+ logger.SetLevel(ERROR)
+ default:
+ logger.SetLevel(INFO)
+ }
+ return logger
}
// SetLevel increases/decreases current log level
@@ -45,6 +66,11 @@ func (l *ConsoleLogger) SetLevel(level Level) {
l.level = level
}
+// IsEnabled returns true if given level is enabled
+func (l *ConsoleLogger) IsEnabled(level Level) bool {
+ return level >= l.level
+}
+
// Debugf logs a DEBUG message
func (l *ConsoleLogger) Debugf(format string, args ...interface{}) {
l.log(DEBUG, format, args...)
@@ -89,7 +115,7 @@ func (l *ConsoleLogger) log(level Level, format string, args ...interface{}) {
message = fmt.Sprintf(format, args...)
}
- fmt.Printf("%s [%s] %s\n", levelString(level), time.Now().Format(time.RFC3339), message)
+ l.logger.Printf("%s [%s] [%s] %s\n", levelString(level), time.Now().Format(time.RFC3339), l.tag, message)
}
}
diff --git a/app/pkg/log/noop.go b/app/pkg/log/noop.go
new file mode 100644
index 000000000..f734bf316
--- /dev/null
+++ b/app/pkg/log/noop.go
@@ -0,0 +1,47 @@
+package log
+
+// NoopLogger doesn't log anything
+type NoopLogger struct {
+}
+
+// NewNoopLogger creates a new NoopLogger
+func NewNoopLogger() *NoopLogger {
+ return &NoopLogger{}
+}
+
+// SetLevel increases/decreases current log level
+func (l *NoopLogger) SetLevel(level Level) {
+}
+
+// IsEnabled returns true if given level is enabled
+func (l *NoopLogger) IsEnabled(level Level) bool {
+ return true
+}
+
+// Debugf logs a DEBUG message
+func (l *NoopLogger) Debugf(format string, args ...interface{}) {
+}
+
+// Infof logs a INFO message
+func (l *NoopLogger) Infof(format string, args ...interface{}) {
+}
+
+// Warnf logs a WARN message
+func (l *NoopLogger) Warnf(format string, args ...interface{}) {
+}
+
+// Errorf logs a ERROR message
+func (l *NoopLogger) Errorf(format string, args ...interface{}) {
+}
+
+// Error logs a ERROR message
+func (l *NoopLogger) Error(err error) {
+}
+
+// Write writes len(p) bytes from p to the underlying data stream.
+func (l *NoopLogger) Write(p []byte) (int, error) {
+ return 0, nil
+}
+
+func (l *NoopLogger) log(level Level, format string, args ...interface{}) {
+}
diff --git a/app/pkg/mock/setup.go b/app/pkg/mock/setup.go
index 423696d10..34ebb97a5 100644
--- a/app/pkg/mock/setup.go
+++ b/app/pkg/mock/setup.go
@@ -38,6 +38,13 @@ func NewServer() (*Server, *app.Services) {
return server, services
}
+// NewWorker creates a new worker and services for worker testing
+func NewWorker() (*Worker, *app.Services) {
+ services := createServices(true)
+ worker := createWorker(services)
+ return worker, services
+}
+
func createServices(seed bool) *app.Services {
services := &app.Services{
Tenants: &inmemory.TenantStorage{},
diff --git a/app/pkg/mock/worker.go b/app/pkg/mock/worker.go
new file mode 100644
index 000000000..cfd8774b6
--- /dev/null
+++ b/app/pkg/mock/worker.go
@@ -0,0 +1,42 @@
+package mock
+
+import (
+ "github.com/getfider/fider/app"
+ "github.com/getfider/fider/app/models"
+ "github.com/getfider/fider/app/pkg/log"
+ "github.com/getfider/fider/app/pkg/worker"
+)
+
+// Worker is fake wrapper for background worker
+type Worker struct {
+ tenant *models.Tenant
+ user *models.User
+ services *app.Services
+}
+
+func createWorker(services *app.Services) *Worker {
+ return &Worker{
+ services: services,
+ }
+}
+
+// OnTenant set current context tenant
+func (w *Worker) OnTenant(tenant *models.Tenant) *Worker {
+ w.tenant = tenant
+ return w
+}
+
+// AsUser set current context user
+func (w *Worker) AsUser(user *models.User) *Worker {
+ w.user = user
+ return w
+}
+
+// Execute given task with current context
+func (w *Worker) Execute(task worker.Task) error {
+ context := worker.NewContext("0", task.Name, log.NewNoopLogger())
+ context.SetServices(w.services)
+ context.SetUser(w.user)
+ context.SetTenant(w.tenant)
+ return task.Job(context)
+}
diff --git a/app/pkg/web/context.go b/app/pkg/web/context.go
index 8f11bd42b..d52be18e0 100644
--- a/app/pkg/web/context.go
+++ b/app/pkg/web/context.go
@@ -19,6 +19,7 @@ import (
"github.com/getfider/fider/app/pkg/jwt"
"github.com/getfider/fider/app/pkg/log"
"github.com/getfider/fider/app/pkg/validate"
+ "github.com/getfider/fider/app/pkg/worker"
)
// Map defines a generic map of type `map[string]interface{}`.
@@ -57,6 +58,28 @@ type Context struct {
logger log.Logger
params StringMap
store Map
+ worker worker.Worker
+}
+
+//Engine returns main HTTP engine
+func (ctx *Context) Engine() *Engine {
+ return ctx.engine
+}
+
+//Enqueue given task to be processed in background
+func (ctx *Context) Enqueue(task worker.Task) {
+ wrap := func(c *Context) worker.Job {
+ return func(wc *worker.Context) error {
+ wc.SetUser(c.User())
+ wc.SetTenant(c.Tenant())
+ return task.Job(wc)
+ }
+ }
+
+ ctx.worker.Enqueue(worker.Task{
+ Name: task.Name,
+ Job: wrap(ctx),
+ })
}
//Tenant returns current tenant
diff --git a/app/pkg/web/engine.go b/app/pkg/web/engine.go
index a9af3128a..ab0730fb1 100644
--- a/app/pkg/web/engine.go
+++ b/app/pkg/web/engine.go
@@ -6,10 +6,13 @@ import (
stdLog "log"
"net/http"
"os"
+ "runtime"
+ "strconv"
"github.com/getfider/fider/app/models"
"github.com/getfider/fider/app/pkg/env"
"github.com/getfider/fider/app/pkg/log"
+ "github.com/getfider/fider/app/pkg/worker"
"github.com/julienschmidt/httprouter"
)
@@ -26,17 +29,19 @@ type Engine struct {
renderer *Renderer
binder *DefaultBinder
middlewares []MiddlewareFunc
+ worker worker.Worker
}
//New creates a new Engine
func New(settings *models.AppSettings) *Engine {
- logger := NewLogger()
+ logger := log.NewConsoleLogger("WEB")
router := &Engine{
mux: httprouter.New(),
logger: logger,
renderer: NewRenderer(settings, logger),
binder: NewDefaultBinder(),
middlewares: make([]MiddlewareFunc, 0),
+ worker: worker.New(),
}
router.mux.NotFound = func(res http.ResponseWriter, req *http.Request) {
@@ -58,6 +63,10 @@ func (e *Engine) Start(address string) {
ErrorLog: stdLog.New(e.logger, "", 0),
}
+ for i := 0; i < runtime.NumCPU()*2; i++ {
+ go e.Worker().Run(strconv.Itoa(i))
+ }
+
var (
err error
certManager *CertificateManager
@@ -96,6 +105,7 @@ func (e *Engine) NewContext(res http.ResponseWriter, req *http.Request, params S
engine: e,
logger: e.logger,
params: params,
+ worker: e.worker,
}
}
@@ -104,6 +114,11 @@ func (e *Engine) Logger() log.Logger {
return e.logger
}
+//Worker returns current worker referenc
+func (e *Engine) Worker() worker.Worker {
+ return e.worker
+}
+
//Group creates a new route group
func (e *Engine) Group() *Group {
g := &Group{
@@ -198,16 +213,3 @@ func (g *Group) Static(prefix, root string) {
}
g.engine.mux.Handle("GET", prefix, g.handler(h))
}
-
-// NewLogger creates a new logger
-func NewLogger() log.Logger {
- logger := log.NewConsoleLogger()
-
- if env.IsProduction() {
- logger.SetLevel(log.INFO)
- } else {
- logger.SetLevel(log.DEBUG)
- }
-
- return logger
-}
diff --git a/app/pkg/web/renderer.go b/app/pkg/web/renderer.go
index 85827a935..577c9b0a9 100644
--- a/app/pkg/web/renderer.go
+++ b/app/pkg/web/renderer.go
@@ -80,7 +80,7 @@ func (r *Renderer) Render(w io.Writer, name string, data interface{}, ctx *Conte
m["__StyleBundle"] = r.cssBundle
m["settings"] = r.settings
- m["baseUrl"] = ctx.BaseURL()
+ m["baseURL"] = ctx.BaseURL()
m["tenant"] = ctx.Tenant()
m["auth"] = Map{
"endpoint": ctx.AuthEndpoint(),
diff --git a/app/pkg/worker/context.go b/app/pkg/worker/context.go
new file mode 100644
index 000000000..ab0d4c739
--- /dev/null
+++ b/app/pkg/worker/context.go
@@ -0,0 +1,73 @@
+package worker
+
+import (
+ "github.com/getfider/fider/app"
+ "github.com/getfider/fider/app/models"
+ "github.com/getfider/fider/app/pkg/log"
+)
+
+//Context holds references to services available for jobs
+type Context struct {
+ workerID string
+ taskName string
+ services *app.Services
+ logger log.Logger
+ user *models.User
+ tenant *models.Tenant
+}
+
+//NewContext creates a new context
+func NewContext(workerID, taskName string, logger log.Logger) *Context {
+ return &Context{
+ workerID: workerID,
+ taskName: taskName,
+ logger: logger,
+ }
+}
+
+//SetUser on context
+func (c *Context) SetUser(user *models.User) {
+ c.user = user
+ c.services.SetCurrentUser(user)
+}
+
+//SetTenant on context
+func (c *Context) SetTenant(tenant *models.Tenant) {
+ c.tenant = tenant
+ c.services.SetCurrentTenant(tenant)
+}
+
+//SetServices on current context
+func (c *Context) SetServices(services *app.Services) {
+ c.services = services
+}
+
+//WorkerID executing current context
+func (c *Context) WorkerID() string {
+ return c.workerID
+}
+
+//TaskName from current context
+func (c *Context) TaskName() string {
+ return c.taskName
+}
+
+//User from current context
+func (c *Context) User() *models.User {
+ return c.user
+}
+
+//Tenant from current context
+func (c *Context) Tenant() *models.Tenant {
+ return c.tenant
+}
+
+//Services from current context
+func (c *Context) Services() *app.Services {
+ return c.services
+}
+
+//Logger from current context
+func (c *Context) Logger() log.Logger {
+ return c.logger
+}
diff --git a/app/pkg/worker/worker.go b/app/pkg/worker/worker.go
new file mode 100644
index 000000000..5271271d0
--- /dev/null
+++ b/app/pkg/worker/worker.go
@@ -0,0 +1,84 @@
+package worker
+
+import (
+ "github.com/getfider/fider/app/pkg/log"
+)
+
+//MiddlewareFunc is worker middleware
+type MiddlewareFunc func(Job) Job
+
+//Job is what's going to be run on background
+type Job func(c *Context) error
+
+//Task represents the Name and Job to be run on background
+type Task struct {
+ Name string
+ Job Job
+}
+
+//Worker is a process that runs tasks
+type Worker interface {
+ Run(id string)
+ Enqueue(task Task)
+ Logger() log.Logger
+ Use(middleware MiddlewareFunc)
+ Length() int
+}
+
+//BackgroundWorker is a worker that runs tasks on background
+type BackgroundWorker struct {
+ logger log.Logger
+ queue chan Task
+ middleware MiddlewareFunc
+}
+
+var maxQueueSize = 100
+
+//New creates a new BackgroundWorker
+func New() *BackgroundWorker {
+ return &BackgroundWorker{
+ logger: log.NewConsoleLogger("BGW"),
+ queue: make(chan Task, maxQueueSize),
+ middleware: func(next Job) Job {
+ return next
+ },
+ }
+}
+
+//Run initializes the worker loop
+func (w *BackgroundWorker) Run(id string) {
+ w.logger.Infof("Starting worker %s.", log.Magenta(id))
+ for task := range w.queue {
+
+ c := &Context{
+ workerID: id,
+ taskName: task.Name,
+ logger: w.logger,
+ }
+
+ if err := w.middleware(task.Job)(c); err != nil {
+ w.logger.Error(err)
+ }
+
+ }
+}
+
+//Enqueue a task on current worker
+func (w *BackgroundWorker) Enqueue(task Task) {
+ w.queue <- task
+}
+
+//Logger from current worker
+func (w *BackgroundWorker) Logger() log.Logger {
+ return w.logger
+}
+
+//Length from current queue length
+func (w *BackgroundWorker) Length() int {
+ return len(w.queue)
+}
+
+//Use this to inject worker dependencies
+func (w *BackgroundWorker) Use(middleware MiddlewareFunc) {
+ w.middleware = middleware
+}
diff --git a/app/pkg/worker/worker_test.go b/app/pkg/worker/worker_test.go
new file mode 100644
index 000000000..b931acc3d
--- /dev/null
+++ b/app/pkg/worker/worker_test.go
@@ -0,0 +1,29 @@
+package worker_test
+
+import (
+ "testing"
+
+ "github.com/getfider/fider/app/pkg/worker"
+
+ . "github.com/onsi/gomega"
+)
+
+func TestBackgroundWorker(t *testing.T) {
+ RegisterTestingT(t)
+
+ var finished bool
+
+ w := worker.New()
+ w.Enqueue(worker.Task{
+ Name: "Do Something",
+ Job: func(c *worker.Context) error {
+ finished = true
+ return nil
+ },
+ })
+ Expect(w.Length()).To(Equal(1))
+ go w.Run("worker-1")
+ Eventually(func() bool {
+ return finished
+ }).Should(BeTrue())
+}
diff --git a/app/services.go b/app/services.go
index 2804c9795..c538cea21 100644
--- a/app/services.go
+++ b/app/services.go
@@ -3,6 +3,10 @@ package app
import (
"github.com/getfider/fider/app/models"
"github.com/getfider/fider/app/pkg/email"
+ "github.com/getfider/fider/app/pkg/email/mailgun"
+ "github.com/getfider/fider/app/pkg/email/smtp"
+ "github.com/getfider/fider/app/pkg/env"
+ "github.com/getfider/fider/app/pkg/log"
"github.com/getfider/fider/app/pkg/oauth"
"github.com/getfider/fider/app/storage"
)
@@ -32,3 +36,20 @@ func (s *Services) SetCurrentUser(user *models.User) {
s.Tenants.SetCurrentUser(user)
s.Ideas.SetCurrentUser(user)
}
+
+//NewEmailer creates a new emailer based on system configuration
+func NewEmailer(logger log.Logger) email.Sender {
+ if env.IsTest() {
+ return email.NewNoopSender()
+ }
+ if env.IsDefined("MAILGUN_API") {
+ return mailgun.NewSender(logger, env.MustGet("MAILGUN_DOMAIN"), env.MustGet("MAILGUN_API"))
+ }
+ return smtp.NewSender(
+ logger,
+ env.MustGet("SMTP_HOST"),
+ env.MustGet("SMTP_PORT"),
+ env.MustGet("SMTP_USERNAME"),
+ env.MustGet("SMTP_PASSWORD"),
+ )
+}
diff --git a/app/storage/postgres/setup_test.go b/app/storage/postgres/setup_test.go
index 5b1df20d6..34e31e0e8 100644
--- a/app/storage/postgres/setup_test.go
+++ b/app/storage/postgres/setup_test.go
@@ -44,7 +44,7 @@ func TeardownDatabaseTest() {
}
func TestMain(m *testing.M) {
- db, _ = dbx.New()
+ db = dbx.New()
db.Migrate()
db.Seed()
defer db.Close()
diff --git a/app/tasks/tasks.go b/app/tasks/tasks.go
new file mode 100644
index 000000000..6dd83603f
--- /dev/null
+++ b/app/tasks/tasks.go
@@ -0,0 +1,41 @@
+package tasks
+
+import (
+ "github.com/getfider/fider/app/models"
+ "github.com/getfider/fider/app/pkg/web"
+ "github.com/getfider/fider/app/pkg/worker"
+)
+
+func describe(name string, job worker.Job) worker.Task {
+ return worker.Task{Name: name, Job: job}
+}
+
+//SendSignInEmail is used to send the sign in email to requestor
+func SendSignInEmail(model *models.SignInByEmail, baseURL string) worker.Task {
+ return describe("Send sign in e-mail", func(c *worker.Context) error {
+ _, err := c.Services().Emailer.Send(c.Tenant().Name, model.Email, "signin_email", web.Map{
+ "tenantName": c.Tenant().Name,
+ "baseURL": baseURL,
+ "verificationKey": model.VerificationKey,
+ })
+ return err
+ })
+}
+
+//SendChangeEmailConfirmation is used to send the change e-mail confirmation e-mail to requestor
+func SendChangeEmailConfirmation(model *models.ChangeUserEmail, baseURL string) worker.Task {
+ return describe("Send change e-mail confirmation", func(c *worker.Context) error {
+ previous := c.User().Email
+ if previous == "" {
+ previous = "(empty)"
+ }
+ _, err := c.Services().Emailer.Send(c.Tenant().Name, model.Email, "change_emailaddress_email", web.Map{
+ "name": c.User().Name,
+ "oldEmail": previous,
+ "newEmail": model.Email,
+ "baseURL": baseURL,
+ "verificationKey": model.VerificationKey,
+ })
+ return err
+ })
+}
diff --git a/app/tasks/tasks_test.go b/app/tasks/tasks_test.go
new file mode 100644
index 000000000..6b5266db9
--- /dev/null
+++ b/app/tasks/tasks_test.go
@@ -0,0 +1,35 @@
+package tasks_test
+
+import (
+ "testing"
+
+ "github.com/getfider/fider/app/pkg/mock"
+
+ "github.com/getfider/fider/app/models"
+ "github.com/getfider/fider/app/tasks"
+ . "github.com/onsi/gomega"
+)
+
+func TestSendSignInEmailTask(t *testing.T) {
+ RegisterTestingT(t)
+
+ worker, _ := mock.NewWorker()
+ task := tasks.SendSignInEmail(&models.SignInByEmail{}, "http://anywhere.com")
+ err := worker.
+ OnTenant(mock.DemoTenant).
+ AsUser(mock.JonSnow).
+ Execute(task)
+ Expect(err).To(BeNil())
+}
+
+func TestSendChangeEmailConfirmationTask(t *testing.T) {
+ RegisterTestingT(t)
+
+ worker, _ := mock.NewWorker()
+ task := tasks.SendChangeEmailConfirmation(&models.ChangeUserEmail{}, "http://anywhere.com")
+ err := worker.
+ OnTenant(mock.DemoTenant).
+ AsUser(mock.JonSnow).
+ Execute(task)
+ Expect(err).To(BeNil())
+}
diff --git a/main.go b/main.go
index 91b3de7cf..3fe130bdd 100644
--- a/main.go
+++ b/main.go
@@ -13,7 +13,7 @@ import (
)
var buildtime string
-var version = "0.9.0"
+var version = "0.10.0-beta"
func main() {
fmt.Printf("Application is starting...\n")
diff --git a/public/services/page.ts b/public/services/page.ts
index 99fa243fb..0339e35fb 100644
--- a/public/services/page.ts
+++ b/public/services/page.ts
@@ -3,7 +3,7 @@ export const setTitle = (title: string): void => {
};
export const getBaseUrl = (): string => {
- return (window as any).props.baseUrl;
+ return (window as any).props.baseURL;
};
export const isSingleHostMode = (): boolean => {
diff --git a/routes.go b/routes.go
index 3670ab414..c69652b26 100644
--- a/routes.go
+++ b/routes.go
@@ -6,37 +6,15 @@ 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/email"
- "github.com/getfider/fider/app/pkg/email/mailgun"
- "github.com/getfider/fider/app/pkg/email/smtp"
- "github.com/getfider/fider/app/pkg/env"
"github.com/getfider/fider/app/pkg/oauth"
"github.com/getfider/fider/app/pkg/web"
)
-func initEmailer() email.Sender {
- if env.IsDefined("MAILGUN_API") {
- return mailgun.NewSender(env.MustGet("MAILGUN_DOMAIN"), env.MustGet("MAILGUN_API"))
- }
- return smtp.NewSender(
- env.MustGet("SMTP_HOST"),
- env.MustGet("SMTP_PORT"),
- env.MustGet("SMTP_USERNAME"),
- env.MustGet("SMTP_PASSWORD"),
- )
-}
-
// GetMainEngine returns main HTTP engine
func GetMainEngine(settings *models.AppSettings) *web.Engine {
r := web.New(settings)
- db, err := dbx.NewWithLogger(r.Logger())
- if err != nil {
- panic(err)
- }
- db.Migrate()
- emailer := initEmailer()
+ r.Worker().Use(middlewares.WorkerSetup(r.Worker().Logger()))
r.Use(middlewares.Compress())
@@ -47,7 +25,7 @@ func GetMainEngine(settings *models.AppSettings) *web.Engine {
assets.Static("/assets/*filepath", "dist")
}
- r.Use(middlewares.Setup(db, emailer))
+ r.Use(middlewares.WebSetup(r.Logger()))
noTenant := r.Group()
{
diff --git a/views/403.html b/views/403.html
index 61af32666..47c86ad86 100644
--- a/views/403.html
+++ b/views/403.html
@@ -14,7 +14,7 @@ Not Authorized &middot; Fider
</p>
{{ if .tenant }}
- <span>Take me back to <a href="{{ .baseUrl }}">{{ .tenant.Subdomain }}.fider.io</a> home page.</span>
+ <span>Take me back to <a href="{{ .baseURL }}">{{ .tenant.Subdomain }}.fider.io</a> home page.</span>
{{ end }}
</div>
</div>
diff --git a/views/404.html b/views/404.html
index 7d7b750af..adda85a86 100644
--- a/views/404.html
+++ b/views/404.html
@@ -15,7 +15,7 @@
</p>
{{ if .tenant }}
- <span>Take me back to <a href="{{ .baseUrl }}">{{ .tenant.Subdomain }}.fider.io</a> home page.</span>
+ <span>Take me back to <a href="{{ .baseURL }}">{{ .tenant.Subdomain }}.fider.io</a> home page.</span>
{{ end }}
</div>
</div>
diff --git a/views/500.html b/views/500.html
index bd2207f24..0ecca6eed 100644
--- a/views/500.html
+++ b/views/500.html
@@ -12,7 +12,7 @@
<p>An error has occurred and we're working to fix the problem! </br> We’ll be up and running shortly.</p>
{{ if .tenant }}
- <span>Take me back to <a href="{{ .baseUrl }}">{{ .tenant.Subdomain }}.fider.io</a> home page.</span>
+ <span>Take me back to <a href="{{ .baseURL }}">{{ .tenant.Subdomain }}.fider.io</a> home page.</span>
{{ end }}
</div>
</div>
diff --git a/views/base.html b/views/base.html
index baa683539..3f9f77fef 100644
--- a/views/base.html
+++ b/views/base.html
@@ -9,7 +9,7 @@
<meta property="og:title" content="{{template "title" .}}" />
<meta property="og:description" content="We'd love to hear what you're thinking about. What can we do better? This is the place for you to vote, discuss and share ideas." />
<meta property="og:type" content="website" />
- <meta property="og:url" content="{{ .baseUrl }}" />
+ <meta property="og:url" content="{{ .baseURL }}" />
<meta property="og:image" content="http://getfider.com/images/logo-small.png">
</head>
<body>
diff --git a/views/templates/change_emailaddress_email.tpl b/views/templates/change_emailaddress_email.tpl
new file mode 100644
index 000000000..e921a6033
--- /dev/null
+++ b/views/templates/change_emailaddress_email.tpl
@@ -0,0 +1,11 @@
+subject: Confirm your new e-mail
+body:
+Hi {{ .name }},
+<br /><br />
+Looks like you have requested to change your e-mail from {{ .oldEmail }} to {{ .newEmail }}.
+<br />
+Click the link below to confirm this operation.
+<br /><br />
+<a href='{{ .baseURL }}/change-email/verify?k={{ .verificationKey }}'>{{ .baseURL }}/change-email/verify?k={{ .verificationKey }}</a>
+<br /><br />
+<span style="color:#b3b3b1;font-size:11px">This link will expire in 24 hours and can only be used once.</span>
\ No newline at end of file
diff --git a/views/templates/echo_test.tpl b/views/templates/echo_test.tpl
new file mode 100644
index 000000000..4b7c2f263
--- /dev/null
+++ b/views/templates/echo_test.tpl
@@ -0,0 +1,3 @@
+subject: Message to: {{ .name }}
+body:
+Hello World {{ .name }}!
\ No newline at end of file
diff --git a/views/templates/signin_email.tpl b/views/templates/signin_email.tpl
new file mode 100644
index 000000000..d3f9fa775
--- /dev/null
+++ b/views/templates/signin_email.tpl
@@ -0,0 +1,7 @@
+subject: Sign in to {{ .tenantName }}
+body:
+Click the link below to sign in.
+<br /><br />
+<a href='{{ .baseURL }}/signin/verify?k={{ .verificationKey }}'>{{ .baseURL }}/signin/verify?k={{ .verificationKey }}</a>
+<br /><br />
+<span style="color:#b3b3b1;font-size:11px">This link will expire in 15 minutes and can only be used once.</span>
\ No newline at end of file
diff --git a/views/templates/signup_email.tpl b/views/templates/signup_email.tpl
new file mode 100644
index 000000000..7e8d7147b
--- /dev/null
+++ b/views/templates/signup_email.tpl
@@ -0,0 +1,7 @@
+subject: Confirm your new Fider instance
+body:
+Click the link below to confirm your new Fider instance.
+<br /><br />
+<a href='{{ .baseURL }}/signup/verify?k={{ .verificationKey }}'>{{ .baseURL }}/signup/verify?k={{ .verificationKey }}</a>
+<br /><br />
+<span style="color:#b3b3b1;font-size:11px">This link will expire in 48 hours and can only be used once.</span>
\ No newline at end of file