remove code duplication

This commit is contained in:
booo 2012-02-08 15:52:13 +01:00
parent 736aaa2800
commit e6e81135a7
4 changed files with 33 additions and 59 deletions

View file

@ -2,26 +2,7 @@ var ERR = require("async-stacktrace");
module.exports = function(app)
{
//TODO put this into module
//checks for padAccess
function hasPadAccess(req, res, callback)
{
app.securityManager.checkAccess(req.params.pad, req.cookies.sessionid, req.cookies.token, req.cookies.password, function(err, accessObj)
{
if(ERR(err, callback)) return;
//there is access, continue
if(accessObj.accessStatus == "grant")
{
callback();
}
//no access
else
{
res.send("403 - Can't touch this", 403);
}
});
}
var hasPadAccess = require('./preconditions').hasPadAccess(app);
//serve timeslider.html under /p/$padname/timeslider
app.get('/p/:pad/:rev?/export/:type', function(req, res, next)

View file

@ -2,26 +2,8 @@ var ERR = require("async-stacktrace");
module.exports = function(app)
{
//TODO put this into module
//checks for padAccess
function hasPadAccess(req, res, callback)
{
app.securityManager.checkAccess(req.params.pad, req.cookies.sessionid, req.cookies.token, req.cookies.password, function(err, accessObj)
{
if(ERR(err, callback)) return;
//there is access, continue
if(accessObj.accessStatus == "grant")
{
callback();
}
//no access
else
{
res.send("403 - Can't touch this", 403);
}
});
}
var hasPadAccess = require('./preconditions').hasPadAccess(app);
//handle import requests
app.post('/p/:pad/import', function(req, res, next)

View file

@ -1,3 +1,5 @@
var ERR = require('async-stacktrace');
module.exports = function(app)
{
//redirects browser to the pad's sanitized url if needed. otherwise, renders the html
@ -26,3 +28,30 @@ module.exports = function(app)
}
});
};
module.exports.hasPadAccess = function(app)
{
//checks for padAccess
var hasPadAccess = function hasPadAccess(req, res, callback)
{
app.securityManager.checkAccess(req.params.pad, req.cookies.sessionid, req.cookies.token, req.cookies.password, function(err, accessObj)
{
if(ERR(err, callback)) return;
//there is access, continue
if(accessObj.accessStatus == "grant")
{
callback();
}
//no access
else
{
res.send("403 - Can't touch this", 403);
}
});
};
return hasPadAccess;
};

View file

@ -3,26 +3,8 @@ var ERR = require('async-stacktrace');
module.exports = function(app)
{
//TODO put this into module
//checks for padAccess
function hasPadAccess(req, res, callback)
{
app.securityManager.checkAccess(req.params.pad, req.cookies.sessionid, req.cookies.token, req.cookies.password, function(err, accessObj)
{
if(ERR(err, callback)) return;
//there is access, continue
if(accessObj.accessStatus == "grant")
{
callback();
}
//no access
else
{
res.send("403 - Can't touch this", 403);
}
});
}
var hasPadAccess = require('./preconditions').hasPadAccess(app);
//serve read only pad
app.get('/ro/:id', function(req, res)