hiro/lack
1
0
Fork 0
mirror of https://github.com/vale981/lack synced 2025-03-04 17:01:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add :keep-empty option to Lack.Middleware.Session for preventing from sending Set-Cookie header until the session is used.

Browse source
This commit is contained in:
Eitaro Fukamachi 2015-09-26 15:45:38 +09:00
parent 8d6fe23e38
commit d4cdb5315d
2 changed files with 32 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/middleware/session.lisp
View file

@ -20,20 +20,27 @@
(defparameter *lack-middleware-session* (defparameter *lack-middleware-session*
(lambda (app &key (lambda (app &key
(store (make-memory-store)) (store (make-memory-store))
(state (make-cookie-state))) (state (make-cookie-state))
(keep-empty t))
(lambda (env) (lambda (env)
(let* ((sid (extract-sid state env)) (let* ((sid (extract-sid state env))
(session (and sid (session (and sid
(fetch-session store sid))) (fetch-session store sid)))
(sid (or sid (sid (or sid
(generate-sid state env)))) (generate-sid state env)))
(setf (getf env :lack.session) (new-session-p (not session))
(or session (make-hash-table :test 'equal))) (session (or session (make-hash-table :test 'equal))))
(setf (getf env :lack.session) session)
(setf (getf env :lack.session.options) (setf (getf env :lack.session.options)
(if session (if new-session-p
(list :id sid) (list :id sid :new-session t)
(list :id sid :new-session t))) (list :id sid)))
(finalize store state env (funcall app env))))) (let ((res (funcall app env)))
(if (and (not keep-empty)
new-session-p
(zerop (hash-table-count session)))
res
(finalize store state env res))))))
"Middleware for session management") "Middleware for session management")
(defun finalize (store state env res) (defun finalize (store state env res)

18
t/middleware/session.lisp
View file

@ -6,7 +6,7 @@
:lack.test)) :lack.test))
(in-package :t.lack.middleware.session) (in-package :t.lack.middleware.session)
(plan 4) (plan 5)
(ok (lack.session.state:make-state) (ok (lack.session.state:make-state)
"Base class of session state") "Base class of session state")
@ -103,4 +103,20 @@
"Set-Cookie header exists") "Set-Cookie header exists")
(is body '("hi") "body")))) (is body '("hi") "body"))))
(subtest ":keep-empty nil"
(let ((app (builder
(:session :keep-empty nil)
(lambda (env)
(when (string= (getf env :path-info) "/session")
(setf (gethash "user" (getf env :lack.session)) "Eitaro"))
'(200 () ("hi"))))))
(destructuring-bind (status headers body)
(funcall app (generate-env "/"))
(declare (ignore status body))
(is headers nil))
(destructuring-bind (status headers body)
(funcall app (generate-env "/session"))
(declare (ignore status body))
(is-type (getf headers :set-cookie) 'string))))
(finalize) (finalize)