diff --git a/app/api/server/v1/users.js b/app/api/server/v1/users.js index b6f1815e9d7..2e17b8ff9df 100644 --- a/app/api/server/v1/users.js +++ b/app/api/server/v1/users.js @@ -614,11 +614,8 @@ API.v1.addRoute('users.forgotPassword', { authRequired: false }, { return API.v1.failure('The \'email\' param is required'); } - const emailSent = Meteor.call('sendForgotPasswordEmail', email); - if (emailSent) { - return API.v1.success(); - } - return API.v1.failure('User not found'); + Meteor.call('sendForgotPasswordEmail', email); + return API.v1.success(); }, }); diff --git a/server/methods/sendForgotPasswordEmail.js b/server/methods/sendForgotPasswordEmail.js index 54684340aeb..c648455249a 100644 --- a/server/methods/sendForgotPasswordEmail.js +++ b/server/methods/sendForgotPasswordEmail.js @@ -14,7 +14,7 @@ Meteor.methods({ const user = Users.findOneByEmailAddress(email, { fields: { _id: 1 } }); if (!user) { - return false; + return true; } if (user.services && !user.services.password) { @@ -24,12 +24,10 @@ Meteor.methods({ } try { - return !!Accounts.sendResetPasswordEmail(user._id, email); + Accounts.sendResetPasswordEmail(user._id, email); + return true; } catch (error) { - throw new Meteor.Error('error-email-send-failed', `Error trying to send email: ${ error.message }`, { - method: 'registerUser', - message: error.message, - }); + console.error(error); } }, }); diff --git a/tests/end-to-end/api/01-users.js b/tests/end-to-end/api/01-users.js index fe24c47d3ed..e27af2b0465 100644 --- a/tests/end-to-end/api/01-users.js +++ b/tests/end-to-end/api/01-users.js @@ -1261,9 +1261,9 @@ describe('[Users]', function() { email: 'invalidEmail', }) .expect('Content-Type', 'application/json') - .expect(400) + .expect(200) .expect((res) => { - expect(res.body).to.have.property('success', false); + expect(res.body).to.have.property('success', true); }) .end(done); });