From 5afa0b4d6214f3c8214c80d6da65a8fe0dc28365 Mon Sep 17 00:00:00 2001
From: Brian Warner <warner@lothar.com>
Date: Tue, 22 May 2012 09:21:55 -0700
Subject: [PATCH] dialog.js: pass requiredEmail (unchecked) through to params
---
resources/static/dialog/controllers/dialog.js | 23 ++++++++++---------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/resources/static/dialog/controllers/dialog.js b/resources/static/dialog/controllers/dialog.js
index febe54823..8517051de 100644
--- a/resources/static/dialog/controllers/dialog.js
+++ b/resources/static/dialog/controllers/dialog.js
@@ -131,20 +131,21 @@ BrowserID.Modules.Dialog = (function() {
params.hostname = user.getHostname();
// verify params
- if (paramsFromRP.tosURL && paramsFromRP.privacyURL) {
- try {
+ try {
+ params.requiredEmail = paramsFromRP.requiredEmail;
+ if (paramsFromRP.tosURL && paramsFromRP.privacyURL) {
params.tosURL = fixupURL(origin_url, paramsFromRP.tosURL);
params.privacyURL = fixupURL(origin_url, paramsFromRP.privacyURL);
- } catch(e) {
- // note: renderError accepts HTML and cheerfully injects it into a
- // frame with a powerful origin. So convert 'e' first.
- return self.renderError("error", {
- action: {
- title: "error in " + _.escape(origin_url),
- message: "improper usage of API: " + _.escape(e)
- }
- });
}
+ } catch(e) {
+ // note: renderError accepts HTML and cheerfully injects it into a
+ // frame with a powerful origin. So convert 'e' first.
+ return self.renderError("error", {
+ action: {
+ title: "error in " + _.escape(origin_url),
+ message: "improper usage of API: " + _.escape(e)
+ }
+ });
}
// after this point, "params" can be relied upon to contain safe data
--
GitLab