@adminforth/two-factors-auth 3.3.0 → 3.3.2

package/custom/TwoFAModal.vue

@@ -178,7 +178,7 @@
           } else if (!response.ok) {
             alert({message: response.error || t('Verification failed'), variant: 'danger'}); 
           } else if (response.ok) {
-            alert({message: t('Verification successful'), variant: 'success'});
+            // alert({message: 'Verification successful', variant: 'success'});
           }
           sessionsIdsToResolve.value = [];
         } catch (error) {

package/dist/custom/TwoFAModal.vue

@@ -178,7 +178,7 @@
           } else if (!response.ok) {
             alert({message: response.error || t('Verification failed'), variant: 'danger'}); 
           } else if (response.ok) {
-            alert({message: t('Verification successful'), variant: 'success'});
+            // alert({message: 'Verification successful', variant: 'success'});
           }
           sessionsIdsToResolve.value = [];
         } catch (error) {

package/dist/index.js

@@ -134,24 +134,36 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
             return false;
         });
     }
-    waitForResponse(id) {
+    waitForResponse(id, timeoutMs) {
         return new Promise((resolve) => {
-            this.pending.set(id, resolve);
+            let timeout;
+            const cleanup = () => {
+                clearTimeout(timeout);
+                this.pending.delete(id);
+            };
+            timeout = setTimeout(() => {
+                cleanup();
+                resolve({ ok: false, error: 'Verification timed out' });
+            }, timeoutMs);
+            this.pending.set(id, (value) => {
+                cleanup();
+                resolve(value);
+            });
         });
     }
     resolveResponse(id, data) {
         const resolve = this.pending.get(id);
         if (resolve) {
             resolve(data);
-            this.pending.delete(id);
         }
     }
     verifyAuto(adminUser) {
         return __awaiter(this, void 0, void 0, function* () {
             const sessionId = crypto.randomUUID();
             const jwt = this.adminforth.auth.issueJWT({ sessionId, adminUserPk: adminUser.pk }, 'auto2FA', '5m');
+            const resultPromise = this.waitForResponse(jwt, 5 * 60 * 1000);
             this.adminforth.websocket.publish(`/user2fa/${adminUser.pk}`, { sessionId: jwt });
-            const result = yield this.waitForResponse(jwt);
+            const result = yield resultPromise;
             this.adminforth.websocket.publish(`/user2fa/${adminUser.pk}-resolve`, { sessionId: jwt });
             return result;
         });

package/index.ts

@@ -143,9 +143,21 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
 
   private pending = new Map<string, (value: any) => void>();
 
-  private waitForResponse(id: string): Promise<any> {
+  private waitForResponse(id: string, timeoutMs: number): Promise<any> {
     return new Promise((resolve) => {
-      this.pending.set(id, resolve);
+      let timeout: ReturnType<typeof setTimeout>;
+      const cleanup = () => {
+        clearTimeout(timeout);
+        this.pending.delete(id);
+      };
+      timeout = setTimeout(() => {
+        cleanup();
+        resolve({ ok: false, error: 'Verification timed out' });
+      }, timeoutMs);
+      this.pending.set(id, (value: any) => {
+        cleanup();
+        resolve(value);
+      });
     });
   }
 
@@ -153,16 +165,20 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
     const resolve = this.pending.get(id);
     if (resolve) {
       resolve(data);
-      this.pending.delete(id);
     }
   }
 
   public async verifyAuto(adminUser: AdminUser) {
     const sessionId = crypto.randomUUID();
     const jwt = this.adminforth.auth.issueJWT({sessionId, adminUserPk: adminUser.pk}, 'auto2FA', '5m');
+    const resultPromise = this.waitForResponse(jwt, 5 * 60 * 1000);
+
     this.adminforth.websocket.publish(`/user2fa/${adminUser.pk}`, { sessionId: jwt });
-    const result = await this.waitForResponse(jwt);
+
+    const result = await resultPromise;
+
     this.adminforth.websocket.publish(`/user2fa/${adminUser.pk}-resolve`, { sessionId: jwt });
+
     return result;
   }
 
@@ -1127,4 +1143,4 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
       }
     });
   }
-}
+}

package/package.json

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