When verifying an email address, show the address that was verified and the...

When verifying an email address, show the address that was verified and the site for which it was created.

issue #349

browserid/static/dialog/qunit.html

@@ -27,6 +27,11 @@
         </div>
 
       </div>
+      <span id="email"></span>
+      <span id="cannotconfirm" class="error">Cannot confirm</span>
+      <span id="cannotcommunicate" class="error">Cannot communicate</span>
+      <span id="siteinfo" class="error"><span id="origin"></span></span>
+      <span class=".hint">Hint</span>
     </div>
 		<ol id="qunit-tests"></ol>
 		<div id="qunit-test-area"></div>

browserid/static/dialog/test/qunit/pages/add_email_address_test.js

+/*jshint browsers:true, forin: true, laxbreak: true */
+/*global steal: true, test: true, start: true, stop: true, module: true, ok: true, equal: true, BrowserID:true */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla BrowserID.
+ *
+ * The Initial Developer of the Original Code is Mozilla.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+steal.plugins("jquery").then("/js/pages/add_email_address", function() {
+  "use strict";
+
+  var bid = BrowserID,
+      network = bid.Network,
+      emailForVerificationTokenFailure = false,
+      completeEmailRegistrationFailure = false,
+      validToken = true;
+  
+  var netMock = {
+    emailForVerificationToken: function(token, onSuccess, onFailure) {
+      emailForVerificationTokenFailure ? onFailure() : onSuccess("testuser@testuser.com");
+    },
+
+    completeEmailRegistration: function(token, onSuccess, onFailure) {
+      completeEmailRegistrationFailure ? onFailure() : onSuccess(validToken);
+    }
+  };
+
+  module("pages/add_email_address", {
+    setup: function() {
+      BrowserID.User.setNetwork(netMock);  
+      emailForVerificationTokenFailure = completeEmailRegistrationFailure = false;
+      validToken = true;
+      $(".error").stop().hide();
+      $("#origin").text("");
+    },
+    teardown: function() {
+      BrowserID.User.setNetwork(network);  
+      $(".error").stop().hide();
+      $("#origin").text("");
+    }
+  });
+
+  test("addEmailAddress with good token and site", function() {
+    localStorage.initiatingOrigin = "browserid.org";
+
+    bid.addEmailAddress("token");
+    
+    equal($("#email").text(), "testuser@testuser.com", "email set");
+    ok($("#siteinfo").is(":visible"), "siteinfo is visible when we say what it is");
+    equal($("#origin").text(), "browserid.org", "origin is updated");
+  });
+
+  test("addEmailAddress with good token and nosite", function() {
+    bid.addEmailAddress("token");
+    
+    equal($("#email").text(), "testuser@testuser.com", "email set");
+    equal($("#siteinfo").is(":visible"), false, "siteinfo is not visible without having it");
+    equal($("#origin").text(), "", "origin is not updated");
+  });
+
+  test("addEmailAddress with bad token", function() {
+    validToken = false;
+
+    bid.addEmailAddress("token");
+    ok($("#cannotconfirm").is(":visible"), "cannot confirm box is visible");
+  });
+
+  test("addEmailAddress with emailForVerficationToken XHR failure", function() {
+    validToken = true;
+    emailForVerificationTokenFailure = true;
+    bid.addEmailAddress("token");
+
+    ok($("#cannotcommunicate").is(":visible"), "cannot communicate box is visible");
+  });
+
+  test("addEmailAddress with completeEmailRegistration XHR failure", function() {
+    validToken = true;
+    completeEmailRegistrationFailure = true;
+    bid.addEmailAddress("token");
+
+    ok($("#cannotcommunicate").is(":visible"), "cannot communicate box is visible");
+  });
+});

browserid/static/dialog/test/qunit/qunit.js

@@ -13,6 +13,7 @@ steal("/dialog/resources/browserid.js",
 	.views('testBodyTemplate.ejs')
 	.views('wait.ejs')
   .then("browserid_unit_test")
+  .then("pages/add_email_address_test")
   .then("controllers/page_controller_unit_test")
   .then("resources/validation_unit_test")
   .then("resources/storage_unit_test")

browserid/static/js/pages/add_email_address.js

@@ -36,28 +36,34 @@
 
 (function() {
   "use strict";
-
-  function emailRegistrationSuccess() {
+  
+  var ANIMATION_TIME=250;
+  function emailRegistrationSuccess(info) {
     $(".hint").hide();
-    $("#congrats").fadeIn(250, function() {
-      $("body").delay(1000).fadeOut(500, function() {
-        // if the close didn't work, then let's redirect the the main page where they'll
-        // get to see the ids that they've created.
-        document.location = '/';
-      });
-    });
+
+    $("#email").text(info.email);
+    
+    if (info.origin) {
+      $("#origin").text(info.origin);
+      $("#siteinfo").show();
+    }
+
+    $("#congrats").fadeIn(ANIMATION_TIME);
   }
 
   function showError(el) {
     $(".hint").hide();
-    $(el).fadeIn(250);
+    $(el).fadeIn(ANIMATION_TIME);
   }
 
   BrowserID.addEmailAddress = function(token) {
-    BrowserID.Network.completeEmailRegistration(token, function onSuccess(valid) {
-      if (valid) {
-        emailRegistrationSuccess();
-      } else {
+    var user = BrowserID.User;
+
+    user.verifyEmail(token, function onSuccess(info) {
+      if (info.valid) {
+        emailRegistrationSuccess(info);
+      }
+      else {
         showError("#cannotconfirm");
       }
     }, function onFailure() {

browserid/views/verifyemail.ejs

@@ -11,7 +11,14 @@
         
 
         <div id="congrats" class="serif">
-          Your email address has been verified!
+          <p>
+            <strong id="email">Your address</strong> has been verified!
+
+            <span id="siteinfo">
+              Your new address has been used to sign in to <strong id="origin"></strong>, 
+              which will be in its original window or tab.
+            </span>
+          </p>
         </div>
   </div>
 </div>