@adminforth/two-factors-auth 3.3.4 → 3.3.5

package/build.log

@@ -16,5 +16,5 @@ custom/pnpm-lock.yaml
 custom/tsconfig.json
 custom/utils.js
 
-sent 286,099 bytes  received 229 bytes  572,656.00 bytes/sec
-total size is 285,205  speedup is 1.00
+sent 286,569 bytes  received 229 bytes  573,596.00 bytes/sec
+total size is 285,663  speedup is 1.00

package/custom/TwoFAModal.vue

@@ -164,7 +164,9 @@
           isAwaiting2FAResult.value = true;
           confirmationResult = await window.adminforthTwoFaModal.get2FaConfirmationResult();
         } catch (error) {
-          console.error(t('Error during 2FA confirmation:', error));
+          if (!isTwoFaCancel(error)) {
+            console.error('[AdminForth 2FA] Error during 2FA confirmation', error);
+          }
         }
         isAwaiting2FAResult.value = false;
         try {
@@ -226,28 +228,41 @@
   let verifyFn: null | ((confirmationResult: string) => Promise<boolean> | boolean) = null;
   let rejectFn: ((err?: any) => void) | null = null;
 
+  function isTwoFaCancel(error: unknown) {
+    return error === 'Cancel';
+  }
+
 
   window.adminforthTwoFaModal = {
     get2FaConfirmationResult: (title?: string, verifyingCallback?: (confirmationResult: string) => Promise<boolean>) =>
-      new Promise(async (resolve, reject) => {
-      if (modelShow.value) throw new Error(t('Modal is already open'));
-      const skipAllowModal = await checkIfSkipAllowModal();
-      if (skipAllowModal) {
-        resolve({ code: "123456" }); // dummy code
-        return;
-      }
-      await checkIfUserHasPasskeys();
-      if (title) {
-        customDialogTitle.value = title;
-      }
-      modelShow.value = true;
-      if (modalMode.value === 'totp') {
-        await addEventListenerForOTPInput();
-      }
-      resolveFn = resolve;
-      rejectFn = reject;
-      verifyFn = verifyingCallback ?? null;
-    }),
+      new Promise((resolve, reject) => {
+        (async () => {
+          if (modelShow.value) {
+            throw new Error(t('Modal is already open'));
+          }
+          const skipAllowModal = await checkIfSkipAllowModal();
+          if (skipAllowModal) {
+            resolve({ code: "123456" }); // dummy code
+            return;
+          }
+          await checkIfUserHasPasskeys();
+          if (title) {
+            customDialogTitle.value = title;
+          }
+          resolveFn = resolve;
+          rejectFn = reject;
+          verifyFn = verifyingCallback ?? null;
+          modelShow.value = true;
+          if (modalMode.value === 'totp') {
+            await addEventListenerForOTPInput();
+          }
+        })().catch((error) => {
+          if (!isTwoFaCancel(error)) {
+            console.error('[AdminForth 2FA] Failed to open 2FA modal', error);
+          }
+          reject(error);
+        });
+      }),
   };
   
   const { t } = useI18n();
@@ -471,4 +486,4 @@
     display: flex;
     gap: 0.75rem;
   }
-</style>
+</style>

package/dist/custom/TwoFAModal.vue

