diff options
| author | Byron Jones <glob@mozilla.com> | 2015-09-09 07:06:50 +0200 |
|---|---|---|
| committer | Byron Jones <glob@mozilla.com> | 2015-09-09 07:06:50 +0200 |
| commit | 32cf4354854dcc2c98faba437fc6794d731fda2e (patch) | |
| tree | c710896719846311c1e9cb8c778fc81b93c83e23 /template/en/default/account | |
| parent | e358696f04bff75912cf777c569262cfc1559860 (diff) | |
| download | bugzilla-32cf4354854dcc2c98faba437fc6794d731fda2e.tar.gz bugzilla-32cf4354854dcc2c98faba437fc6794d731fda2e.tar.xz | |
Bug 1202975 - warning about api key requirement is no longer shown when enabling 2fa
Diffstat (limited to 'template/en/default/account')
| -rw-r--r-- | template/en/default/account/prefs/mfa.html.tmpl | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/template/en/default/account/prefs/mfa.html.tmpl b/template/en/default/account/prefs/mfa.html.tmpl index 2a2cdf220..d6bec08a5 100644 --- a/template/en/default/account/prefs/mfa.html.tmpl +++ b/template/en/default/account/prefs/mfa.html.tmpl @@ -58,7 +58,20 @@ </div> <p class="mfa-api-blurb"> - [% INCLUDE api_key_pref_blurb %] + [% IF user.settings.api_key_only.value == 'on' %] + Enabling two-factor authentication has also required systems that + interface with [% terms.Bugzilla %]'s API to use <a href="userprefs.cgi?tab=apikey">API keys</a> + for authentication.<br> + <br> + While not recommended, this limitation can be lifted by changing the + <a href="userprefs.cgi?tab=settings#api_key_only">Require API key authentication for API requests</a> + preference. + [% ELSE %] + Systems that interface with [% terms.Bugzilla %]'s API are not required to use API keys.<br> + Change the + <a href="userprefs.cgi?tab=settings#api_key_only">Require API key authentication for API requests</a> + preference to enforce API key usage. + [% END %] </p> [% ELSE %] @@ -142,18 +155,12 @@ </p> <p class="mfa-api-blurb" style="display:none"> - [% INCLUDE api_key_pref_blurb %] + Enabling two-factor authentication will also require systems that + interface with [% terms.Bugzilla %]'s API to use <a href="userprefs.cgi?tab=apikey">API keys</a> + for authentication. While not recommended, this limitation can be lifted by changing the + <a href="userprefs.cgi?tab=settings#api_key_only">Require API key authentication for API requests</a> + preference after 2FA is enabled. </p> </div> </div> - -[% BLOCK api_key_pref_blurb %] - Enabling two-factor authentication will also require systems that - interface with [% terms.Bugzilla %]'s API to use <a href="userprefs.cgi?tab=apikey">API keys</a> - for authentication.<br> - <br> - While not recommended, this limitation can be lifted by changing the - <a href="userprefs.cgi?tab=settings#api_key_only">Require API key authentication for API requests</a> - preference after 2FA is enabled. -[% END %] |