middleware.SessionSaver is now built-in.

app.go

@@ -147,6 +147,7 @@ func New(opts Options) *App {
 	}
 	a.Use(a.PanicHandler)
 	a.Use(RequestLogger)
+	a.Use(sessionSaver)
 
 	return a
 }

generators/newapp/templates/actions/app.go.tmpl

@@ -48,12 +48,6 @@ func App() *buffalo.App {
       SSLProxyHeaders: map[string]string{"X-Forwarded-Proto": "https"},
     }))
 
-    {{ if .asWeb -}}
-    // Automatically save the session if the underlying
-    // Handler does not return an error.
-    app.Use(middleware.SessionSaver)
-    {{ end -}}
-
     {{ if .asAPI -}}
     // Set the request content type to JSON
     app.Use(middleware.SetContentType("application/json"))

middleware/csrf.go

@@ -2,7 +2,6 @@ package middleware
 
 import (
 	"fmt"
-	"runtime"
 
 	"github.com/gobuffalo/buffalo"
 	"github.com/gobuffalo/buffalo/middleware/csrf"
@@ -25,9 +24,6 @@ var (
 // CSRF is deprecated, and will be removed in v0.10.0. Use csrf.New instead.
 var CSRF = func(next buffalo.Handler) buffalo.Handler {
 	warningMsg := "middleware.CSRF is deprecated, and will be removed in v0.10.0. Use csrf.New instead."
-	_, file, no, ok := runtime.Caller(1)
-	if ok {
-		warningMsg = fmt.Sprintf("%s Called from %s:%d", warningMsg, file, no)
-	}
+	fmt.Println(warningMsg)
 	return csrf.Middleware(next)
 }

middleware/session_saver.go

@@ -1,18 +1,16 @@
 package middleware
 
 import (
+	"fmt"
+
 	"github.com/gobuffalo/buffalo"
-	"github.com/pkg/errors"
 )
 
-// SessionSaver will automatically save a session if the
-// request was successful.
+// SessionSaver is deprecated, and will be removed in v0.10.0. This now happens automatically. This middleware is no longer required.
 func SessionSaver(next buffalo.Handler) buffalo.Handler {
 	return func(c buffalo.Context) error {
-		err := next(c)
-		if err != nil {
-			return errors.WithStack(err)
-		}
-		return c.Session().Save()
+		warningMsg := "SessionSaver is deprecated, and will be removed in v0.10.0. This now happens automatically. This middleware is no longer required."
+		fmt.Println(warningMsg)
+		return next(c)
 	}
 }

router_test.go

@@ -258,15 +258,15 @@ func Test_Router_Group_Middleware(t *testing.T) {
 
 	a := testApp()
 	a.Use(func(h Handler) Handler { return h })
-	r.Len(a.Middleware.stack, 3)
+	r.Len(a.Middleware.stack, 4)
 
 	g := a.Group("/api/v1")
-	r.Len(a.Middleware.stack, 3)
-	r.Len(g.Middleware.stack, 3)
+	r.Len(a.Middleware.stack, 4)
+	r.Len(g.Middleware.stack, 4)
 
 	g.Use(func(h Handler) Handler { return h })
-	r.Len(a.Middleware.stack, 3)
-	r.Len(g.Middleware.stack, 4)
+	r.Len(a.Middleware.stack, 4)
+	r.Len(g.Middleware.stack, 5)
 }
 
 func Test_Router_Redirect(t *testing.T) {

session.go

@@ -4,6 +4,7 @@ import (
 	"net/http"
 
 	"github.com/gorilla/sessions"
+	"github.com/pkg/errors"
 )
 
 // Session wraps the "github.com/gorilla/sessions" API
@@ -60,3 +61,13 @@ func (a *App) getSession(r *http.Request, w http.ResponseWriter) *Session {
 		res:     w,
 	}
 }
+
+func sessionSaver(next Handler) Handler {
+	return func(c Context) error {
+		err := next(c)
+		if err != nil {
+			return errors.WithStack(err)
+		}
+		return c.Session().Save()
+	}
+}