Merge pull request #337 from matrix-org/dbkr/password_reset_email_not_found

Error if email already in use when resetting pw
This commit is contained in:
David Baker 2016-07-20 14:00:12 +01:00 committed by GitHub
commit ae7e51ae17

View file

@ -48,11 +48,13 @@ class PasswordReset {
*/ */
resetPassword(emailAddress, newPassword) { resetPassword(emailAddress, newPassword) {
this.password = newPassword; this.password = newPassword;
return this.client.requestEmailToken(emailAddress, this.clientSecret, 1).then((res) => { return this.client.requestPasswordEmailToken(emailAddress, this.clientSecret, 1).then((res) => {
this.sessionId = res.sid; this.sessionId = res.sid;
return res; return res;
}, function(err) { }, function(err) {
if (err.httpStatus) { if (err.errcode == 'M_THREEPID_NOT_FOUND') {
err.message = "This email address was not found";
} else if (err.httpStatus) {
err.message = err.message + ` (Status ${err.httpStatus})`; err.message = err.message + ` (Status ${err.httpStatus})`;
} }
throw err; throw err;