Merge branch 'develop' into Tier4-PR-Delivery-11-18-23

Author: veloraven

TwoFactorAuth/view/adminhtml/web/js/u2fkey/auth.js

@@ -84,6 +84,10 @@ define([
          */
         waitForTouch: function () {
             this.idle(false);
+            if (!navigator.credentials) {
+                this.currentStep('no-webauthn');
+                return;
+            }
             navigator.credentials.get({
                 publicKey: this.authenticateData.credentialRequestOptions
             })
@@ -158,8 +162,8 @@ define([
         _onCredentialError: function (u2fError) {
             this.idle(true);
 
-            if (['AbortError', 'NS_ERROR_ABORT', 'NotAllowedError'].indexOf(u2fError.name) === -1) {
-                error.display($t('Unable to register your device'));
+            if (['AbortError', 'NS_ERROR_ABORT'].indexOf(u2fError.name) === -1) {
+                error.display($t(u2fError.message));
             }
         }
     });

TwoFactorAuth/view/adminhtml/web/js/u2fkey/configure.js

@@ -78,6 +78,10 @@ define([
          */
         waitForTouch: function () {
             this.idle(false);
+            if (!navigator.credentials) {
+                this.currentStep('no-webauthn');
+                return;
+            }
             navigator.credentials.create({
                 publicKey: this.registerData.publicKey
             })
@@ -150,8 +154,8 @@ define([
         _onCredentialError: function (u2fError) {
             this.idle(true);
 
-            if (['AbortError', 'NS_ERROR_ABORT', 'NotAllowedError'].indexOf(u2fError.name) === -1) {
-                error.display($t('Unable to register your device'));
+            if (['AbortError', 'NS_ERROR_ABORT'].indexOf(u2fError.name) === -1) {
+                error.display($t(u2fError.message));
             }
         }
     });

TwoFactorAuth/view/adminhtml/web/template/u2fkey/auth.html

@@ -9,7 +9,7 @@
         <fieldset class="admin__fieldset">
             <legend class="admin__legend">
                 <span translate="'2FA - U2F key verification'"></span>
-            </legend><br/>
+            </legend><br>
             <div class="tfa-u2f-touch-key">
                 <h3 translate="'Plug in your U2F key and follow instructions'"></h3>
                 <div visible="$data.idle" class="tfa-u2f-try-again">
@@ -27,6 +27,10 @@ <h3 translate="'Plug in your U2F key and follow instructions'"></h3>
         </div>
         <div translate="'Redirecting to Magento Admin Panel...'"></div>
     </div>
+    <div visible='currentStep() === "no-webauthn"'
+         translate="'Error! Your browser does not support WebAuthn or you are not using a secure connection'"
+    >
+    </div>
     <div visible='$data.loading' class="tfa-waitbox">
         <div data-role="spinner">
             <div class="spinner">

TwoFactorAuth/view/adminhtml/web/template/u2fkey/configure.html

@@ -9,7 +9,7 @@
         <fieldset class="admin__fieldset">
             <legend class="admin__legend">
                 <span translate="'2FA - U2F key device registration'"></span>
-            </legend><br/>
+            </legend><br>
             <div id="u2f-touch-key">
                 <h3 translate="'Plug in your U2F key and follow instructions'"></h3>
                 <div visible="$data.idle" class="tfa-u2f-try-again">
@@ -27,6 +27,10 @@ <h3 translate="'Plug in your U2F key and follow instructions'"></h3>
         </div>
         <div translate="'Redirecting to Magento Admin Panel...'"></div>
     </div>
+    <div visible='currentStep() === "no-webauthn"'
+         translate="'Error! Your browser does not support WebAuthn or you are not using a secure connection'"
+    >
+    </div>
     <div visible='$data.loading' class="tfa-waitbox">
         <div data-role="spinner">
             <div class="spinner">