@adminforth/two-factors-auth 2.9.16 → 2.9.17

package/build.log

@@ -15,5 +15,5 @@ custom/package.json
 custom/tsconfig.json
 custom/utils.js
 
-sent 273,582 bytes  received 210 bytes  547,584.00 bytes/sec
+sent 273,593 bytes  received 210 bytes  547,606.00 bytes/sec
 total size is 272,766  speedup is 1.00

package/dist/index.js

@@ -306,9 +306,9 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
         }
         const beforeLoginConfirmation = this.adminforth.config.auth.beforeLoginConfirmation;
         const beforeLoginConfirmationArray = Array.isArray(beforeLoginConfirmation) ? beforeLoginConfirmation : [beforeLoginConfirmation];
-        beforeLoginConfirmationArray.push((_a) => __awaiter(this, [_a], void 0, function* ({ adminUser, response, extra }) {
+        beforeLoginConfirmationArray.push((_a) => __awaiter(this, [_a], void 0, function* ({ adminUser, response, adminforth, extra, rememberMeDays }) {
             var _b, _c, _d, _e;
-            if (((_b = extra === null || extra === void 0 ? void 0 : extra.body) === null || _b === void 0 ? void 0 : _b.loginAllowedByPasskeyDirectSignIn) === true) {
+            if (((_b = extra === null || extra === void 0 ? void 0 : extra.meta) === null || _b === void 0 ? void 0 : _b.loginAllowedByPasskeyDirectSignIn) === true) {
                 return { body: { loginAllowed: true }, ok: true };
             }
             const secret = adminUser.dbUser[this.options.twoFaSecretFieldName];
@@ -322,7 +322,7 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
             const authPk = authResource.columns.find((col) => col.primaryKey).name;
             const userPk = adminUser.dbUser[authPk];
             const rememberMe = ((_c = extra === null || extra === void 0 ? void 0 : extra.body) === null || _c === void 0 ? void 0 : _c.rememberMe) || false;
-            const rememberMeDays = rememberMe ? adminforth.config.auth.rememberMeDays || 30 : 1;
+            // const rememberMeDays = rememberMe ? adminforth.config.auth.rememberMeDays || 30 : 1;
             let newSecret = null;
             const userNeeds2FA = this.options.usersFilterToApply ? this.options.usersFilterToApply(adminUser) : true;
             if (!userNeeds2FA) {
@@ -495,12 +495,14 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
                     username,
                 };
                 const toReturn = { allowedLogin: true, error: '' };
+                const rememberMe = (body === null || body === void 0 ? void 0 : body.rememberMe) || false;
                 yield this.adminforth.restApi.processLoginCallbacks(adminUser, toReturn, response, {
                     headers,
                     cookies,
                     requestUrl,
                     query,
-                    body: {
+                    body: {},
+                    meta: {
                         loginAllowedByPasskeyDirectSignIn: true
                     },
                 });

package/index.ts

@@ -1,4 +1,4 @@
-import {  AdminForthPlugin, Filters, suggestIfTypo } from "adminforth";
+import {  AdminForthPlugin, Filters, suggestIfTypo, HttpExtra } from "adminforth";
 import type { AdminForthResource, AdminUser, IAdminForth, IHttpServer, IAdminForthAuth, BeforeLoginConfirmationFunction, IAdminForthHttpResponse } from "adminforth";
 import twofactor from 'node-2fa';
 import  { PluginOptions } from "./types.js"
@@ -341,8 +341,8 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
     const beforeLoginConfirmation = this.adminforth.config.auth.beforeLoginConfirmation;
     const beforeLoginConfirmationArray = Array.isArray(beforeLoginConfirmation) ? beforeLoginConfirmation : [beforeLoginConfirmation];
     beforeLoginConfirmationArray.push(
-      async({ adminUser, response, extra }: { adminUser: AdminUser, response: IAdminForthHttpResponse, extra?: any} )=> {
-        if (extra?.body?.loginAllowedByPasskeyDirectSignIn === true) {
+      async({ adminUser, response, adminforth, extra, rememberMeDays }: { adminUser: AdminUser, response: IAdminForthHttpResponse, adminforth: IAdminForth, extra?: HttpExtra,  rememberMeDays?: number} )=> {
+        if ( extra?.meta?.loginAllowedByPasskeyDirectSignIn === true) {
           return { body: { loginAllowed: true }, ok: true };
         }
         const secret = adminUser.dbUser[this.options.twoFaSecretFieldName]
@@ -356,7 +356,7 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
         const authPk = authResource.columns.find((col)=>col.primaryKey).name
         const userPk = adminUser.dbUser[authPk]
         const rememberMe = extra?.body?.rememberMe || false;
-        const rememberMeDays = rememberMe ? adminforth.config.auth.rememberMeDays || 30 : 1;
+        // const rememberMeDays = rememberMe ? adminforth.config.auth.rememberMeDays || 30 : 1;
         let newSecret = null;
 
         const userNeeds2FA = this.options.usersFilterToApply ? this.options.usersFilterToApply(adminUser) : true;
@@ -543,16 +543,25 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
         };
         
         const toReturn = { allowedLogin: true, error: '' };
-
-        await this.adminforth.restApi.processLoginCallbacks(adminUser, toReturn, response, {
-          headers,
-          cookies,
-          requestUrl,
-          query,
-          body: {
-            loginAllowedByPasskeyDirectSignIn: true
+        const rememberMe = body?.rememberMe || false;
+
+        await this.adminforth.restApi.processLoginCallbacks(
+          adminUser, 
+          toReturn, 
+          response, 
+          {
+            headers,
+            cookies,
+            requestUrl,
+            query,
+            body: {},
+            meta: { 
+              loginAllowedByPasskeyDirectSignIn: true 
+            },
           },
-        });
+          // rememberMeDays: rememberMe ? this.adminforth.config.auth.rememberMeDays || 30 : 1, 
+
+        );
 
         if ( toReturn.allowedLogin === true ) {
           this.adminforth.auth.setAuthCookie({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/two-factors-auth",
-  "version": "2.9.16",
+  "version": "2.9.17",
   "description": "AdminForth plugin for two factors authentication",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -29,7 +29,7 @@
     "node-2fa": "^2.0.3"
   },
   "peerDependencies": {
-    "adminforth": "^2.13.0-next.51"
+    "adminforth": "^2.13.0-next.65"
   },
   "devDependencies": {
     "@types/node": "^22.10.7",