@adminforth/two-factors-auth 3.1.4 → 3.2.0

package/dist/index.js

@@ -732,7 +732,7 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
                     }
                 });
                 if (!verificationResult || !('ok' in verificationResult)) {
-                    return { ok: false, error: 'Verification failed' };
+                    return { ok: false, error: 'error' in verificationResult ? verificationResult.error : 'Verification failed' };
                 }
                 const settingsOrigin = (_b = this.options.passkeys) === null || _b === void 0 ? void 0 : _b.settings.expectedOrigin;
                 const rp = {
@@ -1030,15 +1030,15 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
                     return { ok: false, error: message };
                 };
                 if (!(sessionsIds) || !confirmationResult) {
-                    resolveAllIdsAsFailed('Confirmation window was closed or did not return required data');
+                    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) {
-                        resolveAllIdsAsFailed('Invalid session ID or confirmation result');
+                        return (resolveAllIdsAsFailed('Invalid session ID or confirmation result'));
                     }
                     if (validationResult.adminUserPk !== adminUser.pk) {
-                        resolveAllIdsAsFailed('Session does not belong to the authenticated user');
+                        return (resolveAllIdsAsFailed('Session does not belong to the authenticated user'));
                     }
                 }
                 const verificationResult = yield this.verify(confirmationResult, {
@@ -1051,12 +1051,14 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
                     }
                 });
                 if (!verificationResult || !('ok' in verificationResult)) {
-                    resolveAllIdsAsFailed('Verification failed');
+                    return (resolveAllIdsAsFailed('Verification failed'));
                 }
-                for (const id of idsToResolve) {
-                    this.resolveResponse(id, { ok: true, passkeyConfirmed: verificationResult });
+                if ('ok' in verificationResult && verificationResult.ok) {
+                    for (const id of idsToResolve) {
+                        this.resolveResponse(id, { ok: true, passkeyConfirmed: verificationResult });
+                    }
+                    return { ok: true };
                 }
-                return { ok: true };
             })
         });
     }

package/index.ts

@@ -791,8 +791,8 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
             headers,
           } as HttpExtra
         });
-        if ( !verificationResult || !('ok' in verificationResult) ) {
-          return { ok: false, error: 'Verification failed' };
+        if (!verificationResult || !('ok' in verificationResult)) {
+          return { ok: false, error: 'error' in verificationResult ? verificationResult.error : 'Verification failed' };
         }
 
         const settingsOrigin = this.options.passkeys?.settings.expectedOrigin;
@@ -1093,16 +1093,16 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
         }
 
         if (!(sessionsIds) || !confirmationResult) {
-          resolveAllIdsAsFailed('Confirmation window was closed or did not return required data');
+          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) {
-            resolveAllIdsAsFailed('Invalid session ID or confirmation result');
+            return(resolveAllIdsAsFailed('Invalid session ID or confirmation result'));
           }
           if (validationResult.adminUserPk !== adminUser.pk) {
-            resolveAllIdsAsFailed('Session does not belong to the authenticated user');
+            return(resolveAllIdsAsFailed('Session does not belong to the authenticated user'));
           }
         }
 
@@ -1116,13 +1116,14 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
           } as HttpExtra
         });
         if ( !verificationResult || !('ok' in verificationResult) ) {
-          resolveAllIdsAsFailed('Verification failed');
+          return(resolveAllIdsAsFailed('Verification failed'));
         }
-
-        for (const id of idsToResolve) {
-          this.resolveResponse(id, { ok: true, passkeyConfirmed: verificationResult });
+        if ('ok' in verificationResult && verificationResult.ok){
+          for (const id of idsToResolve) {
+            this.resolveResponse(id, { ok: true, passkeyConfirmed: verificationResult });
+          }
+          return { ok: true };
         }
-        return { ok: true };
       }
     });
   }

package/package.json

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