Circular dependancy issue when working on hardening

handlers/account.go

@@ -3,6 +3,7 @@ package handlers
 import (
 	"html/template"
 	"net/http"
+	"synlotto-website/helpers"
 	"synlotto-website/models"
 
 	"github.com/gorilla/csrf"
@@ -15,8 +16,18 @@ func Login(w http.ResponseWriter, r *http.Request) {
 			"templates/account/login.html",
 		))
 
+		session, _ := helpers.GetSession(w, r)
+
+		var flash string
+		if f, ok := session.Values["flash"].(string); ok {
+			flash = f
+			delete(session.Values, "flash")
+			session.Save(r, w)
+		}
+
 		tmpl.ExecuteTemplate(w, "layout", map[string]interface{}{
 			"csrfField": csrf.TemplateField(r),
+			"Flash":     flash,
 		})
 		return
 	}
@@ -30,19 +41,30 @@ func Login(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	session, _ := GetSession(w, r)
-	session.Values["user_id"] = user.Id
+	session, err := helpers.GetSession(w, r)
+	if err != nil {
+		http.Error(w, "Session error", http.StatusInternalServerError)
+		return
+	}
+	session.Options.MaxAge = -1
 	session.Save(r, w)
 
+	newSession, _ := helpers.GetSession(w, r)
+	newSession.Values["user_id"] = user.Id
+	newSession.Save(r, w)
+
 	http.Redirect(w, r, "/", http.StatusSeeOther)
 }
 
 func Logout(w http.ResponseWriter, r *http.Request) {
-	session, _ := GetSession(w, r)
-
+	session, _ := helpers.GetSession(w, r)
 	session.Options.MaxAge = -1
 	session.Save(r, w)
 
+	newSession, _ := helpers.GetSession(w, r)
+	newSession.Values["flash"] = "You’ve been logged out"
+	newSession.Save(r, w)
+
 	http.Redirect(w, r, "/login", http.StatusSeeOther)
 }