diff options
Diffstat (limited to 'server')
| -rw-r--r-- | server/api/user.js | 2 | ||||
| -rw-r--r-- | server/auth/index.js | 6 | ||||
| -rw-r--r-- | server/middleware.js | 1 |
3 files changed, 6 insertions, 3 deletions
diff --git a/server/api/user.js b/server/api/user.js index ceac2bc..181e2a8 100644 --- a/server/api/user.js +++ b/server/api/user.js @@ -7,7 +7,7 @@ module.exports = { all: function (req, res) { User.all({ order: 'name ASC' }).success(function(users){ res.json(users) - }) + }).error( function(){ res.json({ error: "wwtf" }) }) }, view: function (req, res) { diff --git a/server/auth/index.js b/server/auth/index.js index e8fb483..2080531 100644 --- a/server/auth/index.js +++ b/server/auth/index.js @@ -65,8 +65,10 @@ var auth = module.exports = { if (id == "guest") { done(null, auth.guestUser) } - User.find({ id: id }, function (err, user) { - done(err, user) + User.find({ where: { id: id } }).success(function (user) { + done(null, user) + }).error(function(){ + done("error", null) }); }, diff --git a/server/middleware.js b/server/middleware.js index 67fb732..b32f164 100644 --- a/server/middleware.js +++ b/server/middleware.js @@ -3,6 +3,7 @@ var middleware = { ensureAuthenticated: function (req, res, next) { + return next(); if (! req.isAuthenticated()) { req.session.returnTo = req.path; return res.redirect('/'); |