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

AdminForth/1715/translations-doesnt-work-on-li

AdminForth/1715/translations-doesnt-work-on-li

Author: yaroslav8765

adminforth/documentation/docs/tutorial/001-gettingStarted.md

@@ -19,6 +19,7 @@ nvm alias default 20
 nvm use 20
 ```
 
+
 ## Creating an AdminForth Project
 
 The recommended way to get started with AdminForth is via the **`create-app`** CLI, which scaffolds a basic fully functional back-office application. Apart boilerplate it creates one resource for users management.

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

@@ -237,6 +237,8 @@ If you wan't to call 2FA verification modal from the backend for verification, y
 t2fa.verifyAuto(adminUser);
 ```
 This method opens 2FA verification modal at the frontend and then returns verification result.
+The modal is shown only in the same browser tab/window which made the backend request.
+Because of this, `verifyAuto` must be called from a browser-initiated request handled by AdminForth request context, for example from an endpoint wrapped with `admin.express.authorize`.
  
 Here is an example:
 
@@ -932,4 +934,3 @@ After adding passkey you can use passkey, instead of TOTP:
 
 
 
-

adminforth/index.ts

@@ -48,6 +48,7 @@ export * from './types/Back.js';
 export * from './types/Common.js';
 export * from './types/adapters/index.js';
 export * from './modules/filtersTools.js';
+export * from './modules/requestContext.js';
 export { interpretResource };
 export { AdminForthPlugin };
 export { suggestIfTypo, RateLimiter, RAMLock, getClientIp, convertPeriodToSeconds };

adminforth/modules/requestContext.ts

@@ -0,0 +1,21 @@
+import { AsyncLocalStorage } from 'async_hooks';
+
+export const ADMINFORTH_CLIENT_ID_HEADER = 'x-adminforth-client-id';
+
+export type AdminForthRequestContext = {
+  websocketClientId?: string;
+};
+
+const requestContextStorage = new AsyncLocalStorage<AdminForthRequestContext>();
+
+export function runWithRequestContext<T>(context: AdminForthRequestContext, callback: () => T): T {
+  return requestContextStorage.run(context, callback);
+}
+
+export function getRequestContext(): AdminForthRequestContext | undefined {
+  return requestContextStorage.getStore();
+}
+
+export function getRequestWebsocketClientId(): string | undefined {
+  return requestContextStorage.getStore()?.websocketClientId;
+}

adminforth/package.json

@@ -129,11 +129,11 @@
     "typescript": "^5.4.5"
   },
   "peerDependencies": {
-    "@adminforth/connector-clickhouse": "^1.0.1",
-    "@adminforth/connector-mongo": "^1.0.0",
-    "@adminforth/connector-mysql": "^1.0.0",
-    "@adminforth/connector-postgres": "^1.0.0",
-    "@adminforth/connector-sqlite": "^1.0.0"
+    "@adminforth/connector-clickhouse": "^1.0.2",
+    "@adminforth/connector-mongo": "^1.0.1",
+    "@adminforth/connector-mysql": "^1.0.1",
+    "@adminforth/connector-postgres": "^1.0.1",
+    "@adminforth/connector-sqlite": "^1.0.1"
   },
   "peerDependenciesMeta": {
     "@adminforth/connector-sqlite": {

adminforth/pnpm-lock.yaml

@@ -3,17 +3,15 @@ packages:
 
 allowBuilds:
   '@parcel/watcher': true
+  adminforth: true
   better-sqlite3: true
   esbuild: true
   vue-demi: true
 
 minimumReleaseAgeExclude:
-  - '@adminforth/connector-sqlite@1.0.0'
-  - adminforth@2.72.3
-  - '@adminforth/connector-clickhouse@1.0.1'
-  - '@adminforth/connector-mongo@1.0.0'
-  - '@adminforth/connector-mysql@1.0.0'
-  - '@adminforth/connector-postgres@1.0.0'
-
-overrides:
-  adminforth: 'link:'
+  - '@adminforth/connector-clickhouse@1.0.2'
+  - '@adminforth/connector-mongo@1.0.1'
+  - '@adminforth/connector-mysql@1.0.1'
+  - '@adminforth/connector-postgres@1.0.1'
+  - '@adminforth/connector-sqlite@1.0.1'
+  - adminforth@3.0.2

adminforth/pnpm-workspace.yaml

@@ -5,6 +5,7 @@ import { AdminUser } from "../types/Common.js";
 
 export class WebSocketClient implements IWebSocketClient {
   id: string;
+  clientId?: string;
   lastPing: number;
   topics: Set<string>;
   adminUser: AdminUser;
@@ -14,8 +15,9 @@ export class WebSocketClient implements IWebSocketClient {
   onMessage: (handler: (message: string) => void) => void;
   onClose: (handler: () => void) => void;
 
-  constructor({ id, send, close, onMessage, onClose, adminUser }) {
+  constructor({ id, clientId, send, close, onMessage, onClose, adminUser }) {
     this.id = id;
+    this.clientId = clientId;
     this.send = send;
     this.close = close;
     this.onMessage = onMessage;
@@ -25,4 +27,4 @@ export class WebSocketClient implements IWebSocketClient {
     this.topics = new Set();
     this.adminUser = adminUser;
   }
-}
+}