From 9da6054ec01bcb65d46c7c26a78afa947ca20032 Mon Sep 17 00:00:00 2001
From: devStorm <59678453+developStorm@users.noreply.github.com>
Date: Tue, 5 May 2020 05:16:33 -0700
Subject: [PATCH] Allow to use either OTP or FIDO for 2FA

---
 app/auth/templates/auth/fido.html | 6 ++++++
 app/auth/templates/auth/mfa.html  | 6 ++++++
 app/auth/views/fido.py            | 3 ++-
 app/auth/views/mfa.py             | 2 +-
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/auth/templates/auth/fido.html b/app/auth/templates/auth/fido.html
index abde9d4f..836dbc0d 100644
--- a/app/auth/templates/auth/fido.html
+++ b/app/auth/templates/auth/fido.html
@@ -26,6 +26,12 @@
       <button id="btnVerifyKey" class="btn btn-success mt-2">Use your security key</button>
     </div>
 
+    {% if enable_otp %}
+      <div class="text-center text-muted mb-6" style="margin-top: 1em;">
+        Don't have your key with you? <br> <a href="{{ url_for('auth.mfa') }}">Verify by One-Time Password</a>
+      </div>
+    {% endif %}
+    
     <script>
       async function verifyKey () {
         $("#btnVerifyKey").prop('disabled', true);
diff --git a/app/auth/templates/auth/mfa.html b/app/auth/templates/auth/mfa.html
index 6666d45f..a347745a 100644
--- a/app/auth/templates/auth/mfa.html
+++ b/app/auth/templates/auth/mfa.html
@@ -28,6 +28,12 @@
       <button class="btn btn-success mt-2">Validate</button>
     </form>
 
+    {% if enable_fido %}
+      <div class="text-center text-muted mb-6" style="margin-top: 1em;">
+        Having trouble with your authenticator? <br> <a href="{{ url_for('auth.fido') }}">Verify by your security key</a>
+      </div>
+    {% endif %}
+
   </div>
 
 {% endblock %}
\ No newline at end of file
diff --git a/app/auth/views/fido.py b/app/auth/views/fido.py
index e4ef5ddd..166d0eec 100644
--- a/app/auth/views/fido.py
+++ b/app/auth/views/fido.py
@@ -102,4 +102,5 @@ def fido():
     webauthn_assertion_options = webauthn_assertion_options.assertion_dict
 
     return render_template("auth/fido.html", fido_token_form=fido_token_form, 
-                        webauthn_assertion_options=webauthn_assertion_options)
\ No newline at end of file
+                        webauthn_assertion_options=webauthn_assertion_options,
+                        enable_otp=user.enable_otp)
\ No newline at end of file
diff --git a/app/auth/views/mfa.py b/app/auth/views/mfa.py
index 3920c33b..a2ff8d3c 100644
--- a/app/auth/views/mfa.py
+++ b/app/auth/views/mfa.py
@@ -55,4 +55,4 @@ def mfa():
         else:
             flash("Incorrect token", "warning")
 
-    return render_template("auth/mfa.html", otp_token_form=otp_token_form)
+    return render_template("auth/mfa.html", otp_token_form=otp_token_form, enable_fido=(user.fido_uuid is not None))