feat: add caller ip in action context.caller.request.ip

ForestAdmin · Oct 18, 2024 · b16a2ec · b16a2ec
1 parent dbae0cf
commit b16a2ec
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 4 deletions.
diff --git a/packages/_example/docker-compose.yml b/packages/_example/docker-compose.yml
@@ -28,6 +28,7 @@ services:
   mssql:
     image: mcr.microsoft.com/azure-sql-edge
     container_name: forest_agent_example_mssql
+    user: root
     ports:
       - '1433:1433'
     environment:

diff --git a/packages/_example/src/forest/customizations/card.ts b/packages/_example/src/forest/customizations/card.ts
@@ -4,14 +4,16 @@ export default (collection: CardCustomizer) =>
   collection
     .addManyToOneRelation('customer', 'customer', { foreignKey: 'customer_id' })
     .addAction('Create new card', {
-      scope: 'Global',
+      scope: 'Single',
       execute: (context, resultBuilder) => {
         return resultBuilder.success('ok');
       },
       form: [
         {
           type: 'Layout',
           component: 'Page',
+          nextButtonLabel: 'go to next page',
+          previousButtonLabel: 'back',
           elements: [
             {
               type: 'String',
@@ -59,8 +61,8 @@ export default (collection: CardCustomizer) =>
         {
           type: 'Layout',
           component: 'Page',
-          nextButtonLabel: 'go to next page',
-          previousButtonLabel: 'go to previous page',
+          nextButtonLabel: 'go to next page (finalisation, setup of card properties)',
+          previousButtonLabel: 'return to previous page (selection of the card plan)',
           elements: [
             {
               type: 'Layout',
@@ -77,6 +79,7 @@ export default (collection: CardCustomizer) =>
         {
           type: 'Layout',
           component: 'Page',
+          previousButtonLabel: 'return to previous page (useless empty page)',
           elements: [
             {
               type: 'Number',

diff --git a/packages/agent/src/utils/query-string.ts b/packages/agent/src/utils/query-string.ts
@@ -119,6 +119,7 @@ export default class QueryStringParser {
 
   static parseCaller(context: Context): Caller {
     const timezone = context.request.query.timezone?.toString();
+    const { ip } = context.request;
 
     if (!timezone) {
       throw new ValidationError('Missing timezone');
@@ -140,7 +141,7 @@ export default class QueryStringParser {
       QueryStringParser.VALID_TIMEZONES.add(timezone);
     }
 
-    return { ...context.state.user, timezone, requestId: uuidv4() };
+    return { ...context.state.user, timezone, requestId: uuidv4(), request: { ip } };
   }
 
   static parsePagination(context: Context): Page {

diff --git a/packages/datasource-replica/src/cache-interface/datasource.ts b/packages/datasource-replica/src/cache-interface/datasource.ts
@@ -11,6 +11,7 @@ export default class CacheDataSourceInterface {
     firstName: 'Datasource',
     lastName: 'Replica',
     renderingId: 0,
+    request: { ip: '::1' },
     role: 'system',
     tags: {},
     team: 'system',

diff --git a/packages/datasource-toolkit/src/interfaces/caller.ts b/packages/datasource-toolkit/src/interfaces/caller.ts
@@ -6,6 +6,7 @@ export type Caller = {
   team: string;
   renderingId: number;
   requestId: string;
+  request: { ip: string };
   role: string;
   tags: { [key: string]: string };
   permissionLevel: 'admin' | 'developer' | 'editor' | 'user';

diff --git a/packages/datasource-toolkit/test/__factories__/caller.ts b/packages/datasource-toolkit/test/__factories__/caller.ts
@@ -9,6 +9,7 @@ export default Factory.define<Caller>(() => ({
   lastName: 'domain',
   renderingId: 1,
   requestId: '00000000-0000-0000-0000-000000000000',
+  request: { ip: '::1' },
   role: 'role',
   tags: {},
   team: 'team',