@adminforth/two-factors-auth 2.1.2 → 2.1.4

package/build.log

@@ -13,5 +13,5 @@ custom/package.json
 custom/tsconfig.json
 custom/utils.js
 
-sent 74,931 bytes  received 172 bytes  150,206.00 bytes/sec
-total size is 74,291  speedup is 0.99
+sent 77,390 bytes  received 172 bytes  155,124.00 bytes/sec
+total size is 76,750  speedup is 0.99

package/custom/TwoFactorsConfirmation.vue

@@ -204,13 +204,25 @@
   });
 
   async function isCMAAvailable() {
+    let isCMA_supported = false;
+    let isParsingSupported = false;
     if (window.PublicKeyCredential &&  
     PublicKeyCredential.isConditionalMediationAvailable) {  
       const isCMA = await PublicKeyCredential.isConditionalMediationAvailable();  
-      if (isCMA) {  
-        isPasskeysSupported.value = true;
-      }  
+      if (isCMA) {
+        isCMA_supported = true;
+      }
+    }
+    try {
+      const temp = PublicKeyCredential.parseRequestOptionsFromJSON({challenge: 'test123', timeout: 60000, userVerification: 'required'});
+      if (temp && typeof temp === 'object') {
+        isParsingSupported = true;
+      }
+    } catch (e) {
+      adminforth.alert({message: 'Please ensure your browser supports passkeys.', variant: 'warning'});
+      isParsingSupported = false;
     }
+    isPasskeysSupported.value = (isCMA_supported && isParsingSupported);
   }
 
   onBeforeUnmount(() => {
@@ -365,14 +377,19 @@
       if (name === 'AbortError') {
         // Aborted intentionally; no user-facing error needed
         return null;
-      }
-      if (name === 'InvalidStateError' || name === 'OperationError' || /pending/i.test(message)) {
+      } else if (name === 'InvalidStateError' || name === 'OperationError' || /pending/i.test(message)) {
         adminforth.alert({ message: t('Another security prompt is already open. Please try again.'), variant: 'warning' });
         codeError.value = t('A previous passkey attempt was still pending. Please try again.');
         return null;
+      } else if (name === 'NotAllowedError') {
+        adminforth.alert({ message: `The operation either timed out or was not allowed`, variant: 'warning' });
+        codeError.value = 'The operation either timed out or was not allowed.';
+        return null;
+      } else {
+        adminforth.alert({message: `Error during authentication: ${error}`, variant: 'warning'});
+        codeError.value = 'Error during authentication.';
+        return null;
       }
-      adminforth.alert({message: `Error during authentication: ${error}`, variant: 'warning'});
-      codeError.value = 'Error during authentication.';
     }
     finally {
       // Clear in-flight state regardless of outcome

package/custom/TwoFactorsPasskeysSettings.vue

@@ -327,6 +327,8 @@
     }
 
     function checkForCompatibility() {
+        let isCMA_supported = false;
+        let isParsingSupported = false;
         if (window.PublicKeyCredential &&  
             PublicKeyCredential.isUserVerifyingPlatformAuthenticatorAvailable &&  
             PublicKeyCredential.isConditionalMediationAvailable) {  
@@ -335,13 +337,23 @@
             PublicKeyCredential.isConditionalMediationAvailable(),  
         ]).then(results => {  
             if (results.every(r => r === true)) {  
-                isPasskeySupported.value = true;
+                isCMA_supported = true;
             } else {  
-                isPasskeySupported.value = false;
+                isCMA_supported = false;
                 addPasskeyMode.value = 'cross-platform';
             }  
         });  
-        }  
+        }
+        try {
+            const temp = PublicKeyCredential.parseRequestOptionsFromJSON({challenge: 'test123', timeout: 60000, userVerification: 'required'});
+            if (temp && typeof temp === 'object') {
+                isParsingSupported = true;
+            }
+        } catch (e) {
+            adminforth.alert({message: 'Please ensure your browser supports passkeys.', variant: 'warning'});
+            isParsingSupported = false;
+        }
+        isPasskeySupported.value = (isCMA_supported && isParsingSupported);  
     } 
     
     async function fetchInformationFromTheBackend(confirmationResult) {

package/custom/utils.js

@@ -100,7 +100,25 @@
       });
       return credential;
     } catch (error) {
-      adminforth.alert({message: 'Error during authentication', variant: 'warning'});
-      codeError.value = 'Error during authentication.';
+      console.error('Error during authentication:', error);
+      // Handle specific concurrent/pending request error cases gracefully
+      const name = (error && (error.name || error.constructor?.name)) || '';
+      const message = (error && error.message) || '';
+      if (name === 'AbortError') {
+        // Aborted intentionally; no user-facing error needed
+        return null;
+      } else if (name === 'InvalidStateError' || name === 'OperationError' || /pending/i.test(message)) {
+        adminforth.alert({ message: t('Another security prompt is already open. Please try again.'), variant: 'warning' });
+        codeError.value = t('A previous passkey attempt was still pending. Please try again.');
+        return null;
+      } else if (name === 'NotAllowedError') {
+        adminforth.alert({ message: `The operation either timed out or was not allowed`, variant: 'warning' });
+        codeError.value = 'The operation either timed out or was not allowed.';
+        return null;
+      } else {
+        adminforth.alert({message: `Error during authentication: ${error}`, variant: 'warning'});
+        codeError.value = 'Error during authentication.';
+        return null;
+      }
     }
   }

