Merge branch 'next' of github.com:devforth/adminforth into next

Author: SerVitasik

adminforth/documentation/docs/tutorial/08-Plugins/01-agent.md

@@ -43,7 +43,7 @@ async function allowedForSuperAdmins({ adminUser }: { adminUser: AdminUser }): P
 }
 
 export default {
-  dataSource: 'sqlite',
+  dataSource: 'maindb',
   table: 'sessions',
   resourceId: 'sessions',
   label: 'Sessions',
@@ -102,7 +102,7 @@ async function allowedForSuperAdmins({ adminUser }: { adminUser: AdminUser }): P
 }
 
 export default {
-  dataSource: 'sqlite',
+  dataSource: 'maindb',
   table: 'turns',
   resourceId: 'turns',
   label: 'Turns',
@@ -514,7 +514,7 @@ import { AdminForthDataTypes } from 'adminforth';
 import type { AdminForthResourceInput } from 'adminforth';
 
 export default {
-  dataSource: 'sqlite',
+  dataSource: 'maindb',
   table: 'checkpoints',
   resourceId: 'checkpoints',
   label: 'Checkpoints',

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

@@ -227,8 +227,52 @@ plugins: [
 
 So such users will have suggestion to setup 2FA, but will be able to skip it with "Skip for now" button.
 
+## Calling 2FA modal from backend
+If you wan't to call 2FA verification modal from the backend for verification, you can use
 
-## Step-Up MFA (Two-Factor re-authentication on critical operations)
+```ts
+t2fa.verifyAuto(adminUser);
+```
+This method opens 2FA verification modal at the frontend and then returns verification result.
+ 
+Here is an example:
+
+```ts title="./api.ts"
+  //diff-add
+  app.get(`${admin.config.baseUrl}/api/test2faCall/`,
+  //diff-add
+    admin.express.authorize(
+      //diff-add
+      async (_req: IAdminUserExpressRequest, res: Response) => {
+        //diff-add
+        const { adminUser } = _req;
+        //diff-add
+        //diff-add
+        const t2fa = admin.getPluginByClassName('TwoFactorsAuthPlugin');
+        //diff-add
+        const verifyResult = await t2fa.verifyAuto(adminUser);
+        //diff-add
+        if (verifyResult.ok) {
+          //diff-add
+          //some critical action
+          //diff-add
+          res.json({ ok: "true" });
+        //diff-add
+        }
+        //diff-add
+        res.json({ok: "false", message: "Verification failed"})
+      //diff-add
+      }
+    //diff-add
+    )
+  //diff-add
+  );
+```
+
+Under the hood, this metod uses websocket.
+
+## Manual Step-Up MFA (Two-Factor re-authentication on critical operations)
+But if you websocket doesn't work in you application, or you wan't to perform verification manually, here are manual verification examples
 
 ### Request 2FA on custom Actions
 
@@ -719,11 +763,12 @@ Now, update the settings of the Two-Factor Authentication plugin:
 
   plugins: [
     new TwoFactorsAuthPlugin ({ 
-      keyValueAdapter: new RamKeyValueAdapter(),
       twoFaSecretFieldName: 'secret2fa', 
       timeStepWindow: 1,       
       //diff-add
       passkeys: {
+        //diff-add
+        keyValueAdapter: new RamKeyValueAdapter(),
         //diff-add
         credentialResourceID: "passkeys",
         //diff-add

adminforth/spa/src/App.vue

@@ -135,6 +135,7 @@
     <component
       v-for="c in coreStore?.config?.globalInjections?.everyPageBottom || []"
       :is="getCustomComponent(c)"
+      :adminUser="coreStore.adminUser || null"
       :meta="c.meta"
     />
   </div>

dev-demo/api.ts

@@ -1,6 +1,7 @@
 import { Express, Response } from "express";
 import { IAdminForth, IAdminUserExpressRequest } from "adminforth";
 import * as z from "zod";
+import TwoFactorsAuthPlugin from "../plugins/adminforth-two-factors-auth/index.js";
 
 const DASHBOARD_CAR_SOURCES = [
   { resourceId: 'cars_sl', label: 'SQLite' },
@@ -172,4 +173,15 @@ export function initApi(app: Express, admin: IAdminForth) {
       )
     )
   );
+  app.get(`${admin.config.baseUrl}/api/test2faCall/`,
+    admin.express.authorize(
+      async (_req: IAdminUserExpressRequest, res: Response) => {
+        console.log('Received test2faCall');
+        const { adminUser } = _req;
+        const t2fa = admin.getPluginByClassName<TwoFactorsAuthPlugin>('TwoFactorsAuthPlugin');
+        const verifyResult = await t2fa.verifyAuto(adminUser);
+        res.json({ message: "2FA call received!" });
+      }
+    )
+  );
 }

dev-demo/custom/AfComponents.vue

@@ -389,6 +389,9 @@
       Refresh badge
     </Button>
 
+    <Button @click="doTest2faCall">
+      Test 2FA API Call
+    </Button>
   </div>
 
 
@@ -543,4 +546,12 @@ async function callHelloWorldApi() {
     console.error('API error:', error);
   }
 }
+
+async function doTest2faCall() {
+  try {
+    const response = await callApi({ path: '/api/test2faCall/', method: 'GET' });
+  } catch (error) {
+    console.error('2FA API error:', error);
+  }
+}
 </script>