Skip to content

Fix session always assign even when not flash is not set #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ducdigital wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix session always assign even when not flash is not set #34

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3250fa
Update flash not create session unnessecary
ducdigital May 4, 2016
52b826d
Remove unnecessary assignment
ducdigital May 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions lib/flash.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ var isArray = require('util').isArray;
module.exports = function flash(options) {
options = options || {};
var safe = (options.unsafe === undefined) ? true : !options.unsafe;

return function(req, res, next) {
if (req.flash && safe) { return next(); }
req.flash = _flash;
Expand Down Expand Up @@ -58,7 +58,7 @@ module.exports = function flash(options) {
*/
function _flash(type, msg) {
if (this.session === undefined) throw Error('req.flash() requires sessions');
var msgs = this.session.flash = this.session.flash || {};
var msgs = this.session.flash || {};
if (type && msg) {
// util.format is available in Node.js 0.6+
if (arguments.length > 2 && format) {
Expand All @@ -68,15 +68,24 @@ function _flash(type, msg) {
msg.forEach(function(val){
(msgs[type] = msgs[type] || []).push(val);
});
this.session.flash = msgs;
return msgs[type].length;
}
return (msgs[type] = msgs[type] || []).push(msg);
var ret = (msgs[type] = msgs[type] || []).push(msg);
this.session.flash = msgs;
return ret;
} else if (type) {
var arr = msgs[type];
delete msgs[type];
if (Array.isArray(arr)) {
delete msgs[type];
}
if (Object.getOwnPropertyNames(msgs).length === 0) {
delete this.session.flash;
} else {
this.session.flash = msgs;
}
return arr || [];
} else {
this.session.flash = {};
return msgs;
}
}