sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-01 15:31:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

userId is no longer auto-created by session middleware

Browse source
This commit is contained in:
Tyler Renelle 2012-08-24 09:57:42 -04:00
parent c7f0ae1951
commit 494b26c866
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/server/index.js
View file

@ -47,8 +47,10 @@ root = path.dirname(path.dirname(__dirname));
publicPath = path.join(root, 'public');
habitrpgMiddleware = function(req, res, next) {
var model;
var model, _base;
model = req.getModel();
(_base = req.session).userId || (_base.userId = derby.uuid());
model.setNull('_userId', req.session.userId);
model.set('_mobileDevice', /Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(req.header('User-Agent')));
model.set('_nodeEnv', process.env.NODE_ENV);
return next();

9
src/server/index.coffee
View file

@ -31,11 +31,18 @@ root = path.dirname path.dirname __dirname
publicPath = path.join root, 'public'
habitrpgMiddleware = (req, res, next) ->
# set _mobileDevice to true or false so view can exclude portions from mobile device
model = req.getModel()
# chat userId is no longer auto-created by session middleware
req.session.userId ||= derby.uuid()
model.setNull('_userId', req.session.userId)
# set _mobileDevice to true or false so view can exclude portions from mobile device
model.set '_mobileDevice', /Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(req.header 'User-Agent')
# same for production/development
model.set '_nodeEnv', process.env.NODE_ENV
next()
expressApp