From 87d196b0383db59abc1130b4331c1c048bb08cab Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Fri, 31 Jan 2014 11:11:16 -0700 Subject: [PATCH] chore(throttling): throttle in dev too --- src/controllers/auth.js | 2 +- src/server.js | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/controllers/auth.js b/src/controllers/auth.js index dd508039ad..ab141c268e 100644 --- a/src/controllers/auth.js +++ b/src/controllers/auth.js @@ -24,7 +24,7 @@ api.auth = function(req, res, next) { var token = req.headers['x-api-key']; if (!(uid && token)) return res.json(401, NO_TOKEN_OR_UID); User.findOne({_id: uid,apiToken: token}, function(err, user) { - if (err) return res.json(500, {err: err}); + if (err) return next(err); if (_.isEmpty(user)) return res.json(401, NO_USER_FOUND); res.locals.wasModified = req.query._v ? +user._v !== +req.query._v : true; diff --git a/src/server.js b/src/server.js index 0e0f54956a..8d95852ad0 100644 --- a/src/server.js +++ b/src/server.js @@ -95,8 +95,7 @@ if (cluster.isMaster && (isDev || isProd)) { app.set("port", nconf.get('PORT')); - if (isProd) - middleware.apiThrottle(app); + middleware.apiThrottle(app); if (!isProd) app.use(express.logger("dev")); app.use(express.compress()); app.set("views", __dirname + "/../views");