@adminforth/two-factors-auth 4.4.8 → 4.4.9

package/dist/endpoints/registerTwoFaEndpoints.js

@@ -20,8 +20,8 @@ export function registerTwoFaEndpoints(server, handlers) {
         path: `/plugin/twofa/confirmLogin`,
         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({

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/registerTwoFaEndpoints.ts

@@ -18,8 +18,8 @@ export function registerTwoFaEndpoints(server: IHttpServer, handlers: any): void
     path: `/plugin/twofa/confirmLogin`,
     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 });
     },
   });
 

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.4.9",
   "description": "AdminForth plugin for two factors authentication",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

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);
   }