summaryrefslogtreecommitdiffstats
path: root/template/en
diff options
context:
space:
mode:
authorDylan William Hardison <dylan@mozilla.com>2015-06-02 03:08:19 +0200
committerDylan William Hardison <dylan@hardison.net>2015-06-02 03:08:19 +0200
commit3cf3faf600249981e3903978b1501fffaabf7e0f (patch)
tree2f7c8a127f869d3b5d1f9011751c47e3ce334483 /template/en
parentf2c52dff2711d6b61d7879f5f9384390873f52cc (diff)
downloadbugzilla-3cf3faf600249981e3903978b1501fffaabf7e0f.tar.gz
bugzilla-3cf3faf600249981e3903978b1501fffaabf7e0f.tar.xz
Bug 1163760: Backport upstream bug 1144468 to bmo to add authentication delegation
Diffstat (limited to 'template/en')
-rw-r--r--template/en/default/account/auth/delegation.html.tmpl37
-rw-r--r--template/en/default/admin/params/auth.html.tmpl4
-rw-r--r--template/en/default/global/user-error.html.tmpl23
3 files changed, 64 insertions, 0 deletions
diff --git a/template/en/default/account/auth/delegation.html.tmpl b/template/en/default/account/auth/delegation.html.tmpl
new file mode 100644
index 000000000..2afdf1dc7
--- /dev/null
+++ b/template/en/default/account/auth/delegation.html.tmpl
@@ -0,0 +1,37 @@
+[%# 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.
+ #%]
+
+[% PROCESS global/header.html.tmpl
+ title = "Auth Delegation Request" %]
+
+<h1>[% title FILTER html %] </h1>
+<p>
+ A third-party website (<a href="[% callback_base FILTER html %]">[% callback_base FILTER html %]</a>)
+ would like to have <strong>complete</strong> access to your [% terms.Bugzilla %] account.
+</p>
+
+<p>The description of the site reads:
+ <blockquote>
+ [% description FILTER html %]
+ </blockquote>
+</p>
+
+<p>Do you want this website to have <strong>complete</strong> access to your [% terms.Bugzilla %]
+ account?</p>
+
+<div>
+ <form action="auth.cgi" method="post">
+ <input type="hidden" name="confirm" value="1">
+ <input type="hidden" name="callback" value="[% callback FILTER html %]">
+ <input type="hidden" name="description" value="[% description FILTER html %]">
+ <input type="hidden" name="token" value="[% token FILTER html %]">
+ <input type="submit" name="submit" value="Accept">
+ </form>
+</div>
+
+[% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/admin/params/auth.html.tmpl b/template/en/default/admin/params/auth.html.tmpl
index 85d707706..fea4239b3 100644
--- a/template/en/default/admin/params/auth.html.tmpl
+++ b/template/en/default/admin/params/auth.html.tmpl
@@ -150,4 +150,8 @@
"complexity rules and minimum length requirements when the user logs " _
"into the $terms.Bugzilla web interface. If it doesn't, the user would " _
"not be able to log in, and recieve a message to reset their password."
+
+ auth_delegation =>
+ "If set, $terms.Bugzilla will allow third party applications " _
+ "to request API keys for users."
%]
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 5b2f50116..8c7958649 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -129,6 +129,29 @@
account creation. Please contact an administrator to get a new account
created.
+ [% ELSIF error == "auth_delegation_disabled" %]
+ [% title = "Can't use auth delegation" %]
+ This site does not have auth delegation enabled.
+ Please contact an administrator if you require this functionality.
+
+ [% ELSIF error == "auth_delegation_missing_callback" %]
+ [% title = "Auth delegation impossible without callback URI" %]
+ It looks like auth delegation was attempted, but no callback URI was passed.
+ You were sent here by some other site; please contact them for support.
+
+ [% ELSIF error == "auth_delegation_missing_description" %]
+ [% title = "Auth delegation impossible without description" %]
+ It looks like auth delegation was attempted, but no description was passed.
+ You were sent here by some other site; please contact them for support.
+
+ [% ELSIF error == "auth_delegation_missing_token" %]
+ [% title = "Auth delegation can't be confirmed" %]
+ Auth delegation cannot be confirmed due to missing or invalid token.
+
+ [% ELSIF error == "auth_delegation_invalid_token" %]
+ [% title = "Auth delegation can't be confirmed" %]
+ Auth delegation cannot be confirmed due to missing or invalid token.
+
[% ELSIF error == "auth_failure" %]
[% title = "Authorization Required" %]
[% admindocslinks = {'groups.html' => 'Group Security'} %]