beenull/tellform
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix password reset

Browse source
This commit is contained in:
David Baldwynn 2016-11-14 10:59:08 -08:00
parent fdccdb8f81
commit 1092f0da7f
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/controllers/users/users.password.server.controller.js
View file

@ -31,7 +31,10 @@ exports.forgot = function(req, res, next) {
function(token, done) {
if (req.body.username) {
User.findOne({
username: req.body.username
$or: [
{'username': req.body.username},
{'email': req.body.username}
]
}, '-salt -password', function(err, user) {
if(err){
return res.status(500).send({
@ -40,7 +43,7 @@ exports.forgot = function(req, res, next) {
}
if (!user) {
return res.status(400).send({
message: 'No account with that username has been found'
message: 'No account with that username or email has been found'
});
} else if (user.provider !== 'local') {
return res.status(400).send({

1
config/passport_helpers.js
View file

@ -6,7 +6,6 @@ var passport = require("passport");
var User = require('mongoose').model('User');
module.exports.isAuthenticatedOrApiKey = function isAuthenticated(req, res, next) {
debugger;
if (req.isAuthenticated()) {
return next();
} else {