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

Some Code styling and refactor #1410

Merged
merged 1 commit into from
Jun 8, 2018
Merged

Some Code styling and refactor #1410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 15 additions & 24 deletions controllers/user.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ var countTask = require('../libs/tasks').countTask;
var pageMetadata = require('../libs/templateHelpers').pageMetadata;
var orderDir = require('../libs/templateHelpers').orderDir;

var extendSession = require('../libs/modifySessions').extend;

//--- Configuration inclusions
var userRoles = require('../models/userRoles.json');
var strategies = require('./strategies.json');
Expand Down Expand Up @@ -115,7 +117,6 @@ exports.exist = function (aReq, aRes) {

// API - Request for extending a logged in user session
exports.extend = function (aReq, aRes, aNext) {
//
var authedUser = aReq.session.user;

if (!authedUser) {
Expand All @@ -127,32 +128,22 @@ exports.extend = function (aReq, aRes, aNext) {
_id: authedUser._id,
sessionsIds: { "$in": [ aReq.session._id ] }
}, function (aErr, aUser) {
var options = {};
var user = null;

if (aErr) {
console.error(aErr);
statusCodePage(aReq, aRes, aNext, {
statusCode: 500,
statusMessage: 'Server Error'
});
return;
}

if (!aUser) {
aNext();
return;
}
extendSession(aReq, aUser, function (aErr) {
if (aErr) {
if (aErr === 'Already extended') {
aNext();
return;
}

if (aReq.session.cookie.expires) {
aReq.session.cookie.expires = false;
aReq.session.save();
statusCodePage(aReq, aRes, aNext, {
statusCode: 500,
statusMessage: aErr
});
return;
}

aRes.redirect('back');
} else {
aNext();
return;
}
});
});
};

Expand Down
36 changes: 31 additions & 5 deletions libs/modifySessions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function serializeUser(aUser) {
return userObj;
}

// Add a new session id to the user model
// Add a single new session id to the user model
exports.add = function (aReq, aUser, aCallback) {
var store = aReq.sessionStore;

Expand Down Expand Up @@ -62,7 +62,26 @@ exports.add = function (aReq, aUser, aCallback) {
}
};

// Remove a session id from the user model **and** the session store
// Extend a single session
exports.extend = function (aReq, aUser, aCallback) {
if (!aUser) {
aCallback('No User');
return;
}

if (!aReq.session.cookie.expires) {
aCallback('Already extended');
return;
}

// NOTE: Currently allow on any session with
// no additional User restrictions yet

aReq.session.cookie.expires = false;
aReq.session.save(aCallback);
};

// Remove a single session id from the user model **and** the session store
exports.remove = function (aReq, aUser, aCallback) {
var pos = aUser && aUser.sessionIds ?
aUser.sessionIds.indexOf(aReq.sessionID) : -1;
Expand All @@ -86,13 +105,17 @@ exports.update = function (aReq, aUser, aCallback) {
var store = aReq.sessionStore;
var userObj = aUser ? serializeUser(aUser) : null;

if (!aUser || !aUser.sessionIds) { return aCallback('No sessions', null); }
if (!aUser || !aUser.sessionIds) {
aCallback('No sessions', null);
return;
}

async.each(aUser.sessionIds, function (aId, aCb) {
store.get(aId, function (aErr, aSess) {
// Invalid session, will be removed on login
if (aErr || !aSess) {
return aCb(null);
aCb(null);
return;
}

aSess.user = userObj;
Expand All @@ -113,7 +136,10 @@ exports.destroy = function (aReq, aUser, aCallback) {
}
};

if (!aUser || !aUser.sessionIds) { return aCallback('No sessions', null); }
if (!aUser || !aUser.sessionIds) {
aCallback('No sessions', null);
return;
}

async.each(aUser.sessionIds, function (aId, aCb) {
store.set(aId, emptySess, aCb);
Expand Down