Merge branch 'next' of https://github.com/devforth/adminforth into feature/AdminForth/1181/we-need-to-limit-error-length

Author: Pavlo Kulyk

adminforth/documentation/docs/tutorial/08-Plugins/02-TwoFactorsAuth.md

@@ -280,8 +280,6 @@ options: {
           adminUser: adminUser,
         //diff-add
           userPk: adminUser.pk,
-        //diff-add
-          cookies: extra.cookies,
         //diff-add
           response: response,
         //diff-add
@@ -393,7 +391,6 @@ hooks: {
       const verifyRes = await t2fa.verify(confirmationResult, {
         adminUser,
         userPk: adminUser.pk,
-        cookies: extra?.cookies,
         response,
         extra
       });
@@ -404,7 +401,7 @@ hooks: {
     },
   },
   create: {
-    beforeSave: async ({ adminUser, adminforth, extra }) => {
+    beforeSave: async ({ adminUser, adminforth, response, extra }) => {
       const t2fa = adminforth.getPluginByClassName('TwoFactorsAuthPlugin');
       if (!t2fa) {
         return { ok: false, error: 'TwoFactorsAuthPlugin is not configured' };
@@ -418,7 +415,8 @@ hooks: {
       const verifyRes = await t2fa.verify(confirmationResult, {
         adminUser,
         userPk: adminUser.pk,
-        cookies: extra?.cookies,
+        response,
+        extra
       });
       if (!verifyRes || 'error' in verifyRes) {
         return { ok: false, error: verifyRes?.error || 'Two-factor verification failed' };
@@ -534,12 +532,10 @@ app.post(`${ADMIN_BASE_URL}/myCriticalAction`,
         adminUser: adminUser,
       // diff-add
         userPk: adminUser.pk,
-      // diff-add
-        cookies: cookies,
       //diff-add
         response: res, 
       //diff-add
-        extra: {...req.headers},
+        extra: {...req.headers, ...req.cookies},
       //diff-add
       });
       // diff-add