From 30cfc6b605f2a09ad344c438d86dc99e2926857c Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 8 Jul 2016 18:06:50 +0100
Subject: [PATCH] Error if email already in use when resetting pw

Use password reset specific requestToken
---
 src/PasswordReset.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/PasswordReset.js b/src/PasswordReset.js
index bbafa0ef33..a03a565459 100644
--- a/src/PasswordReset.js
+++ b/src/PasswordReset.js
@@ -48,11 +48,13 @@ class PasswordReset {
      */
     resetPassword(emailAddress, 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;
             return res;
         }, 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})`;
             }
             throw err;