merge fix for issue #1440 into train-2012.04.11 - fixes reset passwor…

…d flow
mozilla · Apr 17, 2012 · db83245 · db83245
2 parents 7f071b6 + 7578971
commit db83245
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 1 deletion.
diff --git a/resources/static/dialog/controllers/check_registration.js b/resources/static/dialog/controllers/check_registration.js
@@ -39,7 +39,10 @@ BrowserID.Modules.CheckRegistration = (function() {
           });
         }
         else if (status === "mustAuth") {
-          self.close("authenticate", { email: self.email });
+          user.addressInfo(self.email, function(info) {
+            self.close("authenticate", info);
+          });
+
           oncomplete && oncomplete();
         }
       }, self.getErrorDialog(errors.registration, oncomplete));

diff --git a/resources/static/dialog/resources/state.js b/resources/static/dialog/resources/state.js
@@ -241,6 +241,8 @@ BrowserID.State = (function() {
     handleState("reset_password", function(msg, info) {
       // reset password says the password has been reset, now waiting for
       // confirmation.
+      info = info || {};
+      self.stagedEmail = info.email;
       startAction(false, "doResetPassword", info);
     });
 

diff --git a/resources/static/test/cases/controllers/check_registration.js b/resources/static/test/cases/controllers/check_registration.js
@@ -49,6 +49,14 @@
 
   asyncTest("user validation with mustAuth result", function() {
     xhr.useResult("mustAuth");
+    createController("waitForUserValidation");
+    register("authenticate", function(msg, info) {
+      equal(info.email, "registered@testuser.com", "correct email");
+      ok(info.type, "type sent with info");
+      ok(info.known, "email is known");
+      start();
+    });
+    controller.startCheck();
 
     testVerifiedUserEvent("authenticate", "User Must Auth");
   });

diff --git a/resources/static/test/cases/resources/state.js b/resources/static/test/cases/resources/state.js
@@ -218,6 +218,14 @@
     equal(actions.info.doAuthenticate.email, TEST_EMAIL, "authenticate called with the correct email");
   });
 
+  test("reset_password through to validation on same browser - call doEmailConfirmed with email address", function() {
+    mediator.publish("reset_password", { email: TEST_EMAIL });
+    mediator.publish("user_confirmed");
+
+    equal(actions.info.doEmailConfirmed.email, TEST_EMAIL, "doEmailConfirmed called with correct email");
+  });
+
+
   asyncTest("assertion_generated with null assertion - redirect to pick_email", function() {
     mediator.subscribe("pick_email", function() {
       ok(true, "redirect to pick_email");

diff --git a/resources/static/test/mocks/xhr.js b/resources/static/test/mocks/xhr.js
@@ -109,6 +109,7 @@ BrowserID.Mocks.xhr = (function() {
       "get /wsapi/address_info?email=unregistered%40testuser.com primary": { type: "primary", auth: "https://auth_url", prov: "https://prov_url" },
       "get /wsapi/address_info?email=testuser%40testuser.com unknown_secondary": { type: "secondary", known: false },
       "get /wsapi/address_info?email=testuser%40testuser.com known_secondary": { type: "secondary", known: true },
+      "get /wsapi/address_info?email=registered%40testuser.com mustAuth": { type: "secondary", known: true },
       "get /wsapi/address_info?email=testuser%40testuser.com primary": { type: "primary", auth: "https://auth_url", prov: "https://prov_url" },
       "get /wsapi/address_info?email=testuser%40testuser.com ajaxError": undefined,
       "post /wsapi/add_email_with_assertion invalid": { success: false },