package/dist/custom/TwoFactorsConfirmation.vue

@@ -204,13 +204,25 @@
   });
 
   async function isCMAAvailable() {
+    let isCMA_supported = false;
+    let isParsingSupported = false;
     if (window.PublicKeyCredential &&  
     PublicKeyCredential.isConditionalMediationAvailable) {  
       const isCMA = await PublicKeyCredential.isConditionalMediationAvailable();  
-      if (isCMA) {  
-        isPasskeysSupported.value = true;
-      }  
+      if (isCMA) {
+        isCMA_supported = true;
+      }
+    }
+    try {
+      const temp = PublicKeyCredential.parseRequestOptionsFromJSON({challenge: 'test123', timeout: 60000, userVerification: 'required'});
+      if (temp && typeof temp === 'object') {
+        isParsingSupported = true;
+      }
+    } catch (e) {
+      adminforth.alert({message: 'Please ensure your browser supports passkeys.', variant: 'warning'});
+      isParsingSupported = false;
     }
+    isPasskeysSupported.value = (isCMA_supported && isParsingSupported);
   }
 
   onBeforeUnmount(() => {
@@ -365,14 +377,19 @@
       if (name === 'AbortError') {
         // Aborted intentionally; no user-facing error needed
         return null;
-      }
-      if (name === 'InvalidStateError' || name === 'OperationError' || /pending/i.test(message)) {
+      } else if (name === 'InvalidStateError' || name === 'OperationError' || /pending/i.test(message)) {
         adminforth.alert({ message: t('Another security prompt is already open. Please try again.'), variant: 'warning' });
         codeError.value = t('A previous passkey attempt was still pending. Please try again.');
         return null;
+      } else if (name === 'NotAllowedError') {
+        adminforth.alert({ message: `The operation either timed out or was not allowed`, variant: 'warning' });
+        codeError.value = 'The operation either timed out or was not allowed.';
+        return null;
+      } else {
+        adminforth.alert({message: `Error during authentication: ${error}`, variant: 'warning'});
+        codeError.value = 'Error during authentication.';
+        return null;
       }
-      adminforth.alert({message: `Error during authentication: ${error}`, variant: 'warning'});
-      codeError.value = 'Error during authentication.';
     }
     finally {
       // Clear in-flight state regardless of outcome

package/dist/custom/TwoFactorsPasskeysSettings.vue

@@ -327,6 +327,8 @@
     }
 
     function checkForCompatibility() {
+        let isCMA_supported = false;
+        let isParsingSupported = false;
         if (window.PublicKeyCredential &&  
             PublicKeyCredential.isUserVerifyingPlatformAuthenticatorAvailable &&  
             PublicKeyCredential.isConditionalMediationAvailable) {  
@@ -335,13 +337,23 @@
             PublicKeyCredential.isConditionalMediationAvailable(),  
         ]).then(results => {  
             if (results.every(r => r === true)) {  
-                isPasskeySupported.value = true;
+                isCMA_supported = true;
             } else {  
-                isPasskeySupported.value = false;
+                isCMA_supported = false;
                 addPasskeyMode.value = 'cross-platform';
             }  
         });  
-        }  
+        }
+        try {
+            const temp = PublicKeyCredential.parseRequestOptionsFromJSON({challenge: 'test123', timeout: 60000, userVerification: 'required'});
+            if (temp && typeof temp === 'object') {
+                isParsingSupported = true;
+            }
+        } catch (e) {
+            adminforth.alert({message: 'Please ensure your browser supports passkeys.', variant: 'warning'});
+            isParsingSupported = false;
+        }
+        isPasskeySupported.value = (isCMA_supported && isParsingSupported);  
     } 
     
     async function fetchInformationFromTheBackend(confirmationResult) {

package/dist/custom/utils.js

@@ -100,7 +100,25 @@
       });
       return credential;
     } catch (error) {
-      adminforth.alert({message: 'Error during authentication', variant: 'warning'});
-      codeError.value = 'Error during authentication.';
+      console.error('Error during authentication:', error);
+      // Handle specific concurrent/pending request error cases gracefully
+      const name = (error && (error.name || error.constructor?.name)) || '';
+      const message = (error && error.message) || '';
+      if (name === 'AbortError') {
+        // Aborted intentionally; no user-facing error needed
+        return null;
+      } else if (name === 'InvalidStateError' || name === 'OperationError' || /pending/i.test(message)) {
+        adminforth.alert({ message: t('Another security prompt is already open. Please try again.'), variant: 'warning' });
+        codeError.value = t('A previous passkey attempt was still pending. Please try again.');
+        return null;
+      } else if (name === 'NotAllowedError') {
+        adminforth.alert({ message: `The operation either timed out or was not allowed`, variant: 'warning' });
+        codeError.value = 'The operation either timed out or was not allowed.';
+        return null;
+      } else {
+        adminforth.alert({message: `Error during authentication: ${error}`, variant: 'warning'});
+        codeError.value = 'Error during authentication.';
+        return null;
+      }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/two-factors-auth",
-  "version": "2.1.2",
+  "version": "2.1.4",
   "description": "AdminForth plugin for two factors authentication",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",