Skip to content
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

Jump to bottom

Fix #904, Required regenerate and save API (req.session.regenerate is not a function since upgrade to 0.6.0) #947

Closed
wants to merge 4 commits into from
+652 −35
Closed

Fix #904, Required regenerate and save API (req.session.regenerate is not a function since upgrade to 0.6.0) #947

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9271208
fix for required regenerate and save API
joeyguerra Oct 31, 2022
621f6c6
code cleanup
joeyguerra Oct 31, 2022
eda56fe
Merge branch 'master' of github.com:joeyguerra/passport into missing-…
joeyguerra Feb 13, 2024
c5c9f3e
Use self instead of this to address 'this' handling
joeyguerra Feb 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 20 additions & 10 deletions lib/sessionmanager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,18 @@ function SessionManager(options, serializeUser) {
options = undefined;
}
options = options || {};

if(undefined == options.delegate){
console.warn('This manager utilizes a delegate with an API that contains regenerate and save');
}
this._delegate = options.delegate || {
regenerate: function(req, cb){
cb();
},
save: function(req, cb){
cb();
}
};

this._key = options.key || 'passport';
this._serializeUser = serializeUser;
}
Expand All @@ -22,14 +33,13 @@ SessionManager.prototype.logIn = function(req, user, options, cb) {

var self = this;
var prevSession = req.session;

// regenerate the session, which is good practice to help
// guard against forms of session fixation
req.session.regenerate(function(err) {
this._delegate.regenerate(req, function(err) {
joeyguerra marked this conversation as resolved.
Show resolved Hide resolved
if (err) {
return cb(err);
}

self._serializeUser(user, req, function(err, obj) {
if (err) {
return cb(err);
Expand All @@ -44,15 +54,15 @@ SessionManager.prototype.logIn = function(req, user, options, cb) {
req.session[self._key].user = obj;
// save the session before redirection to ensure page
// load does not happen before session is saved
req.session.save(function(err) {
self._delegate.save(req, function(err) {
if (err) {
return cb(err);
}
cb();
});
});
});
}
};

SessionManager.prototype.logOut = function(req, options, cb) {
if (typeof options == 'function') {
Expand All @@ -73,14 +83,14 @@ SessionManager.prototype.logOut = function(req, options, cb) {
}
var prevSession = req.session;

req.session.save(function(err) {
this._delegate.save(req, function(err) {
if (err) {
return cb(err)
return cb(err);
}

// regenerate the session, which is good practice to help
// guard against forms of session fixation
req.session.regenerate(function(err) {
self._delegate.regenerate(req, function(err) {
if (err) {
return cb(err);
}
Expand All @@ -90,7 +100,7 @@ SessionManager.prototype.logOut = function(req, options, cb) {
cb();
});
});
}
};


module.exports = SessionManager;