diff --git a/example/rp/index.html b/example/rp/index.html index 19ddc0533b343d33ef00de82318cc0f11ddf8655..50f5808a8da6400b14728ef5d541909b156e29a3 100644 --- a/example/rp/index.html +++ b/example/rp/index.html @@ -77,9 +77,6 @@ pre { <input type="checkbox" id="returnTo"> <label for="returnTo">Supply returnTo</label><br /> </li> - </li><li> - <input type="text" id="requiredEmail" width="80"> - <label for="requiredEmail">Require a specific email</label><br /> </li> </ul> <button class="assertion">Get an assertion</button> @@ -181,15 +178,6 @@ navigator.id.watch({ $(document).ready(function() { $(".specify button.assertion").click(function() { - var requiredEmail = $.trim($('#requiredEmail').val()); - if (!requiredEmail.length) requiredEmail = undefined; - if (requiredEmail && requiredEmail.indexOf('@') === -1) { - alert('Invalid Email in "Require a specific email" field. Adding @example.com'); - $('#requiredEmail').val(requiredEmail + '@example.com'); - $('#requiredEmail').focus(); - return; - } - $(".specify button.assertion").attr('disabled', 'true'); navigator.id.request({ @@ -198,7 +186,6 @@ $(document).ready(function() { siteName: $('#siteName').attr('checked') ? "Persona Test Relying Party" : undefined, siteLogo: $('#siteLogo').attr('checked') ? "/i/logo.png" : undefined, returnTo: $('#returnTo').attr('checked') ? "/postVerificationReturn.html" : undefined, - requiredEmail: requiredEmail, oncancel: function() { loggit("oncancel"); $(".specify button.assertion").removeAttr('disabled'); diff --git a/resources/static/dialog/controllers/dialog.js b/resources/static/dialog/controllers/dialog.js index 36e66dca60e3ccc6310246344cb029f22d637376..edc76fd6c98568706fa1ae59575f79955b5c6c2f 100644 --- a/resources/static/dialog/controllers/dialog.js +++ b/resources/static/dialog/controllers/dialog.js @@ -159,9 +159,7 @@ BrowserID.Modules.Dialog = (function() { // verify params try { if (paramsFromRP.requiredEmail) { - if (!bid.verifyEmail(paramsFromRP.requiredEmail)) - throw "invalid requiredEmail: (" + paramsFromRP.requiredEmail + ")"; - params.requiredEmail = paramsFromRP.requiredEmail; + throw "requiredEmail has been deprecated"; } // support old parameter names... diff --git a/resources/static/include_js/include.js b/resources/static/include_js/include.js index e3b60e5ff29ed5e25d3be57dd2cbeebc1b41328a..b57840549501a889fea7df4165a187ce666581dd 100644 --- a/resources/static/include_js/include.js +++ b/resources/static/include_js/include.js @@ -1039,6 +1039,10 @@ } function internalRequest(options) { + if (options.requiredEmail) { + throw "requiredEmail has been deprecated"; + } + // focus an existing window if (w) { try { diff --git a/resources/static/test/cases/controllers/dialog.js b/resources/static/test/cases/controllers/dialog.js index aedd54d97475b720ed0affd26f640161948dfd04..088e182caa3aa417a81206efc52305fa10c0ae32 100644 --- a/resources/static/test/cases/controllers/dialog.js +++ b/resources/static/test/cases/controllers/dialog.js @@ -198,65 +198,6 @@ }); }); - asyncTest("get with invalid requiredEmail - print error screen", function() { - createController({ - ready: function() { - mediator.subscribe("start", function(msg, info) { - ok(false, "start should not have been called"); - }); - - var retval = controller.get(HTTP_TEST_DOMAIN, { - requiredEmail: "bademail" - }); - equal(retval, "invalid requiredEmail: (bademail)", "expected error"); - testErrorVisible(); - start(); - } - }); - }); - - asyncTest("get with script containing requiredEmail - print error screen", function() { - createController({ - ready: function() { - mediator.subscribe("start", function(msg, info) { - ok(false, "start should not have been called"); - }); - - var retval = controller.get(HTTP_TEST_DOMAIN, { - requiredEmail: "<script>window.scriptRun=true;</script>testuser@testuser.com" - }); - - // If requiredEmail is not properly escaped, scriptRun will be true. - equal(typeof window.scriptRun, "undefined", "script was not run"); - equal(retval, "invalid requiredEmail: (<script>window.scriptRun=true;</script>testuser@testuser.com)", "expected error"); - testErrorVisible(); - start(); - } - }); - }); - - asyncTest("get with valid requiredEmail - go to start", function() { - createController({ - ready: function() { - var startInfo; - mediator.subscribe("start", function(msg, info) { - startInfo = info; - }); - - var retval = controller.get(HTTP_TEST_DOMAIN, { - requiredEmail: TESTEMAIL - }); - - testHelpers.testObjectValuesEqual(startInfo, { - requiredEmail: TESTEMAIL - }); - equal(typeof retval, "undefined", "no error expected"); - testErrorNotVisible(); - start(); - } - }); - }); - asyncTest("get with relative tosURL & valid privacyURL - print error screen", function() { createController({ ready: function() {