Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move purl authentication to server/index.js and don't redirect. keep

Browse Source 
them on that url
This commit is contained in:
Tyler Renelle
2012-08-26 16:02:33 -04:00
parent 0e4e306046
commit b711ccfc03
4 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/app/index.js
+1 -6
View File
@@ -20,13 +20,8 @@ helpers = require('./helpers');
helpers.viewHelpers(view);
get('/:uidParam?', function(page, model, _arg) {
var acceptableUid, uidParam, userId;
var uidParam, userId;
uidParam = _arg.uidParam;
acceptableUid = require('guid').isGuid(uidParam) || (uidParam === '3' || uidParam === '9');
if (acceptableUid) {
model.session.userId = uidParam;
return page.redirect('/');
}
userId = model.get('_userId');
return model.subscribe("users." + userId, function(err, user) {
var guid, newUser, task, _i, _len, _ref1;
lib/server/index.js
+7 -2
View File
@@ -47,10 +47,15 @@ root = path.dirname(path.dirname(__dirname));
publicPath = path.join(root, 'public');
habitrpgMiddleware = function(req, res, next) {
var model, _base;
var acceptableUid, model, uidParam, _base;
model = req.getModel();
(_base = req.session).userId || (_base.userId = derby.uuid());
model.setNull('_userId', req.session.userId);
uidParam = req.url.split('/')[1];
acceptableUid = require('guid').isGuid(uidParam) || (uidParam === '3' || uidParam === '9');
if (acceptableUid && req.session.userId !== uidParam) {
req.session.userId = uidParam;
}
model.set('_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);
require('./setupStore').accessControl(store);