@adminforth/two-factors-auth 2.1.4 → 2.2.0

package/dist/custom/TwoFactorsConfirmation.vue

@@ -204,25 +204,13 @@
   });
 
   async function isCMAAvailable() {
-    let isCMA_supported = false;
-    let isParsingSupported = false;
     if (window.PublicKeyCredential &&  
     PublicKeyCredential.isConditionalMediationAvailable) {  
       const isCMA = await PublicKeyCredential.isConditionalMediationAvailable();  
-      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;
+      if (isCMA) {  
+        isPasskeysSupported.value = true;
+      }  
     }
-    isPasskeysSupported.value = (isCMA_supported && isParsingSupported);
   }
 
   onBeforeUnmount(() => {
@@ -311,7 +299,14 @@
       return;
     }
     const { _options, challengeId } = signIn;
-    const options = PublicKeyCredential.parseRequestOptionsFromJSON(_options);
+    let options;
+    try {
+      options = PublicKeyCredential.parseRequestOptionsFromJSON(_options);
+    } catch (e) {
+      console.error('Error parsing request options:', e);
+      adminforth.alert({message: 'Error initiating passkey authentication.', variant: 'warning'});
+      return;
+    }
     const credential = await authenticate(options);
     if (!credential) {
       isFetchingPasskey.value = false;
@@ -349,8 +344,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) {

package/dist/custom/TwoFactorsPasskeysSettings.vue

@@ -11,6 +11,12 @@
                 ]"
                 :data="passkeys"
             >
+            <template #cell:name="{item}">
+                <div class="flex items-center justify-start space-x-2">
+                    <img class="max-h-6" :src="coreStore.theme === 'light' ? item.light_icon : item.dark_icon" />
+                    <p>{{ item.name }}</p>
+                </div>
+            </template>
             <template #cell:actions="{item}">
                 <div class="flex items-center justify-start space-x-2">
                     <Dialog 
@@ -327,8 +333,6 @@
     }
 
     function checkForCompatibility() {
-        let isCMA_supported = false;
-        let isParsingSupported = false;
         if (window.PublicKeyCredential &&  
             PublicKeyCredential.isUserVerifyingPlatformAuthenticatorAvailable &&  
             PublicKeyCredential.isConditionalMediationAvailable) {  
@@ -337,23 +341,13 @@
             PublicKeyCredential.isConditionalMediationAvailable(),  
         ]).then(results => {  
             if (results.every(r => r === true)) {  
-                isCMA_supported = true;
+                isPasskeySupported.value = true;
             } else {  
-                isCMA_supported = false;
+                isPasskeySupported.value = 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) {