From b7889b15ff2244ffe89316617d9fdc5377f1cfcd Mon Sep 17 00:00:00 2001
From: Hinton <oscar@oscarhinton.com>
Date: Thu, 4 Mar 2021 20:19:59 +0100
Subject: [PATCH 1/4] Add support for WebAuthn

---
 src/app/accounts/two-factor.component.html | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/app/accounts/two-factor.component.html b/src/app/accounts/two-factor.component.html
index 90ffdcb78c..8e274188cb 100644
--- a/src/app/accounts/two-factor.component.html
+++ b/src/app/accounts/two-factor.component.html
@@ -34,6 +34,24 @@
                 </div>
             </div>
         </ng-container>
+        <ng-container *ngIf="selectedProviderType === providerType.WebAuthn">
+            <div class="content text-center">
+                <span *ngIf="!webAuthnReady" class="text-center"><i class="fa fa-spinner fa-spin"></i></span>
+                <div *ngIf="webAuthnReady">
+                    <p>{{'insertU2f' | i18n}}</p>
+                    <img src="../../images/u2fkey.jpg" alt="" class="img-rounded img-responsive" />
+                </div>
+            </div>
+
+            <div class="box first">
+                <div class="box-content">
+                    <div class="box-content-row box-content-row-checkbox" appBoxRow>
+                        <label for="remember">{{'rememberMe' | i18n}}</label>
+                        <input id="remember" type="checkbox" name="Remember" [(ngModel)]="remember">
+                    </div>
+                </div>
+            </div>
+        </ng-container>
         <ng-container *ngIf="selectedProviderType === providerType.Duo ||
                         selectedProviderType === providerType.OrganizationDuo">
             <div id="duo-frame"><iframe id="duo_iframe"></iframe></div>
@@ -73,3 +91,4 @@
     </div>
 </form>
 <ng-template #twoFactorOptions></ng-template>
+<iframe id="webauthn_iframe" hidden allow="publickey-credentials-get *"></iframe>

From 907fabdd8edf9c1e021ceb4ba1fcaf289155c680 Mon Sep 17 00:00:00 2001
From: Hinton <oscar@oscarhinton.com>
Date: Thu, 4 Mar 2021 22:36:17 +0100
Subject: [PATCH 2/4] Remove allow from html since it's moved to js

---
 src/app/accounts/two-factor.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/accounts/two-factor.component.html b/src/app/accounts/two-factor.component.html
index 8e274188cb..c4ebbb2327 100644
--- a/src/app/accounts/two-factor.component.html
+++ b/src/app/accounts/two-factor.component.html
@@ -91,4 +91,4 @@
     </div>
 </form>
 <ng-template #twoFactorOptions></ng-template>
-<iframe id="webauthn_iframe" hidden allow="publickey-credentials-get *"></iframe>
+<iframe id="webauthn_iframe" hidden></iframe>

From 862f9a5a632b9ff1dc98f6ede13eee3d8c0f7c85 Mon Sep 17 00:00:00 2001
From: Hinton <oscar@oscarhinton.com>
Date: Mon, 8 Mar 2021 19:12:56 +0100
Subject: [PATCH 3/4] Update to use the new WebAuthn iframe

---
 src/app/accounts/two-factor.component.html | 10 ++--------
 src/locales/en/messages.json               | 11 +++++++----
 src/scss/misc.scss                         | 12 ++++++++++++
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/app/accounts/two-factor.component.html b/src/app/accounts/two-factor.component.html
index c4ebbb2327..8fff552ee3 100644
--- a/src/app/accounts/two-factor.component.html
+++ b/src/app/accounts/two-factor.component.html
@@ -35,14 +35,9 @@
             </div>
         </ng-container>
         <ng-container *ngIf="selectedProviderType === providerType.WebAuthn">
-            <div class="content text-center">
-                <span *ngIf="!webAuthnReady" class="text-center"><i class="fa fa-spinner fa-spin"></i></span>
-                <div *ngIf="webAuthnReady">
-                    <p>{{'insertU2f' | i18n}}</p>
-                    <img src="../../images/u2fkey.jpg" alt="" class="img-rounded img-responsive" />
-                </div>
+            <div id="web-authn-frame">
+                <iframe id="webauthn_iframe"></iframe>
             </div>
-
             <div class="box first">
                 <div class="box-content">
                     <div class="box-content-row box-content-row-checkbox" appBoxRow>
@@ -91,4 +86,3 @@
     </div>
 </form>
 <ng-template #twoFactorOptions></ng-template>
-<iframe id="webauthn_iframe" hidden></iframe>
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index 768a562ffb..91e74722b6 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -592,11 +592,11 @@
     "message": "Verify with Duo Security for your organization using the Duo Mobile app, SMS, phone call, or U2F security key.",
     "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
   },
-  "u2fDesc": {
-    "message": "Use any FIDO U2F enabled security key to access your account."
+  "webAuthnTitle": {
+    "message": "FIDO2 WebAuthn"
   },
-  "u2fTitle": {
-    "message": "FIDO U2F Security Key"
+  "webAuthnDesc": {
+    "message": "Use any WebAuthn enabled security key to access your account."
   },
   "emailTitle": {
     "message": "Email"
@@ -1650,5 +1650,8 @@
   },
   "pendingDeletion": {
     "message": "Pending deletion"
+  },
+  "webAuthnAuthenticate": {
+    "message": "Authenticate WebAutn"
   }
 }
diff --git a/src/scss/misc.scss b/src/scss/misc.scss
index 2ae5737ea3..9325a65027 100644
--- a/src/scss/misc.scss
+++ b/src/scss/misc.scss
@@ -221,6 +221,18 @@ p.lead {
     }
 }
 
+#web-authn-frame {
+    background: url('../images/loading.svg') 0 0 no-repeat;
+    height: 250px;
+    margin: 0 0 15px 0;
+
+    iframe {
+        width: 100%;
+        height: 100%;
+        border: none;
+    }
+}
+
 form, .form {
     .form-group {
         margin-bottom: 10px;

From 0786d74ef586b880b6c680579c13323008b3c0a2 Mon Sep 17 00:00:00 2001
From: Hinton <oscar@oscarhinton.com>
Date: Mon, 15 Mar 2021 16:49:33 +0100
Subject: [PATCH 4/4] Update jslib

---
 jslib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jslib b/jslib
index f80e89465f..f20af0cd7c 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit f80e89465ffc004705d2941301c0ffb6bfd71d1a
+Subproject commit f20af0cd7c90adc07783950bed197b5d47892d6f