style(server): server setup cleanup

This commit is contained in:
Damian Mee 2014-08-05 00:59:08 +02:00
parent 443a481487
commit 21c957cf0f

View file

@ -47,10 +47,9 @@ module.exports = function (options) {
app.use(express.bodyParser()); app.use(express.bodyParser());
if (!options.https) { var authMiddleware;
server = http.createServer(app);
} if (options.https) {
else {
var serverOptions = { var serverOptions = {
key: options.https.key, key: options.https.key,
cert: options.https.cert, cert: options.https.cert,
@ -61,30 +60,28 @@ module.exports = function (options) {
}; };
server = https.createServer(serverOptions, app); server = https.createServer(serverOptions, app);
}
var authMiddleware = function (req, res, next) {
req.device = {};
return next();
};
if (options.https) {
authMiddleware = function(req, res, next) { authMiddleware = function(req, res, next) {
var fingerprint = req.connection.getPeerCertificate().fingerprint; config.isAuthorized(routes.getFingerprint(req), function (err, device) {
config.isAuthorized(fingerprint, function (err, device) {
if (err) { if (err) {
res.json({err: 'Internal Server Error'}); res.json({err: 'Internal Server Error'});
return next(err); return next(err);
} }
if (!device) { if (!device) {
res.statusCode = 404; res.json(404, {err: 'Not Found'});
res.json({err: 'Not Found'});
return next(new Error('Device is unpaired')); return next(new Error('Device is unpaired'));
} }
next(); next();
}); });
}; };
} else {
server = http.createServer(app);
authMiddleware = function (req, res, next) {
req.device = {};
return next();
};
} }
routes.init(app, config, trader, authMiddleware); routes.init(app, config, trader, authMiddleware);