From 78ad8c0d088aa95ec1bd7eadea45ffdba05d907e Mon Sep 17 00:00:00 2001
From: Dylan William Hardison <dylan@hardison.net>
Date: Fri, 15 Sep 2017 16:13:18 -0400
Subject: Bug 1364233 - Add setting to force a group to require MFA and
 restrict users in that group who have not enabled MFA

---
 template/en/default/account/prefs/mfa.html.tmpl | 26 +++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

(limited to 'template/en/default/account')

diff --git a/template/en/default/account/prefs/mfa.html.tmpl b/template/en/default/account/prefs/mfa.html.tmpl
index fc748cdd1..99a4b0f2a 100644
--- a/template/en/default/account/prefs/mfa.html.tmpl
+++ b/template/en/default/account/prefs/mfa.html.tmpl
@@ -6,6 +6,8 @@
   # defined by the Mozilla Public License, v. 2.0.
   #%]
 
+[% SET MFA_HOWTO = "https://wiki.mozilla.org/BMO/UserGuide/Two-Factor_Authentication" %]
+
 [% IF NOT Bugzilla.feature('mfa') %]
   <input type="hidden" name="mfa_action" id="mfa-action" value="">
   <p>
@@ -126,9 +128,25 @@
     </div>
 
   [% ELSE %]
-    <p>
-      Two-factor authentication is currently <b>disabled</b>.
-    </p>
+    [% IF Bugzilla.request_cache.mfa_warning %]
+      <p class="mfa-warning-msg">
+        You <b>must</b> enable two-factor authentication
+        [% UNLESS Bugzilla.request_cache.mfa_grace_period_expired %]
+          before <i>[% Bugzilla.user.mfa_required_date FILTER time %]</i>.
+          After that date, you will be restricted to this page until 2FA is configured.
+        [% ELSE %]
+          before continuing to use [% terms.Bugzilla %].
+        [% END %]
+      </p>
+      <p>
+        <b>Need help setting ip 2FA?</b>
+        You may want to <a href="[% MFA_HOWTO FILTER html %]">read these comprensive instructions</a>.
+      </p>
+    [% ELSE %]
+      <p>
+        Two-factor authentication is currently <b>disabled</b>.
+      </p>
+    [% END %]
     <input type="hidden" name="mfa_action" id="mfa-action" value="enable">
     <input type="hidden" name="mfa" id="mfa">
 
@@ -257,4 +275,4 @@
     <li>If in doubt, generate and print new recovery codes</li>
     <li><b>Do not store these codes electronically</b></li>
   </ul>
-[% END %]
+[% END %]
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b