@@ -164,7 +164,9 @@
           isAwaiting2FAResult.value = true;
           confirmationResult = await window.adminforthTwoFaModal.get2FaConfirmationResult();
         } catch (error) {
-          console.error(t('Error during 2FA confirmation:', error));
+          if (!isTwoFaCancel(error)) {
+            console.error('[AdminForth 2FA] Error during 2FA confirmation', error);
+          }
         }
         isAwaiting2FAResult.value = false;
         try {
@@ -226,28 +228,41 @@
   let verifyFn: null | ((confirmationResult: string) => Promise<boolean> | boolean) = null;
   let rejectFn: ((err?: any) => void) | null = null;
 
+  function isTwoFaCancel(error: unknown) {
+    return error === 'Cancel';
+  }
+
 
   window.adminforthTwoFaModal = {
     get2FaConfirmationResult: (title?: string, verifyingCallback?: (confirmationResult: string) => Promise<boolean>) =>
-      new Promise(async (resolve, reject) => {
-      if (modelShow.value) throw new Error(t('Modal is already open'));
-      const skipAllowModal = await checkIfSkipAllowModal();
-      if (skipAllowModal) {
-        resolve({ code: "123456" }); // dummy code
-        return;
-      }
-      await checkIfUserHasPasskeys();
-      if (title) {
-        customDialogTitle.value = title;
-      }
-      modelShow.value = true;
-      if (modalMode.value === 'totp') {
-        await addEventListenerForOTPInput();
-      }
-      resolveFn = resolve;
-      rejectFn = reject;
-      verifyFn = verifyingCallback ?? null;
-    }),
+      new Promise((resolve, reject) => {
+        (async () => {
+          if (modelShow.value) {
+            throw new Error(t('Modal is already open'));
+          }
+          const skipAllowModal = await checkIfSkipAllowModal();
+          if (skipAllowModal) {
+            resolve({ code: "123456" }); // dummy code
+            return;
+          }
+          await checkIfUserHasPasskeys();
+          if (title) {
+            customDialogTitle.value = title;
+          }
+          resolveFn = resolve;
+          rejectFn = reject;
+          verifyFn = verifyingCallback ?? null;
+          modelShow.value = true;
+          if (modalMode.value === 'totp') {
+            await addEventListenerForOTPInput();
+          }
+        })().catch((error) => {
+          if (!isTwoFaCancel(error)) {
+            console.error('[AdminForth 2FA] Failed to open 2FA modal', error);
+          }
+          reject(error);
+        });
+      }),
   };
   
   const { t } = useI18n();
@@ -471,4 +486,4 @@
     display: flex;
     gap: 0.75rem;
   }
-</style>
+</style>

package/dist/index.js

