diff --git a/modules/users/server/config/strategies/local.js b/modules/users/server/config/strategies/local.js index 79397c31..7913b253 100644 --- a/modules/users/server/config/strategies/local.js +++ b/modules/users/server/config/strategies/local.js @@ -21,23 +21,25 @@ module.exports = function () { }, { email: usernameOrEmail.toLowerCase() }] - }, function (err, user) { - if (err) { - return done(err); - } - if (!user || !user.authenticate(password)) { - return done(null, false, { - message: 'Invalid username or password (' + (new Date()).toLocaleTimeString() + ')' - }); - } - if (user.status === 'banned') { - return done(null, false, { - message: 'You are banned from the server!' - }); - } + }).populate('invited_by', 'username displayName profileImageURL') + .exec(function (err, user) { + console.log(user); + if (err) { + return done(err); + } + if (!user || !user.authenticate(password)) { + return done(null, false, { + message: 'Invalid username or password (' + (new Date()).toLocaleTimeString() + ')' + }); + } + if (user.status === 'banned') { + return done(null, false, { + message: 'You are banned from the server!' + }); + } - return done(null, user); - }); + return done(null, user); + }); } )); }; diff --git a/modules/users/server/config/users.server.config.js b/modules/users/server/config/users.server.config.js index cfce8d42..f7dd3a11 100644 --- a/modules/users/server/config/users.server.config.js +++ b/modules/users/server/config/users.server.config.js @@ -22,7 +22,7 @@ module.exports = function (app) { passport.deserializeUser(function (id, done) { User.findOne({ _id: id - }, '-salt -password', function (err, user) { + }, '-salt -password').populate('invited_by', 'username displayName profileImageURL').exec(function (err, user) { done(err, user); }); }); diff --git a/modules/users/server/controllers/users/users.authorization.server.controller.js b/modules/users/server/controllers/users/users.authorization.server.controller.js index 8c665425..16f9d0a4 100644 --- a/modules/users/server/controllers/users/users.authorization.server.controller.js +++ b/modules/users/server/controllers/users/users.authorization.server.controller.js @@ -19,7 +19,7 @@ exports.userByID = function (req, res, next, id) { User.findOne({ _id: id - }).exec(function (err, user) { + }).populate('invited_by', 'username displayName profileImageURL').exec(function (err, user) { if (err) { return next(err); } else if (!user) {