Bug 1225366 - allow duo authentication for users already enrolled with duo

2 files changed, 76 insertions, 16 deletions

diff --git a/template/en/default/account/prefs/mfa.html.tmpl b/template/en/default/account/prefs/mfa.html.tmpl
index 2d80520a1..2fbe45a60 100644
--- a/template/en/default/account/prefs/mfa.html.tmpl
+++ b/template/en/default/account/prefs/mfa.html.tmpl
@@ -138,7 +138,7 @@
       [% IF Param("duo_host") && user.in_group("mozilla-employee-confidential") %]
         <button type="button" id="mfa-select-duo">Duo Security</button><br>
         <blockquote>
-          Requires a smartphone and a <a href="https://www.duosecurity.com/" target="_blank">Duo Security</a>
+          Requires a <a href="https://mana.mozilla.org/wiki/display/SD/DuoSecurity" target="_blank">Duo Security</a>
           account (recommended for Mozilla employees).
         </blockquote>
       [% END %]
@@ -202,25 +202,25 @@
 
     </div>
 
-    [%# enable - duo %]
-    <div id="mfa-enable-duo" style="display:none">
+    [% IF Param("duo_host") && user.in_group("mozilla-employee-confidential") %]
+      [%# enable - duo %]
+      <div id="mfa-enable-duo" style="display:none">
 
-      <p>
-        <label>Duo Username:</label>
-        <input type="text" name="username" id="mfa-duo-user">
-      </p>
+        <p>
+          <label>Duo Username:</label>
+          <input type="text" name="username" id="mfa-duo-user">
+        </p>
 
-      <p>
-        <img src="images/duo.png" id="duo-logo" width="32" height="32">
-        Verification with Duo Security will be performed before your account is updated.<br>
+        <p>
+          <img src="images/duo.png" id="duo-logo" width="32" height="32">
+          Verification with Duo Security will be performed before your account is updated.<br>
 
-        [% IF user.in_group("mozilla-employee-confidential") %]
-          You must <a href="https://login.mozilla.com/duo_enrollments/" target="_blank">
-          sign up for Duo Security via login.mozilla.com</a> before you can use Duo 2FA.
-        [% END %]
-      </p>
+          You must be <a href="https://mana.mozilla.org/wiki/display/SD/DuoSecurity" target="_blank">
+          enrolled with Duo Security via login.mozilla.com</a> before you can use Duo 2FA.
+        </p>
 
-    </div>
+      </div>
+    [% END %]
 
   [% END %]
 
diff --git a/template/en/default/mfa/duo/not_enrolled.html.tmpl b/template/en/default/mfa/duo/not_enrolled.html.tmpl
new file mode 100644
index 000000000..f6a594dc2
--- /dev/null
+++ b/template/en/default/mfa/duo/not_enrolled.html.tmpl
@@ -0,0 +1,60 @@
+[%# 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.
+  #%]
+
+[% js = BLOCK %]
+
+  $(function() {
+    $('#return')
+      .click(function(event) {
+        event.preventDefault();
+        window.history.back();
+      });
+  });
+
+[% END %]
+
+[% css = BLOCK %]
+
+  #duo_container {
+    background: #fff;
+    padding: 10px;
+    margin-bottom: 1em;
+  }
+
+[% END %]
+
+[%
+  INCLUDE global/header.html.tmpl
+    title      = "Duo Security Not Available"
+    style      = css
+    javascript = js
+%]
+
+<h1>You have not enrolled in Duo Security</h1>
+
+<div id="duo_container">
+  <p>
+    The email address <b>[% email FILTER html %]</b> is not enrolled in Duo Security on
+    <a href="https://login.mozilla.com/" target="_blank">login.mozilla.com</a>.
+  </p>
+
+  <p>
+    Please ensure you are using your Mozilla LDAP username, and that you have
+    completed the <a href="https://mana.mozilla.org/wiki/display/SD/DuoSecurity" target="_blank">
+      Duo Security enrollment process</a>.
+  </p>
+
+  <p>
+    Duo Security MFA may not yet be available for your Mozilla account.<br>
+    Contact End User Services / ServiceDesk for more information.
+  </p>
+</div>
+
+<button type="button" id="return">Return</button>
+
+[% INCLUDE global/footer.html.tmpl %]