From 76cfdd44a62fe852b29faef670794a42d4d718c4 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Fri, 20 Jun 2014 16:11:18 -0700
Subject: [PATCH] Use id as user selector instead of username or email

---
 packages/accounts-password/password_client.js | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/packages/accounts-password/password_client.js b/packages/accounts-password/password_client.js
index 255dbd3d9d..ff391fc505 100644
--- a/packages/accounts-password/password_client.js
+++ b/packages/accounts-password/password_client.js
@@ -126,22 +126,9 @@ Accounts.changePassword = function (oldPassword, newPassword, callback) {
             error.reason === 'old password format') {
           // XXX COMPAT WITH 0.8.1.3
           // The server is telling us to upgrade from SRP to bcrypt, as
-          // in Meteor.loginWithPassword.
-          var userSelector = {};
-          if (Meteor.user().username) {
-            userSelector = { username: Meteor.user().username };
-          } else if (Meteor.user().emails && Meteor.user().emails.length) {
-            userSelector = { email: Meteor.user().emails[0].address };
-          } else {
-            callback(new Error(
-              "Cannot upgrade password format without " +
-                "username or email address"));
-            return;
-          }
-
           srpUpgradePath({
             upgradeError: error,
-            userSelector: userSelector,
+            userSelector: { id: Meteor.user()._id },
             plaintextPassword: oldPassword
           }, function (err) {
             if (err) {