@adminforth/two-factors-auth 4.4.8 → 4.5.0

package/build.log

@@ -17,5 +17,5 @@ custom/tsconfig.json
 custom/use2faApi.ts
 custom/utils.js
 
-sent 311,882 bytes  received 248 bytes  624,260.00 bytes/sec
+sent 311,869 bytes  received 248 bytes  624,234.00 bytes/sec
 total size is 310,909  speedup is 1.00

package/dist/endpoints/registerPasskeyEndpoints.js

@@ -12,6 +12,9 @@ export function registerPasskeyEndpoints(server, handlers) {
     server.endpoint({
         method: 'POST',
         path: `/plugin/passkeys/registrationOptions`,
+        agent: {
+            hiddenFromAgents: true,
+        },
         noAuth: false,
         request_schema: registrationOptionsBodySchema,
         handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, response, cookies, headers }) {
@@ -21,6 +24,9 @@ export function registerPasskeyEndpoints(server, handlers) {
     server.endpoint({
         method: 'POST',
         path: `/plugin/passkeys/finishRegistration`,
+        agent: {
+            hiddenFromAgents: true,
+        },
         noAuth: false,
         request_schema: finishRegistrationBodySchema,
         handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, cookies, response }) {
@@ -30,18 +36,27 @@ export function registerPasskeyEndpoints(server, handlers) {
     server.endpoint({
         method: 'POST',
         path: `/plugin/passkeys/loginOptions`,
+        agent: {
+            hiddenFromAgents: true,
+        },
         noAuth: true,
         handler: (_a) => __awaiter(this, [_a], void 0, function* ({ response, headers }) { return handlers.createLoginOptions({ response, headers }); }),
     });
     server.endpoint({
         method: 'GET',
         path: `/plugin/passkeys/getPasskeys`,
+        agent: {
+            hiddenFromAgents: true,
+        },
         noAuth: false,
         handler: (_a) => __awaiter(this, [_a], void 0, function* ({ adminUser, response }) { return handlers.getPasskeys({ adminUser, response }); }),
     });
     server.endpoint({
         method: 'DELETE',
         path: `/plugin/passkeys/deletePasskey`,
+        agent: {
+            hiddenFromAgents: true,
+        },
         noAuth: false,
         request_schema: deletePasskeyBodySchema,
         handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, response }) {
@@ -51,6 +66,9 @@ export function registerPasskeyEndpoints(server, handlers) {
     server.endpoint({
         method: 'POST',
         path: `/plugin/passkeys/renamePasskey`,
+        agent: {
+            hiddenFromAgents: true,
+        },
         noAuth: false,
         request_schema: renamePasskeyBodySchema,
         handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, response }) {
@@ -60,12 +78,18 @@ export function registerPasskeyEndpoints(server, handlers) {
     server.endpoint({
         method: 'POST',
         path: `/plugin/passkeys/checkIfUserHasPasskeys`,
+        agent: {
+            hiddenFromAgents: true,
+        },
         noAuth: true,
         handler: (_a) => __awaiter(this, [_a], void 0, function* ({ cookies, response }) { return handlers.checkIfUserHasPasskeys({ cookies, response }); }),
     });
     server.endpoint({
         method: 'POST',
         path: `/plugin/passkeys/resolveVerifyAuto`,
+        agent: {
+            hiddenFromAgents: true,
+        },
         noAuth: false,
         request_schema: resolveVerifyAutoBodySchema,
         handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, response, cookies, headers }) {

package/dist/endpoints/registerTwoFaEndpoints.js

@@ -12,21 +12,30 @@ export function registerTwoFaEndpoints(server, handlers) {
     server.endpoint({
         method: 'POST',
         path: `/plugin/twofa/initSetup`,
+        agent: {
+            hiddenFromAgents: true,
+        },
         noAuth: true,
         handler: (_a) => __awaiter(this, [_a], void 0, function* ({ cookies, response }) { return handlers.initSetup({ cookies, response }); }),
     });
     server.endpoint({
         method: 'POST',
         path: `/plugin/twofa/confirmLogin`,
+        agent: {
+            hiddenFromAgents: true,
+        },
         noAuth: true,
         request_schema: confirmLoginBodySchema,
-        handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, response, cookies, headers }) {
-            return handlers.confirmLogin({ body, response, cookies, headers });
+        handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, response, cookies, headers, requestUrl, query }) {
+            return handlers.confirmLogin({ body, response, cookies, headers, requestUrl, query });
         }),
     });
     server.endpoint({
         method: 'POST',
         path: `/plugin/twofa/confirmLoginWithPasskey`,
+        agent: {
+            hiddenFromAgents: true,
+        },
         noAuth: true,
         request_schema: confirmLoginWithPasskeyBodySchema,
         handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, response, cookies, headers, requestUrl, query }) {
@@ -36,17 +45,26 @@ export function registerTwoFaEndpoints(server, handlers) {
     server.endpoint({
         method: "GET",
         path: "/plugin/twofa/skip-allow",
+        agent: {
+            hiddenFromAgents: true,
+        },
         noAuth: true,
         handler: (_a) => __awaiter(this, [_a], void 0, function* ({ cookies, response }) { return handlers.skipAllow({ cookies, response }); }),
     });
     server.endpoint({
         method: "GET",
         path: "/plugin/twofa/skip-allow-modal",
+        agent: {
+            hiddenFromAgents: true,
+        },
         handler: (_a) => __awaiter(this, [_a], void 0, function* ({ adminUser, headers, cookies, response }) { return handlers.skipAllowModal({ adminUser, headers, cookies, response }); }),
     });
     server.endpoint({
         method: 'POST',
         path: `/plugin/twofa/verify`,
+        agent: {
+            hiddenFromAgents: true,
+        },
         noAuth: false,
         request_schema: verifyTotpBodySchema,
         handler: (_a) => __awaiter(this, [_a], void 0, function* ({ adminUser, body, response }) {

package/dist/handlers/createTwoFaHandlers.d.ts

@@ -5,11 +5,13 @@ export declare function createTwoFaHandlers(ctx: any): {
         totpJWT: any;
         status: string;
     }>;
-    confirmLogin: ({ body, response, cookies, headers }: {
+    confirmLogin: ({ body, response, cookies, headers, requestUrl, query }: {
         body: any;
         response: any;
         cookies: any;
         headers: any;
+        requestUrl: any;
+        query: any;
     }) => Promise<{
         error: any;
     } | {

package/dist/handlers/createTwoFaHandlers.js

@@ -18,8 +18,9 @@ export function createTwoFaHandlers(ctx) {
             }
             return toReturn;
         }),
-        confirmLogin: (_a) => __awaiter(this, [_a], void 0, function* ({ body, response, cookies, headers }) {
+        confirmLogin: (_a) => __awaiter(this, [_a], void 0, function* ({ body, response, cookies, headers, requestUrl, query }) {
             var _b, _c;
+            const extra = { body, headers, cookies, query, requestUrl, response };
             if (!(yield ctx.checkPasskeyLoginRateLimit(headers))) {
                 return respondWithStatus({ error: 'Too many login attempts, please try again later' }, response, HttpStatus.TOO_MANY_REQUESTS);
             }
@@ -38,7 +39,7 @@ export function createTwoFaHandlers(ctx) {
                         yield ctx.totpService.saveSecret(decoded.pk, decoded.newSecret);
                     }
                     ctx.cookieService.removeTotpTemporary(response);
-                    yield ctx.cookieService.setAuthCookie({ expireInDuration: decoded.sessionDuration, response, username: decoded.userName, pk: decoded.pk });
+                    yield ctx.cookieService.setAuthCookie({ expireInDuration: decoded.sessionDuration, response, username: decoded.userName, pk: decoded.pk, extra });
                     return { status: 'ok', allowedLogin: true };
                 }
                 else {
@@ -69,7 +70,7 @@ export function createTwoFaHandlers(ctx) {
             }
             if (verified) {
                 ctx.cookieService.removeTotpTemporary(response);
-                yield ctx.cookieService.setAuthCookie({ expireInDuration: decoded.sessionDuration, response, username: decoded.userName, pk: decoded.pk });
+                yield ctx.cookieService.setAuthCookie({ expireInDuration: decoded.sessionDuration, response, username: decoded.userName, pk: decoded.pk, extra });
                 return { status: 'ok', allowedLogin: true };
             }
             else {
@@ -108,7 +109,7 @@ export function createTwoFaHandlers(ctx) {
             const expireInDuration = rememberMe
                 ? ((_b = rememberDaysAfterPasskeyLogin !== null && rememberDaysAfterPasskeyLogin !== void 0 ? rememberDaysAfterPasskeyLogin : ctx.adminforth.config.auth.rememberMeDuration) !== null && _b !== void 0 ? _b : '30d')
                 : '1d';
-            yield ctx.adminforth.restApi.processLoginCallbacks(adminUser, toReturn, response, {
+            const extra = {
                 headers,
                 cookies,
                 requestUrl,
@@ -118,13 +119,15 @@ export function createTwoFaHandlers(ctx) {
                 meta: {
                     loginAllowedByPasskeyDirectSignIn: true
                 },
-            }, expireInDuration);
+            };
+            yield ctx.adminforth.restApi.processLoginCallbacks(adminUser, toReturn, response, extra, expireInDuration);
             if (toReturn.allowedLogin === true) {
                 yield ctx.cookieService.setAuthCookie({
                     response,
                     username,
                     pk: userPk,
                     expireInDuration,
+                    extra,
                 });
             }
             return toReturn;

package/dist/services/cookieService.d.ts

@@ -1,4 +1,4 @@
-import type { IAdminForth, IAdminForthHttpResponse } from "adminforth";
+import type { HttpExtra, IAdminForth, IAdminForthHttpResponse } from "adminforth";
 import type { PluginOptions } from "../types.js";
 import type { CookieList, HttpHeaders } from "../utils/types.js";
 export type TotpTemporaryPayload = {
@@ -30,6 +30,7 @@ export declare class CookieService {
         username: string;
         pk: string;
         expireInDuration: string;
+        extra: HttpExtra;
     }): Promise<string>;
     getTotpTemporary(cookies: CookieList): string | null;
     verifyTotpTemporary(cookies: CookieList): Promise<TotpTemporaryPayload | null>;

package/endpoints/registerPasskeyEndpoints.ts

@@ -11,6 +11,9 @@ export function registerPasskeyEndpoints(server: IHttpServer, handlers: any): vo
   server.endpoint({
     method: 'POST',
     path: `/plugin/passkeys/registrationOptions`,
+    agent: {
+      hiddenFromAgents: true,
+    },
     noAuth: false,
     request_schema: registrationOptionsBodySchema,
     handler: async ({ body, adminUser, response, cookies, headers }) => {
@@ -21,6 +24,9 @@ export function registerPasskeyEndpoints(server: IHttpServer, handlers: any): vo
   server.endpoint({
     method: 'POST',
     path: `/plugin/passkeys/finishRegistration`,
+    agent: {
+      hiddenFromAgents: true,
+    },
     noAuth: false,
     request_schema: finishRegistrationBodySchema,
     handler: async ({ body, adminUser, cookies, response }) => {
@@ -31,6 +37,9 @@ export function registerPasskeyEndpoints(server: IHttpServer, handlers: any): vo
   server.endpoint({
     method: 'POST',
     path: `/plugin/passkeys/loginOptions`,
+    agent: {
+      hiddenFromAgents: true,
+    },
     noAuth: true,
     handler: async ({ response, headers }) => handlers.createLoginOptions({ response, headers }),
   });
@@ -38,6 +47,9 @@ export function registerPasskeyEndpoints(server: IHttpServer, handlers: any): vo
   server.endpoint({
     method: 'GET',
     path: `/plugin/passkeys/getPasskeys`,
+    agent: {
+      hiddenFromAgents: true,
+    },
     noAuth: false,
     handler: async ({ adminUser, response }) => handlers.getPasskeys({ adminUser, response }),
   });
@@ -45,6 +57,9 @@ export function registerPasskeyEndpoints(server: IHttpServer, handlers: any): vo
   server.endpoint({
     method: 'DELETE',
     path: `/plugin/passkeys/deletePasskey`,
+    agent: {
+      hiddenFromAgents: true,
+    },
     noAuth: false,
     request_schema: deletePasskeyBodySchema,
     handler: async ({ body, adminUser, response }) => {
@@ -55,6 +70,9 @@ export function registerPasskeyEndpoints(server: IHttpServer, handlers: any): vo
   server.endpoint({
     method: 'POST',
     path: `/plugin/passkeys/renamePasskey`,
+    agent: {
+      hiddenFromAgents: true,
+    },
     noAuth: false,
     request_schema: renamePasskeyBodySchema,
     handler: async ({ body, adminUser, response }) => {
@@ -65,6 +83,9 @@ export function registerPasskeyEndpoints(server: IHttpServer, handlers: any): vo
   server.endpoint({
     method: 'POST',
     path: `/plugin/passkeys/checkIfUserHasPasskeys`,
+    agent: {
+      hiddenFromAgents: true,
+    },
     noAuth: true,
     handler: async ({ cookies, response }) => handlers.checkIfUserHasPasskeys({ cookies, response }),
   });
@@ -72,6 +93,9 @@ export function registerPasskeyEndpoints(server: IHttpServer, handlers: any): vo
   server.endpoint({
     method: 'POST',
     path: `/plugin/passkeys/resolveVerifyAuto`,
+    agent: {
+      hiddenFromAgents: true,
+    },
     noAuth: false,
     request_schema: resolveVerifyAutoBodySchema,
     handler: async ({ body, adminUser, response, cookies, headers }) => {

package/endpoints/registerTwoFaEndpoints.ts

@@ -9,6 +9,9 @@ export function registerTwoFaEndpoints(server: IHttpServer, handlers: any): void
   server.endpoint({
     method: 'POST',
     path: `/plugin/twofa/initSetup`,
+    agent: {
+      hiddenFromAgents: true,
+    },
     noAuth: true,
     handler: async ({ cookies, response }) => handlers.initSetup({ cookies, response }),
   });
@@ -16,16 +19,22 @@ export function registerTwoFaEndpoints(server: IHttpServer, handlers: any): void
   server.endpoint({
     method: 'POST',
     path: `/plugin/twofa/confirmLogin`,
+    agent: {
+      hiddenFromAgents: true,
+    },
     noAuth: true,
     request_schema: confirmLoginBodySchema,
-    handler: async ({ body, response, cookies, headers }) => {
-      return handlers.confirmLogin({ body, response, cookies, headers });
+    handler: async ({ body, response, cookies, headers, requestUrl, query }) => {
+      return handlers.confirmLogin({ body, response, cookies, headers, requestUrl, query });
     },
   });
 
   server.endpoint({
     method: 'POST',
     path: `/plugin/twofa/confirmLoginWithPasskey`,
+    agent: {
+      hiddenFromAgents: true,
+    },
     noAuth: true,
     request_schema: confirmLoginWithPasskeyBodySchema,
     handler: async ({ body, response, cookies, headers, requestUrl, query }) => {
@@ -36,6 +45,9 @@ export function registerTwoFaEndpoints(server: IHttpServer, handlers: any): void
   server.endpoint({
     method: "GET",
     path: "/plugin/twofa/skip-allow",
+    agent: {
+      hiddenFromAgents: true,
+    },
     noAuth: true,
     handler: async ({ cookies, response }) => handlers.skipAllow({ cookies, response }),
   });
@@ -43,12 +55,18 @@ export function registerTwoFaEndpoints(server: IHttpServer, handlers: any): void
   server.endpoint({
     method: "GET",
     path: "/plugin/twofa/skip-allow-modal",
+    agent: {
+      hiddenFromAgents: true,
+    },
     handler: async ({ adminUser, headers, cookies, response }) => handlers.skipAllowModal({ adminUser, headers, cookies, response }),
   });
 
   server.endpoint({
     method: 'POST',
     path: `/plugin/twofa/verify`,
+    agent: {
+      hiddenFromAgents: true,
+    },
     noAuth: false,
     request_schema: verifyTotpBodySchema,
     handler: async ({ adminUser, body, response }) => {

package/handlers/createTwoFaHandlers.ts

@@ -11,7 +11,8 @@ export function createTwoFaHandlers(ctx: any) {
       return toReturn
     },
 
-    confirmLogin: async ({ body, response, cookies, headers }) => {
+    confirmLogin: async ({ body, response, cookies, headers, requestUrl, query }) => {
+      const extra = { body, headers, cookies, query, requestUrl, response };
       if (!(await ctx.checkPasskeyLoginRateLimit(headers))) {
         return respondWithStatus({ error: 'Too many login attempts, please try again later' }, response, HttpStatus.TOO_MANY_REQUESTS);
       }
@@ -32,7 +33,7 @@ export function createTwoFaHandlers(ctx: any) {
             await ctx.totpService.saveSecret(decoded.pk, decoded.newSecret);
           }
           ctx.cookieService.removeTotpTemporary(response)
-          await ctx.cookieService.setAuthCookie({expireInDuration: decoded.sessionDuration, response, username:decoded.userName, pk:decoded.pk})
+          await ctx.cookieService.setAuthCookie({expireInDuration: decoded.sessionDuration, response, username:decoded.userName, pk:decoded.pk, extra})
           return { status: 'ok', allowedLogin: true }
         } else {
           return respondWithStatus({ error: 'Wrong or expired OTP code' }, response, HttpStatus.FORBIDDEN)
@@ -61,7 +62,7 @@ export function createTwoFaHandlers(ctx: any) {
       }
       if (verified) {
         ctx.cookieService.removeTotpTemporary(response)
-        await ctx.cookieService.setAuthCookie({expireInDuration: decoded.sessionDuration, response, username:decoded.userName, pk:decoded.pk})
+        await ctx.cookieService.setAuthCookie({expireInDuration: decoded.sessionDuration, response, username:decoded.userName, pk:decoded.pk, extra})
         return { status: 'ok', allowedLogin: true }
       } else {
         return respondWithStatus({ error: verificationError }, response, HttpStatus.FORBIDDEN)
@@ -105,21 +106,23 @@ export function createTwoFaHandlers(ctx: any) {
         ? (rememberDaysAfterPasskeyLogin ?? ctx.adminforth.config.auth.rememberMeDuration ?? '30d')
         : '1d';
 
+      const extra = {
+        headers,
+        cookies,
+        requestUrl,
+        query,
+        body: {},
+        response,
+        meta: {
+          loginAllowedByPasskeyDirectSignIn: true
+        },
+      };
+
       await ctx.adminforth.restApi.processLoginCallbacks(
         adminUser,
         toReturn,
         response,
-        {
-          headers,
-          cookies,
-          requestUrl,
-          query,
-          body: {},
-          response,
-          meta: {
-            loginAllowedByPasskeyDirectSignIn: true
-          },
-        },
+        extra,
         expireInDuration,
       );
 
@@ -129,6 +132,7 @@ export function createTwoFaHandlers(ctx: any) {
           username,
           pk: userPk,
           expireInDuration,
+          extra,
         });
       }
       return toReturn;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/two-factors-auth",
-  "version": "4.4.8",
+  "version": "4.5.0",
   "description": "AdminForth plugin for two factors authentication",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -29,11 +29,11 @@
     "zod": "^4.3.6"
   },
   "peerDependencies": {
-    "adminforth": "^3.31.5"
+    "adminforth": "^3.32.0"
   },
   "devDependencies": {
     "@types/node": "^22.10.7",
-    "adminforth": "^3.31.5",
+    "adminforth": "^3.32.0",
     "semantic-release": "^24.2.1",
     "semantic-release-slack-bot": "^4.0.2",
     "typescript": "^5.7.3"

package/services/cookieService.ts

@@ -1,4 +1,4 @@
-import type { IAdminForth, IAdminForthHttpResponse } from "adminforth";
+import type { HttpExtra, IAdminForth, IAdminForthHttpResponse } from "adminforth";
 import { convertPeriodToSeconds } from "adminforth";
 import type { PluginOptions } from "../types.js";
 import type { CookieList, HttpHeaders } from "../utils/types.js";
@@ -43,7 +43,7 @@ export class CookieService {
     return this.adminforth.auth.getCustomCookie({ cookies, name: AUTH_COOKIE });
   }
 
-  public setAuthCookie(opts: { response: IAdminForthHttpResponse; username: string; pk: string; expireInDuration: string }): Promise<string> {
+  public setAuthCookie(opts: { response: IAdminForthHttpResponse; username: string; pk: string; expireInDuration: string; extra: HttpExtra }): Promise<string> {
     return this.adminforth.auth.setAuthCookie(opts);
   }