revert to passing store around

seagyn · May 26, 2022 · 0aa245b · 0aa245b
1 parent 15886d6
commit 0aa245b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/inertia.go b/inertia.go
@@ -18,28 +18,28 @@ type Inertia struct {
 	url           string
 	rootTemplate  string
 	version       string
-	session       *session.Session
+	store         *session.Store
 	sharedProps   map[string]interface{}
 	sharedFuncMap template.FuncMap
 	templateFS    fs.FS
 }
 
 // New function.
-func New(url, rootTemplate, version string, session *session.Session) *Inertia {
+func New(url, rootTemplate, version string, store *session.Store) *Inertia {
 	i := new(Inertia)
 	i.url = url
 	i.rootTemplate = rootTemplate
 	i.version = version
-	i.session = session
+	i.store = store
 	i.sharedProps = make(map[string]interface{})
 	i.sharedFuncMap = template.FuncMap{"marshal": marshal}
 
 	return i
 }
 
 // NewWithFS function.
-func NewWithFS(url, rootTemplate, version string, session *session.Session, templateFS fs.FS) *Inertia {
-	i := New(url, rootTemplate, version, session)
+func NewWithFS(url, rootTemplate, version string, store *session.Store, templateFS fs.FS) *Inertia {
+	i := New(url, rootTemplate, version, store)
 	i.templateFS = templateFS
 
 	return i

diff --git a/middleware.go b/middleware.go
@@ -15,11 +15,13 @@ func (i *Inertia) Middleware(c *fiber.Ctx) error {
 		return c.SendStatus(fiber.StatusConflict)
 	}
 
-	message := i.session.Get("message")
+	sess, _ := i.store.Get(c)
+
+	message := sess.Get("message")
 
 	if message != nil {
-		i.Share("message", i.session.Get("message"))
-		i.session.Delete("message")
+		i.Share("message", sess.Get("message"))
+		sess.Delete("message")
 	}
 
 	// Go to next middleware: