Merge branch 'main' into fix/create-many-preserve-order

Author: FelixMalfait

packages/twenty-server/src/engine/api/common/common-query-runners/common-create-many-query-runner/common-create-many-query-runner.service.ts

@@ -432,20 +432,13 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSer
       .take(QUERY_MAX_RECORDS)
       .getMany();
 
-    // Preserve original input order by sorting results to match orderedIds
-    const recordsById = new Map<string, ObjectRecord>(
-      upsertedRecords.map((record) => [record.id, record as ObjectRecord]),
-    );
-
-    return orderedIds.map((id) => {
-      const record = recordsById.get(id);
+    const orderIndex = new Map(orderedIds.map((id, index) => [id, index]));
 
-      if (!record) {
-        throw new Error(`Record with id ${id} not found after upsert`);
-      }
+    upsertedRecords.sort(
+      (a, b) => (orderIndex.get(a.id) ?? 0) - (orderIndex.get(b.id) ?? 0),
+    );
 
-      return record;
-    });
+    return upsertedRecords as ObjectRecord[];
   }
 
   async processQueryResult(

packages/twenty-server/src/engine/api/common/common-query-runners/common-find-duplicates-query-runner.service.ts

@@ -78,14 +78,13 @@ export class CommonFindDuplicatesQueryRunnerService extends CommonBaseQueryRunne
         })
         .getMany()) as ObjectRecord[];
 
-      // Preserve original input order
-      const recordsById = new Map(
-        fetchedRecords.map((record) => [record.id, record]),
+      const orderIndex = new Map(args.ids.map((id, index) => [id, index]));
+
+      fetchedRecords.sort(
+        (a, b) => (orderIndex.get(a.id) ?? 0) - (orderIndex.get(b.id) ?? 0),
       );
 
-      objectRecords = args.ids
-        .map((id) => recordsById.get(id))
-        .filter(isDefined);
+      objectRecords = fetchedRecords;
     } else if (args.data && !isEmpty(args.data)) {
       objectRecords = args.data;
     }

packages/twenty-server/src/engine/api/common/common-query-runners/common-merge-many-query-runner.service.ts

@@ -137,10 +137,10 @@ export class CommonMergeManyQueryRunnerService extends CommonBaseQueryRunnerServ
       flatFieldMetadataMaps: context.flatFieldMetadataMaps,
     });
 
-    const fetchedRecords = await context.repository.find({
+    const fetchedRecords = (await context.repository.find({
       where: { id: In(args.ids) },
       select: columnsToSelect,
-    });
+    })) as ObjectRecord[];
 
     if (fetchedRecords.length !== args.ids.length) {
       throw new CommonQueryRunnerException(
@@ -150,23 +150,13 @@ export class CommonMergeManyQueryRunnerService extends CommonBaseQueryRunnerServ
       );
     }
 
