From 3cf3faf600249981e3903978b1501fffaabf7e0f Mon Sep 17 00:00:00 2001 From: Dylan William Hardison Date: Mon, 1 Jun 2015 21:08:19 -0400 Subject: Bug 1163760: Backport upstream bug 1144468 to bmo to add authentication delegation --- .../en/default/account/auth/delegation.html.tmpl | 37 ++++++++++++++++++++++ template/en/default/admin/params/auth.html.tmpl | 4 +++ template/en/default/global/user-error.html.tmpl | 23 ++++++++++++++ 3 files changed, 64 insertions(+) create mode 100644 template/en/default/account/auth/delegation.html.tmpl (limited to 'template') 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" %] + +

[% title FILTER html %]

+

+ A third-party website ([% callback_base FILTER html %]) + would like to have complete access to your [% terms.Bugzilla %] account. +

+ +

The description of the site reads: +

+ [% description FILTER html %] +
+

+ +

Do you want this website to have complete access to your [% terms.Bugzilla %] + account?

+ +
+
+ + + + + +
+
+ +[% 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'} %] -- cgit v1.2.3-24-g4f1b