@adminforth/two-factors-auth 4.0.1 → 4.0.2

package/build.log

@@ -16,5 +16,5 @@ custom/pnpm-lock.yaml
 custom/tsconfig.json
 custom/utils.js
 
-sent 286,243 bytes  received 229 bytes  572,944.00 bytes/sec
-total size is 285,337  speedup is 1.00
+sent 286,356 bytes  received 229 bytes  573,170.00 bytes/sec
+total size is 285,450  speedup is 1.00

package/custom/TwoFAModal.vue

@@ -110,6 +110,7 @@
   import { getPasskey } from './utils.js' 
   import { useAdminforth } from '@/adminforth';
   import websocket from '@/websocket';
+  import { getAdminForthClientId } from '@/utils/clientId';
   import type { AdminUser } from '@/types/Common';
 
   type TwoFaConfirmationResult = { mode: 'totp'; result: string } | { mode: 'passkey'; result: Record<string, any> };
@@ -150,7 +151,8 @@
   watch( props, () => {
     if (props.adminUser) {
       websocket.unsubscribeByPrefix(`/user2fa/`);
-      websocket.subscribe(`/user2fa/${props.adminUser.pk}`, async (data: {sessionId: string}) => {
+      const user2FaTopic = `/user2fa/${props.adminUser.pk}/${getAdminForthClientId()}`;
+      websocket.subscribe(user2FaTopic, async (data: {sessionId: string}) => {
         if (!allowAddNewSessions) {
           alert({message: t('Some process or user tries to add new actions to confirm. Action was blocked'), variant: 'warning'});
           return;
@@ -188,7 +190,7 @@
         }
         allowAddNewSessions = true;
       });
-      websocket.subscribe(`/user2fa/${props.adminUser.pk}-resolve`, async (data: {sessionId: string}) => {
+      websocket.subscribe(`${user2FaTopic}/resolve`, async (data: {sessionId: string}) => {
         if (sessionsIdsToResolve.value.includes(data.sessionId) && rejectFn && modelShow.value) {
           onCancel();
           sessionsIdsToResolve.value = sessionsIdsToResolve.value.filter(id => id !== data.sessionId);

package/dist/custom/TwoFAModal.vue

@@ -110,6 +110,7 @@
   import { getPasskey } from './utils.js' 
   import { useAdminforth } from '@/adminforth';
   import websocket from '@/websocket';
+  import { getAdminForthClientId } from '@/utils/clientId';
   import type { AdminUser } from '@/types/Common';
 
   type TwoFaConfirmationResult = { mode: 'totp'; result: string } | { mode: 'passkey'; result: Record<string, any> };
@@ -150,7 +151,8 @@
   watch( props, () => {
     if (props.adminUser) {
       websocket.unsubscribeByPrefix(`/user2fa/`);
-      websocket.subscribe(`/user2fa/${props.adminUser.pk}`, async (data: {sessionId: string}) => {
+      const user2FaTopic = `/user2fa/${props.adminUser.pk}/${getAdminForthClientId()}`;
+      websocket.subscribe(user2FaTopic, async (data: {sessionId: string}) => {
         if (!allowAddNewSessions) {
           alert({message: t('Some process or user tries to add new actions to confirm. Action was blocked'), variant: 'warning'});
           return;
@@ -188,7 +190,7 @@
         }
         allowAddNewSessions = true;
       });
-      websocket.subscribe(`/user2fa/${props.adminUser.pk}-resolve`, async (data: {sessionId: string}) => {
+      websocket.subscribe(`${user2FaTopic}/resolve`, async (data: {sessionId: string}) => {
         if (sessionsIdsToResolve.value.includes(data.sessionId) && rejectFn && modelShow.value) {
           onCancel();
           sessionsIdsToResolve.value = sessionsIdsToResolve.value.filter(id => id !== data.sessionId);

package/dist/index.js

@@ -8,6 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { AdminForthPlugin, suggestIfTypo } from "adminforth";
+import * as AdminForthRuntime from "adminforth";
 import { PasskeyService } from "./services/passkeyService.js";
 import { TotpService } from "./services/totpService.js";
 import { verifyMfaConfirmation } from "./services/verifyMfaConfirmation.js";
@@ -19,6 +20,7 @@ import { createPasskeyHandlers } from "./handlers/createPasskeyHandlers.js";
 import { createTwoFaHandlers } from "./handlers/createTwoFaHandlers.js";
 import { parsePeriod } from "./utils/parsePeriod.js";
 import crypto from 'crypto';
+const getRequestWebsocketClientId = AdminForthRuntime.getRequestWebsocketClientId;
 export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
     constructor(options) {
         super(options, import.meta.url);
@@ -77,12 +79,16 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
     }
     verifyAuto(adminUser) {
         return __awaiter(this, void 0, void 0, function* () {
+            const websocketClientId = getRequestWebsocketClientId === null || getRequestWebsocketClientId === void 0 ? void 0 : getRequestWebsocketClientId();
+            if (!websocketClientId) {
+                return { ok: false, error: '2FA auto verification requires an active browser request context' };
+            }
             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 });
+            this.adminforth.websocket.publish(`/user2fa/${adminUser.pk}/${websocketClientId}`, { sessionId: jwt });
             const result = yield resultPromise;
-            this.adminforth.websocket.publish(`/user2fa/${adminUser.pk}-resolve`, { sessionId: jwt });
+            this.adminforth.websocket.publish(`/user2fa/${adminUser.pk}/${websocketClientId}/resolve`, { sessionId: jwt });
             return result;
         });
     }

package/index.ts

@@ -1,4 +1,5 @@
 import {  AdminForthPlugin, suggestIfTypo, HttpExtra } from "adminforth";
+import * as AdminForthRuntime from "adminforth";
 import type { AdminForthResource, AdminUser, IAdminForth, IHttpServer, IAdminForthAuth, IAdminForthHttpResponse } from "adminforth";
 import  { PluginOptions } from "./types.js"
 import { PasskeyService } from "./services/passkeyService.js";
@@ -13,6 +14,10 @@ import { createTwoFaHandlers } from "./handlers/createTwoFaHandlers.js";
 import { parsePeriod } from "./utils/parsePeriod.js";
 import crypto from 'crypto';
 
+const getRequestWebsocketClientId = (AdminForthRuntime as typeof AdminForthRuntime & {
+  getRequestWebsocketClientId?: () => string | undefined;
+}).getRequestWebsocketClientId;
+
 export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
   options: PluginOptions;
   adminforth: IAdminForth;
@@ -87,15 +92,19 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
   }
 
   public async verifyAuto(adminUser: AdminUser) {
+    const websocketClientId = getRequestWebsocketClientId?.();
+    if (!websocketClientId) {
+      return { ok: false, error: '2FA auto verification requires an active browser request context' };
+    }
     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 });
+    this.adminforth.websocket.publish(`/user2fa/${adminUser.pk}/${websocketClientId}`, { sessionId: jwt });
 
     const result = await resultPromise;
 
-    this.adminforth.websocket.publish(`/user2fa/${adminUser.pk}-resolve`, { sessionId: jwt });
+    this.adminforth.websocket.publish(`/user2fa/${adminUser.pk}/${websocketClientId}/resolve`, { sessionId: jwt });
 
     return result;
   }

package/package.json

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