Skip to content

The open alternative to Salesforce, designed for AI.

Reject server route triggers on ad-hoc logic functions (#29145)

Charles Bochet826eb99a865c
diff --git a/packages/twenty-docs/developers/extend/apps/logic/logic-functions.mdx b/packages/twenty-docs/developers/extend/apps/logic/logic-functions.mdx
index 2b40491652b..99ed33c8556 100644
--- a/packages/twenty-docs/developers/extend/apps/logic/logic-functions.mdx
+++ b/packages/twenty-docs/developers/extend/apps/logic/logic-functions.mdx
@@ -308,10 +308,10 @@ const destinationUrl = getServerRouteUrl(
<Note>
URLs carrying only the resolver's `id` or `universalIdentifier`
- (`/webhooks/server/:identifier`) still resolve for now. The
- `universalIdentifier` form answers with a `Deprecation` header and returns
- `404` when two registrations declare the same identifier. Move the URLs
- registered with your providers to the registration form.
+ (`/webhooks/server/:identifier`) still resolve for now, and both answer with
+ a `Deprecation` header. The `universalIdentifier` form returns `409` when two
+ registrations declare the same identifier. Move the URLs registered with your
+ providers to the registration form.
</Note>
**Answering a verification GET.** Some providers verify an endpoint before they deliver to it, by sending a `GET` carrying a challenge to the same URL they will later `POST` events to — Meta's WhatsApp Cloud API is one. A server route answers `POST` only unless you say otherwise, so declare both methods:
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-42/__tests__/2-42-workspace-command-1789757500000-sync-message-record-page.command.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-42/__tests__/2-42-workspace-command-1789757500000-sync-message-record-page.command.spec.ts
index 6e8f81db166..a263c1726e8 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-42/__tests__/2-42-workspace-command-1789757500000-sync-message-record-page.command.spec.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-42/__tests__/2-42-workspace-command-1789757500000-sync-message-record-page.command.spec.ts
@@ -15,6 +15,9 @@ import { computeTwentyStandardApplicationAllFlatEntityMaps } from 'src/engine/wo
import { type WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service';
import { FlatViewFieldValidatorService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-view-field-validator.service';
+const WORKSPACE_CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER =
+ '7f1c2b9e-6a1d-4c55-9a2e-1a6f0d6c2b11';
+
jest.mock(
'src/engine/workspace-manager/twenty-standard-application/utils/twenty-standard-application-all-flat-entity-maps.constant',
);
@@ -334,6 +337,8 @@ describe('SyncMessageRecordPageCommand', () => {
isSystemBuild: true,
applicationUniversalIdentifier:
STANDARD_APPLICATION.universalIdentifier,
+ workspaceCustomApplicationUniversalIdentifier:
+ WORKSPACE_CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER,
},
workspaceId: WORKSPACE_ID,
});
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/__tests__/2-43-workspace-command-1790266078807-sync-attachment-record-page.command.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/__tests__/2-43-workspace-command-1790266078807-sync-attachment-record-page.command.spec.ts
index 0df13b0524d..aa2e5091669 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/__tests__/2-43-workspace-command-1790266078807-sync-attachment-record-page.command.spec.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/__tests__/2-43-workspace-command-1790266078807-sync-attachment-record-page.command.spec.ts
@@ -15,6 +15,9 @@ import { computeTwentyStandardApplicationAllFlatEntityMaps } from 'src/engine/wo
import { type WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service';
import { FlatViewFieldValidatorService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-view-field-validator.service';
+const WORKSPACE_CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER =
+ '7f1c2b9e-6a1d-4c55-9a2e-1a6f0d6c2b11';
+
jest.mock(
'src/engine/workspace-manager/twenty-standard-application/utils/twenty-standard-application-all-flat-entity-maps.constant',
);
@@ -403,6 +406,8 @@ describe('SyncAttachmentRecordPageCommand', () => {
isSystemBuild: true,
applicationUniversalIdentifier:
STANDARD_APPLICATION.universalIdentifier,
+ workspaceCustomApplicationUniversalIdentifier:
+ WORKSPACE_CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER,
},
workspaceId: WORKSPACE_ID,
});
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-54/2-54-upgrade-version-command.module.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-54/2-54-upgrade-version-command.module.ts
index e7991209786..0f3bb354be9 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-54/2-54-upgrade-version-command.module.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-54/2-54-upgrade-version-command.module.ts
@@ -3,6 +3,7 @@ import { Module } from '@nestjs/common';
import { WorkspaceIteratorModule } from 'src/database/commands/command-runners/workspace-iterator.module';
import { AddChatConversationTypeCommand } from 'src/database/commands/upgrade-version-command/2-54/2-54-workspace-command-1793280040522-add-chat-conversation-type.command';
import { AddMergeWithRecordCommandMenuItemCommand } from 'src/database/commands/upgrade-version-command/2-54/2-54-workspace-command-1793265618567-add-merge-with-record-command-menu-item.command';
+import { StripServerRoutesFromCustomAppLogicFunctionsCommand } from 'src/database/commands/upgrade-version-command/2-54/2-54-workspace-command-1793352708113-strip-server-routes-from-custom-app-logic-functions.command';
import { UpdateCrmHygieneSkillMergeGuidanceCommand } from 'src/database/commands/upgrade-version-command/2-54/2-54-workspace-command-1793206127866-update-crm-hygiene-skill-merge-guidance.command';
import { RemoveMessageCampaignFlagCommand } from 'src/database/commands/upgrade-version-command/2-54/2-54-workspace-command-1793266150123-remove-message-campaign-flag.command';
import { AddCampaignsNavigationFolderCommand } from 'src/database/commands/upgrade-version-command/2-54/2-54-workspace-command-1793266210456-add-campaigns-navigation-folder.command';
@@ -21,6 +22,7 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace
providers: [
AddChatConversationTypeCommand,
AddMergeWithRecordCommandMenuItemCommand,
+ StripServerRoutesFromCustomAppLogicFunctionsCommand,
UpdateCrmHygieneSkillMergeGuidanceCommand,
RemoveMessageCampaignFlagCommand,
AddCampaignsNavigationFolderCommand,
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-54/2-54-workspace-command-1793352708113-strip-server-routes-from-custom-app-logic-functions.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-54/2-54-workspace-command-1793352708113-strip-server-routes-from-custom-app-logic-functions.command.ts
new file mode 100644
index 00000000000..0cdf0570784
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-54/2-54-workspace-command-1793352708113-strip-server-routes-from-custom-app-logic-functions.command.ts
@@ -0,0 +1,77 @@
+import { InjectDataSource } from '@nestjs/typeorm';
+
+import { Command } from 'nest-commander';
+import { DataSource } from 'typeorm';
+
+import { ProvisionedWorkspaceCommandRunner } from 'src/database/commands/command-runners/provisioned-workspace.command-runner';
+import { WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';
+import { type RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspace.command-runner';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
+import { RegisteredWorkspaceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-workspace-command.decorator';
+import { getMetadataFlatEntityMapsKey } from 'src/engine/metadata-modules/flat-entity/utils/get-metadata-flat-entity-maps-key.util';
+import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
+
+@RegisteredWorkspaceCommand('2.54.0', 1793352708113)
+@Command({
+ name: 'upgrade:2-54:strip-server-routes-from-custom-app-logic-functions',
+ description:
+ 'Clear serverRouteTriggerSettings on Custom app logic functions so they can no longer answer a public server route',
+})
+export class StripServerRoutesFromCustomAppLogicFunctionsCommand extends ProvisionedWorkspaceCommandRunner {
+ constructor(
+ protected readonly workspaceIteratorService: WorkspaceIteratorService,
+ private readonly applicationService: ApplicationService,
+ private readonly workspaceCacheService: WorkspaceCacheService,
+ @InjectDataSource()
+ private readonly coreDataSource: DataSource,
+ ) {
+ super(workspaceIteratorService);
+ }
+
+ override async runOnWorkspace({
+ workspaceId,
+ options,
+ }: RunOnWorkspaceArgs): Promise<void> {
+ const { workspaceCustomFlatApplication } =
+ await this.applicationService.findWorkspaceTwentyStandardAndCustomApplicationOrThrow(
+ { workspaceId },
+ );
+
+ const affected: { id: string }[] = await this.coreDataSource.query(
+ `SELECT id FROM core."logicFunction"
+ WHERE "workspaceId" = $1
+ AND "applicationId" = $2
+ AND "serverRouteTriggerSettings" IS NOT NULL`,
+ [workspaceId, workspaceCustomFlatApplication.id],
+ );
+
+ if (affected.length === 0) {
+ return;
+ }
+
+ if (options.dryRun) {
+ this.logger.log(
+ `[DRY RUN] Workspace ${workspaceId}: would clear server routes on ${affected.length} Custom app logic function(s)`,
+ );
+
+ return;
+ }
+
+ await this.coreDataSource.query(
+ `UPDATE core."logicFunction"
+ SET "serverRouteTriggerSettings" = NULL
+ WHERE "workspaceId" = $1
+ AND "applicationId" = $2
+ AND "serverRouteTriggerSettings" IS NOT NULL`,
+ [workspaceId, workspaceCustomFlatApplication.id],
+ );
+
+ await this.workspaceCacheService.invalidateAndRecompute(workspaceId, [
+ getMetadataFlatEntityMapsKey('logicFunction'),
+ ]);
+
+ this.logger.log(
+ `Workspace ${workspaceId}: cleared server routes on ${affected.length} Custom app logic function(s)`,
+ );
+ }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/server-route-trigger/exceptions/server-route-trigger-rest-api-exception-filter.ts b/packages/twenty-server/src/engine/core-modules/server-route-trigger/exceptions/server-route-trigger-rest-api-exception-filter.ts
index ebf74cf376d..a6dfabd3e56 100644
--- a/packages/twenty-server/src/engine/core-modules/server-route-trigger/exceptions/server-route-trigger-rest-api-exception-filter.ts
+++ b/packages/twenty-server/src/engine/core-modules/server-route-trigger/exceptions/server-route-trigger-rest-api-exception-filter.ts
@@ -90,6 +90,12 @@ export class ServerRouteTriggerRestApiExceptionFilter implements ExceptionFilter
undefined,
{ shouldBeCapturedBySentry: false },
);
+ case ServerRouteTriggerExceptionCode.AMBIGUOUS_SERVER_ROUTE:
+ return this.httpExceptionHandlerService.handleError(
+ exception as CustomException,
+ response,
+ 409,
+ );
default: {
return this.httpExceptionHandlerService.handleError(
exception as CustomException,
diff --git a/packages/twenty-server/src/engine/core-modules/server-route-trigger/exceptions/server-route-trigger.exception.ts b/packages/twenty-server/src/engine/core-modules/server-route-trigger/exceptions/server-route-trigger.exception.ts
index bbb145b2826..2fc869f6506 100644
--- a/packages/twenty-server/src/engine/core-modules/server-route-trigger/exceptions/server-route-trigger.exception.ts
+++ b/packages/twenty-server/src/engine/core-modules/server-route-trigger/exceptions/server-route-trigger.exception.ts
@@ -13,6 +13,7 @@ export enum ServerRouteTriggerExceptionCode {
RESOLVER_INVALID_RESULT = 'RESOLVER_INVALID_RESULT',
RESOLVER_REQUIRES_AUTHENTICATION = 'RESOLVER_REQUIRES_AUTHENTICATION',
METHOD_NOT_ALLOWED = 'METHOD_NOT_ALLOWED',
+ AMBIGUOUS_SERVER_ROUTE = 'AMBIGUOUS_SERVER_ROUTE',
}
const getServerRouteTriggerExceptionUserFriendlyMessage = (
@@ -35,6 +36,8 @@ const getServerRouteTriggerExceptionUserFriendlyMessage = (
return msg`Server logic function requires authentication.`;
case ServerRouteTriggerExceptionCode.METHOD_NOT_ALLOWED:
return msg`This HTTP method is not allowed on this server route.`;
+ case ServerRouteTriggerExceptionCode.AMBIGUOUS_SERVER_ROUTE:
+ return msg`Several applications declare this server route. Use the application registration URL instead.`;
default:
assertUnreachable(code);
}
diff --git a/packages/twenty-server/src/engine/core-modules/server-route-trigger/server-route-trigger.controller.ts b/packages/twenty-server/src/engine/core-modules/server-route-trigger/server-route-trigger.controller.ts
index 6d1fa5552e2..005e318c1c6 100644
--- a/packages/twenty-server/src/engine/core-modules/server-route-trigger/server-route-trigger.controller.ts
+++ b/packages/twenty-server/src/engine/core-modules/server-route-trigger/server-route-trigger.controller.ts
@@ -44,14 +44,14 @@ export class ServerRouteTriggerController {
request: Request;
response: Response;
}) {
- const { response: triggerResponse, isResolvedThroughLegacyIdentifier } =
+ const { response: triggerResponse, isResolvedThroughDeprecatedRoute } =
await this.serverRouteTriggerService.handle({
request,
resolverLogicFunctionIdentifier,
resolverApplicationRegistrationId,
});
- if (isResolvedThroughLegacyIdentifier) {
+ if (isResolvedThroughDeprecatedRoute) {
response.setHeader(
'Deprecation',
SERVER_ROUTE_LEGACY_IDENTIFIER_DEPRECATION_HEADER_VALUE,
diff --git a/packages/twenty-server/src/engine/core-modules/server-route-trigger/server-route-trigger.service.ts b/packages/twenty-server/src/engine/core-modules/server-route-trigger/server-route-trigger.service.ts
index 2c78eb608a8..4a023d9dc3f 100644
--- a/packages/twenty-server/src/engine/core-modules/server-route-trigger/server-route-trigger.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/server-route-trigger/server-route-trigger.service.ts
@@ -49,12 +49,12 @@ const QUEUED_TARGET_RETRY_LIMIT = 3;
export type ServerRouteTriggerResult = {
response: RouteTriggerResponse;
- isResolvedThroughLegacyIdentifier: boolean;
+ isResolvedThroughDeprecatedRoute: boolean;
};
type ResolvedServerRouteResolver = {
resolver: LogicFunctionEntity;
- isResolvedThroughLegacyIdentifier: boolean;
+ isResolvedThroughDeprecatedRoute: boolean;
};
@Injectable()
@@ -80,7 +80,7 @@ export class ServerRouteTriggerService {
resolverLogicFunctionIdentifier: string;
resolverApplicationRegistrationId?: string;
}): Promise<ServerRouteTriggerResult> {
- const { resolver, isResolvedThroughLegacyIdentifier } = isDefined(
+ const { resolver, isResolvedThroughDeprecatedRoute } = isDefined(
resolverApplicationRegistrationId,
)
? await this.findRegistrationResolverOrThrow({
@@ -159,7 +159,7 @@ export class ServerRouteTriggerService {
if (isLogicFunctionHttpResponse(resolverResult.data)) {
return {
response: buildRouteTriggerResponse(resolverResult.data),
- isResolvedThroughLegacyIdentifier,
+ isResolvedThroughDeprecatedRoute,
};
}
@@ -175,7 +175,7 @@ export class ServerRouteTriggerService {
payload: dispatchResult.payload ?? event,
applicationRegistrationId,
}),
- isResolvedThroughLegacyIdentifier,
+ isResolvedThroughDeprecatedRoute,
};
} catch (error) {
this.recordServerRouteFailure({
@@ -269,9 +269,10 @@ export class ServerRouteTriggerService {
throw buildNotFoundException();
}
- return { resolver, isResolvedThroughLegacyIdentifier: false };
+ return { resolver, isResolvedThroughDeprecatedRoute: false };
}
+ // TODO(@charlesBochet): drop the single-identifier routes (id and universalIdentifier) after 2026-11-29.
private async findResolverOrThrow(
identifier: string,
): Promise<ResolvedServerRouteResolver> {
@@ -280,9 +281,13 @@ export class ServerRouteTriggerService {
.getOne();
if (isDefined(resolverById)) {
+ this.logger.warn(
+ `Server route ${identifier} resolved through the deprecated logic function id form; the registered URL should move to /webhooks/server/${resolverById.application?.applicationRegistration?.id}/${resolverById.universalIdentifier}`,
+ );
+
return {
resolver: resolverById,
- isResolvedThroughLegacyIdentifier: false,
+ isResolvedThroughDeprecatedRoute: true,
};
}
@@ -295,14 +300,18 @@ export class ServerRouteTriggerService {
if (legacyCandidates.length > 1) {
this.logger.error(
- `Server route ${identifier} is claimed by ${legacyCandidates.length} application registrations (owner workspaces: ${legacyCandidates
+ `Server route ${identifier} is claimed by several application registrations (owner workspaces: ${legacyCandidates
.map((candidate) => candidate.workspaceId)
.join(', ')}); refusing to dispatch`,
);
+
+ throw new ServerRouteTriggerException(
+ `Server route ${identifier} is claimed by several application registrations`,
+ ServerRouteTriggerExceptionCode.AMBIGUOUS_SERVER_ROUTE,
+ );
}
- const legacyResolver =
- legacyCandidates.length === 1 ? legacyCandidates[0] : undefined;
+ const [legacyResolver] = legacyCandidates;
if (!isDefined(legacyResolver)) {
throw new ServerRouteTriggerException(
@@ -317,7 +326,7 @@ export class ServerRouteTriggerService {
return {
resolver: legacyResolver,
- isResolvedThroughLegacyIdentifier: true,
+ isResolvedThroughDeprecatedRoute: true,
};
}
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/validators/utils/__tests__/validate-enum-flat-field-metadata.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/validators/utils/__tests__/validate-enum-flat-field-metadata.util.spec.ts
index 6323f9df26f..dc60cd3aa29 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/validators/utils/__tests__/validate-enum-flat-field-metadata.util.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/validators/utils/__tests__/validate-enum-flat-field-metadata.util.spec.ts
@@ -10,6 +10,9 @@ import { type FlatFieldMetadataTypeValidationArgs } from 'src/engine/metadata-mo
import { validateEnumSelectFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/validators/utils/validate-enum-flat-field-metadata.util';
import { type WorkspaceMigrationBuilderAdditionalCacheDataMaps } from 'src/engine/workspace-manager/workspace-migration/types/workspace-migration-builder-additional-cache-data-maps.type';
+const WORKSPACE_CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER =
+ '7f1c2b9e-6a1d-4c55-9a2e-1a6f0d6c2b11';
+
const OPTION_WITHOUT_COLOR = {
id: '2c73ce21-d19f-4b37-935e-48c351e2bb1b',
label: 'Car Repairs and Servicing',
@@ -62,6 +65,8 @@ const validateOptionColor = ({
isSystemBuild: false,
applicationUniversalIdentifier:
flatFieldMetadata.applicationUniversalIdentifier,
+ workspaceCustomApplicationUniversalIdentifier:
+ WORKSPACE_CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER,
},
});
};
diff --git a/packages/twenty-server/src/engine/metadata-modules/logic-function/logic-function.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/logic-function/logic-function.resolver.ts
index aef8e7fefe8..74ad2f6601c 100644
--- a/packages/twenty-server/src/engine/metadata-modules/logic-function/logic-function.resolver.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/logic-function/logic-function.resolver.ts
@@ -1,4 +1,9 @@
-import { UseFilters, UseGuards, UsePipes } from '@nestjs/common';
+import {
+ UseFilters,
+ UseGuards,
+ UseInterceptors,
+ UsePipes,
+} from '@nestjs/common';
import {
Args,
Mutation,
@@ -52,6 +57,7 @@ import { SubscriptionService } from 'src/engine/subscriptions/subscription.servi
import { wrapAsyncIteratorWithLifecycle } from 'src/engine/subscriptions/utils/wrap-async-iterator-with-lifecycle';
import { EventLogLiveService } from 'src/engine/core-modules/event-logs/live/event-log-live.service';
import { ApplicationTargetGuard } from 'src/engine/guards/application-target.guard';
+import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';
@UseGuards(
AuthPrincipalGuard({
@@ -67,6 +73,7 @@ import { ApplicationTargetGuard } from 'src/engine/guards/application-target.gua
}),
NoPermissionGuard,
)
+@UseInterceptors(WorkspaceMigrationGraphqlApiExceptionInterceptor)
@MetadataResolver(() => LogicFunctionDTO)
@UsePipes(ResolverValidationPipe)
@UseFilters(
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service.ts
index 127adbb4ba0..7012c4e08ee 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service.ts
@@ -7,6 +7,7 @@ import {
} from 'twenty-shared/metadata';
import { isDefined } from 'twenty-shared/utils';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { LoggerService } from 'src/engine/core-modules/logger/logger.service';
import { WORKSPACE_MIGRATION_ACTION_COUNT_BUCKET_BOUNDARIES } from 'src/engine/core-modules/metrics/constants/workspace-migration-action-count-bucket-boundaries.constant';
import { WORKSPACE_MIGRATION_DURATION_MS_BUCKET_BOUNDARIES } from 'src/engine/core-modules/metrics/constants/workspace-migration-duration-ms-bucket-boundaries.constant';
@@ -34,6 +35,7 @@ import {
WorkspaceMigrationOrchestratorFailedResult,
WorkspaceMigrationOrchestratorSuccessfulResult,
} from 'src/engine/workspace-manager/workspace-migration/types/workspace-migration-orchestrator.type';
+import { type WorkspaceMigrationBuilderOptions } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-builder-options.type';
import { WorkspaceMigrationRunnerService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/services/workspace-migration-runner.service';
type ValidateBuildAndRunWorkspaceMigrationFromMatriceArgs = {
@@ -86,6 +88,7 @@ export class WorkspaceMigrationValidateBuildAndRunService {
private readonly metadataSideEffectEngineService: MetadataSideEffectEngineService,
private readonly metricsService: MetricsService,
private readonly logger: LoggerService,
+ private readonly applicationService: ApplicationService,
twentyConfigService: TwentyConfigService,
) {
const logLevels = twentyConfigService.get('LOG_LEVELS');
@@ -94,7 +97,8 @@ export class WorkspaceMigrationValidateBuildAndRunService {
}
public async validateBuildAndRunWorkspaceMigrationFromTo(
- args: WorkspaceMigrationOrchestratorBuildArgs & {
+ args: Omit<WorkspaceMigrationOrchestratorBuildArgs, 'buildOptions'> & {
+ buildOptions: WorkspaceMigrationBuilderOptions;
idByUniversalIdentifierByMetadataName?: IdByUniversalIdentifierByMetadataName;
dryRun?: boolean;
shouldDeferActions?: boolean;
@@ -112,10 +116,22 @@ export class WorkspaceMigrationValidateBuildAndRunService {
...buildArgs
} = args;
+ const { workspaceCustomFlatApplication } =
+ await this.applicationService.findWorkspaceTwentyStandardAndCustomApplicationOrThrow(
+ { workspaceId: buildArgs.workspaceId },
+ );
+
const buildStart = performance.now();
const validateAndBuildResult =
await this.workspaceMigrationBuildOrchestratorService
- .buildWorkspaceMigration(buildArgs)
+ .buildWorkspaceMigration({
+ ...buildArgs,
+ buildOptions: {
+ ...buildArgs.buildOptions,
+ workspaceCustomApplicationUniversalIdentifier:
+ workspaceCustomFlatApplication.universalIdentifier,
+ },
+ })
.catch((error) => {
this.metricsService.recordHistogram({
key: MetricsKeys.WorkspaceMigrationBuildDurationMs,
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/types/workspace-migration-orchestrator.type.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/types/workspace-migration-orchestrator.type.ts
index 2c0c10869d3..a6bc610c123 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/types/workspace-migration-orchestrator.type.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/types/workspace-migration-orchestrator.type.ts
@@ -8,7 +8,7 @@ import {
import { type WorkspaceMigrationBuilderAdditionalCacheDataMaps } from 'src/engine/workspace-manager/workspace-migration/types/workspace-migration-builder-additional-cache-data-maps.type';
import { type AllUniversalFlatEntityMaps } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/all-universal-flat-entity-maps.type';
import { type FailedFlatEntityValidation } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/types/failed-flat-entity-validation.type';
-import { type WorkspaceMigrationBuilderOptions } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-builder-options.type';
+import { type WorkspaceMigrationValidationBuildOptions } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-builder-options.type';
import { type WorkspaceMigration } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration.type';
export type FromToAllUniversalFlatEntityMaps = {
@@ -19,7 +19,7 @@ export type FromToAllUniversalFlatEntityMaps = {
export type WorkspaceMigrationOrchestratorBuildArgs = {
workspaceId: string;
- buildOptions: WorkspaceMigrationBuilderOptions;
+ buildOptions: WorkspaceMigrationValidationBuildOptions;
fromToAllFlatEntityMaps: FromToAllUniversalFlatEntityMaps;
additionalCacheDataMaps: WorkspaceMigrationBuilderAdditionalCacheDataMaps;
// Must contain the flat entity maps of the current application and of the applications it depends on
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/services/workspace-entity-migration-builder.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/services/workspace-entity-migration-builder.service.ts
index f7eb9619b61..2a3c35a7ae8 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/services/workspace-entity-migration-builder.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/services/workspace-entity-migration-builder.service.ts
@@ -46,10 +46,10 @@ import { FlatEntityUpdateValidationArgs } from 'src/engine/workspace-manager/wor
import { UniversalFlatEntityValidationArgs } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/universal-flat-entity-validation-args.type';
import { UniversalFlatEntityValidationReturnType } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/universal-flat-entity-validation-result.type';
import { AllUniversalWorkspaceMigrationAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common.type';
-import { type WorkspaceMigrationBuilderOptions } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-builder-options.type';
+import { type WorkspaceMigrationValidationBuildOptions } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-builder-options.type';
export type ValidateAndBuildArgs<T extends AllMetadataName> = {
- buildOptions: WorkspaceMigrationBuilderOptions;
+ buildOptions: WorkspaceMigrationValidationBuildOptions;
dependencyOptimisticFlatEntityMaps: AllUniversalFlatEntityMaps;
workspaceId: string;
additionalCacheDataMaps: WorkspaceMigrationBuilderAdditionalCacheDataMaps;
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/universal-flat-entity-validation-args.type.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/universal-flat-entity-validation-args.type.ts
index bf33e36b209..f97579989b6 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/universal-flat-entity-validation-args.type.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/universal-flat-entity-validation-args.type.ts
@@ -4,7 +4,7 @@ import { type MetadataUniversalFlatEntityAndRelatedFlatEntityMapsForValidation }
import { type MetadataUniversalFlatEntity } from 'src/engine/metadata-modules/flat-entity/types/metadata-universal-flat-entity.type';
import { type WorkspaceMigrationBuilderAdditionalCacheDataMaps } from 'src/engine/workspace-manager/workspace-migration/types/workspace-migration-builder-additional-cache-data-maps.type';
import { type MetadataUniversalFlatEntityMaps } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/metadata-universal-flat-entity-maps.type';
-import { type WorkspaceMigrationBuilderOptions } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-builder-options.type';
+import { type WorkspaceMigrationValidationBuildOptions } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-builder-options.type';
export type UniversalFlatEntityValidationArgs<T extends AllMetadataName> = {
additionalCacheDataMaps: WorkspaceMigrationBuilderAdditionalCacheDataMaps;
@@ -12,5 +12,5 @@ export type UniversalFlatEntityValidationArgs<T extends AllMetadataName> = {
optimisticFlatEntityMapsAndRelatedFlatEntityMaps: MetadataUniversalFlatEntityAndRelatedFlatEntityMapsForValidation<T>;
workspaceId: string;
remainingFlatEntityMapsToValidate: MetadataUniversalFlatEntityMaps<T>;
- buildOptions: WorkspaceMigrationBuilderOptions;
+ buildOptions: WorkspaceMigrationValidationBuildOptions;
};
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-builder-options.type.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-builder-options.type.ts
index 9ec393c8c9d..d1817f007e0 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-builder-options.type.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-builder-options.type.ts
@@ -6,3 +6,9 @@ export type WorkspaceMigrationBuilderOptions = {
applicationUniversalIdentifier: string;
applicationDefaultRoleUniversalIdentifier?: string;
};
+
+// The migration runner resolves the workspace Custom application for every build.
+export type WorkspaceMigrationValidationBuildOptions =
+ WorkspaceMigrationBuilderOptions & {
+ workspaceCustomApplicationUniversalIdentifier: string;
+ };
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/__tests__/flat-mcp-server-validator.service.spec.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/__tests__/flat-mcp-server-validator.service.spec.ts
index c50a06d36ed..3e8e98b9279 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/__tests__/flat-mcp-server-validator.service.spec.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/__tests__/flat-mcp-server-validator.service.spec.ts
@@ -11,6 +11,9 @@ import { type FlatEntityUpdateValidationArgs } from 'src/engine/workspace-manage
import { type UniversalFlatEntityValidationArgs } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/universal-flat-entity-validation-args.type';
import { FlatMcpServerValidatorService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-mcp-server-validator.service';
+const WORKSPACE_CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER =
+ '7f1c2b9e-6a1d-4c55-9a2e-1a6f0d6c2b11';
+
const WORKSPACE_ID = v4();
const APPLICATION_UNIVERSAL_IDENTIFIER = v4();
const OTHER_APPLICATION_UNIVERSAL_IDENTIFIER = v4();
@@ -105,6 +108,8 @@ const buildValidationArgs = (
buildOptions: {
isSystemBuild: false,
applicationUniversalIdentifier: APPLICATION_UNIVERSAL_IDENTIFIER,
+ workspaceCustomApplicationUniversalIdentifier:
+ WORKSPACE_CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER,
},
};
};
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/__tests__/flat-skill-validator.service.spec.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/__tests__/flat-skill-validator.service.spec.ts
index 2597d0c0f1c..67af894c8be 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/__tests__/flat-skill-validator.service.spec.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/__tests__/flat-skill-validator.service.spec.ts
@@ -60,6 +60,8 @@ const validateWorkspaceUpdate = (
isSystemBuild: false,
applicationUniversalIdentifier:
WORKSPACE_CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER,
+ workspaceCustomApplicationUniversalIdentifier:
+ WORKSPACE_CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER,
},
flatEntityUpdate,
universalIdentifier: standardSkill.universalIdentifier,
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-logic-function-validator.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-logic-function-validator.service.ts
index e518db0f60b..4c864025898 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-logic-function-validator.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-logic-function-validator.service.ts
@@ -16,6 +16,7 @@ import { getEmptyFlatEntityValidationError } from 'src/engine/workspace-manager/
import { type FlatEntityUpdateValidationArgs } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/universal-flat-entity-update-validation-args.type';
import { type UniversalFlatEntityValidationArgs } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/universal-flat-entity-validation-args.type';
import { validateLogicFunctionForwardedRequestHeaders } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-logic-function-forwarded-request-headers.util';
+import { validateLogicFunctionServerRouteApplication } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-logic-function-server-route-application.util';
@Injectable()
export class FlatLogicFunctionValidatorService {
@@ -27,6 +28,7 @@ export class FlatLogicFunctionValidatorService {
optimisticFlatEntityMapsAndRelatedFlatEntityMaps: {
flatLogicFunctionMaps: optimisticFlatLogicFunctionMaps,
},
+ buildOptions,
}: FlatEntityUpdateValidationArgs<
typeof ALL_METADATA_NAME.logicFunction
>): FailedFlatEntityValidation<'logicFunction', 'update'> {
@@ -96,6 +98,13 @@ export class FlatLogicFunctionValidatorService {
validationResult.errors.push(
...validateLogicFunctionForwardedRequestHeaders(flatEntityUpdate),
+ ...validateLogicFunctionServerRouteApplication({
+ applicationUniversalIdentifier:
+ existingFlatLogicFunction.applicationUniversalIdentifier,
+ serverRouteTriggerSettings: flatEntityUpdate.serverRouteTriggerSettings,
+ workspaceCustomApplicationUniversalIdentifier:
+ buildOptions.workspaceCustomApplicationUniversalIdentifier,
+ }),
);
const mergedPrebuiltState = {
@@ -163,6 +172,7 @@ export class FlatLogicFunctionValidatorService {
optimisticFlatEntityMapsAndRelatedFlatEntityMaps: {
flatLogicFunctionMaps: optimisticFlatLogicFunctionMaps,
},
+ buildOptions,
}: UniversalFlatEntityValidationArgs<
typeof ALL_METADATA_NAME.logicFunction
>): FailedFlatEntityValidation<'logicFunction', 'create'> {
@@ -234,6 +244,14 @@ export class FlatLogicFunctionValidatorService {
...validateLogicFunctionForwardedRequestHeaders(
flatLogicFunctionToValidate,
),
+ ...validateLogicFunctionServerRouteApplication({
+ applicationUniversalIdentifier:
+ flatLogicFunctionToValidate.applicationUniversalIdentifier,
+ serverRouteTriggerSettings:
+ flatLogicFunctionToValidate.serverRouteTriggerSettings,
+ workspaceCustomApplicationUniversalIdentifier:
+ buildOptions.workspaceCustomApplicationUniversalIdentifier,
+ }),
);
if (
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/__tests__/validate-logic-function-server-route-application.util.spec.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/__tests__/validate-logic-function-server-route-application.util.spec.ts
new file mode 100644
index 00000000000..05ddad15c4e
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/__tests__/validate-logic-function-server-route-application.util.spec.ts
@@ -0,0 +1,46 @@
+import { LogicFunctionExceptionCode } from 'src/engine/metadata-modules/logic-function/logic-function.exception';
+import { validateLogicFunctionServerRouteApplication } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-logic-function-server-route-application.util';
+
+const CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER =
+ '7f1c2b9e-6a1d-4c55-9a2e-1a6f0d6c2b11';
+const INSTALLED_APPLICATION_UNIVERSAL_IDENTIFIER =
+ '3d0b8f4a-2c7e-4b19-8f5d-9e4a1c7b6d22';
+
+describe('validateLogicFunctionServerRouteApplication', () => {
+ it('rejects a server route on a workspace custom application function', () => {
+ const errors = validateLogicFunctionServerRouteApplication({
+ applicationUniversalIdentifier: CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER,
+ serverRouteTriggerSettings: { forwardedRequestHeaders: [] },
+ workspaceCustomApplicationUniversalIdentifier:
+ CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER,
+ });
+
+ expect(errors).toHaveLength(1);
+ expect(errors[0].code).toBe(
+ LogicFunctionExceptionCode.INVALID_LOGIC_FUNCTION_INPUT,
+ );
+ });
+
+ it('accepts a server route on an installed application function', () => {
+ expect(
+ validateLogicFunctionServerRouteApplication({
+ applicationUniversalIdentifier:
+ INSTALLED_APPLICATION_UNIVERSAL_IDENTIFIER,
+ serverRouteTriggerSettings: { forwardedRequestHeaders: [] },
+ workspaceCustomApplicationUniversalIdentifier:
+ CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER,
+ }),
+ ).toEqual([]);
+ });
+
+ it('accepts a workspace custom application function without a server route', () => {
+ expect(
+ validateLogicFunctionServerRouteApplication({
+ applicationUniversalIdentifier: CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER,
+ serverRouteTriggerSettings: null,
+ workspaceCustomApplicationUniversalIdentifier:
+ CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER,
+ }),
+ ).toEqual([]);
+ });
+});
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-logic-function-server-route-application.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-logic-function-server-route-application.util.ts
new file mode 100644
index 00000000000..68a15e6dc35
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-logic-function-server-route-application.util.ts
@@ -0,0 +1,35 @@
+import { msg, t } from '@lingui/core/macro';
+import { isDefined } from 'twenty-shared/utils';
+
+import { LogicFunctionExceptionCode } from 'src/engine/metadata-modules/logic-function/logic-function.exception';
+import { type UniversalFlatLogicFunction } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-logic-function.type';
+import { type FlatEntityValidationError } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/types/failed-flat-entity-validation.type';
+
+export const validateLogicFunctionServerRouteApplication = ({
+ applicationUniversalIdentifier,
+ serverRouteTriggerSettings,
+ workspaceCustomApplicationUniversalIdentifier,
+}: Partial<
+ Pick<
+ UniversalFlatLogicFunction,
+ 'applicationUniversalIdentifier' | 'serverRouteTriggerSettings'
+ >
+> & {
+ workspaceCustomApplicationUniversalIdentifier: string;
+}): FlatEntityValidationError<LogicFunctionExceptionCode>[] => {
+ if (
+ !isDefined(serverRouteTriggerSettings) ||
+ applicationUniversalIdentifier !==
+ workspaceCustomApplicationUniversalIdentifier
+ ) {
+ return [];
+ }
+
+ return [
+ {
+ code: LogicFunctionExceptionCode.INVALID_LOGIC_FUNCTION_INPUT,
+ message: t`serverRouteTriggerSettings can only be set by an installed application`,
+ userFriendlyMessage: msg`Server routes can only be defined by an application.`,
+ },
+ ];
+};
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration.module.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration.module.ts
index 6c543fb9667..8dff036244c 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration.module.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration.module.ts
@@ -1,5 +1,6 @@
import { Module } from '@nestjs/common';
+import { ApplicationModule } from 'src/engine/core-modules/application/application.module';
import { MetricsModule } from 'src/engine/core-modules/metrics/metrics.module';
import { MetadataSideEffectModule } from 'src/engine/metadata-modules/metadata-side-effect/metadata-side-effect.module';
import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';
@@ -16,6 +17,7 @@ import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/wor
WorkspaceCacheModule,
MetadataSideEffectModule,
MetricsModule,
+ ApplicationModule,
],
providers: [
WorkspaceMigrationValidateBuildAndRunService,
diff --git a/packages/twenty-server/test/integration/metadata/suites/logic-function/failing-logic-function-server-route.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/logic-function/failing-logic-function-server-route.integration-spec.ts
new file mode 100644
index 00000000000..3ed1782e821
--- /dev/null
+++ b/packages/twenty-server/test/integration/metadata/suites/logic-function/failing-logic-function-server-route.integration-spec.ts
@@ -0,0 +1,20 @@
+import { createOneLogicFunction } from 'test/integration/metadata/suites/logic-function/utils/create-logic-function.util';
+import { v4 as uuidv4 } from 'uuid';
+
+describe('Logic function creation should reject server route triggers', () => {
+ it('fails when serverRouteTriggerSettings is provided', async () => {
+ const { errors } = await createOneLogicFunction({
+ input: {
+ name: `server-route-${uuidv4()}`,
+ serverRouteTriggerSettings: { forwardedRequestHeaders: [] },
+ },
+ expectToFail: true,
+ });
+
+ expect(errors).toHaveLength(1);
+ expect(errors[0].extensions.code).toBe('METADATA_VALIDATION_FAILED');
+ expect(
+ errors[0].extensions.errors.logicFunction[0].errors[0].message,
+ ).toContain('serverRouteTriggerSettings');
+ });
+});
diff --git a/packages/twenty-server/test/integration/server-route-trigger/suites/__snapshots__/server-route-trigger-resolution.integration-spec.ts.snap b/packages/twenty-server/test/integration/server-route-trigger/suites/__snapshots__/server-route-trigger-resolution.integration-spec.ts.snap
index eaa739a519b..efe8c30ea9a 100644
--- a/packages/twenty-server/test/integration/server-route-trigger/suites/__snapshots__/server-route-trigger-resolution.integration-spec.ts.snap
+++ b/packages/twenty-server/test/integration/server-route-trigger/suites/__snapshots__/server-route-trigger-resolution.integration-spec.ts.snap
@@ -3,14 +3,14 @@
exports[`ServerRouteTrigger resolver resolution (integration) by legacy universalIdentifier refuses to dispatch once a foreign workspace claims the same identifier 1`] = `
{
"body": {
- "code": "LOGIC_FUNCTION_NOT_FOUND",
+ "code": "AMBIGUOUS_SERVER_ROUTE",
"error": "Error",
"messages": [
- "Server resolver function 9e0f1a2b-3c4d-4e5f-8a6b-7c8d9e0f1a2b not found",
+ "Server route 9e0f1a2b-3c4d-4e5f-8a6b-7c8d9e0f1a2b is claimed by several application registrations",
],
- "statusCode": 404,
+ "statusCode": 409,
},
- "status": 404,
+ "status": 409,
}
`;
diff --git a/packages/twenty-server/test/integration/server-route-trigger/suites/server-route-trigger-resolution.integration-spec.ts b/packages/twenty-server/test/integration/server-route-trigger/suites/server-route-trigger-resolution.integration-spec.ts
index 495306e011f..b567c05ca0e 100644
--- a/packages/twenty-server/test/integration/server-route-trigger/suites/server-route-trigger-resolution.integration-spec.ts
+++ b/packages/twenty-server/test/integration/server-route-trigger/suites/server-route-trigger-resolution.integration-spec.ts
@@ -123,12 +123,14 @@ describe('ServerRouteTrigger resolver resolution (integration)', () => {
}, 60000);
describe('by primary key', () => {
- it('dispatches to the resolver and does not flag the response as deprecated', async () => {
+ it('still dispatches and flags the response as deprecated', async () => {
const response = await callServerRoute({ identifier: ownerResolverId });
expect(response.status).toBe(200);
expect(response.body).toEqual(OWNER_RESPONSE);
- expect(response.headers['deprecation']).toBeUndefined();
+ expect(response.headers['deprecation']).toBe(
+ SERVER_ROUTE_LEGACY_IDENTIFIER_DEPRECATION_HEADER_VALUE,
+ );
}, 60000);
it('rejects the id of a copy installed in a workspace that does not own the app', async () => {
@@ -222,7 +224,7 @@ describe('ServerRouteTrigger resolver resolution (integration)', () => {
expectToFail: true,
});
- expect(response.status).toBe(404);
+ expect(response.status).toBe(409);
expect(response.body).not.toEqual(OWNER_RESPONSE);
expectOneNotInternalServerErrorHttpResponseSnapshot({
status: response.status,