@@ -1035,42 +1035,49 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
             handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, response, cookies, headers }) {
                 const sessionsIds = body === null || body === void 0 ? void 0 : body.sessionsIds;
                 const confirmationResult = body === null || body === void 0 ? void 0 : body.confirmationResult;
-                const idsToResolve = sessionsIds;
+                const idsToResolve = Array.isArray(sessionsIds) ? sessionsIds : [];
                 const resolveAllIdsAsFailed = (message) => {
                     for (const id of idsToResolve) {
                         this.resolveResponse(id, { ok: false, error: message });
                     }
                     return { ok: false, error: message };
                 };
-                if (!(sessionsIds) || !confirmationResult) {
-                    return (resolveAllIdsAsFailed('Confirmation window was closed or did not return required data'));
-                }
-                for (const id of idsToResolve) {
-                    const validationResult = yield this.adminforth.auth.verify(id, 'auto2FA', false);
-                    if (!validationResult) {
-                        return (resolveAllIdsAsFailed('Invalid session ID or confirmation result'));
+                try {
+                    if (!idsToResolve.length || !confirmationResult) {
+                        return (resolveAllIdsAsFailed('Confirmation window was closed or did not return required data'));
                     }
-                    if (validationResult.adminUserPk !== adminUser.pk) {
-                        return (resolveAllIdsAsFailed('Session does not belong to the authenticated user'));
+                    for (const id of idsToResolve) {
+                        const validationResult = yield this.adminforth.auth.verify(id, 'auto2FA', false);
+                        if (!validationResult) {
+                            return (resolveAllIdsAsFailed('Invalid session ID or confirmation result'));
+                        }
+                        if (validationResult.adminUserPk !== adminUser.pk) {
+                            return (resolveAllIdsAsFailed('Session does not belong to the authenticated user'));
+                        }
                     }
-                }
-                const verificationResult = yield this.verify(confirmationResult, {
-                    adminUser: adminUser,
-                    userPk: adminUser.pk,
-                    cookies: cookies,
-                    response: response,
-                    extra: {
-                        headers: headers,
+                    const verificationResult = yield this.verify(confirmationResult, {
+                        adminUser: adminUser,
+                        userPk: adminUser.pk,
+                        cookies: cookies,
+                        response: response,
+                        extra: {
+                            headers: headers,
+                        }
+                    });
+                    if (!verificationResult || !('ok' in verificationResult)) {
+                        return (resolveAllIdsAsFailed('Verification failed'));
+                    }
+                    if ('ok' in verificationResult && verificationResult.ok) {
+                        for (const id of idsToResolve) {
+                            this.resolveResponse(id, { ok: true, passkeyConfirmed: verificationResult });
+                        }
+                        return { ok: true };
                     }
-                });
-                if (!verificationResult || !('ok' in verificationResult)) {
                     return (resolveAllIdsAsFailed('Verification failed'));
                 }
-                if ('ok' in verificationResult && verificationResult.ok) {
-                    for (const id of idsToResolve) {
-                        this.resolveResponse(id, { ok: true, passkeyConfirmed: verificationResult });
-                    }
-                    return { ok: true };
+                catch (error) {
+                    console.error('[AdminForth 2FA] Error resolving automatic 2FA verification', error);
+                    return (resolveAllIdsAsFailed(error instanceof Error ? error.message : 'Verification failed'));
                 }
             })
         });

package/index.ts

@@ -1100,7 +1100,7 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
       handler: async ({ body, adminUser, response, cookies, headers }) => {
         const sessionsIds = body?.sessionsIds;
         const confirmationResult = body?.confirmationResult;
-        const idsToResolve = sessionsIds;
+        const idsToResolve = Array.isArray(sessionsIds) ? sessionsIds : [];
 
         const resolveAllIdsAsFailed = (message) => {
           for (const id of idsToResolve) {
@@ -1109,37 +1109,43 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
           return { ok: false, error: message };
         }
 
-        if (!(sessionsIds) || !confirmationResult) {
-          return(resolveAllIdsAsFailed('Confirmation window was closed or did not return required data'));
-        }
-
-        for (const id of idsToResolve) {
-          const validationResult = await this.adminforth.auth.verify(id, 'auto2FA', false);
-          if (!validationResult) {
-            return(resolveAllIdsAsFailed('Invalid session ID or confirmation result'));
-          }
-          if (validationResult.adminUserPk !== adminUser.pk) {
-            return(resolveAllIdsAsFailed('Session does not belong to the authenticated user'));
+        try {
+          if (!idsToResolve.length || !confirmationResult) {
+            return(resolveAllIdsAsFailed('Confirmation window was closed or did not return required data'));
           }
-        }
 
-        const verificationResult = await this.verify(confirmationResult, {
-          adminUser: adminUser,
-          userPk: adminUser.pk, 
-          cookies: cookies,
-          response: response,
-          extra: {
-            headers: headers,            
-          } as HttpExtra
-        });
-        if ( !verificationResult || !('ok' in verificationResult) ) {
-          return(resolveAllIdsAsFailed('Verification failed'));
-        }
-        if ('ok' in verificationResult && verificationResult.ok){
           for (const id of idsToResolve) {
-            this.resolveResponse(id, { ok: true, passkeyConfirmed: verificationResult });
+            const validationResult = await this.adminforth.auth.verify(id, 'auto2FA', false);
+            if (!validationResult) {
+              return(resolveAllIdsAsFailed('Invalid session ID or confirmation result'));
+            }
+            if (validationResult.adminUserPk !== adminUser.pk) {
+              return(resolveAllIdsAsFailed('Session does not belong to the authenticated user'));
+            }
+          }
+
+          const verificationResult = await this.verify(confirmationResult, {
+            adminUser: adminUser,
+            userPk: adminUser.pk, 
+            cookies: cookies,
+            response: response,
+            extra: {
+              headers: headers,            
+            } as HttpExtra
+          });
+          if ( !verificationResult || !('ok' in verificationResult) ) {
+            return(resolveAllIdsAsFailed('Verification failed'));
+          }
+          if ('ok' in verificationResult && verificationResult.ok){
+            for (const id of idsToResolve) {
+              this.resolveResponse(id, { ok: true, passkeyConfirmed: verificationResult });
+            }
+            return { ok: true };
           }
-          return { ok: true };
+          return(resolveAllIdsAsFailed('Verification failed'));
+        } catch (error) {
+          console.error('[AdminForth 2FA] Error resolving automatic 2FA verification', error);
+          return(resolveAllIdsAsFailed(error instanceof Error ? error.message : 'Verification failed'));
         }
       }
     });

package/package.json

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