chore(deps): bump github.com/ViBiOh/mailer from 1.16.9 to 1.17.1

Bumps [github.com/ViBiOh/mailer](https://github.com/ViBiOh/mailer) from 1.16.9 to 1.17.1.
- [Release notes](https://github.com/ViBiOh/mailer/releases)
- [Commits](ViBiOh/mailer@v1.16.9...v1.17.1)

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Vincent Boutour <[email protected]>

cmd/ketchup/api.go

@@ -21,6 +21,7 @@ import (
 	"github.com/ViBiOh/httputils/v4/pkg/logger"
 	"github.com/ViBiOh/httputils/v4/pkg/owasp"
 	"github.com/ViBiOh/httputils/v4/pkg/prometheus"
+	"github.com/ViBiOh/httputils/v4/pkg/recoverer"
 	"github.com/ViBiOh/httputils/v4/pkg/redis"
 	"github.com/ViBiOh/httputils/v4/pkg/renderer"
 	"github.com/ViBiOh/httputils/v4/pkg/server"
@@ -140,7 +141,7 @@ func main() {
 	}
 
 	go promServer.Start("prometheus", healthApp.End(), prometheusApp.Handler())
-	go appServer.Start("http", healthApp.End(), httputils.Handler(appHandler, healthApp, prometheusApp.Middleware, owasp.New(owaspConfig).Middleware, cors.New(corsConfig).Middleware))
+	go appServer.Start("http", healthApp.End(), httputils.Handler(appHandler, healthApp, recoverer.Middleware, prometheusApp.Middleware, owasp.New(owaspConfig).Middleware, cors.New(corsConfig).Middleware))
 
 	healthApp.WaitForTermination(appServer.Done())
 	server.GracefulWait(appServer.Done(), promServer.Done())

go.mod

@@ -5,11 +5,9 @@ go 1.16
 require (
 	github.com/DATA-DOG/go-sqlmock v1.5.0
 	github.com/ViBiOh/auth/v2 v2.7.0
-	github.com/ViBiOh/httputils/v4 v4.8.0
-	github.com/ViBiOh/mailer v1.16.9
+	github.com/ViBiOh/httputils/v4 v4.10.2
+	github.com/ViBiOh/mailer v1.17.1
 	github.com/lib/pq v1.10.1
 	github.com/prometheus/client_golang v1.10.0
-	golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 // indirect
-	golang.org/x/sys v0.0.0-20210510120138-977fb7262007 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
 )

go.sum

@@ -8,10 +8,11 @@ github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWX
 github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
 github.com/ViBiOh/auth/v2 v2.7.0 h1:hR7D7hGt9UEiIuqZBaWRoIv+9uCjcAgxj97il9WWxGE=
 github.com/ViBiOh/auth/v2 v2.7.0/go.mod h1:ai96/8BXLiV7t748W7AVDANbmrM0QTNDsPOVZKPLYvk=
-github.com/ViBiOh/httputils/v4 v4.8.0 h1:fs2fjkBnmElYyPbM5vqDz00SyJsomUmKQIwTxSLw+kM=
 github.com/ViBiOh/httputils/v4 v4.8.0/go.mod h1:1hyt/nMC1kLiB9sm+qfHaQY9TIxS7gcUQZTV0DZ/nwc=
-github.com/ViBiOh/mailer v1.16.9 h1:7Bjl7Zp0FOsT3W8PeR6zQTsSqFf+101jr/Dv3lLUzRA=
-github.com/ViBiOh/mailer v1.16.9/go.mod h1:cSP0mW1oTyvYIHH+FS1C7ip419BGEnkN7xOmoQ7HHvs=
+github.com/ViBiOh/httputils/v4 v4.10.2 h1:EthjbXD/8OHsybkZh2/uAoVChPWKXodPXp3jHtFyLRg=
+github.com/ViBiOh/httputils/v4 v4.10.2/go.mod h1:SSNbzuDG+W6wPEgbIMuFkgKuE2ssVHDV8YyHvnxoFs0=
+github.com/ViBiOh/mailer v1.17.1 h1:1d2Iv4ZjUfCdXm/OD19l0nVjObWlamRh7yvywz0oBBU=
+github.com/ViBiOh/mailer v1.17.1/go.mod h1:sbu3TLXHSG2vWJa+2CeSG4NC+1bAx1Lqn4XS291Juh4=
 github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
 github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=

pkg/ketchup/ketchups.go

@@ -71,7 +71,7 @@ func (a app) handleCreate(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	renderer.Redirect(w, r, fmt.Sprintf("%s/", appPath), renderer.NewSuccessMessage(fmt.Sprintf("%s created with success!", created.Repository.Name)))
+	a.rendererApp.Redirect(w, r, fmt.Sprintf("%s/", appPath), renderer.NewSuccessMessage(fmt.Sprintf("%s created with success!", created.Repository.Name)))
 }
 
 func (a app) handleUpdate(w http.ResponseWriter, r *http.Request) {
@@ -95,7 +95,7 @@ func (a app) handleUpdate(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	renderer.Redirect(w, r, fmt.Sprintf("%s/", appPath), renderer.NewSuccessMessage(fmt.Sprintf("Updated %s with success!", updated.Version)))
+	a.rendererApp.Redirect(w, r, fmt.Sprintf("%s/", appPath), renderer.NewSuccessMessage(fmt.Sprintf("Updated %s with success!", updated.Version)))
 }
 
 func (a app) handleDelete(w http.ResponseWriter, r *http.Request) {
@@ -112,5 +112,5 @@ func (a app) handleDelete(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	renderer.Redirect(w, r, fmt.Sprintf("%s/", appPath), renderer.NewSuccessMessage("Deleted with success!"))
+	a.rendererApp.Redirect(w, r, fmt.Sprintf("%s/", appPath), renderer.NewSuccessMessage("Deleted with success!"))
 }

pkg/ketchup/renderer.go

@@ -2,7 +2,6 @@ package ketchup
 
 import (
 	"net/http"
-	"strings"
 
 	"github.com/ViBiOh/httputils/v4/pkg/logger"
 	"github.com/ViBiOh/httputils/v4/pkg/query"
@@ -39,12 +38,12 @@ func min(a, b uint64) uint64 {
 }
 
 func (a app) AppTemplateFunc(r *http.Request) (string, int, map[string]interface{}, error) {
-	pagination, err := query.ParsePagination(r, 1, 100, 100)
+	pagination, err := query.ParsePagination(r, 100, 100)
 	if err != nil {
 		return "", http.StatusBadRequest, nil, err
 	}
 
-	ketchups, _, err := a.ketchupService.List(r.Context(), pagination.PageSize, strings.TrimSpace(r.URL.Query().Get("lastKey")))
+	ketchups, _, err := a.ketchupService.List(r.Context(), pagination.PageSize, pagination.LastKey)
 	if err != nil {
 		return "", http.StatusInternalServerError, nil, err
 	}

pkg/ketchup/signup.go

@@ -41,6 +41,6 @@ func (a app) Signup() http.Handler {
 
 		go a.cleanToken(context.Background(), token)
 
-		renderer.Redirect(w, r, fmt.Sprintf("%s/", appPath), renderer.NewSuccessMessage("Welcome to ketchup!"))
+		a.rendererApp.Redirect(w, r, fmt.Sprintf("%s/", appPath), renderer.NewSuccessMessage("Welcome to ketchup!"))
 	})
 }