@adminforth/two-factors-auth 2.1.3 → 2.1.5

package/build.log

@@ -13,5 +13,5 @@ custom/package.json
 custom/tsconfig.json
 custom/utils.js
 
-sent 76,042 bytes  received 172 bytes  152,428.00 bytes/sec
-total size is 75,402  speedup is 0.99
+sent 77,515 bytes  received 172 bytes  155,374.00 bytes/sec
+total size is 76,884  speedup is 0.99

package/custom/TwoFactorsConfirmation.vue

@@ -349,8 +349,11 @@
     }
   }
 
+  let controller = new AbortController();
+
   async function authenticate(options) {
     console.log("Authenticating with options:", options);
+    controller.abort();
     try {
       // Guard: prevent concurrent navigator.credentials.get calls
       if (webAuthn.inFlight) {
@@ -377,14 +380,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/utils.js

@@ -91,7 +91,10 @@
     }
   }
 
+  let controller = new AbortController();
+
   async function authenticate(options) {
+    controller.abort();
     try {
       const abortController = new AbortController();
       const credential = await navigator.credentials.get({
@@ -100,7 +103,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

@@ -349,8 +349,11 @@
     }
   }
 
+  let controller = new AbortController();
+
   async function authenticate(options) {
     console.log("Authenticating with options:", options);
+    controller.abort();
     try {
       // Guard: prevent concurrent navigator.credentials.get calls
       if (webAuthn.inFlight) {
@@ -377,14 +380,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/utils.js

@@ -91,7 +91,10 @@
     }
   }
 
+  let controller = new AbortController();
+
   async function authenticate(options) {
+    controller.abort();
     try {
       const abortController = new AbortController();
       const credential = await navigator.credentials.get({
@@ -100,7 +103,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.3",
+  "version": "2.1.5",
   "description": "AdminForth plugin for two factors authentication",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",