-    // Preserve original input order
-    const recordsById = new Map(
-      fetchedRecords.map((record) => [record.id, record]),
+    const orderIndex = new Map(args.ids.map((id, index) => [id, index]));
+
+    fetchedRecords.sort(
+      (a, b) => (orderIndex.get(a.id) ?? 0) - (orderIndex.get(b.id) ?? 0),
     );
-    const recordsToMerge = args.ids.map((id) => {
-      const record = recordsById.get(id);
-
-      if (!record) {
-        throw new CommonQueryRunnerException(
-          `Record with id ${id} not found`,
-          CommonQueryRunnerExceptionCode.RECORD_NOT_FOUND,
-          { userFriendlyMessage: msg`Record not found.` },
-        );
-      }
 
-      return record;
-    });
+    const recordsToMerge = fetchedRecords;
 
     if (args.dryRun && args.selectedFieldsResult.relations) {
       await this.processNestedRelationsHelper.processNestedRelations({

packages/twenty-server/src/engine/core-modules/audit/utils/events/workspace-event/webhook/webhook-response.ts

@@ -11,6 +11,7 @@ export const webhookResponseSchema = z.strictObject({
     url: z.string(),
     webhookId: z.string(),
     eventName: z.string(),
+    error: z.string().optional(),
   }),
 });
 

packages/twenty-server/src/engine/core-modules/tool/services/secure-http-client.service.ts

@@ -0,0 +1,21 @@
+import { Injectable } from '@nestjs/common';
+
+import axios, { type AxiosInstance } from 'axios';
+
+import { getSecureAdapter } from 'src/engine/core-modules/tool/utils/get-secure-axios-adapter.util';
+import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';
+
+@Injectable()
+export class SecureHttpClientService {
+  constructor(private readonly twentyConfigService: TwentyConfigService) {}
+
+  getHttpClient(): AxiosInstance {
+    const isSafeModeEnabled = this.twentyConfigService.get(
+      'OUTBOUND_HTTP_SAFE_MODE_ENABLED',
+    );
+
+    return isSafeModeEnabled
+      ? axios.create({ adapter: getSecureAdapter() })
+      : axios.create();
+  }
+}

packages/twenty-server/src/engine/core-modules/tool/tool.module.ts

@@ -5,6 +5,7 @@ import { TypeOrmModule } from '@nestjs/typeorm';
 import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';
 import { FileModule } from 'src/engine/core-modules/file/file.module';
 import { JwtModule } from 'src/engine/core-modules/jwt/jwt.module';
+import { SecureHttpClientService } from 'src/engine/core-modules/tool/services/secure-http-client.service';
 import { CodeInterpreterTool } from 'src/engine/core-modules/tool/tools/code-interpreter-tool/code-interpreter-tool';
 import { HttpTool } from 'src/engine/core-modules/tool/tools/http-tool/http-tool';
 import { SearchHelpCenterTool } from 'src/engine/core-modules/tool/tools/search-help-center-tool/search-help-center-tool';
@@ -24,7 +25,14 @@ import { MessagingImportManagerModule } from 'src/modules/messaging/message-impo
     SendEmailTool,
     SearchHelpCenterTool,
     CodeInterpreterTool,
+    SecureHttpClientService,
+  ],
+  exports: [
+    HttpTool,
+    SendEmailTool,
+    SearchHelpCenterTool,
+    CodeInterpreterTool,
+    SecureHttpClientService,
   ],
-  exports: [HttpTool, SendEmailTool, SearchHelpCenterTool, CodeInterpreterTool],
 })
 export class ToolModule {}

packages/twenty-server/src/engine/core-modules/tool/tools/http-tool/http-tool.ts

@@ -4,6 +4,7 @@ import axios, { type AxiosRequestConfig } from 'axios';
 import { isDefined } from 'twenty-shared/utils';
 import { parseDataFromContentType } from 'twenty-shared/workflow';
 
+import { SecureHttpClientService } from 'src/engine/core-modules/tool/services/secure-http-client.service';
 import { HttpRequestInputZodSchema } from 'src/engine/core-modules/tool/tools/http-tool/http-tool.schema';
 import { type HttpRequestInput } from 'src/engine/core-modules/tool/tools/http-tool/types/http-request-input.type';
 import { type ToolInput } from 'src/engine/core-modules/tool/types/tool-input.type';
@@ -12,16 +13,16 @@ import {
   type Tool,
   type ToolExecutionContext,
 } from 'src/engine/core-modules/tool/types/tool.type';
-import { getSecureAdapter } from 'src/engine/core-modules/tool/utils/get-secure-axios-adapter.util';
-import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';
 
 @Injectable()
 export class HttpTool implements Tool {
   description =
     'Make an HTTP request to any URL with configurable method, headers, and body.';
   inputSchema = HttpRequestInputZodSchema;
 
-  constructor(private readonly twentyConfigService: TwentyConfigService) {}
+  constructor(
+    private readonly secureHttpClientService: SecureHttpClientService,
+  ) {}
 
   async execute(
     parameters: ToolInput,
@@ -47,16 +48,7 @@ export class HttpTool implements Tool {
         }
       }
 
-      const isSafeModeEnabled = this.twentyConfigService.get(
-        'HTTP_TOOL_SAFE_MODE_ENABLED',
-      );
-
-      const axiosClient = isSafeModeEnabled
-        ? axios.create({
-            adapter: getSecureAdapter(),
-          })
-        : axios.create();
-
+      const axiosClient = this.secureHttpClientService.getHttpClient();
       const response = await axiosClient(axiosConfig);
 
       return {