Bug 820183 - BrowserID extension should allow custom configuration of browserid hostnames to use for verification

r=glob

3 files changed, 26 insertions, 4 deletions

diff --git a/extensions/BrowserID/template/en/default/admin/params/browserid.html.tmpl b/extensions/BrowserID/template/en/default/admin/params/browserid.html.tmpl
new file mode 100644
index 000000000..be60e612b
--- /dev/null
+++ b/extensions/BrowserID/template/en/default/admin/params/browserid.html.tmpl
@@ -0,0 +1,20 @@
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+  # License, v. 2.0. If a copy of the MPL was not distributed with this
+  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  #
+  # This Source Code Form is "Incompatible With Secondary Licenses", as
+  # defined by the Mozilla Public License, v. 2.0.
+  #%]
+
+[%
+  title = "BrowserID"
+  desc = "Configure BrowserID Authentication"
+%]
+
+[% param_descs = {
+  browserid_verify_server => "This is the URL for the BrowserID (Persona) authority that the " _
+                             "user will be verified against. Example: <kbd>https://browserid.org</kbd>.",
+  browserid_includejs_server => "This is the URL needed by BrowserID to load the necessary javascript " _
+                                "library for authentication. Example: <kbd>https://browserid.org</kbd>."
+ }
+%]
diff --git a/extensions/BrowserID/template/en/default/hook/account/auth/login-additional_methods.html.tmpl b/extensions/BrowserID/template/en/default/hook/account/auth/login-additional_methods.html.tmpl
index 3a0ecb1cc..57f7da8ce 100644
--- a/extensions/BrowserID/template/en/default/hook/account/auth/login-additional_methods.html.tmpl
+++ b/extensions/BrowserID/template/en/default/hook/account/auth/login-additional_methods.html.tmpl
@@ -1,9 +1,10 @@
-[% IF Param('user_info_class').split(',').contains('BrowserID') %]
+[% IF Param('user_info_class').split(',').contains('BrowserID')
+      && Param('browserid_includejs_url') %]
 
 [% USE Bugzilla %]
 [% cgi = Bugzilla.cgi %]
 
-<script src="https://browserid.org/include.js" type="text/javascript"></script>
+<script src="[% Param('browserid_includejs_url') %]" type="text/javascript"></script>
 
 <script type="text/javascript">
 function createHidden(name, value, form) {
diff --git a/extensions/BrowserID/template/en/default/hook/account/auth/login-small-additional_methods.html.tmpl b/extensions/BrowserID/template/en/default/hook/account/auth/login-small-additional_methods.html.tmpl
index 08e68a690..b1c186493 100644
--- a/extensions/BrowserID/template/en/default/hook/account/auth/login-small-additional_methods.html.tmpl
+++ b/extensions/BrowserID/template/en/default/hook/account/auth/login-small-additional_methods.html.tmpl
@@ -1,5 +1,6 @@
-[% IF Param('user_info_class').split(',').contains('BrowserID') %]
-<script src="https://browserid.org/include.js" type="text/javascript"></script>
+[% IF Param('user_info_class').split(',').contains('BrowserID')
+      && Param('browserid_includejs_url') %]
+<script src="[% Param('browserid_includejs_url') %]" type="text/javascript"></script>
 
 [%# Note this code is a tiny bit different from the other copy; the name of
   # the variable containing the login url is 'login_target' rather than