The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Scope application tokens to their own application (#26681)
Paul Rastoin6959dc8c94ce
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-upgrade-version-command.module.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-upgrade-version-command.module.tsindex cbd673a0f53..0c655cd6a6f 100644--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-upgrade-version-command.module.ts+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-upgrade-version-command.module.ts@@ -13,6 +13,8 @@ import { EnableCommonRecordSharingCommand } from 'src/database/commands/upgrade-import { BackfillLogicFunctionFileRowsCommand } from 'src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790262034322-backfill-logic-function-file-rows.command';import { RepairInitialCompanyTargetsCommand } from 'src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790339692474-repair-initial-company-targets.command';import { ProvisionAgentChatThreadTargetCommand } from 'src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790317893308-provision-agent-chat-thread-target.command';+import { BackfillOAuthOnlyApplicationSourceTypeCommand } from 'src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790352791059-backfill-oauth-only-application-source-type.command';+import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';import { ApplicationModule } from 'src/engine/core-modules/application/application.module';import { BillingModule } from 'src/engine/core-modules/billing/billing.module';import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';@@ -28,7 +30,11 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspaceApplicationModule,AgentHistoryMigrationModule,AgentHistoryModule,- TypeOrmModule.forFeature([FieldMetadataEntity, FileEntity]),+ TypeOrmModule.forFeature([+ ApplicationEntity,+ FieldMetadataEntity,+ FileEntity,+ ]),WorkspaceCacheModule,WorkspaceIteratorModule,BillingModule,@@ -46,6 +52,8 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspaceSyncAttachmentRecordPageCommand,RelabelAttachmentTargetFieldsCommand,ProvisionAgentChatThreadTargetCommand,+ BackfillOAuthOnlyApplicationSourceTypeCommand,+ provideWorkspaceScopedRepository(ApplicationEntity),provideWorkspaceScopedRepository(FieldMetadataEntity),provideWorkspaceScopedRepository(FileEntity),],diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790352791059-backfill-oauth-only-application-source-type.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790352791059-backfill-oauth-only-application-source-type.command.tsnew file mode 100644index 00000000000..563aa6e349c--- /dev/null+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790352791059-backfill-oauth-only-application-source-type.command.ts@@ -0,0 +1,77 @@+import { Command } from 'nest-commander';+import { Not } 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 { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';+import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';+import { ApplicationService } from 'src/engine/core-modules/application/application.service';+import { RegisteredWorkspaceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-workspace-command.decorator';+import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/inject-workspace-scoped-repository.decorator';+import { WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository';++// OAuth logins created the application row with the default `local` source+// type before it was copied from the registration.+@RegisteredWorkspaceCommand('2.43.0', 1790352791059)+@Command({+ name: 'upgrade:2-43:backfill-oauth-only-application-source-type',+ description:+ 'Set the source type of applications created by an OAuth login to `oauth-only`, like their registration',+})+export class BackfillOAuthOnlyApplicationSourceTypeCommand extends ProvisionedWorkspaceCommandRunner {+ constructor(+ protected readonly workspaceIteratorService: WorkspaceIteratorService,+ @InjectWorkspaceScopedRepository(ApplicationEntity)+ private readonly applicationRepository: WorkspaceScopedRepository<ApplicationEntity>,+ private readonly applicationService: ApplicationService,+ ) {+ super(workspaceIteratorService);+ }++ override async runOnWorkspace(args: RunOnWorkspaceArgs): Promise<void> {+ await this.up(args);+ }++ async down(_args: RunOnWorkspaceArgs): Promise<void> {+ // `local` was only the column default for these rows, and OAuth logins+ // already write `oauth-only`, so earlier versions expect this value too.+ }++ async up({+ workspaceId,+ options,+ index,+ total,+ }: RunOnWorkspaceArgs): Promise<void> {+ const dryRun = options.dryRun ?? false;++ const applications = await this.applicationRepository.find(workspaceId, {+ where: {+ sourceType: Not(ApplicationRegistrationSourceType.OAUTH_ONLY),+ applicationRegistration: {+ sourceType: ApplicationRegistrationSourceType.OAUTH_ONLY,+ },+ },+ });++ this.logger.log(+ `${dryRun ? '[DRY RUN] ' : ''}Found ${applications.length} OAuth application(s) to backfill on workspace ${workspaceId} (${index + 1}/${total})`,+ );++ if (dryRun) {+ return;+ }++ for (const application of applications) {+ await this.applicationService.update(application.id, {+ sourceType: ApplicationRegistrationSourceType.OAUTH_ONLY,+ workspaceId,+ });++ this.logger.log(+ `Set application "${application.name}" (${application.id}) to oauth-only`,+ );+ }+ }+}diff --git a/packages/twenty-server/src/engine/api/mcp/services/mcp-protocol.service.ts b/packages/twenty-server/src/engine/api/mcp/services/mcp-protocol.service.tsindex f6157370cec..ad4b531c38d 100644--- a/packages/twenty-server/src/engine/api/mcp/services/mcp-protocol.service.ts+++ b/packages/twenty-server/src/engine/api/mcp/services/mcp-protocol.service.ts@@ -266,6 +266,7 @@ export class McpProtocolService {userId: options?.userId,userWorkspaceId: options?.userWorkspaceId,excludeTools: MCP_EXCLUDED_TOOL_NAMES,+ application: options?.application,}),inputSchema: zodSchema(getToolCatalogInputSchema),annotations: MCP_CLOSED_WORLD_READ_ONLY_TOOL_ANNOTATIONS,diff --git a/packages/twenty-server/src/engine/core-modules/application/application-development/application-development.module.ts b/packages/twenty-server/src/engine/core-modules/application/application-development/application-development.module.tsindex ce603e86cc1..fc134720629 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-development/application-development.module.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-development/application-development.module.ts@@ -20,9 +20,11 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cacheimport { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';+import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';@Module({imports: [+ WorkspaceManyOrAllFlatEntityMapsCacheModule,ApplicationModule,ApplicationManifestModule,ApplicationPackageModule,diff --git a/packages/twenty-server/src/engine/core-modules/application/application-development/application-development.resolver.ts b/packages/twenty-server/src/engine/core-modules/application/application-development/application-development.resolver.tsindex 19f52f7ea55..ff1e5eec967 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-development/application-development.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-development/application-development.resolver.ts@@ -31,6 +31,7 @@ import { ApplicationExceptionFilter } from 'src/engine/core-modules/application/import { FileDTO } from 'src/engine/core-modules/file/dtos/file.dto';import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';+import { ApplicationTargetArgs } from 'src/engine/decorators/auth/application-target-args.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';@@ -66,7 +67,11 @@ export class ApplicationDevelopmentResolver {@Query(() => ApplicationExportDTO)async exportApplication(- @Args() { universalIdentifier }: ExportApplicationInput,+ @ApplicationTargetArgs<ExportApplicationInput>({+ kind: 'applicationUniversalIdentifier',+ idKey: 'universalIdentifier',+ })+ { universalIdentifier }: ExportApplicationInput,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,): Promise<ApplicationExportDTO> {return this.applicationDevelopmentService.exportApplication({@@ -77,7 +82,10 @@ export class ApplicationDevelopmentResolver {@Mutation(() => WorkspaceMigrationDTO)async syncApplication(- @Args()+ @ApplicationTargetArgs<ApplicationInput>({+ kind: 'applicationUniversalIdentifier',+ idKey: 'manifest.application.universalIdentifier',+ }){ manifest, dryRun, inferDeletionFromMissingEntities }: ApplicationInput,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,): Promise<WorkspaceMigrationDTO> {@@ -98,7 +106,10 @@ export class ApplicationDevelopmentResolver {@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,@Args({ name: 'file', type: () => GraphQLUpload }){ createReadStream }: FileUpload,- @Args()+ @ApplicationTargetArgs<UploadApplicationFileInput>({+ kind: 'applicationUniversalIdentifier',+ idKey: 'applicationUniversalIdentifier',+ }){applicationUniversalIdentifier,fileFolder,@@ -122,7 +133,11 @@ export class ApplicationDevelopmentResolver {@UseGuards(SettingsPermissionGuard(PermissionFlagType.UPLOAD_FILE))async createApplicationFileUploads(@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,- @Args() {+ @ApplicationTargetArgs<CreateApplicationFileUploadsInput>({+ kind: 'applicationUniversalIdentifier',+ idKey: 'applicationUniversalIdentifier',+ })+ {applicationUniversalIdentifier,files,}: CreateApplicationFileUploadsInput,@@ -138,7 +153,11 @@ export class ApplicationDevelopmentResolver {@UseGuards(SettingsPermissionGuard(PermissionFlagType.UPLOAD_FILE))async completeApplicationFileUploads(@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,- @Args() {+ @ApplicationTargetArgs<CompleteApplicationFileUploadsInput>({+ kind: 'applicationUniversalIdentifier',+ idKey: 'applicationUniversalIdentifier',+ })+ {applicationUniversalIdentifier,fileIds,}: CompleteApplicationFileUploadsInput,diff --git a/packages/twenty-server/src/engine/core-modules/application/application-health/application-health.module.ts b/packages/twenty-server/src/engine/core-modules/application/application-health/application-health.module.tsindex 665681431d2..b8681f5714e 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-health/application-health.module.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-health/application-health.module.ts@@ -5,9 +5,15 @@ import { ApplicationHealthResolver } from 'src/engine/core-modules/application/aimport { ApplicationModule } from 'src/engine/core-modules/application/application.module';import { LogicFunctionExecutorModule } from 'src/engine/core-modules/logic-function/logic-function-executor/logic-function-executor.module';import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';+import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';@Module({- imports: [ApplicationModule, LogicFunctionExecutorModule, PermissionsModule],+ imports: [+ ApplicationModule,+ LogicFunctionExecutorModule,+ PermissionsModule,+ WorkspaceManyOrAllFlatEntityMapsCacheModule,+ ],providers: [ApplicationHealthCheckService, ApplicationHealthResolver],exports: [ApplicationHealthCheckService],})diff --git a/packages/twenty-server/src/engine/core-modules/application/application-health/application-health.resolver.ts b/packages/twenty-server/src/engine/core-modules/application/application-health/application-health.resolver.tsindex b7586ad459b..8b6134619c1 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-health/application-health.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-health/application-health.resolver.ts@@ -1,5 +1,5 @@import { UseFilters, UseGuards } from '@nestjs/common';-import { Args, Mutation } from '@nestjs/graphql';+import { Mutation } from '@nestjs/graphql';import { PermissionFlagType } from 'twenty-shared/constants';@@ -11,6 +11,7 @@ import { ApplicationHealthCheckResultDTO } from 'src/engine/core-modules/applicaimport { ApplicationDTO } from 'src/engine/core-modules/application/dtos/application.dto';import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';+import { ApplicationTargetArg } from 'src/engine/decorators/auth/application-target-arg.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';@@ -28,7 +29,11 @@ export class ApplicationHealthResolver {@Mutation(() => ApplicationHealthCheckResultDTO, { nullable: true })async runApplicationHealthCheck(- @Args('applicationId', { type: () => UUIDScalarType })+ @ApplicationTargetArg(+ 'applicationId',+ { kind: 'applicationId' },+ { type: () => UUIDScalarType },+ )applicationId: string,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,): Promise<ApplicationHealthCheckResultDTO | null> {diff --git a/packages/twenty-server/src/engine/core-modules/application/application-install/application-install.module.ts b/packages/twenty-server/src/engine/core-modules/application/application-install/application-install.module.tsindex 553928f7dbc..2bd7a128676 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-install/application-install.module.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-install/application-install.module.ts@@ -24,9 +24,11 @@ import { SdkClientModule } from 'src/engine/core-modules/sdk-client/sdk-client.mimport { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';+import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';@Module({imports: [+ WorkspaceManyOrAllFlatEntityMapsCacheModule,TypeOrmModule.forFeature([ApplicationEntity,ApplicationRegistrationEntity,diff --git a/packages/twenty-server/src/engine/core-modules/application/application-install/application-install.resolver.ts b/packages/twenty-server/src/engine/core-modules/application/application-install/application-install.resolver.tsindex 5e217467132..9cc1588232e 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-install/application-install.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-install/application-install.resolver.ts@@ -31,6 +31,8 @@ import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filtimport { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';import { JobStatusDTO } from 'src/engine/core-modules/message-queue/dtos/job-status.dto';import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';+import { ApplicationTargetArg } from 'src/engine/decorators/auth/application-target-arg.decorator';+import { ApplicationTargetArgs } from 'src/engine/decorators/auth/application-target-args.decorator';import { AuthApplication } from 'src/engine/decorators/auth/auth-application.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { AllowSuspendedWorkspace } from 'src/engine/decorators/auth/allow-suspended-workspace.decorator';@@ -99,7 +101,10 @@ export class ApplicationInstallResolver {})@UseGuards(SettingsPermissionGuard(PermissionFlagType.APPLICATIONS))async installMarketplaceApp(- @Args('universalIdentifier') universalIdentifier: string,+ @ApplicationTargetArg('universalIdentifier', {+ kind: 'applicationUniversalIdentifier',+ })+ universalIdentifier: string,@Args('version', { type: () => String, nullable: true })version: string | undefined,@AuthWorkspace() workspace: WorkspaceEntity,@@ -116,7 +121,10 @@ export class ApplicationInstallResolver {@Mutation(() => ApplicationDTO)@UseGuards(SettingsPermissionGuard(PermissionFlagType.APPLICATIONS))async installApplication(- @Args('universalIdentifier') universalIdentifier: string,+ @ApplicationTargetArg('universalIdentifier', {+ kind: 'applicationUniversalIdentifier',+ })+ universalIdentifier: string,@Args('version', { type: () => String, nullable: true })version: string | undefined,@AuthWorkspace() workspace: WorkspaceEntity,@@ -136,7 +144,11 @@ export class ApplicationInstallResolver {@Mutation(() => TriggerInstallApplicationJobResultDTO)@UseGuards(SettingsPermissionGuard(PermissionFlagType.APPLICATIONS))async triggerInstallApplicationJob(- @Args('input') { universalIdentifier }: TriggerInstallApplicationJobInput,+ @ApplicationTargetArg<TriggerInstallApplicationJobInput>('input', {+ kind: 'applicationUniversalIdentifier',+ idKey: 'universalIdentifier',+ })+ { universalIdentifier }: TriggerInstallApplicationJobInput,@AuthWorkspace() workspace: WorkspaceEntity,): Promise<TriggerInstallApplicationJobResultDTO> {return this.applicationLifecycleJobService.triggerInstallApplicationJob({@@ -148,7 +160,11 @@ export class ApplicationInstallResolver {@Mutation(() => TriggerUninstallApplicationJobResultDTO)@UseGuards(SettingsPermissionGuard(PermissionFlagType.APPLICATIONS))async triggerUninstallApplicationJob(- @Args('input') { universalIdentifier }: TriggerUninstallApplicationJobInput,+ @ApplicationTargetArg<TriggerUninstallApplicationJobInput>('input', {+ kind: 'applicationUniversalIdentifier',+ idKey: 'universalIdentifier',+ })+ { universalIdentifier }: TriggerUninstallApplicationJobInput,@AuthWorkspace() workspace: WorkspaceEntity,): Promise<TriggerUninstallApplicationJobResultDTO> {return this.applicationLifecycleJobService.triggerUninstallApplicationJob({@@ -201,7 +217,12 @@ export class ApplicationInstallResolver {@Mutation(() => ApplicationDTO)@UseGuards(SettingsPermissionGuard(PermissionFlagType.APPLICATIONS))async updateApplication(- @Args('id', { type: () => UUIDScalarType }) id: string,+ @ApplicationTargetArg(+ 'id',+ { kind: 'applicationId' },+ { type: () => UUIDScalarType },+ )+ id: string,@Args('input') input: UpdateApplicationInput,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,) {@@ -221,7 +242,11 @@ export class ApplicationInstallResolver {@Mutation(() => Boolean)@UseGuards(SettingsPermissionGuard(PermissionFlagType.APPLICATIONS))async uninstallApplication(- @Args() { universalIdentifier }: UninstallApplicationInput,+ @ApplicationTargetArgs<UninstallApplicationInput>({+ kind: 'applicationUniversalIdentifier',+ idKey: 'universalIdentifier',+ })+ { universalIdentifier }: UninstallApplicationInput,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,) {await this.applicationUninstallRunnerService.uninstallApplication({diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.module.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.module.tsindex 8b7ef1ebc19..012c8c69fc3 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.module.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.module.ts@@ -32,9 +32,11 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entimport { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module';+import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';@Module({imports: [+ WorkspaceManyOrAllFlatEntityMapsCacheModule,TypeOrmModule.forFeature([ApplicationRegistrationEntity,ApplicationEntity,diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.resolver.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.resolver.tsindex f1cd713e4e7..c20198f281b 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.resolver.ts@@ -59,6 +59,11 @@ import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twentimport { StreamSizeExceededError } from 'src/utils/stream-size-exceeded-error';import { streamToBuffer } from 'src/utils/stream-to-buffer';import { ApplicationRegistrationVariableDTO } from 'src/engine/core-modules/application/application-registration-variable/dtos/application-registration-variable.dto';+import { ApplicationExceptionFilter } from 'src/engine/core-modules/application/application-exception-filter';+import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';+import { getScopedCallingApplication } from 'src/engine/core-modules/application/utils/get-scoped-calling-application.util';+import { ApplicationTargetArg } from 'src/engine/decorators/auth/application-target-arg.decorator';+import { AuthApplication } from 'src/engine/decorators/auth/auth-application.decorator';import {ApplicationRegistrationException,ApplicationRegistrationExceptionCode,@@ -68,6 +73,7 @@ import {@MetadataResolver(() => ApplicationRegistrationEntity)@UseFilters(ApplicationRegistrationExceptionFilter,+ ApplicationExceptionFilter,FileUploadGraphqlApiExceptionFilter,AuthGraphqlApiExceptionFilter,PreventNestToAutoLogGraphqlErrorsFilter,@@ -94,7 +100,10 @@ export class ApplicationRegistrationResolver {@UseGuards(WorkspaceAuthGuard, NoPermissionGuard)@Query(() => ApplicationRegistrationEntity, { nullable: true })async findApplicationRegistrationByUniversalIdentifier(- @Args('universalIdentifier') universalIdentifier: string,+ @ApplicationTargetArg('universalIdentifier', {+ kind: 'applicationUniversalIdentifier',+ })+ universalIdentifier: string,): Promise<ApplicationRegistrationEntity | null> {return this.applicationRegistrationService.findOneByUniversalIdentifierGlobal(universalIdentifier,@@ -108,8 +117,23 @@ export class ApplicationRegistrationResolver {@Query(() => [ApplicationRegistrationEntity])async findManyApplicationRegistrations(@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,+ @AuthApplication({ allowUndefined: true })+ callingApplication: FlatApplication | undefined,): Promise<ApplicationRegistrationEntity[]> {- return this.applicationRegistrationService.findMany(workspaceId);+ const registrations =+ await this.applicationRegistrationService.findMany(workspaceId);++ const scopedCallingApplication =+ getScopedCallingApplication(callingApplication);++ if (!isDefined(scopedCallingApplication)) {+ return registrations;+ }++ return registrations.filter(+ (registration) =>+ registration.id === scopedCallingApplication.applicationRegistrationId,+ );}@UseGuards(@@ -118,7 +142,8 @@ export class ApplicationRegistrationResolver {)@Query(() => ApplicationRegistrationEntity)async findOneApplicationRegistration(- @Args('id') id: string,+ @ApplicationTargetArg('id', { kind: 'applicationRegistrationId' })+ id: string,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,): Promise<ApplicationRegistrationEntity> {return this.applicationRegistrationService.findOneById(id, workspaceId);@@ -130,7 +155,8 @@ export class ApplicationRegistrationResolver {)@Query(() => ApplicationRegistrationStatsDTO)async findApplicationRegistrationStats(- @Args('id') id: string,+ @ApplicationTargetArg('id', { kind: 'applicationRegistrationId' })+ id: string,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,): Promise<ApplicationRegistrationStatsDTO> {return this.applicationRegistrationService.getStats(id, workspaceId);@@ -202,7 +228,10 @@ export class ApplicationRegistrationResolver {)@Query(() => [ApplicationRegistrationVariableDTO])async findApplicationRegistrationVariables(- @Args('applicationRegistrationId') applicationRegistrationId: string,+ @ApplicationTargetArg('applicationRegistrationId', {+ kind: 'applicationRegistrationId',+ })+ applicationRegistrationId: string,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,): Promise<ApplicationRegistrationVariableDTO[]> {return this.applicationRegistrationVariableService.findVariablesWithObfuscatedValues(@@ -321,7 +350,8 @@ export class ApplicationRegistrationResolver {)@Query(() => String, { nullable: true })async applicationRegistrationTarballUrl(- @Args('id') id: string,+ @ApplicationTargetArg('id', { kind: 'applicationRegistrationId' })+ id: string,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,): Promise<string | null> {const registration = await this.applicationRegistrationService.findOneById(diff --git a/packages/twenty-server/src/engine/core-modules/application/application-upgrade/application-upgrade.module.ts b/packages/twenty-server/src/engine/core-modules/application/application-upgrade/application-upgrade.module.tsindex 55d2c7d6314..9370badfbd2 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-upgrade/application-upgrade.module.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-upgrade/application-upgrade.module.ts@@ -14,9 +14,11 @@ import { TwentyConfigModule } from 'src/engine/core-modules/twenty-config/twentyimport { WorkspaceVersionModule } from 'src/engine/workspace-manager/workspace-version/workspace-version.module';import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';+import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';@Module({imports: [+ WorkspaceManyOrAllFlatEntityMapsCacheModule,TypeOrmModule.forFeature([ApplicationEntity,ApplicationRegistrationEntity,diff --git a/packages/twenty-server/src/engine/core-modules/application/application-upgrade/application-upgrade.resolver.ts b/packages/twenty-server/src/engine/core-modules/application/application-upgrade/application-upgrade.resolver.tsindex d0bbe7347bf..1dbbea25bc0 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-upgrade/application-upgrade.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-upgrade/application-upgrade.resolver.ts@@ -6,6 +6,7 @@ import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decoratoimport { ApplicationExceptionFilter } from 'src/engine/core-modules/application/application-exception-filter';import { ApplicationUpgradeService } from 'src/engine/core-modules/application/application-upgrade/application-upgrade.service';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';+import { ApplicationTargetArg } from 'src/engine/decorators/auth/application-target-arg.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';@@ -24,7 +25,10 @@ export class ApplicationUpgradeResolver {@Mutation(() => Boolean)@UseGuards(SettingsPermissionGuard(PermissionFlagType.APPLICATIONS))async upgradeApplication(- @Args('appRegistrationId') appRegistrationId: string,+ @ApplicationTargetArg('appRegistrationId', {+ kind: 'applicationRegistrationId',+ })+ appRegistrationId: string,@Args('targetVersion') targetVersion: string,@AuthWorkspace() workspace: WorkspaceEntity,): Promise<boolean> {diff --git a/packages/twenty-server/src/engine/core-modules/application/connection-provider/application-connection-provider.resolver.ts b/packages/twenty-server/src/engine/core-modules/application/connection-provider/application-connection-provider.resolver.tsindex ade4d196e88..d4bccef1d4b 100644--- a/packages/twenty-server/src/engine/core-modules/application/connection-provider/application-connection-provider.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/application/connection-provider/application-connection-provider.resolver.ts@@ -1,19 +1,22 @@-import { UseGuards } from '@nestjs/common';-import { Args, Parent, Query, ResolveField } from '@nestjs/graphql';+import { UseFilters, UseGuards } from '@nestjs/common';+import { Parent, Query, ResolveField } from '@nestjs/graphql';import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';+import { ApplicationExceptionFilter } from 'src/engine/core-modules/application/application-exception-filter';import { ApplicationConnectionProviderDTO } from 'src/engine/core-modules/application/connection-provider/dtos/application-connection-provider.dto';import { ConnectionProviderService } from 'src/engine/core-modules/application/connection-provider/connection-provider.service';import { buildPublicAssetLogoUrl } from 'src/engine/core-modules/application/utils/build-public-asset-logo-url.util';import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';+import { ApplicationTargetArg } from 'src/engine/decorators/auth/application-target-arg.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';@UseGuards(WorkspaceAuthGuard)@MetadataResolver(() => ApplicationConnectionProviderDTO)+@UseFilters(ApplicationExceptionFilter)export class ApplicationConnectionProviderResolver {constructor(private readonly oauthProviderService: ConnectionProviderService,@@ -23,7 +26,11 @@ export class ApplicationConnectionProviderResolver {@Query(() => [ApplicationConnectionProviderDTO])@UseGuards(NoPermissionGuard)async applicationConnectionProviders(- @Args('applicationId', { type: () => UUIDScalarType })+ @ApplicationTargetArg(+ 'applicationId',+ { kind: 'applicationId' },+ { type: () => UUIDScalarType },+ )applicationId: string,@AuthWorkspace() workspace: WorkspaceEntity,): Promise<ApplicationConnectionProviderDTO[]> {diff --git a/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider.module.ts b/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider.module.tsindex 877c5b0abea..9dca0f8cf05 100644--- a/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider.module.ts+++ b/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider.module.ts@@ -21,9 +21,11 @@ import { FlatConnectionProviderModule } from 'src/engine/metadata-modules/flat-cimport { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';+import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';@Module({imports: [+ WorkspaceManyOrAllFlatEntityMapsCacheModule,TypeOrmModule.forFeature([ConnectionProviderEntity,ApplicationEntity,diff --git a/packages/twenty-server/src/engine/core-modules/application/constants/application-target-metadata-key.constant.ts b/packages/twenty-server/src/engine/core-modules/application/constants/application-target-metadata-key.constant.tsnew file mode 100644index 00000000000..68f990e0f41--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/constants/application-target-metadata-key.constant.ts@@ -0,0 +1 @@+export const APPLICATION_TARGET_METADATA_KEY = 'applicationTarget';diff --git a/packages/twenty-server/src/engine/core-modules/application/front-component-shared-dependencies/front-component-shared-dependencies.controller.ts b/packages/twenty-server/src/engine/core-modules/application/front-component-shared-dependencies/front-component-shared-dependencies.controller.tsindex 0ddb714e081..768e99eeb2e 100644--- a/packages/twenty-server/src/engine/core-modules/application/front-component-shared-dependencies/front-component-shared-dependencies.controller.ts+++ b/packages/twenty-server/src/engine/core-modules/application/front-component-shared-dependencies/front-component-shared-dependencies.controller.ts@@ -28,6 +28,7 @@ import {import { PRESIGNED_URL_NO_STORE_CACHE_CONTROL } from 'src/engine/core-modules/file/interfaces/file-folder.interface';import { setFileResponseHeaders } from 'src/engine/core-modules/file/utils/set-file-response-headers.utils';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';+import { ApplicationTargetParam } from 'src/engine/decorators/auth/application-target-param.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { AllowSuspendedWorkspace } from 'src/engine/decorators/auth/allow-suspended-workspace.decorator';import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';@@ -50,7 +51,8 @@ export class FrontComponentSharedDependenciesController {@UseGuards(NoPermissionGuard)async getBuiltSharedDependencies(@Res() res: Response,- @Param('applicationId') applicationId: string,+ @ApplicationTargetParam('applicationId', { kind: 'applicationId' })+ applicationId: string,@AuthWorkspace() workspace: WorkspaceEntity,@Param('cacheKey') cacheKey?: string,) {diff --git a/packages/twenty-server/src/engine/core-modules/application/front-component-shared-dependencies/front-component-shared-dependencies.module.ts b/packages/twenty-server/src/engine/core-modules/application/front-component-shared-dependencies/front-component-shared-dependencies.module.tsindex b5416c68f3c..49c48971323 100644--- a/packages/twenty-server/src/engine/core-modules/application/front-component-shared-dependencies/front-component-shared-dependencies.module.ts+++ b/packages/twenty-server/src/engine/core-modules/application/front-component-shared-dependencies/front-component-shared-dependencies.module.ts@@ -5,9 +5,15 @@ import { FrontComponentSharedDependenciesService } from 'src/engine/core-modulesimport { ApplicationModule } from 'src/engine/core-modules/application/application.module';import { FileStorageModule } from 'src/engine/core-modules/file-storage/file-storage.module';import { TwentyConfigModule } from 'src/engine/core-modules/twenty-config/twenty-config.module';+import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';@Module({- imports: [ApplicationModule, FileStorageModule, TwentyConfigModule],+ imports: [+ ApplicationModule,+ FileStorageModule,+ TwentyConfigModule,+ WorkspaceManyOrAllFlatEntityMapsCacheModule,+ ],controllers: [FrontComponentSharedDependenciesController],providers: [FrontComponentSharedDependenciesService],})diff --git a/packages/twenty-server/src/engine/core-modules/application/types/application-target.type.ts b/packages/twenty-server/src/engine/core-modules/application/types/application-target.type.tsnew file mode 100644index 00000000000..a5cbffb19db--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/types/application-target.type.ts@@ -0,0 +1,34 @@+import { type AllMetadataName } from 'twenty-shared/metadata';++export type ApplicationTargetKind =+ | { kind: 'applicationId' }+ | { kind: 'applicationUniversalIdentifier' }+ | { kind: 'applicationRegistrationId' }+ | {+ kind: 'applicationOwnedEntity';+ metadataName: AllMetadataName;+ };++// Dotted path to a required string field, at most three levels deep, such as+// 'manifest.application.universalIdentifier'+export type StringPathOf<+ TInput,+ TDepth extends unknown[] = [],+> = TDepth['length'] extends 3+ ? never+ : {+ [TKey in keyof TInput & string]-?: TInput[TKey] extends string+ ? TKey+ : TInput[TKey] extends readonly unknown[]+ ? never+ : TInput[TKey] extends object+ ? `${TKey}.${StringPathOf<TInput[TKey], [...TDepth, unknown]>}`+ : never;+ }[keyof TInput & string];++export type ApplicationTarget = ApplicationTargetKind &+ (+ | { source: 'graphqlArg'; argName: string; idKey?: string }+ | { source: 'graphqlArgs'; idKey: string }+ | { source: 'routeParam'; argName: string }+ );diff --git a/packages/twenty-server/src/engine/core-modules/application/utils/attach-application-target.util.ts b/packages/twenty-server/src/engine/core-modules/application/utils/attach-application-target.util.tsnew file mode 100644index 00000000000..706ab7103a6--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/utils/attach-application-target.util.ts@@ -0,0 +1,42 @@+import { UseGuards } from '@nestjs/common';++import { isDefined } from 'twenty-shared/utils';++import { APPLICATION_TARGET_METADATA_KEY } from 'src/engine/core-modules/application/constants/application-target-metadata-key.constant';+import { type ApplicationTarget } from 'src/engine/core-modules/application/types/application-target.type';+import { ApplicationTargetGuard } from 'src/engine/guards/application-target.guard';++export const attachApplicationTarget = ({+ prototype,+ propertyKey,+ target,+}: {+ prototype: object;+ propertyKey: string | symbol | undefined;+ target: ApplicationTarget;+}): void => {+ const descriptor = isDefined(propertyKey)+ ? Object.getOwnPropertyDescriptor(prototype, propertyKey)+ : undefined;++ if (!isDefined(propertyKey) || typeof descriptor?.value !== 'function') {+ throw new Error(+ 'An application target decorator must decorate a method parameter',+ );+ }++ // One owner to compare against per handler+ if (Reflect.hasMetadata(APPLICATION_TARGET_METADATA_KEY, descriptor.value)) {+ throw new Error(+ `${String(propertyKey)} declares more than one application target`,+ );+ }++ Reflect.defineMetadata(+ APPLICATION_TARGET_METADATA_KEY,+ target,+ descriptor.value,+ );++ UseGuards(ApplicationTargetGuard)(prototype, propertyKey, descriptor);+};diff --git a/packages/twenty-server/src/engine/core-modules/application/utils/can-caller-reach-application.util.ts b/packages/twenty-server/src/engine/core-modules/application/utils/can-caller-reach-application.util.tsnew file mode 100644index 00000000000..c8b872af177--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/utils/can-caller-reach-application.util.ts@@ -0,0 +1,25 @@+import { isDefined } from 'twenty-shared/utils';++import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';+import { getScopedCallingApplication } from 'src/engine/core-modules/application/utils/get-scoped-calling-application.util';++// Sessions and API keys keep workspace-wide reach behind their permission+// flags; an application token only reaches its own application.+export const canCallerReachApplication = ({+ callingApplication,+ applicationId,+}: {+ callingApplication:+ | Pick<FlatApplication, 'id' | 'sourceType'>+ | null+ | undefined;+ applicationId: string | null | undefined;+}): boolean => {+ const scopedCallingApplication =+ getScopedCallingApplication(callingApplication);++ return (+ !isDefined(scopedCallingApplication) ||+ applicationId === scopedCallingApplication.id+ );+};diff --git a/packages/twenty-server/src/engine/core-modules/application/utils/get-scoped-calling-application.util.ts b/packages/twenty-server/src/engine/core-modules/application/utils/get-scoped-calling-application.util.tsnew file mode 100644index 00000000000..6054071b8f8--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/utils/get-scoped-calling-application.util.ts@@ -0,0 +1,13 @@+import { isDefined } from 'twenty-shared/utils';++import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';+import { isOAuthOnlyApplication } from 'src/engine/core-modules/application/utils/is-oauth-only-application.util';++export const getScopedCallingApplication = <+ TApplication extends Pick<FlatApplication, 'sourceType'>,+>(+ callingApplication: TApplication | null | undefined,+): TApplication | undefined =>+ isDefined(callingApplication) && !isOAuthOnlyApplication(callingApplication)+ ? callingApplication+ : undefined;diff --git a/packages/twenty-server/src/engine/core-modules/application/utils/is-oauth-only-application.util.ts b/packages/twenty-server/src/engine/core-modules/application/utils/is-oauth-only-application.util.tsnew file mode 100644index 00000000000..24fde5b4f43--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/utils/is-oauth-only-application.util.ts@@ -0,0 +1,10 @@+import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';+import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';++// OAuth-only applications (the Twenty CLI, dynamically registered MCP clients)+// ship no code and only hold tokens a user approved, so they keep that user's+// reach instead of being scoped to their own empty application.+export const isOAuthOnlyApplication = (+ application: Pick<FlatApplication, 'sourceType'>,+): boolean =>+ application.sourceType === ApplicationRegistrationSourceType.OAUTH_ONLY;diff --git a/packages/twenty-server/src/engine/core-modules/event-logs/event-logs-live.resolver.ts b/packages/twenty-server/src/engine/core-modules/event-logs/event-logs-live.resolver.tsindex 759bc5822df..0bd0e31d805 100644--- a/packages/twenty-server/src/engine/core-modules/event-logs/event-logs-live.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/event-logs/event-logs-live.resolver.ts@@ -1,8 +1,10 @@import { UseFilters, UseGuards, UsePipes } from '@nestjs/common';import { Args, Subscription } from '@nestjs/graphql';+import { isString } from '@sniptt/guards';import { PermissionFlagType } from 'twenty-shared/constants';import { EventLogTable } from 'twenty-shared/types';+import { isNonEmptyArray } from 'twenty-shared/utils';import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';@@ -10,7 +12,10 @@ import { EventLogsGraphqlApiExceptionFilter } from 'src/engine/core-modules/evenimport { ForbiddenExceptionGraphqlFilter } from 'src/engine/core-modules/event-logs/filters/forbidden-exception-graphql.filter';import { PreventNestToAutoLogGraphqlErrorsFilter } from 'src/engine/core-modules/graphql/filters/prevent-nest-to-auto-log-graphql-errors.filter';import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';+import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';+import { canCallerReachApplication } from 'src/engine/core-modules/application/utils/can-caller-reach-application.util';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';+import { AuthApplication } from 'src/engine/decorators/auth/auth-application.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';@@ -66,6 +71,8 @@ export class EventLogsLiveResolver {async eventLogsLive(@Args('table', { type: () => EventLogTable }) table: EventLogTable,@AuthWorkspace() workspace: WorkspaceEntity,+ @AuthApplication({ allowUndefined: true })+ callingApplication: FlatApplication | undefined,) {await this.eventLogsService.validateAccess(workspace.id, table);@@ -76,10 +83,30 @@ export class EventLogsLiveResolver {clickHouseTable,);- const iterator = await this.subscriptionService.subscribe({- channel: SubscriptionChannel.WORKSPACE_EVENTS_CHANNEL,- workspaceId: workspace.id,- });+ const iterator =+ await this.subscriptionService.subscribe<WorkspaceEventLivePayload>({+ channel: SubscriptionChannel.WORKSPACE_EVENTS_CHANNEL,+ workspaceId: workspace.id,+ mapPayload: (payload) => {+ if (+ payload.table !==+ getClickHouseTableName(EventLogTable.APPLICATION_LOG)+ ) {+ return payload;+ }++ const rows = payload.rows.filter((row) =>+ canCallerReachApplication({+ callingApplication,+ applicationId: isString(row.applicationId)+ ? row.applicationId+ : undefined,+ }),+ );++ return isNonEmptyArray(rows) ? { ...payload, rows } : undefined;+ },+ });return wrapAsyncIteratorWithLifecycle(() => iterator, {onHeartbeat: async () => {diff --git a/packages/twenty-server/src/engine/core-modules/event-logs/event-logs.resolver.ts b/packages/twenty-server/src/engine/core-modules/event-logs/event-logs.resolver.tsindex 1a0203d1a96..713bbe4b8bd 100644--- a/packages/twenty-server/src/engine/core-modules/event-logs/event-logs.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/event-logs/event-logs.resolver.ts@@ -11,7 +11,10 @@ import { EventLogsGraphqlApiExceptionFilter } from 'src/engine/core-modules/evenimport { ForbiddenExceptionGraphqlFilter } from 'src/engine/core-modules/event-logs/filters/forbidden-exception-graphql.filter';import { PreventNestToAutoLogGraphqlErrorsFilter } from 'src/engine/core-modules/graphql/filters/prevent-nest-to-auto-log-graphql-errors.filter';import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';+import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';+import { getScopedCallingApplication } from 'src/engine/core-modules/application/utils/get-scoped-calling-application.util';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';+import { AuthApplication } from 'src/engine/decorators/auth/auth-application.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';@@ -42,7 +45,11 @@ export class EventLogsResolver {async eventLogs(@AuthWorkspace() workspace: WorkspaceEntity,@Args('input') input: EventLogQueryInput,+ @AuthApplication({ allowUndefined: true })+ callingApplication: FlatApplication | undefined,): Promise<EventLogQueryResult> {- return this.eventLogsService.queryEventLogs(workspace.id, input);+ return this.eventLogsService.queryEventLogs(workspace.id, input, {+ callingApplicationId: getScopedCallingApplication(callingApplication)?.id,+ });}}diff --git a/packages/twenty-server/src/engine/core-modules/event-logs/event-logs.service.spec.ts b/packages/twenty-server/src/engine/core-modules/event-logs/event-logs.service.spec.tsindex 40e1a746c3b..d7e0de9db20 100644--- a/packages/twenty-server/src/engine/core-modules/event-logs/event-logs.service.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/event-logs/event-logs.service.spec.ts@@ -7,6 +7,8 @@ import { type EnterprisePlanService } from 'src/engine/core-modules/enterprise/simport { EventLogsService } from 'src/engine/core-modules/event-logs/event-logs.service';import { type UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';+const CALLING_APPLICATION_ID = 'calling-application-id';+const makeDeletedRecordRow = (recordId: string, timestamp: string) => ({event: 'Object Record Deleted',timestamp,@@ -109,4 +111,60 @@ describe('EventLogsService', () => {]);expect(select).toHaveBeenCalledTimes(2);});++ it('should scope application logs to the calling application', async () => {+ select.mockResolvedValue([]);++ await service.queryEventLogs(+ 'workspace-id',+ { table: EventLogTable.APPLICATION_LOG },+ { callingApplicationId: CALLING_APPLICATION_ID },+ );++ expect(select).toHaveBeenCalledTimes(2);++ for (const [query, params] of select.mock.calls) {+ expect(query).toContain(+ '"applicationId" = {callingApplicationId:String}',+ );+ expect(params).toMatchObject({+ workspaceId: 'workspace-id',+ callingApplicationId: CALLING_APPLICATION_ID,+ });+ }+ });++ it('should keep the application scope when fetching the rows sharing the last timestamp', async () => {+ select+ .mockResolvedValueOnce(pageRowsEndingOnSharedTimestamp)+ .mockResolvedValueOnce([{ totalCount: 5 }])+ .mockResolvedValueOnce([]);++ await service.queryEventLogs(+ 'workspace-id',+ { table: EventLogTable.APPLICATION_LOG, first: 2 },+ { callingApplicationId: CALLING_APPLICATION_ID },+ );++ expect(select).toHaveBeenCalledTimes(3);+ expect(select).toHaveBeenLastCalledWith(+ expect.stringContaining(+ '"applicationId" = {callingApplicationId:String}',+ ),+ expect.objectContaining({ callingApplicationId: CALLING_APPLICATION_ID }),+ );+ });++ it('should return every application log to a caller that is not an application', async () => {+ select.mockResolvedValue([]);++ await service.queryEventLogs('workspace-id', {+ table: EventLogTable.APPLICATION_LOG,+ });++ for (const [query, params] of select.mock.calls) {+ expect(query).not.toContain('"applicationId"');+ expect(params).not.toHaveProperty('callingApplicationId');+ }+ });});diff --git a/packages/twenty-server/src/engine/core-modules/event-logs/event-logs.service.ts b/packages/twenty-server/src/engine/core-modules/event-logs/event-logs.service.tsindex 467ab4eddcf..dddbda11657 100644--- a/packages/twenty-server/src/engine/core-modules/event-logs/event-logs.service.ts+++ b/packages/twenty-server/src/engine/core-modules/event-logs/event-logs.service.ts@@ -43,6 +43,7 @@ export class EventLogsService {async queryEventLogs(workspaceId: string,input: EventLogQueryInput,+ { callingApplicationId }: { callingApplicationId?: string } = {},): Promise<EventLogQueryResult> {await this.validateAccess(workspaceId, input.table);@@ -57,6 +58,14 @@ export class EventLogsService {const whereClauses: string[] = ['"workspaceId" = {workspaceId:String}'];const params: Record<string, unknown> = { workspaceId };+ if (+ input.table === EventLogTable.APPLICATION_LOG &&+ isDefined(callingApplicationId)+ ) {+ whereClauses.push('"applicationId" = {callingApplicationId:String}');+ params.callingApplicationId = callingApplicationId;+ }+await this.applyFilters(whereClauses,params,diff --git a/packages/twenty-server/src/engine/core-modules/sdk-client/__tests__/sdk-client.controller.spec.ts b/packages/twenty-server/src/engine/core-modules/sdk-client/__tests__/sdk-client.controller.spec.tsindex 909df1ae5b0..9634b66f300 100644--- a/packages/twenty-server/src/engine/core-modules/sdk-client/__tests__/sdk-client.controller.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/sdk-client/__tests__/sdk-client.controller.spec.ts@@ -8,9 +8,11 @@ import {SDK_CLIENT_MODULE_NO_STORE_CACHE_CONTROL,} from 'src/engine/core-modules/sdk-client/constants/sdk-client-module-cache-control';import { SdkClientController } from 'src/engine/core-modules/sdk-client/controllers/sdk-client.controller';+import { HttpExceptionHandlerService } from 'src/engine/core-modules/exception-handler/http-exception-handler.service';import { SdkClientArchiveService } from 'src/engine/core-modules/sdk-client/sdk-client-archive.service';import { getInstalledSdkMetadataModule } from 'src/engine/core-modules/sdk-client/utils/get-installed-sdk-metadata-module.util';import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';+import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';jest.mock(@@ -76,6 +78,11 @@ describe('SdkClientController', () => {provide: SdkClientArchiveService,useValue: sdkClientArchiveService,},+ { provide: HttpExceptionHandlerService, useValue: {} },+ {+ provide: WorkspaceManyOrAllFlatEntityMapsCacheService,+ useValue: {},+ },],}).compile();diff --git a/packages/twenty-server/src/engine/core-modules/sdk-client/controllers/sdk-client.controller.ts b/packages/twenty-server/src/engine/core-modules/sdk-client/controllers/sdk-client.controller.tsindex 922ae7d6ced..7d1a69407ac 100644--- a/packages/twenty-server/src/engine/core-modules/sdk-client/controllers/sdk-client.controller.ts+++ b/packages/twenty-server/src/engine/core-modules/sdk-client/controllers/sdk-client.controller.ts@@ -4,6 +4,7 @@ import {NotFoundException,Param,Res,+ UseFilters,UseGuards,} from '@nestjs/common';@@ -11,6 +12,7 @@ import { Response } from 'express';import { ApiPath } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';+import { ApplicationRestApiExceptionFilter } from 'src/engine/core-modules/application/application-rest-api-exception.filter';import {ALLOWED_SDK_MODULES,type SdkModuleName,@@ -22,6 +24,7 @@ import {import { SdkClientArchiveService } from 'src/engine/core-modules/sdk-client/sdk-client-archive.service';import { getInstalledSdkMetadataModule } from 'src/engine/core-modules/sdk-client/utils/get-installed-sdk-metadata-module.util';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';+import { ApplicationTargetParam } from 'src/engine/decorators/auth/application-target-param.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { AllowSuspendedWorkspace } from 'src/engine/decorators/auth/allow-suspended-workspace.decorator';import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';@@ -31,6 +34,7 @@ import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/works@Controller(`${ApiPath.Rest}/sdk-client`)@AllowSuspendedWorkspace()@UseGuards(WorkspaceAuthGuard)+@UseFilters(ApplicationRestApiExceptionFilter)export class SdkClientController {constructor(private readonly workspaceCacheService: WorkspaceCacheService,@@ -58,7 +62,8 @@ export class SdkClientController {@UseGuards(NoPermissionGuard)async getSdkModule(@Res() res: Response,- @Param('applicationId') applicationId: string,+ @ApplicationTargetParam('applicationId', { kind: 'applicationId' })+ applicationId: string,@Param('moduleName') moduleName: SdkModuleName,@AuthWorkspace() workspace: WorkspaceEntity,@Param('checksum') checksum?: string,diff --git a/packages/twenty-server/src/engine/core-modules/sdk-client/sdk-client.module.ts b/packages/twenty-server/src/engine/core-modules/sdk-client/sdk-client.module.tsindex bd72e8b2d46..05ce14c68aa 100644--- a/packages/twenty-server/src/engine/core-modules/sdk-client/sdk-client.module.ts+++ b/packages/twenty-server/src/engine/core-modules/sdk-client/sdk-client.module.ts@@ -12,9 +12,11 @@ import { getInstalledSdkMetadataModule } from 'src/engine/core-modules/sdk-clienimport { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';+import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';@Module({imports: [+ WorkspaceManyOrAllFlatEntityMapsCacheModule,TypeOrmModule.forFeature([ApplicationEntity, WorkspaceEntity]),WorkspaceCacheModule,CoreGraphQLApiModule,diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/logic-function-tool.provider.spec.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/logic-function-tool.provider.spec.tsindex aaef7ca52cc..eb33d0485fe 100644--- a/packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/logic-function-tool.provider.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/logic-function-tool.provider.spec.ts@@ -1,3 +1,5 @@+import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';+import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';import { LogicFunctionToolProvider } from 'src/engine/core-modules/tool-provider/providers/logic-function-tool.provider';import { type ToolIndexEntry } from 'src/engine/core-modules/tool-provider/types/tool-index-entry.type';import { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/constant/create-empty-flat-entity-maps.constant';@@ -24,7 +26,10 @@ const createFlatLogicFunction = (...overrides,}) as FlatLogicFunction;-const generateDescriptors = async (logicFunctions: FlatLogicFunction[]) => {+const generateDescriptors = async (+ logicFunctions: FlatLogicFunction[],+ application?: FlatApplication,+) => {const flatLogicFunctionMaps =createEmptyFlatEntityMaps() as FlatEntityMaps<FlatLogicFunction>;@@ -59,7 +64,12 @@ const generateDescriptors = async (logicFunctions: FlatLogicFunction[]) => {const provider = new LogicFunctionToolProvider(flatEntityMapsCacheService);return (await provider.generateDescriptors(- { workspaceId, roleId, rolePermissionConfig: { unionOf: [roleId] } },+ {+ workspaceId,+ roleId,+ rolePermissionConfig: { unionOf: [roleId] },+ application,+ },{ includeSchemas: false },)) as ToolIndexEntry[];};@@ -111,4 +121,54 @@ describe('LogicFunctionToolProvider', () => {expect(descriptors).toEqual([]);});++ it('should only expose the calling application tools to an application token', async () => {+ const logicFunctions = [+ createFlatLogicFunction({+ name: 'own-tool',+ applicationId: 'calling-application-id',+ }),+ createFlatLogicFunction({+ name: 'other-tool',+ applicationId: 'other-application-id',+ }),+ ];++ const sessionDescriptors = await generateDescriptors(logicFunctions);+ const applicationDescriptors = await generateDescriptors(logicFunctions, {+ id: 'calling-application-id',+ } as FlatApplication);++ expect(sessionDescriptors.map(({ name }) => name)).toEqual([+ 'app_own_tool',+ 'app_other_tool',+ ]);+ expect(applicationDescriptors.map(({ name }) => name)).toEqual([+ 'app_own_tool',+ ]);+ });++ it('should expose every application tool to an OAuth-only client', async () => {+ const descriptors = await generateDescriptors(+ [+ createFlatLogicFunction({+ name: 'first-tool',+ applicationId: 'first-application-id',+ }),+ createFlatLogicFunction({+ name: 'second-tool',+ applicationId: 'second-application-id',+ }),+ ],+ {+ id: 'mcp-client-application-id',+ sourceType: ApplicationRegistrationSourceType.OAUTH_ONLY,+ } as FlatApplication,+ );++ expect(descriptors.map(({ name }) => name)).toEqual([+ 'app_first_tool',+ 'app_second_tool',+ ]);+ });});diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/providers/logic-function-tool.provider.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/providers/logic-function-tool.provider.tsindex 85021328e41..0a33fb6d7c3 100644--- a/packages/twenty-server/src/engine/core-modules/tool-provider/providers/logic-function-tool.provider.ts+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/providers/logic-function-tool.provider.ts@@ -6,6 +6,7 @@ import {DEFAULT_TOOL_INPUT_SCHEMA,} from 'twenty-shared/logic-function';+import { canCallerReachApplication } from 'src/engine/core-modules/application/utils/can-caller-reach-application.util';import { type GenerateDescriptorOptions } from 'src/engine/core-modules/tool-provider/interfaces/generate-descriptor-options.type';import { type ToolProvider } from 'src/engine/core-modules/tool-provider/interfaces/tool-provider.interface';import { type ToolProviderContext } from 'src/engine/core-modules/tool-provider/interfaces/tool-provider-context.type';@@ -84,7 +85,11 @@ export class LogicFunctionToolProvider implements ToolProvider {(fn): fn is FlatLogicFunction =>isDefined(fn) &&isDefined(fn.toolTriggerSettings) &&- fn.deletedAt === null,+ fn.deletedAt === null &&+ canCallerReachApplication({+ callingApplication: context.application,+ applicationId: fn.applicationId,+ }),);const descriptors: (ToolIndexEntry | ToolDescriptor)[] = [];diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/resolvers/tool-index.resolver.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/resolvers/tool-index.resolver.tsindex 3c48f60f053..605cbf399f9 100644--- a/packages/twenty-server/src/engine/core-modules/tool-provider/resolvers/tool-index.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/resolvers/tool-index.resolver.ts@@ -78,6 +78,7 @@ export class ToolIndexResolver {userId: user?.id,userWorkspaceId,locale,+ application,});}@@ -107,6 +108,7 @@ export class ToolIndexResolver {rolePermissionConfig: { intersectionOf: roleIds },userId: user?.id,userWorkspaceId,+ application,},});diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/services/tool-registry.service.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/services/tool-registry.service.tsindex acfec16c68e..1fe667c3874 100644--- a/packages/twenty-server/src/engine/core-modules/tool-provider/services/tool-registry.service.ts+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/services/tool-registry.service.ts@@ -4,6 +4,7 @@ import { type ToolSet, jsonSchema } from 'ai';import { type ToolCategory } from 'twenty-shared/ai';import { type APP_LOCALES } from 'twenty-shared/translations';+import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';import { type ToolProviderContext } from 'src/engine/core-modules/tool-provider/interfaces/tool-provider-context.type';import { type ToolProvider } from 'src/engine/core-modules/tool-provider/interfaces/tool-provider.interface';import { type ToolRetrievalOptions } from 'src/engine/core-modules/tool-provider/interfaces/tool-retrieval-options.type';@@ -183,6 +184,7 @@ export class ToolRegistryService {rolePermissionConfig?: RolePermissionConfig;categories?: ToolCategory[];excludeTools?: Set<string>;+ application?: FlatApplication;},): Promise<ToolIndexEntry[]> {const context = this.buildContextFromToolContext({@@ -192,6 +194,7 @@ export class ToolRegistryService {userId: options?.userId,userWorkspaceId: options?.userWorkspaceId,locale: options?.locale,+ application: options?.application,});return this.getCatalog(context, {diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/tools/get-tool-catalog.tool.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/tools/get-tool-catalog.tool.tsindex d845f16f36d..79c7239f3d7 100644--- a/packages/twenty-server/src/engine/core-modules/tool-provider/tools/get-tool-catalog.tool.ts+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/tools/get-tool-catalog.tool.ts@@ -1,6 +1,8 @@import { z } from 'zod';import { ToolCategory } from 'twenty-shared/ai';++import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';import { type ToolRegistryService } from 'src/engine/core-modules/tool-provider/services/tool-registry.service';import { type ToolIndexEntry } from 'src/engine/core-modules/tool-provider/types/tool-index-entry.type';import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';@@ -36,6 +38,7 @@ export const createGetToolCatalogTool = (userId?: string;userWorkspaceId?: string;excludeTools?: Set<string>;+ application?: FlatApplication;},) => ({description:diff --git a/packages/twenty-server/src/engine/decorators/auth/application-target-arg.decorator.ts b/packages/twenty-server/src/engine/decorators/auth/application-target-arg.decorator.tsnew file mode 100644index 00000000000..5c26ccafe8a--- /dev/null+++ b/packages/twenty-server/src/engine/decorators/auth/application-target-arg.decorator.ts@@ -0,0 +1,31 @@+import { Args, type ArgsOptions } from '@nestjs/graphql';++import { isDefined } from 'twenty-shared/utils';++import {+ type ApplicationTargetKind,+ type StringPathOf,+} from 'src/engine/core-modules/application/types/application-target.type';+import { attachApplicationTarget } from 'src/engine/core-modules/application/utils/attach-application-target.util';++// Replaces @Args so the argument the guard reads is the one the schema+// declares. TInput defaults to never, so an idKey requires the input type.+export const ApplicationTargetArg =+ <TInput = never>(+ argName: string,+ target: ApplicationTargetKind & { idKey?: StringPathOf<TInput> },+ argsOptions?: ArgsOptions,+ ): ParameterDecorator =>+ (prototype, propertyKey, parameterIndex) => {+ attachApplicationTarget({+ prototype,+ propertyKey,+ target: { ...target, source: 'graphqlArg', argName },+ });++ const argsDecorator = isDefined(argsOptions)+ ? Args(argName, argsOptions)+ : Args(argName);++ argsDecorator(prototype, propertyKey, parameterIndex);+ };diff --git a/packages/twenty-server/src/engine/decorators/auth/application-target-args.decorator.ts b/packages/twenty-server/src/engine/decorators/auth/application-target-args.decorator.tsnew file mode 100644index 00000000000..47026d2589f--- /dev/null+++ b/packages/twenty-server/src/engine/decorators/auth/application-target-args.decorator.ts@@ -0,0 +1,22 @@+import { Args } from '@nestjs/graphql';++import {+ type ApplicationTargetKind,+ type StringPathOf,+} from 'src/engine/core-modules/application/types/application-target.type';+import { attachApplicationTarget } from 'src/engine/core-modules/application/utils/attach-application-target.util';++// @ArgsType counterpart of ApplicationTargetArg: replaces a bare @Args()+export const ApplicationTargetArgs =+ <TArgs = never>(+ target: ApplicationTargetKind & { idKey: StringPathOf<TArgs> },+ ): ParameterDecorator =>+ (prototype, propertyKey, parameterIndex) => {+ attachApplicationTarget({+ prototype,+ propertyKey,+ target: { ...target, source: 'graphqlArgs' },+ });++ Args()(prototype, propertyKey, parameterIndex);+ };diff --git a/packages/twenty-server/src/engine/decorators/auth/application-target-param.decorator.ts b/packages/twenty-server/src/engine/decorators/auth/application-target-param.decorator.tsnew file mode 100644index 00000000000..61ad56a96af--- /dev/null+++ b/packages/twenty-server/src/engine/decorators/auth/application-target-param.decorator.ts@@ -0,0 +1,17 @@+import { Param } from '@nestjs/common';++import { type ApplicationTargetKind } from 'src/engine/core-modules/application/types/application-target.type';+import { attachApplicationTarget } from 'src/engine/core-modules/application/utils/attach-application-target.util';++// REST counterpart of ApplicationTargetArg: replaces @Param+export const ApplicationTargetParam =+ (paramName: string, target: ApplicationTargetKind): ParameterDecorator =>+ (prototype, propertyKey, parameterIndex) => {+ attachApplicationTarget({+ prototype,+ propertyKey,+ target: { ...target, source: 'routeParam', argName: paramName },+ });++ Param(paramName)(prototype, propertyKey, parameterIndex);+ };diff --git a/packages/twenty-server/src/engine/guards/__tests__/application-target.guard.spec.ts b/packages/twenty-server/src/engine/guards/__tests__/application-target.guard.spec.tsnew file mode 100644index 00000000000..2635a57beba--- /dev/null+++ b/packages/twenty-server/src/engine/guards/__tests__/application-target.guard.spec.ts@@ -0,0 +1,396 @@+import { type ExecutionContext } from '@nestjs/common';+import { GUARDS_METADATA } from '@nestjs/common/constants';+import { Reflector } from '@nestjs/core';+import { GqlExecutionContext } from '@nestjs/graphql';++import { ApplicationExceptionCode } from 'src/engine/core-modules/application/application.exception';+import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';+import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';+import { ApplicationTargetArg } from 'src/engine/decorators/auth/application-target-arg.decorator';+import { ApplicationTargetArgs } from 'src/engine/decorators/auth/application-target-args.decorator';+import { ApplicationTargetParam } from 'src/engine/decorators/auth/application-target-param.decorator';+import { ApplicationTargetGuard } from 'src/engine/guards/application-target.guard';+import { type WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';++const WORKSPACE_ID = 'workspace-id';+const OWN_LOGIC_FUNCTION_ID = 'own-logic-function-id';+const OTHER_LOGIC_FUNCTION_ID = 'other-logic-function-id';++const CALLING_APPLICATION = {+ id: 'calling-application-id',+ universalIdentifier: 'calling-application-universal-identifier',+ applicationRegistrationId: 'calling-application-registration-id',+} as FlatApplication;++type LogicFunctionInput = { id: string; payload: object };++type ExportInput = { universalIdentifier: string };++type SyncInput = {+ manifest: { application: { universalIdentifier: string } };+ dryRun?: boolean;+};++class TestResolver {+ runHealthCheck(+ @ApplicationTargetArg('applicationId', { kind: 'applicationId' })+ _applicationId: string,+ ) {}++ exportApplication(+ @ApplicationTargetArgs<ExportInput>({+ kind: 'applicationUniversalIdentifier',+ idKey: 'universalIdentifier',+ })+ _input: ExportInput,+ ) {}++ syncApplication(+ @ApplicationTargetArgs<SyncInput>({+ kind: 'applicationUniversalIdentifier',+ idKey: 'manifest.application.universalIdentifier',+ })+ _input: SyncInput,+ ) {}++ findRegistration(+ @ApplicationTargetArg('id', { kind: 'applicationRegistrationId' })+ _id: string,+ ) {}++ executeLogicFunction(+ @ApplicationTargetArg<LogicFunctionInput>('input', {+ kind: 'applicationOwnedEntity',+ metadataName: 'logicFunction',+ idKey: 'id',+ })+ _input: LogicFunctionInput,+ ) {}++ getSdkModule(+ @ApplicationTargetParam('applicationId', { kind: 'applicationId' })+ _applicationId: string,+ ) {}++ undecorated() {}+}++const buildFlatLogicFunctionMaps = () => ({+ byUniversalIdentifier: {+ 'own-logic-function': {+ id: OWN_LOGIC_FUNCTION_ID,+ universalIdentifier: 'own-logic-function',+ applicationId: CALLING_APPLICATION.id,+ },+ 'other-logic-function': {+ id: OTHER_LOGIC_FUNCTION_ID,+ universalIdentifier: 'other-logic-function',+ applicationId: 'other-application-id',+ },+ },+ universalIdentifierById: {+ [OWN_LOGIC_FUNCTION_ID]: 'own-logic-function',+ [OTHER_LOGIC_FUNCTION_ID]: 'other-logic-function',+ },+ universalIdentifiersByApplicationId: {},+});++describe('ApplicationTargetGuard', () => {+ let guard: ApplicationTargetGuard;++ const buildGraphqlContext = ({+ handler,+ args,+ application,+ }: {+ handler: (...args: never[]) => unknown;+ args: Record<string, unknown>;+ application?: FlatApplication;+ }): ExecutionContext => {+ jest.spyOn(GqlExecutionContext, 'create').mockReturnValue({+ getArgs: () => args,+ getContext: () => ({+ req: { application, workspace: { id: WORKSPACE_ID } },+ }),+ } as unknown as GqlExecutionContext);++ return {+ getType: () => 'graphql',+ getHandler: () => handler,+ } as unknown as ExecutionContext;+ };++ const buildHttpContext = ({+ handler,+ params,+ application,+ }: {+ handler: (...args: never[]) => unknown;+ params: Record<string, string>;+ application?: FlatApplication;+ }): ExecutionContext =>+ ({+ getType: () => 'http',+ getHandler: () => handler,+ switchToHttp: () => ({+ getRequest: () => ({+ application,+ params,+ workspace: { id: WORKSPACE_ID },+ }),+ }),+ }) as unknown as ExecutionContext;++ const expectForbidden = async (context: ExecutionContext) => {+ await expect(guard.canActivate(context)).rejects.toMatchObject({+ code: ApplicationExceptionCode.FORBIDDEN,+ });+ };++ beforeEach(() => {+ jest.restoreAllMocks();++ guard = new ApplicationTargetGuard(new Reflector(), {+ getOrRecomputeManyOrAllFlatEntityMaps: jest.fn().mockResolvedValue({+ flatLogicFunctionMaps: buildFlatLogicFunctionMaps(),+ }),+ } as unknown as WorkspaceManyOrAllFlatEntityMapsCacheService);+ });++ it('should attach the guard to every decorated handler', () => {+ expect(+ Reflect.getMetadata(+ GUARDS_METADATA,+ TestResolver.prototype.executeLogicFunction,+ ),+ ).toEqual([ApplicationTargetGuard]);+ expect(+ Reflect.getMetadata(GUARDS_METADATA, TestResolver.prototype.undecorated),+ ).toBeUndefined();+ });++ it('should refuse a second application target on the same handler', () => {+ expect(() => {+ class DoubleTargetResolver {+ find(+ @ApplicationTargetArg('applicationId', { kind: 'applicationId' })+ _applicationId: string,+ @ApplicationTargetArg('id', { kind: 'applicationRegistrationId' })+ _id: string,+ ) {}+ }++ return DoubleTargetResolver;+ }).toThrow('declares more than one application target');+ });++ it('should let callers that are not applications through', async () => {+ await expect(+ guard.canActivate(+ buildGraphqlContext({+ handler: TestResolver.prototype.runHealthCheck,+ args: { applicationId: 'other-application-id' },+ }),+ ),+ ).resolves.toBe(true);+ });++ it('should let OAuth-only clients such as the CLI through', async () => {+ await expect(+ guard.canActivate(+ buildGraphqlContext({+ handler: TestResolver.prototype.exportApplication,+ args: { universalIdentifier: 'other-universal-identifier' },+ application: {+ ...CALLING_APPLICATION,+ sourceType: ApplicationRegistrationSourceType.OAUTH_ONLY,+ },+ }),+ ),+ ).resolves.toBe(true);+ });++ it('should let handlers without an application target through', async () => {+ await expect(+ guard.canActivate(+ buildGraphqlContext({+ handler: TestResolver.prototype.undecorated,+ args: {},+ application: CALLING_APPLICATION,+ }),+ ),+ ).resolves.toBe(true);+ });++ it('should compare an application id argument with the caller', async () => {+ await expect(+ guard.canActivate(+ buildGraphqlContext({+ handler: TestResolver.prototype.runHealthCheck,+ args: { applicationId: CALLING_APPLICATION.id },+ application: CALLING_APPLICATION,+ }),+ ),+ ).resolves.toBe(true);++ await expectForbidden(+ buildGraphqlContext({+ handler: TestResolver.prototype.runHealthCheck,+ args: { applicationId: 'other-application-id' },+ application: CALLING_APPLICATION,+ }),+ );+ });++ it('should compare a universal identifier read from an args type', async () => {+ await expect(+ guard.canActivate(+ buildGraphqlContext({+ handler: TestResolver.prototype.exportApplication,+ args: {+ universalIdentifier: CALLING_APPLICATION.universalIdentifier,+ },+ application: CALLING_APPLICATION,+ }),+ ),+ ).resolves.toBe(true);++ await expectForbidden(+ buildGraphqlContext({+ handler: TestResolver.prototype.exportApplication,+ args: { universalIdentifier: 'other-universal-identifier' },+ application: CALLING_APPLICATION,+ }),+ );+ });++ it('should compare a universal identifier read from a nested path', async () => {+ await expect(+ guard.canActivate(+ buildGraphqlContext({+ handler: TestResolver.prototype.syncApplication,+ args: {+ manifest: {+ application: {+ universalIdentifier: CALLING_APPLICATION.universalIdentifier,+ },+ },+ },+ application: CALLING_APPLICATION,+ }),+ ),+ ).resolves.toBe(true);++ await expectForbidden(+ buildGraphqlContext({+ handler: TestResolver.prototype.syncApplication,+ args: {+ manifest: {+ application: { universalIdentifier: 'other-universal-identifier' },+ },+ },+ application: CALLING_APPLICATION,+ }),+ );++ await expect(+ guard.canActivate(+ buildGraphqlContext({+ handler: TestResolver.prototype.syncApplication,+ args: { manifest: {} },+ application: CALLING_APPLICATION,+ }),+ ),+ ).rejects.toMatchObject({+ message:+ 'Missing application target "manifest.application.universalIdentifier"',+ });+ });++ it('should compare a registration id with the caller registration', async () => {+ await expect(+ guard.canActivate(+ buildGraphqlContext({+ handler: TestResolver.prototype.findRegistration,+ args: { id: CALLING_APPLICATION.applicationRegistrationId },+ application: CALLING_APPLICATION,+ }),+ ),+ ).resolves.toBe(true);++ await expectForbidden(+ buildGraphqlContext({+ handler: TestResolver.prototype.findRegistration,+ args: { id: 'other-registration-id' },+ application: CALLING_APPLICATION,+ }),+ );+ });++ it('should compare the owner of an entity read from an input argument', async () => {+ await expect(+ guard.canActivate(+ buildGraphqlContext({+ handler: TestResolver.prototype.executeLogicFunction,+ args: { input: { id: OWN_LOGIC_FUNCTION_ID, payload: {} } },+ application: CALLING_APPLICATION,+ }),+ ),+ ).resolves.toBe(true);++ await expectForbidden(+ buildGraphqlContext({+ handler: TestResolver.prototype.executeLogicFunction,+ args: { input: { id: OTHER_LOGIC_FUNCTION_ID, payload: {} } },+ application: CALLING_APPLICATION,+ }),+ );+ });++ it('should leave unknown entity ids to the resolver', async () => {+ await expect(+ guard.canActivate(+ buildGraphqlContext({+ handler: TestResolver.prototype.executeLogicFunction,+ args: { input: { id: 'unknown-logic-function-id', payload: {} } },+ application: CALLING_APPLICATION,+ }),+ ),+ ).resolves.toBe(true);+ });++ it('should refuse an application caller when the target cannot be read', async () => {+ await expect(+ guard.canActivate(+ buildGraphqlContext({+ handler: TestResolver.prototype.executeLogicFunction,+ args: {},+ application: CALLING_APPLICATION,+ }),+ ),+ ).rejects.toMatchObject({+ code: ApplicationExceptionCode.FORBIDDEN,+ message: 'Missing application target "input.id"',+ });+ });++ it('should read the target from a route parameter', async () => {+ await expect(+ guard.canActivate(+ buildHttpContext({+ handler: TestResolver.prototype.getSdkModule,+ params: { applicationId: CALLING_APPLICATION.id },+ application: CALLING_APPLICATION,+ }),+ ),+ ).resolves.toBe(true);++ await expectForbidden(+ buildHttpContext({+ handler: TestResolver.prototype.getSdkModule,+ params: { applicationId: 'other-application-id' },+ application: CALLING_APPLICATION,+ }),+ );+ });+});diff --git a/packages/twenty-server/src/engine/guards/application-target.guard.ts b/packages/twenty-server/src/engine/guards/application-target.guard.tsnew file mode 100644index 00000000000..f07218e9d9b--- /dev/null+++ b/packages/twenty-server/src/engine/guards/application-target.guard.ts@@ -0,0 +1,195 @@+import {+ type CanActivate,+ type ExecutionContext,+ Injectable,+} from '@nestjs/common';+import { Reflector } from '@nestjs/core';+import { GqlExecutionContext } from '@nestjs/graphql';++import { isNonEmptyString, isObject } from '@sniptt/guards';+import { type AllMetadataName } from 'twenty-shared/metadata';+import { assertUnreachable, isDefined } from 'twenty-shared/utils';++import {+ ApplicationException,+ ApplicationExceptionCode,+} from 'src/engine/core-modules/application/application.exception';+import { APPLICATION_TARGET_METADATA_KEY } from 'src/engine/core-modules/application/constants/application-target-metadata-key.constant';+import { type ApplicationTarget } from 'src/engine/core-modules/application/types/application-target.type';+import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';+import { isOAuthOnlyApplication } from 'src/engine/core-modules/application/utils/is-oauth-only-application.util';+import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';+import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';+import { type SyncableFlatEntity } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-from.type';+import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';+import { getMetadataFlatEntityMapsKey } from 'src/engine/metadata-modules/flat-entity/utils/get-metadata-flat-entity-maps-key.util';+import { getRequest } from 'src/utils/extract-request';++// Sessions and API keys keep workspace-wide reach behind their permission+// flags; an application token only reaches the target it names when that+// target is its own application.+@Injectable()+export class ApplicationTargetGuard implements CanActivate {+ constructor(+ private readonly reflector: Reflector,+ private readonly flatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,+ ) {}++ async canActivate(context: ExecutionContext): Promise<boolean> {+ const target = this.reflector.get<ApplicationTarget | undefined>(+ APPLICATION_TARGET_METADATA_KEY,+ context.getHandler(),+ );+ const request = getRequest(context);+ const callingApplication: FlatApplication | undefined =+ request?.application;++ if (+ !isDefined(target) ||+ !isDefined(callingApplication) ||+ isOAuthOnlyApplication(callingApplication)+ ) {+ return true;+ }++ const targetValue = this.readTargetValue({ context, request, target });++ if (!isNonEmptyString(targetValue)) {+ throw new ApplicationException(+ `Missing application target "${this.getTargetName(target)}"`,+ ApplicationExceptionCode.FORBIDDEN,+ );+ }++ switch (target.kind) {+ case 'applicationId':+ return this.assertOrThrow(+ targetValue === callingApplication.id,+ 'An application token can only target its own application',+ );+ case 'applicationUniversalIdentifier':+ return this.assertOrThrow(+ targetValue === callingApplication.universalIdentifier,+ 'An application token can only target its own application',+ );+ case 'applicationRegistrationId':+ return this.assertOrThrow(+ targetValue === callingApplication.applicationRegistrationId,+ 'An application token can only reach its own application registration',+ );+ case 'applicationOwnedEntity':+ return this.assertOrThrow(+ await this.isOwnedByCallingApplication({+ metadataName: target.metadataName,+ entityId: targetValue,+ callingApplication,+ workspaceId: request.workspace.id,+ }),+ 'An application token can only reach its own application',+ );+ default:+ return assertUnreachable(target);+ }+ }++ private readTargetValue({+ context,+ request,+ target,+ }: {+ context: ExecutionContext;+ request: { params?: Record<string, unknown> };+ target: ApplicationTarget;+ }): unknown {+ switch (target.source) {+ case 'graphqlArg': {+ const argValue =+ GqlExecutionContext.create(context).getArgs()[target.argName];++ return isDefined(target.idKey)+ ? this.readPath(argValue, target.idKey)+ : argValue;+ }+ case 'graphqlArgs':+ return this.readPath(+ GqlExecutionContext.create(context).getArgs(),+ target.idKey,+ );+ case 'routeParam':+ return request.params?.[target.argName];+ default:+ return assertUnreachable(target);+ }+ }++ private readPath(value: unknown, path: string): unknown {+ return path+ .split('.')+ .reduce<unknown>(+ (currentValue, key) =>+ isObject(currentValue)+ ? (currentValue as Record<string, unknown>)[key]+ : undefined,+ value,+ );+ }++ private getTargetName(target: ApplicationTarget): string {+ switch (target.source) {+ case 'graphqlArg':+ return isDefined(target.idKey)+ ? `${target.argName}.${target.idKey}`+ : target.argName;+ case 'graphqlArgs':+ return target.idKey;+ case 'routeParam':+ return target.argName;+ default:+ return assertUnreachable(target);+ }+ }++ private async isOwnedByCallingApplication({+ metadataName,+ entityId,+ callingApplication,+ workspaceId,+ }: {+ metadataName: AllMetadataName;+ entityId: string;+ callingApplication: FlatApplication;+ workspaceId: string;+ }): Promise<boolean> {+ const flatMapsKey = getMetadataFlatEntityMapsKey(metadataName);++ const flatEntityMapsByKey =+ await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(+ { workspaceId, flatMapsKeys: [flatMapsKey] },+ );++ const flatEntityMaps: FlatEntityMaps<SyncableFlatEntity> =+ flatEntityMapsByKey[flatMapsKey];++ const flatEntity = findFlatEntityByIdInFlatEntityMaps({+ flatEntityId: entityId,+ flatEntityMaps,+ });++ // Unknown ids pass so the resolver keeps answering NOT_FOUND+ return (+ !isDefined(flatEntity) ||+ flatEntity.applicationId === callingApplication.id+ );+ }++ private assertOrThrow(isOwnTarget: boolean, message: string): true {+ if (!isOwnTarget) {+ throw new ApplicationException(+ message,+ ApplicationExceptionCode.FORBIDDEN,+ );+ }++ return true;+ }+}diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/agent.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/agent.resolver.tsindex bb8fcc1c096..067994a285d 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/agent.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/agent.resolver.ts@@ -4,7 +4,12 @@ import { Args, Mutation, Query } from '@nestjs/graphql';import { PermissionFlagType } from 'twenty-shared/constants';import { isNonEmptyString } from '@sniptt/guards';+import { ApplicationExceptionFilter } from 'src/engine/core-modules/application/application-exception-filter';+import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';+import { canCallerReachApplication } from 'src/engine/core-modules/application/utils/can-caller-reach-application.util';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';+import { ApplicationTargetArg } from 'src/engine/decorators/auth/application-target-arg.decorator';+import { AuthApplication } from 'src/engine/decorators/auth/auth-application.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';@@ -28,7 +33,7 @@ import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filtAiGraphqlApiExceptionInterceptor,)@MetadataResolver()-@UseFilters(AuthGraphqlApiExceptionFilter)+@UseFilters(ApplicationExceptionFilter, AuthGraphqlApiExceptionFilter)export class AgentResolver {constructor(private readonly agentService: AgentService,@@ -38,16 +43,30 @@ export class AgentResolver {@Query(() => [AgentDTO])async findManyAgents(@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,+ @AuthApplication({ allowUndefined: true })+ callingApplication: FlatApplication | undefined,): Promise<AgentDTO[]> {const flatAgentsWithRoleId =await this.agentService.findManyAgents(workspaceId);- return flatAgentsWithRoleId.map(fromFlatAgentWithRoleIdToAgentDto);+ return flatAgentsWithRoleId+ .filter((flatAgent) =>+ canCallerReachApplication({+ callingApplication,+ applicationId: flatAgent.applicationId,+ }),+ )+ .map(fromFlatAgentWithRoleIdToAgentDto);}@Query(() => AgentDTO)async findOneAgent(- @Args('input') { id }: AgentIdInput,+ @ApplicationTargetArg<AgentIdInput>('input', {+ kind: 'applicationOwnedEntity',+ metadataName: 'agent',+ idKey: 'id',+ })+ { id }: AgentIdInput,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,): Promise<AgentDTO> {const fatAgentWithRoleId = await this.agentService.findOneAgentById({diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/ai-agent.module.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/ai-agent.module.tsindex 938da25db05..e7e62ce6653 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/ai-agent.module.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/ai-agent.module.ts@@ -22,9 +22,11 @@ import { AgentResolver } from './agent.resolver';import { AgentService } from './agent.service';import { AgentEntity } from './entities/agent.entity';+import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';@Module({imports: [+ WorkspaceManyOrAllFlatEntityMapsCacheModule,TypeOrmModule.forFeature([AgentEntity, RoleEntity, RoleTargetEntity]),AiModelsModule,AiAgentRoleModule,diff --git a/packages/twenty-server/src/engine/metadata-modules/connected-account/resolvers/connected-account.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/connected-account/resolvers/connected-account.resolver.tsindex 56655287a34..1873c0ec5d8 100644--- a/packages/twenty-server/src/engine/metadata-modules/connected-account/resolvers/connected-account.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/connected-account/resolvers/connected-account.resolver.ts@@ -5,9 +5,11 @@ import { PermissionFlagType } from 'twenty-shared/constants';import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';+import { ApplicationExceptionFilter } from 'src/engine/core-modules/application/application-exception-filter';import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { AuthApplication } from 'src/engine/decorators/auth/auth-application.decorator';+import { ApplicationTargetArg } from 'src/engine/decorators/auth/application-target-arg.decorator';import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { AllowSuspendedWorkspace } from 'src/engine/decorators/auth/allow-suspended-workspace.decorator';@@ -26,7 +28,7 @@ import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filt@UseGuards(WorkspaceAuthGuard)@UseInterceptors(ConnectedAccountGraphqlApiExceptionInterceptor)@MetadataResolver(() => ConnectedAccountDTO)-@UseFilters(AuthGraphqlApiExceptionFilter)+@UseFilters(ApplicationExceptionFilter, AuthGraphqlApiExceptionFilter)export class ConnectedAccountResolver {constructor(private readonly connectedAccountMetadataService: ConnectedAccountMetadataService,@@ -51,7 +53,11 @@ export class ConnectedAccountResolver {@Query(() => [ApplicationConnectedAccountDTO])@UseGuards(SettingsPermissionGuard(PermissionFlagType.APPLICATIONS))async applicationConnectedAccounts(- @Args('applicationId', { type: () => UUIDScalarType })+ @ApplicationTargetArg(+ 'applicationId',+ { kind: 'applicationId' },+ { type: () => UUIDScalarType },+ )applicationId: string,@AuthWorkspace() workspace: WorkspaceEntity,@AuthUserWorkspaceId() userWorkspaceId: string,diff --git a/packages/twenty-server/src/engine/metadata-modules/front-component/controllers/front-component.controller.ts b/packages/twenty-server/src/engine/metadata-modules/front-component/controllers/front-component.controller.tsindex e31f695bd34..07f147302be 100644--- a/packages/twenty-server/src/engine/metadata-modules/front-component/controllers/front-component.controller.ts+++ b/packages/twenty-server/src/engine/metadata-modules/front-component/controllers/front-component.controller.ts@@ -2,7 +2,6 @@ import {Controller,Get,Logger,- Param,Res,UseFilters,UseGuards,@@ -13,6 +12,7 @@ import { pipeline } from 'stream/promises';import { Response } from 'express';import { ApiPath, FileFolder } from 'twenty-shared/types';+import { ApplicationRestApiExceptionFilter } from 'src/engine/core-modules/application/application-rest-api-exception.filter';import {FileStorageException,FileStorageExceptionCode,@@ -21,6 +21,7 @@ import { PRESIGNED_URL_NO_STORE_CACHE_CONTROL } from 'src/engine/core-modules/fiimport { setFileResponseHeaders } from 'src/engine/core-modules/file/utils/set-file-response-headers.utils';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';+import { ApplicationTargetParam } from 'src/engine/decorators/auth/application-target-param.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { AllowSuspendedWorkspace } from 'src/engine/decorators/auth/allow-suspended-workspace.decorator';import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';@@ -40,6 +41,7 @@ import { WorkspaceMigrationRunnerRestApiExceptionFilter } from 'src/engine/works@UseGuards(WorkspaceAuthGuard)@UseFilters(PermissionsRestApiExceptionFilter,+ ApplicationRestApiExceptionFilter,FrontComponentRestApiExceptionFilter,FlatEntityMapsRestApiExceptionFilter,WorkspaceMigrationRunnerRestApiExceptionFilter,@@ -53,7 +55,11 @@ export class FrontComponentController {@UseGuards(NoPermissionGuard)async getBuiltJs(@Res() res: Response,- @Param('frontComponentId') frontComponentId: string,+ @ApplicationTargetParam('frontComponentId', {+ kind: 'applicationOwnedEntity',+ metadataName: 'frontComponent',+ })+ frontComponentId: string,@AuthWorkspace() workspace: WorkspaceEntity,) {const fileResponse = await this.frontComponentServicediff --git a/packages/twenty-server/src/engine/metadata-modules/front-component/front-component.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/front-component/front-component.resolver.tsindex 1969b0c01ea..d01d0c75544 100644--- a/packages/twenty-server/src/engine/metadata-modules/front-component/front-component.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/front-component/front-component.resolver.ts@@ -19,10 +19,13 @@ import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/import { ApplicationExceptionFilter } from 'src/engine/core-modules/application/application-exception-filter';import { ApplicationTokenPairDTO } from 'src/engine/core-modules/application/application-oauth/dtos/application-token-pair.dto';import { ApplicationVariableEntityService } from 'src/engine/core-modules/application/application-variable/application-variable.service';+import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';+import { canCallerReachApplication } from 'src/engine/core-modules/application/utils/can-caller-reach-application.util';import { ApplicationTokenService } from 'src/engine/core-modules/auth/token/services/application-token.service';import { type AuthContextUser } from 'src/engine/core-modules/auth/types/auth-context.type';import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';+import { AuthApplication } from 'src/engine/decorators/auth/auth-application.decorator';import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';import { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';@@ -107,8 +110,19 @@ export class FrontComponentResolver {@AllowSuspendedWorkspace()async frontComponents(@AuthWorkspace() workspace: WorkspaceEntity,+ @AuthApplication({ allowUndefined: true })+ callingApplication: FlatApplication | undefined,): Promise<FrontComponentDTO[]> {- return await this.frontComponentService.findAll(workspace.id);+ const frontComponents = await this.frontComponentService.findAll(+ workspace.id,+ );++ return frontComponents.filter((frontComponent) =>+ canCallerReachApplication({+ callingApplication,+ applicationId: frontComponent.applicationId,+ }),+ );}@Query(() => FrontComponentDTO, { nullable: true })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.tsindex 786fa402465..494089fe65e 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@@ -6,12 +6,17 @@ import { PermissionFlagType } from 'twenty-shared/constants';import { isDefined } from 'twenty-shared/utils';import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';+import { ApplicationExceptionFilter } from 'src/engine/core-modules/application/application-exception-filter';+import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';+import { canCallerReachApplication } from 'src/engine/core-modules/application/utils/can-caller-reach-application.util';import { PreventNestToAutoLogGraphqlErrorsFilter } from 'src/engine/core-modules/graphql/filters/prevent-nest-to-auto-log-graphql-errors.filter';import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';import { UsageLimitGraphqlApiExceptionFilter } from 'src/engine/core-modules/usage-limit/filters/usage-limit-graphql-api-exception.filter';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { type AuthContextUser } from 'src/engine/core-modules/auth/types/auth-context.type';import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';+import { ApplicationTargetArg } from 'src/engine/decorators/auth/application-target-arg.decorator';+import { AuthApplication } from 'src/engine/decorators/auth/auth-application.decorator';import { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';@@ -46,6 +51,7 @@ import { EventLogLiveService } from 'src/engine/core-modules/event-logs/live/eve@UseFilters(UsageLimitGraphqlApiExceptionFilter,PreventNestToAutoLogGraphqlErrorsFilter,+ ApplicationExceptionFilter,AuthGraphqlApiExceptionFilter,)export class LogicFunctionResolver {@@ -58,7 +64,12 @@ export class LogicFunctionResolver {@Query(() => LogicFunctionDTO)async findOneLogicFunction(- @Args('input') { id }: LogicFunctionIdInput,+ @ApplicationTargetArg<LogicFunctionIdInput>('input', {+ kind: 'applicationOwnedEntity',+ metadataName: 'logicFunction',+ idKey: 'id',+ })+ { id }: LogicFunctionIdInput,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,): Promise<LogicFunctionDTO> {try {@@ -85,6 +96,8 @@ export class LogicFunctionResolver {@AllowSuspendedWorkspace()async findManyLogicFunctions(@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,+ @AuthApplication({ allowUndefined: true })+ callingApplication: FlatApplication | undefined,): Promise<LogicFunctionDTO[]> {try {const { flatLogicFunctionMaps } =@@ -99,7 +112,11 @@ export class LogicFunctionResolver {.filter((flatLogicFunction): flatLogicFunction is FlatLogicFunction =>isDefined(flatLogicFunction) &&- !isDefined(flatLogicFunction.deletedAt),+ !isDefined(flatLogicFunction.deletedAt) &&+ canCallerReachApplication({+ callingApplication,+ applicationId: flatLogicFunction.applicationId,+ }),).map((flatLogicFunction) =>fromFlatLogicFunctionToLogicFunctionDto({ flatLogicFunction }),@@ -183,7 +200,12 @@ export class LogicFunctionResolver {@Mutation(() => LogicFunctionExecutionResultDTO)@UseGuards(SettingsPermissionGuard(PermissionFlagType.WORKFLOWS))async executeOneLogicFunction(- @Args('input') { id, payload }: ExecuteOneLogicFunctionInput,+ @ApplicationTargetArg<ExecuteOneLogicFunctionInput>('input', {+ kind: 'applicationOwnedEntity',+ metadataName: 'logicFunction',+ idKey: 'id',+ })+ { id, payload }: ExecuteOneLogicFunctionInput,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,@AuthUser() { id: userId }: AuthContextUser,@AuthUserWorkspaceId() userWorkspaceId: string,@@ -204,7 +226,12 @@ export class LogicFunctionResolver {@Query(() => String, { nullable: true })@UseGuards(SettingsPermissionGuard(PermissionFlagType.WORKFLOWS))async getLogicFunctionSourceCode(- @Args('input') { id }: LogicFunctionIdInput,+ @ApplicationTargetArg<LogicFunctionIdInput>('input', {+ kind: 'applicationOwnedEntity',+ metadataName: 'logicFunction',+ idKey: 'id',+ })+ { id }: LogicFunctionIdInput,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,) {try {@@ -220,7 +247,11 @@ export class LogicFunctionResolver {@Mutation(() => Boolean)@UseGuards(SettingsPermissionGuard(PermissionFlagType.WORKFLOWS))async updateOneLogicFunction(- @Args('input')+ @ApplicationTargetArg<UpdateLogicFunctionFromSourceInput>('input', {+ kind: 'applicationOwnedEntity',+ metadataName: 'logicFunction',+ idKey: 'id',+ })updateLogicFunctionFromSourceInput: UpdateLogicFunctionFromSourceInput,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,): Promise<boolean> {@@ -274,6 +305,8 @@ export class LogicFunctionResolver {async logicFunctionLogs(@Args('input') _: LogicFunctionLogsInput,@AuthWorkspace() workspace: WorkspaceEntity,+ @AuthApplication({ allowUndefined: true })+ callingApplication: FlatApplication | undefined,) {// Register CLI presence (refreshed by the heartbeat) so the executor only publishes when watched.await this.eventLogLiveService.markWatched(@@ -281,9 +314,18 @@ export class LogicFunctionResolver {SubscriptionChannel.LOGIC_FUNCTION_LOGS_CHANNEL,);- const iterator = await this.subscriptionService.subscribe({+ const iterator = await this.subscriptionService.subscribe<{+ logicFunctionLogs: LogicFunctionLogsDTO;+ }>({channel: SubscriptionChannel.LOGIC_FUNCTION_LOGS_CHANNEL,workspaceId: workspace.id,+ mapPayload: (payload) =>+ canCallerReachApplication({+ callingApplication,+ applicationId: payload.logicFunctionLogs.applicationId,+ })+ ? payload+ : undefined,});return wrapAsyncIteratorWithLifecycle(() => iterator, {diff --git a/packages/twenty-server/src/engine/metadata-modules/skill/skill.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/skill/skill.resolver.tsindex 2a920d6bd19..55c132ae082 100644--- a/packages/twenty-server/src/engine/metadata-modules/skill/skill.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/skill/skill.resolver.ts@@ -4,7 +4,12 @@ import { Args, Mutation, Query } from '@nestjs/graphql';import { PermissionFlagType } from 'twenty-shared/constants';import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';+import { ApplicationExceptionFilter } from 'src/engine/core-modules/application/application-exception-filter';+import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';+import { canCallerReachApplication } from 'src/engine/core-modules/application/utils/can-caller-reach-application.util';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';+import { ApplicationTargetArg } from 'src/engine/decorators/auth/application-target-arg.decorator';+import { AuthApplication } from 'src/engine/decorators/auth/auth-application.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';@@ -25,20 +30,34 @@ import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filtSkillGraphqlApiExceptionInterceptor,)@MetadataResolver(() => SkillDTO)-@UseFilters(AuthGraphqlApiExceptionFilter)+@UseFilters(ApplicationExceptionFilter, AuthGraphqlApiExceptionFilter)export class SkillResolver {constructor(private readonly skillService: SkillService) {}@Query(() => [SkillDTO])async skills(@AuthWorkspace() workspace: WorkspaceEntity,+ @AuthApplication({ allowUndefined: true })+ callingApplication: FlatApplication | undefined,): Promise<SkillDTO[]> {- return this.skillService.findAll(workspace.id);+ const skills = await this.skillService.findAll(workspace.id);++ return skills.filter((skill) =>+ canCallerReachApplication({+ callingApplication,+ applicationId: skill.applicationId,+ }),+ );}@Query(() => SkillDTO, { nullable: true })async skill(- @Args('id', { type: () => UUIDScalarType }) id: string,+ @ApplicationTargetArg(+ 'id',+ { kind: 'applicationOwnedEntity', metadataName: 'skill' },+ { type: () => UUIDScalarType },+ )+ id: string,@AuthWorkspace() workspace: WorkspaceEntity,): Promise<SkillDTO | null> {return this.skillService.findById(id, workspace.id);diff --git a/packages/twenty-server/src/engine/subscriptions/__tests__/subscription.service.spec.ts b/packages/twenty-server/src/engine/subscriptions/__tests__/subscription.service.spec.tsnew file mode 100644index 00000000000..adffa9a8aed--- /dev/null+++ b/packages/twenty-server/src/engine/subscriptions/__tests__/subscription.service.spec.ts@@ -0,0 +1,59 @@+import { type RedisClientService } from 'src/engine/core-modules/redis-client/redis-client.service';+import { SubscriptionChannel } from 'src/engine/subscriptions/enums/subscription-channel.enum';+import { SubscriptionService } from 'src/engine/subscriptions/subscription.service';++const WORKSPACE_ID = 'workspace-id';++const buildSubscriptionService = (publishedPayloads: number[]) => {+ const asyncIterator = jest.fn().mockReturnValue(+ (async function* () {+ yield* publishedPayloads;+ })(),+ );++ const subscriptionService = new SubscriptionService({+ getPubSubClient: () => ({ asyncIterator }),+ } as unknown as RedisClientService);++ return { asyncIterator, subscriptionService };+};++const collect = async <TValue>(iterator: AsyncIterableIterator<TValue>) => {+ const values: TValue[] = [];++ for await (const value of iterator) {+ values.push(value);+ }++ return values;+};++describe('SubscriptionService', () => {+ it('should receive every payload published on the workspace channel', async () => {+ const { asyncIterator, subscriptionService } = buildSubscriptionService([+ 1, 2, 3,+ ]);++ const iterator = await subscriptionService.subscribe<number>({+ channel: SubscriptionChannel.LOGIC_FUNCTION_LOGS_CHANNEL,+ workspaceId: WORKSPACE_ID,+ });++ expect(asyncIterator).toHaveBeenCalledWith(+ `${SubscriptionChannel.LOGIC_FUNCTION_LOGS_CHANNEL}:${WORKSPACE_ID}`,+ );+ expect(await collect(iterator)).toEqual([1, 2, 3]);+ });++ it('should map payloads and drop the ones mapped to undefined', async () => {+ const { subscriptionService } = buildSubscriptionService([1, 2, 3]);++ const iterator = await subscriptionService.subscribe<number>({+ channel: SubscriptionChannel.LOGIC_FUNCTION_LOGS_CHANNEL,+ workspaceId: WORKSPACE_ID,+ mapPayload: (payload) => (payload === 2 ? undefined : payload * 10),+ });++ expect(await collect(iterator)).toEqual([10, 30]);+ });+});diff --git a/packages/twenty-server/src/engine/subscriptions/subscription.service.ts b/packages/twenty-server/src/engine/subscriptions/subscription.service.tsindex 198059eaf93..abeeef62cb9 100644--- a/packages/twenty-server/src/engine/subscriptions/subscription.service.ts+++ b/packages/twenty-server/src/engine/subscriptions/subscription.service.ts@@ -1,7 +1,10 @@import { Injectable } from '@nestjs/common';+import { isDefined } from 'twenty-shared/utils';+import { RedisClientService } from 'src/engine/core-modules/redis-client/redis-client.service';import { SubscriptionChannel } from 'src/engine/subscriptions/enums/subscription-channel.enum';+import { filterMapAsyncIterator } from 'src/engine/subscriptions/utils/filter-map-async-iterator';@Injectable()export class SubscriptionService {@@ -27,18 +30,24 @@ export class SubscriptionService {return `${SubscriptionChannel.EVENT_STREAM_CHANNEL}:${workspaceId}:${eventStreamChannelId}`;}- async subscribe({+ async subscribe<TPayload>({channel,workspaceId,+ mapPayload,}: {channel: SubscriptionChannel;workspaceId: string;- }) {+ mapPayload?: (payload: TPayload) => TPayload | undefined;+ }): Promise<AsyncIterableIterator<TPayload>> {const client = this.redisClient.getPubSubClient();- return client.asyncIterator(+ const iterator = client.asyncIterator<TPayload>(this.getSubscriptionChannel({ channel, workspaceId }),);++ return isDefined(mapPayload)+ ? filterMapAsyncIterator(iterator, mapPayload)+ : iterator;}async subscribeToEventStream({diff --git a/packages/twenty-server/src/engine/subscriptions/utils/__tests__/filter-map-async-iterator.spec.ts b/packages/twenty-server/src/engine/subscriptions/utils/__tests__/filter-map-async-iterator.spec.tsnew file mode 100644index 00000000000..2ae9a32763e--- /dev/null+++ b/packages/twenty-server/src/engine/subscriptions/utils/__tests__/filter-map-async-iterator.spec.ts@@ -0,0 +1,42 @@+import { filterMapAsyncIterator } from 'src/engine/subscriptions/utils/filter-map-async-iterator';++describe('filterMapAsyncIterator', () => {+ it('maps source values and skips the ones mapped to undefined', async () => {+ const stream = filterMapAsyncIterator<number>(+ (async function* () {+ yield 1;+ yield 2;+ yield 3;+ })(),+ (value) => (value === 2 ? undefined : value * 10),+ );+ const values = [];++ for await (const value of stream) {+ values.push(value);+ }++ expect(values).toEqual([10, 30]);+ });++ it('closes the source while a read is pending', async () => {+ const sourceReturn = jest+ .fn()+ .mockResolvedValue({ done: true, value: undefined });+ const stream = filterMapAsyncIterator<number>(+ {+ next: () => new Promise(() => {}),+ return: sourceReturn,+ },+ (value) => value,+ );++ void stream.next();++ await expect(stream.return?.()).resolves.toEqual({+ done: true,+ value: undefined,+ });+ expect(sourceReturn).toHaveBeenCalledTimes(1);+ });+});diff --git a/packages/twenty-server/src/engine/subscriptions/utils/filter-map-async-iterator.ts b/packages/twenty-server/src/engine/subscriptions/utils/filter-map-async-iterator.tsnew file mode 100644index 00000000000..c479e2de751--- /dev/null+++ b/packages/twenty-server/src/engine/subscriptions/utils/filter-map-async-iterator.ts@@ -0,0 +1,36 @@+import { isDefined } from 'twenty-shared/utils';++// Not an async generator: its return() would wait for the pending next(), so a+// closed subscription would keep its pub/sub listener until the next message.+export const filterMapAsyncIterator = <TValue>(+ iterator: AsyncIterator<TValue>,+ mapValue: (value: TValue) => TValue | undefined,+): AsyncIterableIterator<TValue> => ({+ next: async () => {+ while (true) {+ const result = await iterator.next();++ if (result.done === true) {+ return result;+ }++ const mappedValue = mapValue(result.value);++ if (isDefined(mappedValue)) {+ return { done: false, value: mappedValue };+ }+ }+ },+ return: async () =>+ (await iterator.return?.()) ?? { done: true, value: undefined },+ throw: async (error: unknown) => {+ if (isDefined(iterator.throw)) {+ return iterator.throw(error);+ }++ throw error;+ },+ [Symbol.asyncIterator]() {+ return this;+ },+});diff --git a/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/find-application-registration-by-universal-identifier-query-factory.util.ts b/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/find-application-registration-by-universal-identifier-query-factory.util.tsnew file mode 100644index 00000000000..5936592b484--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/find-application-registration-by-universal-identifier-query-factory.util.ts@@ -0,0 +1,32 @@+import gql from 'graphql-tag';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';++export type FindApplicationRegistrationByUniversalIdentifierFactoryInput = {+ universalIdentifier: string;+};++const DEFAULT_FIND_APPLICATION_REGISTRATION_BY_UNIVERSAL_IDENTIFIER_GQL_FIELDS = `+ id+ universalIdentifier+ name+ oAuthClientId+ oAuthRedirectUris+ ownerWorkspaceId+ sourcePackage+`;++export const findApplicationRegistrationByUniversalIdentifierQueryFactory = ({+ input,+ gqlFields = DEFAULT_FIND_APPLICATION_REGISTRATION_BY_UNIVERSAL_IDENTIFIER_GQL_FIELDS,+}: PerformMetadataQueryParams<FindApplicationRegistrationByUniversalIdentifierFactoryInput>) => ({+ query: gql`+ query FindApplicationRegistrationByUniversalIdentifier($universalIdentifier: String!) {+ findApplicationRegistrationByUniversalIdentifier(universalIdentifier: $universalIdentifier) {+ ${gqlFields}+ }+ }+ `,+ variables: {+ universalIdentifier: input.universalIdentifier,+ },+});diff --git a/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/find-application-registration-by-universal-identifier.util.ts b/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/find-application-registration-by-universal-identifier.util.tsnew file mode 100644index 00000000000..847a08edf3f--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/find-application-registration-by-universal-identifier.util.ts@@ -0,0 +1,46 @@+import {+ type FindApplicationRegistrationByUniversalIdentifierFactoryInput,+ findApplicationRegistrationByUniversalIdentifierQueryFactory,+} from 'test/integration/metadata/suites/application-registration/utils/find-application-registration-by-universal-identifier-query-factory.util';+import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';++import { type ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';++export const findApplicationRegistrationByUniversalIdentifier = async ({+ input,+ gqlFields,+ expectToFail = false,+ token,+}: PerformMetadataQueryParams<FindApplicationRegistrationByUniversalIdentifierFactoryInput>): CommonResponseBody<{+ findApplicationRegistrationByUniversalIdentifier: ApplicationRegistrationEntity | null;+}> => {+ const graphqlOperation =+ findApplicationRegistrationByUniversalIdentifierQueryFactory({+ input,+ gqlFields,+ });++ const response = await makeMetadataApiRequest(graphqlOperation, token);++ if (expectToFail === true) {+ warnIfNoErrorButExpectedToFail({+ response,+ errorMessage:+ 'Finding application registration by universal identifier should have failed but did not',+ });+ }++ if (expectToFail === false) {+ warnIfErrorButNotExpectedToFail({+ response,+ errorMessage:+ 'Finding application registration by universal identifier has failed but should not',+ });+ }++ return { data: response.body.data, errors: response.body.errors };+};diff --git a/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/find-application-registration-stats-query-factory.util.ts b/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/find-application-registration-stats-query-factory.util.tsnew file mode 100644index 00000000000..b8a7dac3b9a--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/find-application-registration-stats-query-factory.util.ts@@ -0,0 +1,27 @@+import gql from 'graphql-tag';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';++export type FindApplicationRegistrationStatsFactoryInput = {+ id: string;+};++const DEFAULT_FIND_APPLICATION_REGISTRATION_STATS_GQL_FIELDS = `+ activeInstalls+ suspendedInstalls+`;++export const findApplicationRegistrationStatsQueryFactory = ({+ input,+ gqlFields = DEFAULT_FIND_APPLICATION_REGISTRATION_STATS_GQL_FIELDS,+}: PerformMetadataQueryParams<FindApplicationRegistrationStatsFactoryInput>) => ({+ query: gql`+ query FindApplicationRegistrationStats($id: String!) {+ findApplicationRegistrationStats(id: $id) {+ ${gqlFields}+ }+ }+ `,+ variables: {+ id: input.id,+ },+});diff --git a/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/find-application-registration-stats.util.ts b/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/find-application-registration-stats.util.tsnew file mode 100644index 00000000000..c1f6d096481--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/find-application-registration-stats.util.ts@@ -0,0 +1,45 @@+import {+ type FindApplicationRegistrationStatsFactoryInput,+ findApplicationRegistrationStatsQueryFactory,+} from 'test/integration/metadata/suites/application-registration/utils/find-application-registration-stats-query-factory.util';+import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';++import { type ApplicationRegistrationStatsDTO } from 'src/engine/core-modules/application/application-registration/dtos/application-registration-stats.dto';++export const findApplicationRegistrationStats = async ({+ input,+ gqlFields,+ expectToFail = false,+ token,+}: PerformMetadataQueryParams<FindApplicationRegistrationStatsFactoryInput>): CommonResponseBody<{+ findApplicationRegistrationStats: ApplicationRegistrationStatsDTO;+}> => {+ const graphqlOperation = findApplicationRegistrationStatsQueryFactory({+ input,+ gqlFields,+ });++ const response = await makeMetadataApiRequest(graphqlOperation, token);++ if (expectToFail === true) {+ warnIfNoErrorButExpectedToFail({+ response,+ errorMessage:+ 'Finding application registration stats should have failed but did not',+ });+ }++ if (expectToFail === false) {+ warnIfErrorButNotExpectedToFail({+ response,+ errorMessage:+ 'Finding application registration stats has failed but should not',+ });+ }++ return { data: response.body.data, errors: response.body.errors };+};diff --git a/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/find-application-registration-tarball-url-query-factory.util.ts b/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/find-application-registration-tarball-url-query-factory.util.tsnew file mode 100644index 00000000000..18ccdc2c83e--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/find-application-registration-tarball-url-query-factory.util.ts@@ -0,0 +1,19 @@+import gql from 'graphql-tag';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';++export type FindApplicationRegistrationTarballUrlFactoryInput = {+ id: string;+};++export const findApplicationRegistrationTarballUrlQueryFactory = ({+ input,+}: PerformMetadataQueryParams<FindApplicationRegistrationTarballUrlFactoryInput>) => ({+ query: gql`+ query ApplicationRegistrationTarballUrl($id: String!) {+ applicationRegistrationTarballUrl(id: $id)+ }+ `,+ variables: {+ id: input.id,+ },+});diff --git a/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/find-application-registration-tarball-url.util.ts b/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/find-application-registration-tarball-url.util.tsnew file mode 100644index 00000000000..ee5c0dc2a64--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/find-application-registration-tarball-url.util.ts@@ -0,0 +1,41 @@+import {+ type FindApplicationRegistrationTarballUrlFactoryInput,+ findApplicationRegistrationTarballUrlQueryFactory,+} from 'test/integration/metadata/suites/application-registration/utils/find-application-registration-tarball-url-query-factory.util';+import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';++export const findApplicationRegistrationTarballUrl = async ({+ input,+ expectToFail = false,+ token,+}: PerformMetadataQueryParams<FindApplicationRegistrationTarballUrlFactoryInput>): CommonResponseBody<{+ applicationRegistrationTarballUrl: string | null;+}> => {+ const graphqlOperation = findApplicationRegistrationTarballUrlQueryFactory({+ input,+ });++ const response = await makeMetadataApiRequest(graphqlOperation, token);++ if (expectToFail === true) {+ warnIfNoErrorButExpectedToFail({+ response,+ errorMessage:+ 'Finding application registration tarball url should have failed but did not',+ });+ }++ if (expectToFail === false) {+ warnIfErrorButNotExpectedToFail({+ response,+ errorMessage:+ 'Finding application registration tarball url has failed but should not',+ });+ }++ return { data: response.body.data, errors: response.body.errors };+};diff --git a/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/find-many-application-registrations-query-factory.util.ts b/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/find-many-application-registrations-query-factory.util.tsnew file mode 100644index 00000000000..ef613f89ae7--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/find-many-application-registrations-query-factory.util.ts@@ -0,0 +1,19 @@+import gql from 'graphql-tag';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';++const DEFAULT_FIND_MANY_APPLICATION_REGISTRATIONS_GQL_FIELDS = `+ id+ universalIdentifier+`;++export const findManyApplicationRegistrationsQueryFactory = ({+ gqlFields = DEFAULT_FIND_MANY_APPLICATION_REGISTRATIONS_GQL_FIELDS,+}: Partial<PerformMetadataQueryParams<undefined>>) => ({+ query: gql`+ query FindManyApplicationRegistrations {+ findManyApplicationRegistrations {+ ${gqlFields}+ }+ }+ `,+});diff --git a/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/find-many-application-registrations.util.ts b/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/find-many-application-registrations.util.tsnew file mode 100644index 00000000000..3325d50fa9a--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/find-many-application-registrations.util.ts@@ -0,0 +1,40 @@+import { findManyApplicationRegistrationsQueryFactory } from 'test/integration/metadata/suites/application-registration/utils/find-many-application-registrations-query-factory.util';+import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';++import { type ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';++export const findManyApplicationRegistrations = async ({+ gqlFields,+ expectToFail = false,+ token,+}: Partial<PerformMetadataQueryParams<undefined>>): CommonResponseBody<{+ findManyApplicationRegistrations: ApplicationRegistrationEntity[];+}> => {+ const graphqlOperation = findManyApplicationRegistrationsQueryFactory({+ gqlFields,+ });++ const response = await makeMetadataApiRequest(graphqlOperation, token);++ if (expectToFail === true) {+ warnIfNoErrorButExpectedToFail({+ response,+ errorMessage:+ 'Finding application registrations should have failed but did not',+ });+ }++ if (expectToFail === false) {+ warnIfErrorButNotExpectedToFail({+ response,+ errorMessage:+ 'Finding application registrations has failed but should not',+ });+ }++ return { data: response.body.data, errors: response.body.errors };+};diff --git a/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/find-one-application-registration-query-factory.util.ts b/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/find-one-application-registration-query-factory.util.tsnew file mode 100644index 00000000000..bcf13ffc32f--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/find-one-application-registration-query-factory.util.ts@@ -0,0 +1,27 @@+import gql from 'graphql-tag';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';++export type FindOneApplicationRegistrationFactoryInput = {+ id: string;+};++const DEFAULT_FIND_ONE_APPLICATION_REGISTRATION_GQL_FIELDS = `+ id+ universalIdentifier+`;++export const findOneApplicationRegistrationQueryFactory = ({+ input,+ gqlFields = DEFAULT_FIND_ONE_APPLICATION_REGISTRATION_GQL_FIELDS,+}: PerformMetadataQueryParams<FindOneApplicationRegistrationFactoryInput>) => ({+ query: gql`+ query FindOneApplicationRegistration($id: String!) {+ findOneApplicationRegistration(id: $id) {+ ${gqlFields}+ }+ }+ `,+ variables: {+ id: input.id,+ },+});diff --git a/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/find-one-application-registration.util.ts b/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/find-one-application-registration.util.tsnew file mode 100644index 00000000000..b91eff06aa7--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/find-one-application-registration.util.ts@@ -0,0 +1,45 @@+import {+ type FindOneApplicationRegistrationFactoryInput,+ findOneApplicationRegistrationQueryFactory,+} from 'test/integration/metadata/suites/application-registration/utils/find-one-application-registration-query-factory.util';+import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';++import { type ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';++export const findOneApplicationRegistration = async ({+ input,+ gqlFields,+ expectToFail = false,+ token,+}: PerformMetadataQueryParams<FindOneApplicationRegistrationFactoryInput>): CommonResponseBody<{+ findOneApplicationRegistration: ApplicationRegistrationEntity;+}> => {+ const graphqlOperation = findOneApplicationRegistrationQueryFactory({+ input,+ gqlFields,+ });++ const response = await makeMetadataApiRequest(graphqlOperation, token);++ if (expectToFail === true) {+ warnIfNoErrorButExpectedToFail({+ response,+ errorMessage:+ 'Finding application registration should have failed but did not',+ });+ }++ if (expectToFail === false) {+ warnIfErrorButNotExpectedToFail({+ response,+ errorMessage:+ 'Finding application registration has failed but should not',+ });+ }++ return { data: response.body.data, errors: response.body.errors };+};diff --git a/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/failing-cross-application-access.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/failing-cross-application-access.integration-spec.ts.snapnew file mode 100644index 00000000000..5744a24a6c5--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/failing-cross-application-access.integration-spec.ts.snap@@ -0,0 +1,623 @@+// Jest Snapshot v1, https://goo.gl/fbAQLP++exports[`Application token access to another application should fail with a user-bound application token should refuse applicationConnectedAccounts on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only target its own application",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with a user-bound application token should refuse applicationConnectionProviders on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only target its own application",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with a user-bound application token should refuse applicationRegistrationTarballUrl on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only reach its own application registration",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with a user-bound application token should refuse completeApplicationFileUploads on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only target its own application",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with a user-bound application token should refuse createApplicationFileUploads on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only target its own application",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with a user-bound application token should refuse exportApplication on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only target its own application",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with a user-bound application token should refuse findApplicationRegistrationByUniversalIdentifier on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only target its own application",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with a user-bound application token should refuse findApplicationRegistrationStats on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only reach its own application registration",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with a user-bound application token should refuse findApplicationRegistrationVariables on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only reach its own application registration",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with a user-bound application token should refuse findOneAgent on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only reach its own application",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with a user-bound application token should refuse findOneApplicationRegistration on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only reach its own application registration",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with a user-bound application token should refuse findOneLogicFunction on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only reach its own application",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with a user-bound application token should refuse getLogicFunctionSourceCode on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only reach its own application",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with a user-bound application token should refuse installApplication on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only target its own application",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with a user-bound application token should refuse installMarketplaceApp on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only target its own application",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with a user-bound application token should refuse runApplicationHealthCheck on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only target its own application",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with a user-bound application token should refuse skill on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only reach its own application",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with a user-bound application token should refuse syncApplication on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only target its own application",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with a user-bound application token should refuse to run a workflow action of another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only reach its own application",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with a user-bound application token should refuse triggerInstallApplicationJob on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only target its own application",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with a user-bound application token should refuse triggerUninstallApplicationJob on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only target its own application",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with a user-bound application token should refuse uninstallApplication on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only target its own application",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with a user-bound application token should refuse updateApplication on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only target its own application",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with a user-bound application token should refuse updateOneLogicFunction on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only reach its own application",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with a user-bound application token should refuse upgradeApplication on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only reach its own application registration",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with a user-bound application token should refuse uploadApplicationFile on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only target its own application",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with an application token without user binding should refuse applicationConnectedAccounts on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only target its own application",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with an application token without user binding should refuse applicationConnectionProviders on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only target its own application",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with an application token without user binding should refuse applicationRegistrationTarballUrl on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only reach its own application registration",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with an application token without user binding should refuse completeApplicationFileUploads on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only target its own application",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with an application token without user binding should refuse createApplicationFileUploads on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only target its own application",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with an application token without user binding should refuse exportApplication on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only target its own application",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with an application token without user binding should refuse findApplicationRegistrationByUniversalIdentifier on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only target its own application",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with an application token without user binding should refuse findApplicationRegistrationStats on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only reach its own application registration",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with an application token without user binding should refuse findApplicationRegistrationVariables on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only reach its own application registration",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with an application token without user binding should refuse findOneAgent on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only reach its own application",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with an application token without user binding should refuse findOneApplicationRegistration on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only reach its own application registration",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with an application token without user binding should refuse findOneLogicFunction on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only reach its own application",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with an application token without user binding should refuse getLogicFunctionSourceCode on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only reach its own application",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with an application token without user binding should refuse installApplication on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only target its own application",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with an application token without user binding should refuse installMarketplaceApp on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only target its own application",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with an application token without user binding should refuse runApplicationHealthCheck on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only target its own application",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with an application token without user binding should refuse skill on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only reach its own application",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with an application token without user binding should refuse syncApplication on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only target its own application",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with an application token without user binding should refuse to run a workflow action of another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only reach its own application",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with an application token without user binding should refuse triggerInstallApplicationJob on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only target its own application",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with an application token without user binding should refuse triggerUninstallApplicationJob on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only target its own application",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with an application token without user binding should refuse uninstallApplication on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only target its own application",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with an application token without user binding should refuse updateApplication on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only target its own application",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with an application token without user binding should refuse updateOneLogicFunction on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only reach its own application",+ "name": "ForbiddenError",+}+`;++exports[`Application token access to another application should fail with an application token without user binding should refuse upgradeApplication on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "userFriendlyMessage": "An error occurred.",+ },+ "message": "Forbidden resource",+}+`;++exports[`Application token access to another application should fail with an application token without user binding should refuse uploadApplicationFile on another application 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "An application token can only target its own application",+ "name": "ForbiddenError",+}+`;diff --git a/packages/twenty-server/test/integration/metadata/suites/application/failing-cross-application-access.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/application/failing-cross-application-access.integration-spec.tsnew file mode 100644index 00000000000..2dd836bd342--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application/failing-cross-application-access.integration-spec.ts@@ -0,0 +1,606 @@+import crypto from 'crypto';+import { findApplicationRegistrationVariables } from 'test/integration/metadata/suites/application-registration-variable/utils/application-registration-variable-api.util';+import { findApplicationRegistrationByUniversalIdentifier } from 'test/integration/metadata/suites/application-registration/utils/find-application-registration-by-universal-identifier.util';+import { findApplicationRegistrationStats } from 'test/integration/metadata/suites/application-registration/utils/find-application-registration-stats.util';+import { findApplicationRegistrationTarballUrl } from 'test/integration/metadata/suites/application-registration/utils/find-application-registration-tarball-url.util';+import { findManyApplicationRegistrations } from 'test/integration/metadata/suites/application-registration/utils/find-many-application-registrations.util';+import { findOneApplicationRegistration } from 'test/integration/metadata/suites/application-registration/utils/find-one-application-registration.util';+import { findAgents } from 'test/integration/metadata/suites/agent/utils/find-agents.util';+import { findOneAgent } from 'test/integration/metadata/suites/agent/utils/find-one-agent.util';+import { buildBaseManifest } from 'test/integration/metadata/suites/application/utils/build-base-manifest.util';+import { cleanupApplicationAndAppRegistration } from 'test/integration/metadata/suites/application/utils/cleanup-application-and-app-registration.util';+import { completeApplicationFileUploads } from 'test/integration/metadata/suites/application/utils/complete-application-file-uploads.util';+import { createApplicationFileUploads } from 'test/integration/metadata/suites/application/utils/create-application-file-uploads.util';+import { exportApplication } from 'test/integration/metadata/suites/application/utils/export-application.util';+import { installApplication } from 'test/integration/metadata/suites/application/utils/install-application.util';+import { installMarketplaceApp } from 'test/integration/metadata/suites/application/utils/install-marketplace-app.util';+import { runApplicationHealthCheck } from 'test/integration/metadata/suites/application/utils/run-application-health-check.util';+import { syncApplication } from 'test/integration/metadata/suites/application/utils/sync-application.util';+import { triggerInstallApplicationJob } from 'test/integration/metadata/suites/application/utils/trigger-install-application-job.util';+import { triggerUninstallApplicationJob } from 'test/integration/metadata/suites/application/utils/trigger-uninstall-application-job.util';+import { uninstallApplication } from 'test/integration/metadata/suites/application/utils/uninstall-application.util';+import { updateApplication } from 'test/integration/metadata/suites/application/utils/update-application.util';+import { upgradeApplication } from 'test/integration/metadata/suites/application/utils/upgrade-application.util';+import { uploadApplicationFile } from 'test/integration/metadata/suites/application/utils/upload-application-file.util';+import {+ type ApplicationWithResources,+ setupApplicationWithResources,+} from 'test/integration/metadata/suites/application/utils/setup-application-with-resources.util';+import { findApplicationConnectedAccounts } from 'test/integration/metadata/suites/connected-account/utils/find-application-connected-accounts.util';+import { findApplicationConnectionProviders } from 'test/integration/metadata/suites/connection-provider/utils/find-application-connection-providers.util';+import { findFrontComponents } from 'test/integration/metadata/suites/front-component/utils/find-front-components.util';+import { executeLogicFunction } from 'test/integration/metadata/suites/logic-function/utils/execute-logic-function.util';+import { findManyLogicFunctions } from 'test/integration/metadata/suites/logic-function/utils/find-many-logic-functions.util';+import { findOneLogicFunction } from 'test/integration/metadata/suites/logic-function/utils/find-one-logic-function.util';+import { getLogicFunctionSourceCode } from 'test/integration/metadata/suites/logic-function/utils/get-logic-function-source-code.util';+import { updateLogicFunctionSource } from 'test/integration/metadata/suites/logic-function/utils/update-logic-function-source.util';+import { findSkill } from 'test/integration/metadata/suites/skill/utils/find-skill.util';+import { findSkills } from 'test/integration/metadata/suites/skill/utils/find-skills.util';+import { expectOneNotInternalServerErrorSnapshot } from 'test/integration/graphql/utils/expect-one-not-internal-server-error-snapshot.util';+import { generateAppleAdminApplicationTokenPair } from 'test/integration/utils/generate-apple-admin-application-token-pair.util';+import { generateApplicationTokenPair } from 'test/integration/utils/generate-application-token-pair.util';+import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';+import {+ type EachTestingContext,+ eachTestingContextFilter,+} from 'twenty-shared/testing';++import { type BaseGraphQLError } from 'src/engine/core-modules/graphql/utils/graphql-errors.util';+import { type LogicFunctionExecutorService } from 'src/engine/core-modules/logic-function/logic-function-executor/logic-function-executor.service';+import { LogicFunctionExecutionStatus } from 'src/engine/metadata-modules/logic-function/dtos/logic-function-execution-result.dto';+import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';++type GlobalTestContext = {+ callingApplication: ApplicationWithResources;+ otherApplication: ApplicationWithResources;+ userBoundToken: string;+ unboundToken: string;+};++type TokenTestContext = {+ token: (globalContext: GlobalTestContext) => string;+};++type EndpointTestContext = {+ requestOtherApplication: (params: {+ otherApplication: ApplicationWithResources;+ token: string;+ }) => Promise<{ errors: BaseGraphQLError[] }>;+};++type ListEndpointTestContext = {+ listApplicationIds: (token: string) => Promise<(string | undefined)[]>;+ expectedApplicationIds: (globalContext: GlobalTestContext) => string[];+};++const tokenTestCases: EachTestingContext<TokenTestContext>[] = [+ {+ title: 'with a user-bound application token',+ context: { token: (globalContext) => globalContext.userBoundToken },+ },+ {+ title: 'with an application token without user binding',+ context: { token: (globalContext) => globalContext.unboundToken },+ },+];++const singleTargetEndpointTestCases: EachTestingContext<EndpointTestContext>[] =+ [+ {+ title: 'findApplicationRegistrationByUniversalIdentifier',+ context: {+ requestOtherApplication: ({ otherApplication, token }) =>+ findApplicationRegistrationByUniversalIdentifier({+ input: {+ universalIdentifier: otherApplication.universalIdentifier,+ },+ token,+ expectToFail: true,+ }),+ },+ },+ {+ title: 'findOneApplicationRegistration',+ context: {+ requestOtherApplication: ({ otherApplication, token }) =>+ findOneApplicationRegistration({+ input: { id: otherApplication.applicationRegistrationId },+ token,+ expectToFail: true,+ }),+ },+ },+ {+ title: 'findApplicationRegistrationStats',+ context: {+ requestOtherApplication: ({ otherApplication, token }) =>+ findApplicationRegistrationStats({+ input: { id: otherApplication.applicationRegistrationId },+ token,+ expectToFail: true,+ }),+ },+ },+ {+ title: 'findApplicationRegistrationVariables',+ context: {+ requestOtherApplication: ({ otherApplication, token }) =>+ findApplicationRegistrationVariables({+ applicationRegistrationId:+ otherApplication.applicationRegistrationId,+ token,+ expectToFail: true,+ }),+ },+ },+ {+ title: 'applicationRegistrationTarballUrl',+ context: {+ requestOtherApplication: ({ otherApplication, token }) =>+ findApplicationRegistrationTarballUrl({+ input: { id: otherApplication.applicationRegistrationId },+ token,+ expectToFail: true,+ }),+ },+ },+ {+ title: 'exportApplication',+ context: {+ requestOtherApplication: ({ otherApplication, token }) =>+ exportApplication({+ universalIdentifier: otherApplication.universalIdentifier,+ token,+ expectToFail: true,+ }),+ },+ },+ {+ title: 'findOneLogicFunction',+ context: {+ requestOtherApplication: ({ otherApplication, token }) =>+ findOneLogicFunction({+ input: { id: otherApplication.logicFunctionId },+ token,+ expectToFail: true,+ }),+ },+ },+ {+ title: 'getLogicFunctionSourceCode',+ context: {+ requestOtherApplication: ({ otherApplication, token }) =>+ getLogicFunctionSourceCode({+ input: { id: otherApplication.logicFunctionId },+ token,+ expectToFail: true,+ }),+ },+ },+ {+ title: 'updateOneLogicFunction',+ context: {+ requestOtherApplication: ({ otherApplication, token }) =>+ updateLogicFunctionSource({+ input: {+ id: otherApplication.logicFunctionId,+ update: {+ sourceHandlerCode: 'export const handler = () => "pwned";',+ },+ },+ token,+ expectToFail: true,+ }),+ },+ },+ {+ title: 'runApplicationHealthCheck',+ context: {+ requestOtherApplication: ({ otherApplication, token }) =>+ runApplicationHealthCheck({+ input: { applicationId: otherApplication.id },+ token,+ expectToFail: true,+ }),+ },+ },+ {+ title: 'applicationConnectionProviders',+ context: {+ requestOtherApplication: ({ otherApplication, token }) =>+ findApplicationConnectionProviders({+ input: { applicationId: otherApplication.id },+ token,+ expectToFail: true,+ }),+ },+ },+ {+ title: 'applicationConnectedAccounts',+ context: {+ requestOtherApplication: ({ otherApplication, token }) =>+ findApplicationConnectedAccounts({+ input: { applicationId: otherApplication.id },+ token,+ expectToFail: true,+ }),+ },+ },+ {+ title: 'findOneAgent',+ context: {+ requestOtherApplication: ({ otherApplication, token }) =>+ findOneAgent({+ input: { id: otherApplication.agentId },+ token,+ expectToFail: true,+ }),+ },+ },+ {+ title: 'skill',+ context: {+ requestOtherApplication: ({ otherApplication, token }) =>+ findSkill({+ input: { id: otherApplication.skillId },+ token,+ expectToFail: true,+ }),+ },+ },+ {+ title: 'syncApplication',+ context: {+ requestOtherApplication: ({ otherApplication, token }) =>+ syncApplication({+ manifest: buildBaseManifest({+ appId: otherApplication.universalIdentifier,+ roleId: crypto.randomUUID(),+ }),+ dryRun: true,+ token,+ expectToFail: true,+ }),+ },+ },+ {+ title: 'uploadApplicationFile',+ context: {+ requestOtherApplication: async ({ otherApplication, token }) => {+ jest.useRealTimers();++ try {+ return await uploadApplicationFile({+ applicationUniversalIdentifier:+ otherApplication.universalIdentifier,+ fileFolder: 'BuiltLogicFunction',+ filePath: 'dist/handler.mjs',+ fileBuffer: Buffer.from('export const handler = () => {};'),+ filename: 'handler.mjs',+ contentType: 'application/javascript',+ token,+ expectToFail: true,+ });+ } finally {+ jest.useFakeTimers();+ }+ },+ },+ },+ {+ title: 'createApplicationFileUploads',+ context: {+ requestOtherApplication: ({ otherApplication, token }) =>+ createApplicationFileUploads({+ applicationUniversalIdentifier:+ otherApplication.universalIdentifier,+ files: [+ {+ fileFolder: 'BuiltLogicFunction',+ filePath: 'dist/handler.mjs',+ size: 32,+ },+ ],+ token,+ expectToFail: true,+ }),+ },+ },+ {+ title: 'completeApplicationFileUploads',+ context: {+ requestOtherApplication: ({ otherApplication, token }) =>+ completeApplicationFileUploads({+ applicationUniversalIdentifier:+ otherApplication.universalIdentifier,+ fileIds: [crypto.randomUUID()],+ token,+ expectToFail: true,+ }),+ },+ },+ {+ title: 'installApplication',+ context: {+ requestOtherApplication: ({ otherApplication, token }) =>+ installApplication({+ input: {+ universalIdentifier: otherApplication.universalIdentifier,+ },+ token,+ expectToFail: true,+ }),+ },+ },+ {+ title: 'installMarketplaceApp',+ context: {+ requestOtherApplication: ({ otherApplication, token }) =>+ installMarketplaceApp({+ input: {+ universalIdentifier: otherApplication.universalIdentifier,+ },+ token,+ expectToFail: true,+ }),+ },+ },+ {+ title: 'triggerInstallApplicationJob',+ context: {+ requestOtherApplication: ({ otherApplication, token }) =>+ triggerInstallApplicationJob({+ input: {+ universalIdentifier: otherApplication.universalIdentifier,+ },+ token,+ expectToFail: true,+ }),+ },+ },+ {+ title: 'uninstallApplication',+ context: {+ requestOtherApplication: ({ otherApplication, token }) =>+ uninstallApplication({+ universalIdentifier: otherApplication.universalIdentifier,+ token,+ expectToFail: true,+ }),+ },+ },+ {+ title: 'triggerUninstallApplicationJob',+ context: {+ requestOtherApplication: ({ otherApplication, token }) =>+ triggerUninstallApplicationJob({+ input: {+ universalIdentifier: otherApplication.universalIdentifier,+ },+ token,+ expectToFail: true,+ }),+ },+ },+ {+ title: 'updateApplication',+ context: {+ requestOtherApplication: ({ otherApplication, token }) =>+ updateApplication({+ input: { id: otherApplication.id, autoUpgrade: false },+ token,+ expectToFail: true,+ }),+ },+ },+ {+ title: 'upgradeApplication',+ context: {+ requestOtherApplication: ({ otherApplication, token }) =>+ upgradeApplication({+ input: {+ appRegistrationId: otherApplication.applicationRegistrationId,+ targetVersion: '1.0.0',+ },+ token,+ expectToFail: true,+ }),+ },+ },+ ];++const listEndpointTestCases: EachTestingContext<ListEndpointTestContext>[] = [+ {+ title: 'findManyApplicationRegistrations',+ context: {+ listApplicationIds: async (token) => {+ const { data } = await findManyApplicationRegistrations({+ token,+ expectToFail: false,+ });++ return data.findManyApplicationRegistrations.map(({ id }) => id);+ },+ expectedApplicationIds: ({ callingApplication }) => [+ callingApplication.applicationRegistrationId,+ ],+ },+ },+ {+ title: 'findManyLogicFunctions',+ context: {+ listApplicationIds: async (token) => {+ const { data } = await findManyLogicFunctions({+ token,+ expectToFail: false,+ });++ return data.findManyLogicFunctions.map(+ ({ applicationId }) => applicationId,+ );+ },+ expectedApplicationIds: ({ callingApplication }) => [+ callingApplication.id,+ callingApplication.id,+ ],+ },+ },+ {+ title: 'frontComponents',+ context: {+ listApplicationIds: async (token) => {+ const { data } = await findFrontComponents({+ token,+ expectToFail: false,+ });++ return data.frontComponents.map(({ applicationId }) => applicationId);+ },+ expectedApplicationIds: ({ callingApplication }) => [+ callingApplication.id,+ ],+ },+ },+ {+ title: 'findManyAgents',+ context: {+ listApplicationIds: async (token) => {+ const { data } = await findAgents({+ input: undefined,+ token,+ expectToFail: false,+ });++ return data.findManyAgents.map(({ applicationId }) => applicationId);+ },+ expectedApplicationIds: ({ callingApplication }) => [+ callingApplication.id,+ ],+ },+ },+ {+ title: 'skills',+ context: {+ listApplicationIds: async (token) => {+ const { data } = await findSkills({+ input: undefined,+ token,+ expectToFail: false,+ });++ return data.skills.map(({ applicationId }) => applicationId);+ },+ expectedApplicationIds: ({ callingApplication }) => [+ callingApplication.id,+ ],+ },+ },+];++describe('Application token access to another application should fail', () => {+ let globalTestContext: GlobalTestContext;+ let executeSpy: jest.SpyInstance;++ beforeAll(async () => {+ const callingApplication = await setupApplicationWithResources({+ name: 'Calling Application',+ });+ const otherApplication = await setupApplicationWithResources({+ name: 'Other Application',+ });++ const [userBoundTokenPair, unboundTokenPair] = await Promise.all([+ generateAppleAdminApplicationTokenPair({+ applicationId: callingApplication.id,+ }),+ generateApplicationTokenPair({+ workspaceId: SEED_APPLE_WORKSPACE_ID,+ applicationId: callingApplication.id,+ }),+ ]);++ globalTestContext = {+ callingApplication,+ otherApplication,+ userBoundToken: userBoundTokenPair.applicationAccessToken.token,+ unboundToken: unboundTokenPair.applicationAccessToken.token,+ };+ }, 120000);++ beforeEach(() => {+ executeSpy = jest+ .spyOn(+ getAppProviderByClassName<LogicFunctionExecutorService>(+ 'LogicFunctionExecutorService',+ ),+ 'execute',+ )+ .mockResolvedValue({+ data: { ran: true },+ duration: 1,+ billedDurationMs: 1,+ logs: '',+ status: LogicFunctionExecutionStatus.SUCCESS,+ });+ });++ afterEach(() => {+ executeSpy.mockRestore();+ });++ afterAll(async () => {+ await cleanupApplicationAndAppRegistration({+ applicationUniversalIdentifier:+ globalTestContext.callingApplication.universalIdentifier,+ });+ await cleanupApplicationAndAppRegistration({+ applicationUniversalIdentifier:+ globalTestContext.otherApplication.universalIdentifier,+ });+ });++ describe.each(eachTestingContextFilter(tokenTestCases))(+ '$title',+ ({ context: tokenContext }) => {+ it.each(eachTestingContextFilter(singleTargetEndpointTestCases))(+ 'should refuse $title on another application',+ async ({ context }) => {+ const { errors } = await context.requestOtherApplication({+ otherApplication: globalTestContext.otherApplication,+ token: tokenContext.token(globalTestContext),+ });++ expectOneNotInternalServerErrorSnapshot({ errors });+ },+ );++ it('should refuse to run a workflow action of another application', async () => {+ const { errors } = await executeLogicFunction({+ input: {+ id: globalTestContext.otherApplication+ .workflowActionLogicFunctionId,+ payload: {},+ },+ token: tokenContext.token(globalTestContext),+ expectToFail: true,+ });++ expectOneNotInternalServerErrorSnapshot({ errors });+ expect(executeSpy).not.toHaveBeenCalled();+ });++ it.each(eachTestingContextFilter(listEndpointTestCases))(+ 'should only list its own application items from $title',+ async ({ context }) => {+ const applicationIds = await context.listApplicationIds(+ tokenContext.token(globalTestContext),+ );++ expect(applicationIds).toEqual(+ context.expectedApplicationIds(globalTestContext),+ );+ },+ );+ },+ );+});diff --git a/packages/twenty-server/test/integration/metadata/suites/application/successful-application-resource-access.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/application/successful-application-resource-access.integration-spec.tsnew file mode 100644index 00000000000..d73c181bf1f--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application/successful-application-resource-access.integration-spec.ts@@ -0,0 +1,470 @@+import crypto from 'crypto';+import { findApplicationRegistrationVariables } from 'test/integration/metadata/suites/application-registration-variable/utils/application-registration-variable-api.util';+import { findApplicationRegistrationByUniversalIdentifier } from 'test/integration/metadata/suites/application-registration/utils/find-application-registration-by-universal-identifier.util';+import { findApplicationRegistrationStats } from 'test/integration/metadata/suites/application-registration/utils/find-application-registration-stats.util';+import { findApplicationRegistrationTarballUrl } from 'test/integration/metadata/suites/application-registration/utils/find-application-registration-tarball-url.util';+import { findManyApplicationRegistrations } from 'test/integration/metadata/suites/application-registration/utils/find-many-application-registrations.util';+import { findOneApplicationRegistration } from 'test/integration/metadata/suites/application-registration/utils/find-one-application-registration.util';+import { findAgents } from 'test/integration/metadata/suites/agent/utils/find-agents.util';+import { findOneAgent } from 'test/integration/metadata/suites/agent/utils/find-one-agent.util';+import { buildBaseManifest } from 'test/integration/metadata/suites/application/utils/build-base-manifest.util';+import { cleanupApplicationAndAppRegistration } from 'test/integration/metadata/suites/application/utils/cleanup-application-and-app-registration.util';+import { exportApplication } from 'test/integration/metadata/suites/application/utils/export-application.util';+import { installApplication } from 'test/integration/metadata/suites/application/utils/install-application.util';+import { runApplicationHealthCheck } from 'test/integration/metadata/suites/application/utils/run-application-health-check.util';+import { syncApplication } from 'test/integration/metadata/suites/application/utils/sync-application.util';+import { updateApplication } from 'test/integration/metadata/suites/application/utils/update-application.util';+import {+ type ApplicationWithResources,+ setupApplicationWithResources,+} from 'test/integration/metadata/suites/application/utils/setup-application-with-resources.util';+import { findApplicationConnectedAccounts } from 'test/integration/metadata/suites/connected-account/utils/find-application-connected-accounts.util';+import { findApplicationConnectionProviders } from 'test/integration/metadata/suites/connection-provider/utils/find-application-connection-providers.util';+import { findFrontComponents } from 'test/integration/metadata/suites/front-component/utils/find-front-components.util';+import { executeLogicFunction } from 'test/integration/metadata/suites/logic-function/utils/execute-logic-function.util';+import { findManyLogicFunctions } from 'test/integration/metadata/suites/logic-function/utils/find-many-logic-functions.util';+import { findOneLogicFunction } from 'test/integration/metadata/suites/logic-function/utils/find-one-logic-function.util';+import { findSkill } from 'test/integration/metadata/suites/skill/utils/find-skill.util';+import { findSkills } from 'test/integration/metadata/suites/skill/utils/find-skills.util';+import { generateAppleAdminApplicationTokenPair } from 'test/integration/utils/generate-apple-admin-application-token-pair.util';+import { generateApplicationTokenPair } from 'test/integration/utils/generate-application-token-pair.util';+import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';+import {+ type EachTestingContext,+ eachTestingContextFilter,+} from 'twenty-shared/testing';++import { type LogicFunctionExecutorService } from 'src/engine/core-modules/logic-function/logic-function-executor/logic-function-executor.service';+import { LogicFunctionExecutionStatus } from 'src/engine/metadata-modules/logic-function/dtos/logic-function-execution-result.dto';+import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';++type GlobalTestContext = {+ application: ApplicationWithResources;+ otherApplication: ApplicationWithResources;+ userBoundToken: string;+ unboundToken: string;+};++type CallerTestContext = {+ token: (globalContext: GlobalTestContext) => string | undefined;+ targetApplication: (+ globalContext: GlobalTestContext,+ ) => ApplicationWithResources;+ hasUser: boolean;+};++type EndpointTestContext = {+ requiresUser?: boolean;+ expectToReach: (params: {+ application: ApplicationWithResources;+ token: string | undefined;+ }) => Promise<void>;+};++const callerTestCases: EachTestingContext<CallerTestContext>[] = [+ {+ title: 'a user-bound application token on its own application',+ context: {+ token: (globalContext) => globalContext.userBoundToken,+ targetApplication: (globalContext) => globalContext.application,+ hasUser: true,+ },+ },+ {+ title: 'an application token without user binding on its own application',+ context: {+ token: (globalContext) => globalContext.unboundToken,+ targetApplication: (globalContext) => globalContext.application,+ hasUser: false,+ },+ },+ {+ title: 'an admin session on an installed application',+ context: {+ token: () => undefined,+ targetApplication: (globalContext) => globalContext.otherApplication,+ hasUser: true,+ },+ },+];++const endpointTestCases: EachTestingContext<EndpointTestContext>[] = [+ {+ title: 'findApplicationRegistrationByUniversalIdentifier',+ context: {+ expectToReach: async ({ application, token }) => {+ const { data } = await findApplicationRegistrationByUniversalIdentifier(+ {+ input: { universalIdentifier: application.universalIdentifier },+ token,+ expectToFail: false,+ },+ );++ expect(+ data.findApplicationRegistrationByUniversalIdentifier,+ ).toMatchObject({+ id: application.applicationRegistrationId,+ ownerWorkspaceId: SEED_APPLE_WORKSPACE_ID,+ });+ },+ },+ },+ {+ title: 'findOneApplicationRegistration',+ context: {+ expectToReach: async ({ application, token }) => {+ const { data } = await findOneApplicationRegistration({+ input: { id: application.applicationRegistrationId },+ token,+ expectToFail: false,+ });++ expect(data.findOneApplicationRegistration.id).toBe(+ application.applicationRegistrationId,+ );+ },+ },+ },+ {+ title: 'findApplicationRegistrationStats',+ context: {+ expectToReach: async ({ application, token }) => {+ const { data } = await findApplicationRegistrationStats({+ input: { id: application.applicationRegistrationId },+ token,+ expectToFail: false,+ });++ expect(data.findApplicationRegistrationStats).toMatchObject({+ activeInstalls: expect.any(Number),+ });+ },+ },+ },+ {+ title: 'findApplicationRegistrationVariables',+ context: {+ expectToReach: async ({ application, token }) => {+ const { data } = await findApplicationRegistrationVariables({+ applicationRegistrationId: application.applicationRegistrationId,+ token,+ expectToFail: false,+ });++ expect(data.findApplicationRegistrationVariables).toEqual([]);+ },+ },+ },+ {+ title: 'applicationRegistrationTarballUrl',+ context: {+ expectToReach: async ({ application, token }) => {+ const { data } = await findApplicationRegistrationTarballUrl({+ input: { id: application.applicationRegistrationId },+ token,+ expectToFail: false,+ });++ // Development registrations have no tarball to sign+ expect(data.applicationRegistrationTarballUrl).toBeNull();+ },+ },+ },+ {+ title: 'exportApplication',+ context: {+ expectToReach: async ({ application, token }) => {+ const { data } = await exportApplication({+ universalIdentifier: application.universalIdentifier,+ token,+ expectToFail: false,+ });++ expect(data.exportApplication.application.universalIdentifier).toBe(+ application.universalIdentifier,+ );+ },+ },+ },+ {+ title: 'findOneLogicFunction',+ context: {+ expectToReach: async ({ application, token }) => {+ const { data } = await findOneLogicFunction({+ input: { id: application.logicFunctionId },+ token,+ expectToFail: false,+ });++ expect(data.findOneLogicFunction).toMatchObject({+ id: application.logicFunctionId,+ applicationId: application.id,+ });+ },+ },+ },+ {+ title: 'executeOneLogicFunction',+ context: {+ requiresUser: true,+ expectToReach: async ({ application, token }) => {+ const { data } = await executeLogicFunction({+ input: { id: application.workflowActionLogicFunctionId, payload: {} },+ token,+ expectToFail: false,+ });++ expect(data.executeOneLogicFunction.data).toEqual({ ran: true });+ },+ },+ },+ {+ title: 'runApplicationHealthCheck',+ context: {+ expectToReach: async ({ application, token }) => {+ const { data } = await runApplicationHealthCheck({+ input: { applicationId: application.id },+ token,+ expectToFail: false,+ });++ expect(data.runApplicationHealthCheck).toBeNull();+ },+ },+ },+ {+ title: 'applicationConnectionProviders',+ context: {+ expectToReach: async ({ application, token }) => {+ const { data } = await findApplicationConnectionProviders({+ input: { applicationId: application.id },+ token,+ expectToFail: false,+ });++ expect(+ data.applicationConnectionProviders.map(({ name }) => name),+ ).toEqual([application.connectionProviderName]);+ },+ },+ },+ {+ title: 'applicationConnectedAccounts',+ context: {+ requiresUser: true,+ expectToReach: async ({ application, token }) => {+ const { data } = await findApplicationConnectedAccounts({+ input: { applicationId: application.id },+ token,+ expectToFail: false,+ });++ expect(data.applicationConnectedAccounts).toEqual([]);+ },+ },+ },+ {+ title: 'findOneAgent',+ context: {+ expectToReach: async ({ application, token }) => {+ const { data } = await findOneAgent({+ input: { id: application.agentId },+ token,+ expectToFail: false,+ });++ expect(data.findOneAgent.id).toBe(application.agentId);+ },+ },+ },+ {+ title: 'skill',+ context: {+ expectToReach: async ({ application, token }) => {+ const { data } = await findSkill({+ input: { id: application.skillId },+ token,+ expectToFail: false,+ });++ expect(data.skill.id).toBe(application.skillId);+ },+ },+ },+ {+ title: 'syncApplication',+ context: {+ expectToReach: async ({ application, token }) => {+ const { data } = await syncApplication({+ manifest: buildBaseManifest({+ appId: application.universalIdentifier,+ roleId: crypto.randomUUID(),+ }),+ dryRun: true,+ inferDeletionFromMissingEntities: false,+ token,+ expectToFail: false,+ });++ expect(data.syncApplication.applicationUniversalIdentifier).toBe(+ application.universalIdentifier,+ );+ },+ },+ },+ {+ title: 'installApplication',+ context: {+ expectToReach: async ({ application, token }) => {+ const { data } = await installApplication({+ input: { universalIdentifier: application.universalIdentifier },+ token,+ expectToFail: false,+ });++ expect(data.installApplication.id).toBe(application.id);+ },+ },+ },+ {+ title: 'updateApplication',+ context: {+ expectToReach: async ({ application, token }) => {+ const { data } = await updateApplication({+ input: { id: application.id, autoUpgrade: false },+ token,+ expectToFail: false,+ });++ expect(data.updateApplication.id).toBe(application.id);+ },+ },+ },+];++describe('Application resource access should succeed', () => {+ let globalTestContext: GlobalTestContext;+ let executeSpy: jest.SpyInstance;++ beforeAll(async () => {+ const application = await setupApplicationWithResources({+ name: 'Own Application',+ });+ const otherApplication = await setupApplicationWithResources({+ name: 'Installed Application',+ });++ const [userBoundTokenPair, unboundTokenPair] = await Promise.all([+ generateAppleAdminApplicationTokenPair({+ applicationId: application.id,+ }),+ generateApplicationTokenPair({+ workspaceId: SEED_APPLE_WORKSPACE_ID,+ applicationId: application.id,+ }),+ ]);++ globalTestContext = {+ application,+ otherApplication,+ userBoundToken: userBoundTokenPair.applicationAccessToken.token,+ unboundToken: unboundTokenPair.applicationAccessToken.token,+ };+ }, 120000);++ beforeEach(() => {+ executeSpy = jest+ .spyOn(+ getAppProviderByClassName<LogicFunctionExecutorService>(+ 'LogicFunctionExecutorService',+ ),+ 'execute',+ )+ .mockResolvedValue({+ data: { ran: true },+ duration: 1,+ billedDurationMs: 1,+ logs: '',+ status: LogicFunctionExecutionStatus.SUCCESS,+ });+ });++ afterEach(() => {+ executeSpy.mockRestore();+ });++ afterAll(async () => {+ await cleanupApplicationAndAppRegistration({+ applicationUniversalIdentifier:+ globalTestContext.application.universalIdentifier,+ });+ await cleanupApplicationAndAppRegistration({+ applicationUniversalIdentifier:+ globalTestContext.otherApplication.universalIdentifier,+ });+ });++ describe.each(eachTestingContextFilter(callerTestCases))(+ 'from $title',+ ({ context: callerContext }) => {+ it.each(+ eachTestingContextFilter(endpointTestCases).filter(+ ({ context }) => callerContext.hasUser || !context.requiresUser,+ ),+ )('should reach $title', async ({ context }) => {+ await context.expectToReach({+ application: callerContext.targetApplication(globalTestContext),+ token: callerContext.token(globalTestContext),+ });+ });+ },+ );++ it('should list every application items from an admin session', async () => {+ const { application, otherApplication } = globalTestContext;+ const applicationIds = [application.id, otherApplication.id];++ const [+ { data: registrationsData },+ { data: logicFunctionsData },+ { data: frontComponentsData },+ { data: agentsData },+ { data: skillsData },+ ] = await Promise.all([+ findManyApplicationRegistrations({ expectToFail: false }),+ findManyLogicFunctions({ expectToFail: false }),+ findFrontComponents({ expectToFail: false }),+ findAgents({ input: undefined, expectToFail: false }),+ findSkills({ input: undefined, expectToFail: false }),+ ]);++ expect(+ registrationsData.findManyApplicationRegistrations.map(({ id }) => id),+ ).toEqual(+ expect.arrayContaining([+ application.applicationRegistrationId,+ otherApplication.applicationRegistrationId,+ ]),+ );+ expect(+ logicFunctionsData.findManyLogicFunctions.map(({ id }) => id),+ ).toEqual(+ expect.arrayContaining([+ application.logicFunctionId,+ otherApplication.logicFunctionId,+ ]),+ );+ expect(+ frontComponentsData.frontComponents.map(+ ({ applicationId }) => applicationId,+ ),+ ).toEqual(expect.arrayContaining(applicationIds));+ expect(+ agentsData.findManyAgents.map(({ applicationId }) => applicationId),+ ).toEqual(expect.arrayContaining(applicationIds));+ expect(skillsData.skills.map(({ applicationId }) => applicationId)).toEqual(+ expect.arrayContaining(applicationIds),+ );+ });+});diff --git a/packages/twenty-server/test/integration/metadata/suites/application/successful-oauth-only-client-access.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/application/successful-oauth-only-client-access.integration-spec.tsnew file mode 100644index 00000000000..cabfccd2306--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application/successful-oauth-only-client-access.integration-spec.ts@@ -0,0 +1,220 @@+import crypto from 'crypto';+import gql from 'graphql-tag';+import request from 'supertest';+import { getMcpToolCatalog } from 'test/integration/graphql/suites/application-role-intersection/utils/get-mcp-tool-catalog.util';+import { findApplicationRegistrationByUniversalIdentifier } from 'test/integration/metadata/suites/application-registration/utils/find-application-registration-by-universal-identifier.util';+import { buildBaseManifest } from 'test/integration/metadata/suites/application/utils/build-base-manifest.util';+import { cleanupApplicationAndAppRegistration } from 'test/integration/metadata/suites/application/utils/cleanup-application-and-app-registration.util';+import { createApplicationFileUploads } from 'test/integration/metadata/suites/application/utils/create-application-file-uploads.util';+import { exportApplication } from 'test/integration/metadata/suites/application/utils/export-application.util';+import { installApplication } from 'test/integration/metadata/suites/application/utils/install-application.util';+import {+ type ApplicationWithResources,+ setupApplicationWithResources,+} from 'test/integration/metadata/suites/application/utils/setup-application-with-resources.util';+import { syncApplication } from 'test/integration/metadata/suites/application/utils/sync-application.util';+import { uninstallApplication } from 'test/integration/metadata/suites/application/utils/uninstall-application.util';+import { executeLogicFunction } from 'test/integration/metadata/suites/logic-function/utils/execute-logic-function.util';+import { findManyLogicFunctions } from 'test/integration/metadata/suites/logic-function/utils/find-many-logic-functions.util';+import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';+import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';+import { ToolCategory } from 'twenty-shared/ai';++import { type LogicFunctionExecutorService } from 'src/engine/core-modules/logic-function/logic-function-executor/logic-function-executor.service';+import { LogicFunctionExecutionStatus } from 'src/engine/metadata-modules/logic-function/dtos/logic-function-execution-result.dto';+import { TWENTY_CLI_APPLICATION_REGISTRATION } from 'src/engine/workspace-manager/twenty-standard-application/constants/twenty-cli-application-registration.constant';++const CLI_CALLBACK_URL = 'http://127.0.0.1:53682/callback';++// Same browser flow as `twenty remote add`: authorize the CLI client with PKCE+// as the workspace admin, then exchange the code for the CLI access token.+const loginAsTwentyCli = async (): Promise<string> => {+ const baseUrl = `http://localhost:${APP_PORT}`;++ const discovery = await request(baseUrl)+ .get('/.well-known/oauth-authorization-server')+ .expect(200);++ const clientId: string = discovery.body.cli_client_id;+ const codeVerifier = crypto.randomBytes(32).toString('base64url');+ const codeChallenge = crypto+ .createHash('sha256')+ .update(codeVerifier)+ .digest('base64url');++ const authorizeResponse = await makeMetadataApiRequest({+ query: gql`+ mutation AuthorizeApp(+ $clientId: String!+ $codeChallenge: String+ $redirectUrl: String!+ ) {+ authorizeApp(+ clientId: $clientId+ codeChallenge: $codeChallenge+ redirectUrl: $redirectUrl+ ) {+ redirectUrl+ }+ }+ `,+ variables: { clientId, codeChallenge, redirectUrl: CLI_CALLBACK_URL },+ });++ expect(authorizeResponse.body.errors).toBeUndefined();++ const code = new URL(+ authorizeResponse.body.data.authorizeApp.redirectUrl,+ ).searchParams.get('code');++ const tokenResponse = await request(baseUrl)+ .post('/oauth/token')+ .send({+ grant_type: 'authorization_code',+ code,+ code_verifier: codeVerifier,+ redirect_uri: CLI_CALLBACK_URL,+ client_id: clientId,+ })+ .expect(200);++ return tokenResponse.body.access_token;+};++describe('OAuth-only client access to installed applications should succeed', () => {+ let installedApplication: ApplicationWithResources;+ let cliToken: string;+ let executeSpy: jest.SpyInstance;++ beforeAll(async () => {+ installedApplication = await setupApplicationWithResources({+ name: 'Installed Application',+ });++ cliToken = await loginAsTwentyCli();+ }, 120000);++ beforeEach(() => {+ executeSpy = jest+ .spyOn(+ getAppProviderByClassName<LogicFunctionExecutorService>(+ 'LogicFunctionExecutorService',+ ),+ 'execute',+ )+ .mockResolvedValue({+ data: { ran: true },+ duration: 1,+ billedDurationMs: 1,+ logs: '',+ status: LogicFunctionExecutionStatus.SUCCESS,+ });+ });++ afterEach(() => {+ executeSpy.mockRestore();+ });++ afterAll(async () => {+ await cleanupApplicationAndAppRegistration({+ applicationUniversalIdentifier: installedApplication.universalIdentifier,+ });+ await uninstallApplication({+ universalIdentifier:+ TWENTY_CLI_APPLICATION_REGISTRATION.universalIdentifier,+ expectToFail: false,+ });+ });++ it('should find the registration of the application it develops', async () => {+ const { data } = await findApplicationRegistrationByUniversalIdentifier({+ input: { universalIdentifier: installedApplication.universalIdentifier },+ token: cliToken,+ expectToFail: false,+ });++ expect(data.findApplicationRegistrationByUniversalIdentifier).toMatchObject(+ { id: installedApplication.applicationRegistrationId },+ );+ });++ it('should export the application it develops', async () => {+ const { data } = await exportApplication({+ universalIdentifier: installedApplication.universalIdentifier,+ token: cliToken,+ expectToFail: false,+ });++ expect(data.exportApplication.application.universalIdentifier).toBe(+ installedApplication.universalIdentifier,+ );+ });++ it('should list and run the logic functions of the application it develops', async () => {+ const { data } = await findManyLogicFunctions({+ token: cliToken,+ expectToFail: false,+ });++ expect(data.findManyLogicFunctions.map(({ id }) => id)).toContain(+ installedApplication.logicFunctionId,+ );++ const { errors } = await executeLogicFunction({+ input: { id: installedApplication.logicFunctionId, payload: {} },+ token: cliToken,+ expectToFail: false,+ });++ expect(errors).toBeUndefined();+ expect(executeSpy).toHaveBeenCalledTimes(1);+ });++ it('should sync and upload files for the application it develops', async () => {+ const { errors: syncErrors } = await syncApplication({+ manifest: buildBaseManifest({+ appId: installedApplication.universalIdentifier,+ roleId: crypto.randomUUID(),+ }),+ dryRun: true,+ inferDeletionFromMissingEntities: false,+ token: cliToken,+ expectToFail: false,+ });++ expect(syncErrors).toBeUndefined();++ const { data } = await createApplicationFileUploads({+ applicationUniversalIdentifier: installedApplication.universalIdentifier,+ files: [+ {+ fileFolder: 'BuiltLogicFunction',+ filePath: 'dist/handler.mjs',+ size: 32,+ },+ ],+ token: cliToken,+ expectToFail: false,+ });++ expect(data.createApplicationFileUploads.targets).toHaveLength(1);+ });++ it('should install the application it develops', async () => {+ const { data } = await installApplication({+ input: { universalIdentifier: installedApplication.universalIdentifier },+ token: cliToken,+ expectToFail: false,+ });++ expect(data.installApplication.id).toBe(installedApplication.id);+ });++ it('should see the tools of installed applications over MCP', async () => {+ const catalog = await getMcpToolCatalog({ token: cliToken });++ expect(+ catalog[ToolCategory.LOGIC_FUNCTION]?.map(({ name }) => name),+ ).toContain('app_installed_application_handler');+ });+});diff --git a/packages/twenty-server/test/integration/metadata/suites/application/utils/install-marketplace-app-query-factory.util.ts b/packages/twenty-server/test/integration/metadata/suites/application/utils/install-marketplace-app-query-factory.util.tsnew file mode 100644index 00000000000..ad73f2696e7--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application/utils/install-marketplace-app-query-factory.util.ts@@ -0,0 +1,28 @@+import gql from 'graphql-tag';++export type InstallMarketplaceAppFactoryInput = {+ universalIdentifier: string;+ version?: string;+};++export const installMarketplaceAppQueryFactory = ({+ input,+}: {+ input: InstallMarketplaceAppFactoryInput;+}) => ({+ query: gql`+ mutation InstallMarketplaceApp(+ $universalIdentifier: String!+ $version: String+ ) {+ installMarketplaceApp(+ universalIdentifier: $universalIdentifier+ version: $version+ )+ }+ `,+ variables: {+ universalIdentifier: input.universalIdentifier,+ version: input.version,+ },+});diff --git a/packages/twenty-server/test/integration/metadata/suites/application/utils/install-marketplace-app.util.ts b/packages/twenty-server/test/integration/metadata/suites/application/utils/install-marketplace-app.util.tsnew file mode 100644index 00000000000..7c9e35afb5f--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application/utils/install-marketplace-app.util.ts@@ -0,0 +1,40 @@+import {+ type InstallMarketplaceAppFactoryInput,+ installMarketplaceAppQueryFactory,+} from 'test/integration/metadata/suites/application/utils/install-marketplace-app-query-factory.util';+import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';++export const installMarketplaceApp = async ({+ input,+ expectToFail = false,+ token,+}: {+ input: InstallMarketplaceAppFactoryInput;+ expectToFail?: boolean;+ token?: string;+}): CommonResponseBody<{+ installMarketplaceApp: boolean;+}> => {+ const graphqlOperation = installMarketplaceAppQueryFactory({ input });++ const response = await makeMetadataApiRequest(graphqlOperation, token);++ if (expectToFail === true) {+ warnIfNoErrorButExpectedToFail({+ response,+ errorMessage: 'Install marketplace app should have failed but did not',+ });+ }++ if (expectToFail === false) {+ warnIfErrorButNotExpectedToFail({+ response,+ errorMessage: 'Install marketplace app has failed but should not',+ });+ }++ return { data: response.body.data, errors: response.body.errors };+};diff --git a/packages/twenty-server/test/integration/metadata/suites/application/utils/run-application-health-check-query-factory.util.ts b/packages/twenty-server/test/integration/metadata/suites/application/utils/run-application-health-check-query-factory.util.tsnew file mode 100644index 00000000000..8e9ee60a9bf--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application/utils/run-application-health-check-query-factory.util.ts@@ -0,0 +1,27 @@+import gql from 'graphql-tag';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';++export type RunApplicationHealthCheckFactoryInput = {+ applicationId: string;+};++const DEFAULT_RUN_APPLICATION_HEALTH_CHECK_GQL_FIELDS = `+ status+ title+`;++export const runApplicationHealthCheckQueryFactory = ({+ input,+ gqlFields = DEFAULT_RUN_APPLICATION_HEALTH_CHECK_GQL_FIELDS,+}: PerformMetadataQueryParams<RunApplicationHealthCheckFactoryInput>) => ({+ query: gql`+ mutation RunApplicationHealthCheck($applicationId: UUID!) {+ runApplicationHealthCheck(applicationId: $applicationId) {+ ${gqlFields}+ }+ }+ `,+ variables: {+ applicationId: input.applicationId,+ },+});diff --git a/packages/twenty-server/test/integration/metadata/suites/application/utils/run-application-health-check.util.ts b/packages/twenty-server/test/integration/metadata/suites/application/utils/run-application-health-check.util.tsnew file mode 100644index 00000000000..d684ce37423--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application/utils/run-application-health-check.util.ts@@ -0,0 +1,45 @@+import {+ type RunApplicationHealthCheckFactoryInput,+ runApplicationHealthCheckQueryFactory,+} from 'test/integration/metadata/suites/application/utils/run-application-health-check-query-factory.util';+import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';++import { type ApplicationHealthCheckResultDTO } from 'src/engine/core-modules/application/dtos/application-health-check-result.dto';++export const runApplicationHealthCheck = async ({+ input,+ gqlFields,+ expectToFail = false,+ token,+}: PerformMetadataQueryParams<RunApplicationHealthCheckFactoryInput>): CommonResponseBody<{+ runApplicationHealthCheck: ApplicationHealthCheckResultDTO | null;+}> => {+ const graphqlOperation = runApplicationHealthCheckQueryFactory({+ input,+ gqlFields,+ });++ const response = await makeMetadataApiRequest(graphqlOperation, token);++ if (expectToFail === true) {+ warnIfNoErrorButExpectedToFail({+ response,+ errorMessage:+ 'Running application health check should have failed but did not',+ });+ }++ if (expectToFail === false) {+ warnIfErrorButNotExpectedToFail({+ response,+ errorMessage:+ 'Running application health check has failed but should not',+ });+ }++ return { data: response.body.data, errors: response.body.errors };+};diff --git a/packages/twenty-server/test/integration/metadata/suites/application/utils/setup-application-with-resources.util.ts b/packages/twenty-server/test/integration/metadata/suites/application/utils/setup-application-with-resources.util.tsnew file mode 100644index 00000000000..1b3a3741d7c--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application/utils/setup-application-with-resources.util.ts@@ -0,0 +1,262 @@+import { buildBaseManifest } from 'test/integration/metadata/suites/application/utils/build-base-manifest.util';+import { seedBuiltFrontComponentSharedDependenciesFile } from 'test/integration/metadata/suites/application/utils/seed-built-front-component-shared-dependencies-file.util';+import { setupApplicationForSync } from 'test/integration/metadata/suites/application/utils/setup-application-for-sync.util';+import { syncApplication } from 'test/integration/metadata/suites/application/utils/sync-application.util';+import { uploadApplicationFile } from 'test/integration/metadata/suites/application/utils/upload-application-file.util';+import { SystemPermissionFlag } from 'twenty-shared/constants';+import { v4 as uuidv4 } from 'uuid';++import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';++export type ApplicationWithResources = {+ id: string;+ universalIdentifier: string;+ applicationRegistrationId: string;+ logicFunctionId: string;+ workflowActionLogicFunctionId: string;+ frontComponentId: string;+ agentId: string;+ skillId: string;+ connectionProviderName: string;+};++export const BUILT_FRONT_COMPONENT_CONTENT = 'dummy built component content';++export const SHARED_DEPENDENCIES_BUNDLE_CONTENT =+ 'export const sharedDependenciesReady = true;\n';++const BUILT_FRONT_COMPONENT_PATH = 'src/front-components/component.mjs';++const SHARED_DEPENDENCIES_BUILT_PATH =+ 'src/front-component-shared-dependencies.mjs';++const DEFAULT_PERMISSION_FLAG_UNIVERSAL_IDENTIFIERS = [+ SystemPermissionFlag.APPLICATIONS,+ SystemPermissionFlag.API_KEYS_AND_WEBHOOKS,+ SystemPermissionFlag.WORKFLOWS,+ SystemPermissionFlag.AI,+];++const findIdByUniversalIdentifier = async ({+ table,+ universalIdentifier,+}: {+ table: 'logicFunction' | 'frontComponent' | 'agent' | 'skill';+ universalIdentifier: string;+}): Promise<string> => {+ const [row] = await globalThis.testDataSource.query(+ `SELECT id FROM core."${table}"+ WHERE "universalIdentifier" = $1 AND "workspaceId" = $2`,+ [universalIdentifier, SEED_APPLE_WORKSPACE_ID],+ );++ if (row === undefined) {+ throw new Error(`No ${table} synced for ${universalIdentifier}`);+ }++ return row.id;+};++// Syncs an application holding one of each resource an application token+// could reach, with a default role carrying the flags the endpoints check.+export const setupApplicationWithResources = async ({+ name,+ permissionFlagUniversalIdentifiers = DEFAULT_PERMISSION_FLAG_UNIVERSAL_IDENTIFIERS,+}: {+ name: string;+ permissionFlagUniversalIdentifiers?: string[];+}): Promise<ApplicationWithResources> => {+ const applicationUniversalIdentifier = uuidv4();+ const roleUniversalIdentifier = uuidv4();+ const logicFunctionUniversalIdentifier = uuidv4();+ const workflowActionLogicFunctionUniversalIdentifier = uuidv4();+ const frontComponentUniversalIdentifier = uuidv4();+ const agentUniversalIdentifier = uuidv4();+ const skillUniversalIdentifier = uuidv4();+ const slug = name.toLowerCase().replace(/[^a-z0-9]+/g, '-');+ const connectionProviderName = `${slug}-provider`;++ await setupApplicationForSync({+ applicationUniversalIdentifier,+ name,+ description: `${name} for cross-application access tests`,+ sourcePath: `test-${applicationUniversalIdentifier}`,+ });++ jest.useRealTimers();++ await uploadApplicationFile({+ applicationUniversalIdentifier,+ fileFolder: 'BuiltFrontComponent',+ filePath: BUILT_FRONT_COMPONENT_PATH,+ fileBuffer: Buffer.from(BUILT_FRONT_COMPONENT_CONTENT),+ filename: 'component.mjs',+ contentType: 'application/javascript',+ expectToFail: false,+ });++ jest.useFakeTimers();++ await syncApplication({+ manifest: buildBaseManifest({+ appId: applicationUniversalIdentifier,+ roleId: roleUniversalIdentifier,+ overrides: {+ application: {+ universalIdentifier: applicationUniversalIdentifier,+ defaultRoleUniversalIdentifier: roleUniversalIdentifier,+ displayName: name,+ description: `${name} for cross-application access tests`,+ applicationVariables: {},+ packageJsonChecksum: null,+ yarnLockChecksum: null,+ },+ roles: [+ {+ universalIdentifier: roleUniversalIdentifier,+ label: `${name} role`,+ description: 'Reaches application resources',+ canUpdateAllSettings: false,+ permissionFlagUniversalIdentifiers,+ },+ ],+ logicFunctions: [+ {+ universalIdentifier: logicFunctionUniversalIdentifier,+ name: `${slug}-handler`,+ description: 'Handles an HTTP route',+ handlerName: 'handler',+ sourceHandlerPath: 'src/handler.ts',+ builtHandlerPath: 'dist/handler.mjs',+ builtHandlerChecksum: 'handler-checksum',+ httpRouteTriggerSettings: {+ path: `/${slug}`,+ httpMethod: 'POST',+ isAuthRequired: true,+ },+ toolTriggerSettings: {},+ },+ {+ universalIdentifier: workflowActionLogicFunctionUniversalIdentifier,+ name: `${slug}-workflow-action`,+ description: 'Runs as a workflow step',+ handlerName: 'handler',+ sourceHandlerPath: 'src/workflow-action.ts',+ builtHandlerPath: 'dist/workflow-action.mjs',+ builtHandlerChecksum: 'workflow-action-checksum',+ workflowActionTriggerSettings: { label: `${name} action` },+ },+ ],+ frontComponents: [+ {+ universalIdentifier: frontComponentUniversalIdentifier,+ name: `${slug}-component`,+ description: `The ${name} component`,+ sourceComponentPath: 'src/front-components/component.tsx',+ builtComponentPath: BUILT_FRONT_COMPONENT_PATH,+ builtComponentChecksum: 'component-checksum',+ componentName: 'Component',+ isHeadless: false,+ },+ ],+ agents: [+ {+ universalIdentifier: agentUniversalIdentifier,+ name: `${slug}-agent`,+ label: `${name} agent`,+ description: 'An agent owned by the application',+ icon: 'IconRobot',+ prompt: `You are the ${name} agent.`,+ },+ ],+ skills: [+ {+ universalIdentifier: skillUniversalIdentifier,+ name: `${slug}-skill`,+ label: `${name} skill`,+ description: 'A skill owned by the application',+ icon: 'IconSparkles',+ content: `# ${name} skill`,+ },+ ],+ connectionProviders: [+ {+ universalIdentifier: uuidv4(),+ name: connectionProviderName,+ displayName: `${name} provider`,+ type: 'oauth',+ oauth: {+ authorizationEndpoint: 'https://provider.example.com/authorize',+ tokenEndpoint: 'https://provider.example.com/token',+ scopes: ['read'],+ clientIdVariable: 'PROVIDER_CLIENT_ID',+ clientSecretVariable: 'PROVIDER_CLIENT_SECRET',+ },+ },+ ],+ },+ }),+ expectToFail: false,+ });++ const [application] = await globalThis.testDataSource.query(+ `SELECT id, "applicationRegistrationId" FROM core."application"+ WHERE "universalIdentifier" = $1 AND "workspaceId" = $2`,+ [applicationUniversalIdentifier, SEED_APPLE_WORKSPACE_ID],+ );++ seedBuiltFrontComponentSharedDependenciesFile({+ applicationUniversalIdentifier,+ builtPath: SHARED_DEPENDENCIES_BUILT_PATH,+ content: SHARED_DEPENDENCIES_BUNDLE_CONTENT,+ });++ await globalThis.testDataSource.query(+ `UPDATE core."application"+ SET "frontComponentSharedDependenciesBuiltPath" = $1,+ "frontComponentSharedDependenciesChecksum" = $2+ WHERE id = $3`,+ [SHARED_DEPENDENCIES_BUILT_PATH, 'a'.repeat(64), application.id],+ );++ const [+ logicFunctionId,+ workflowActionLogicFunctionId,+ frontComponentId,+ agentId,+ skillId,+ ] = await Promise.all([+ findIdByUniversalIdentifier({+ table: 'logicFunction',+ universalIdentifier: logicFunctionUniversalIdentifier,+ }),+ findIdByUniversalIdentifier({+ table: 'logicFunction',+ universalIdentifier: workflowActionLogicFunctionUniversalIdentifier,+ }),+ findIdByUniversalIdentifier({+ table: 'frontComponent',+ universalIdentifier: frontComponentUniversalIdentifier,+ }),+ findIdByUniversalIdentifier({+ table: 'agent',+ universalIdentifier: agentUniversalIdentifier,+ }),+ findIdByUniversalIdentifier({+ table: 'skill',+ universalIdentifier: skillUniversalIdentifier,+ }),+ ]);++ return {+ id: application.id,+ universalIdentifier: applicationUniversalIdentifier,+ applicationRegistrationId: application.applicationRegistrationId,+ logicFunctionId,+ workflowActionLogicFunctionId,+ frontComponentId,+ agentId,+ skillId,+ connectionProviderName,+ };+};diff --git a/packages/twenty-server/test/integration/metadata/suites/application/utils/trigger-install-application-job-query-factory.util.ts b/packages/twenty-server/test/integration/metadata/suites/application/utils/trigger-install-application-job-query-factory.util.tsnew file mode 100644index 00000000000..cca328daaaf--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application/utils/trigger-install-application-job-query-factory.util.ts@@ -0,0 +1,26 @@+import gql from 'graphql-tag';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';++export type TriggerInstallApplicationJobFactoryInput = {+ universalIdentifier: string;+};++const DEFAULT_TRIGGER_INSTALL_APPLICATION_JOB_GQL_FIELDS = `+ jobId+`;++export const triggerInstallApplicationJobQueryFactory = ({+ input,+ gqlFields = DEFAULT_TRIGGER_INSTALL_APPLICATION_JOB_GQL_FIELDS,+}: PerformMetadataQueryParams<TriggerInstallApplicationJobFactoryInput>) => ({+ query: gql`+ mutation TriggerInstallApplicationJob($input: TriggerInstallApplicationJobInput!) {+ triggerInstallApplicationJob(input: $input) {+ ${gqlFields}+ }+ }+ `,+ variables: {+ input: { universalIdentifier: input.universalIdentifier },+ },+});diff --git a/packages/twenty-server/test/integration/metadata/suites/application/utils/trigger-install-application-job.util.ts b/packages/twenty-server/test/integration/metadata/suites/application/utils/trigger-install-application-job.util.tsnew file mode 100644index 00000000000..985b50271b2--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application/utils/trigger-install-application-job.util.ts@@ -0,0 +1,43 @@+import {+ type TriggerInstallApplicationJobFactoryInput,+ triggerInstallApplicationJobQueryFactory,+} from 'test/integration/metadata/suites/application/utils/trigger-install-application-job-query-factory.util';+import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';++export const triggerInstallApplicationJob = async ({+ input,+ gqlFields,+ expectToFail = false,+ token,+}: PerformMetadataQueryParams<TriggerInstallApplicationJobFactoryInput>): CommonResponseBody<{+ triggerInstallApplicationJob: { jobId: string };+}> => {+ const graphqlOperation = triggerInstallApplicationJobQueryFactory({+ input,+ gqlFields,+ });++ const response = await makeMetadataApiRequest(graphqlOperation, token);++ if (expectToFail === true) {+ warnIfNoErrorButExpectedToFail({+ response,+ errorMessage:+ 'Triggering the application install job should have failed but did not',+ });+ }++ if (expectToFail === false) {+ warnIfErrorButNotExpectedToFail({+ response,+ errorMessage:+ 'Triggering the application install job has failed but should not',+ });+ }++ return { data: response.body.data, errors: response.body.errors };+};diff --git a/packages/twenty-server/test/integration/metadata/suites/application/utils/trigger-uninstall-application-job-query-factory.util.ts b/packages/twenty-server/test/integration/metadata/suites/application/utils/trigger-uninstall-application-job-query-factory.util.tsnew file mode 100644index 00000000000..4ed2167c34f--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application/utils/trigger-uninstall-application-job-query-factory.util.ts@@ -0,0 +1,26 @@+import gql from 'graphql-tag';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';++export type TriggerUninstallApplicationJobFactoryInput = {+ universalIdentifier: string;+};++const DEFAULT_TRIGGER_UNINSTALL_APPLICATION_JOB_GQL_FIELDS = `+ jobId+`;++export const triggerUninstallApplicationJobQueryFactory = ({+ input,+ gqlFields = DEFAULT_TRIGGER_UNINSTALL_APPLICATION_JOB_GQL_FIELDS,+}: PerformMetadataQueryParams<TriggerUninstallApplicationJobFactoryInput>) => ({+ query: gql`+ mutation TriggerUninstallApplicationJob($input: TriggerUninstallApplicationJobInput!) {+ triggerUninstallApplicationJob(input: $input) {+ ${gqlFields}+ }+ }+ `,+ variables: {+ input: { universalIdentifier: input.universalIdentifier },+ },+});diff --git a/packages/twenty-server/test/integration/metadata/suites/application/utils/trigger-uninstall-application-job.util.ts b/packages/twenty-server/test/integration/metadata/suites/application/utils/trigger-uninstall-application-job.util.tsnew file mode 100644index 00000000000..68c150c3b6f--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application/utils/trigger-uninstall-application-job.util.ts@@ -0,0 +1,43 @@+import {+ type TriggerUninstallApplicationJobFactoryInput,+ triggerUninstallApplicationJobQueryFactory,+} from 'test/integration/metadata/suites/application/utils/trigger-uninstall-application-job-query-factory.util';+import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';++export const triggerUninstallApplicationJob = async ({+ input,+ gqlFields,+ expectToFail = false,+ token,+}: PerformMetadataQueryParams<TriggerUninstallApplicationJobFactoryInput>): CommonResponseBody<{+ triggerUninstallApplicationJob: { jobId: string };+}> => {+ const graphqlOperation = triggerUninstallApplicationJobQueryFactory({+ input,+ gqlFields,+ });++ const response = await makeMetadataApiRequest(graphqlOperation, token);++ if (expectToFail === true) {+ warnIfNoErrorButExpectedToFail({+ response,+ errorMessage:+ 'Triggering the application uninstall job should have failed but did not',+ });+ }++ if (expectToFail === false) {+ warnIfErrorButNotExpectedToFail({+ response,+ errorMessage:+ 'Triggering the application uninstall job has failed but should not',+ });+ }++ return { data: response.body.data, errors: response.body.errors };+};diff --git a/packages/twenty-server/test/integration/metadata/suites/application/utils/update-application-query-factory.util.ts b/packages/twenty-server/test/integration/metadata/suites/application/utils/update-application-query-factory.util.tsnew file mode 100644index 00000000000..ca8eb878169--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application/utils/update-application-query-factory.util.ts@@ -0,0 +1,28 @@+import gql from 'graphql-tag';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';++export type UpdateApplicationFactoryInput = {+ id: string;+ autoUpgrade: boolean;+};++const DEFAULT_UPDATE_APPLICATION_GQL_FIELDS = `+ id+`;++export const updateApplicationQueryFactory = ({+ input,+ gqlFields = DEFAULT_UPDATE_APPLICATION_GQL_FIELDS,+}: PerformMetadataQueryParams<UpdateApplicationFactoryInput>) => ({+ query: gql`+ mutation UpdateApplication($id: UUID!, $input: UpdateApplicationInput!) {+ updateApplication(id: $id, input: $input) {+ ${gqlFields}+ }+ }+ `,+ variables: {+ id: input.id,+ input: { autoUpgrade: input.autoUpgrade },+ },+});diff --git a/packages/twenty-server/test/integration/metadata/suites/application/utils/update-application.util.ts b/packages/twenty-server/test/integration/metadata/suites/application/utils/update-application.util.tsnew file mode 100644index 00000000000..f62b49f456b--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application/utils/update-application.util.ts@@ -0,0 +1,41 @@+import {+ type UpdateApplicationFactoryInput,+ updateApplicationQueryFactory,+} from 'test/integration/metadata/suites/application/utils/update-application-query-factory.util';+import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';++export const updateApplication = async ({+ input,+ gqlFields,+ expectToFail = false,+ token,+}: PerformMetadataQueryParams<UpdateApplicationFactoryInput>): CommonResponseBody<{+ updateApplication: { id: string };+}> => {+ const graphqlOperation = updateApplicationQueryFactory({+ input,+ gqlFields,+ });++ const response = await makeMetadataApiRequest(graphqlOperation, token);++ if (expectToFail === true) {+ warnIfNoErrorButExpectedToFail({+ response,+ errorMessage: 'Updating the application should have failed but did not',+ });+ }++ if (expectToFail === false) {+ warnIfErrorButNotExpectedToFail({+ response,+ errorMessage: 'Updating the application has failed but should not',+ });+ }++ return { data: response.body.data, errors: response.body.errors };+};diff --git a/packages/twenty-server/test/integration/metadata/suites/application/utils/upgrade-application-query-factory.util.ts b/packages/twenty-server/test/integration/metadata/suites/application/utils/upgrade-application-query-factory.util.tsnew file mode 100644index 00000000000..92b8d5dd145--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application/utils/upgrade-application-query-factory.util.ts@@ -0,0 +1,27 @@+import gql from 'graphql-tag';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';++export type UpgradeApplicationFactoryInput = {+ appRegistrationId: string;+ targetVersion: string;+};++export const upgradeApplicationQueryFactory = ({+ input,+}: PerformMetadataQueryParams<UpgradeApplicationFactoryInput>) => ({+ query: gql`+ mutation UpgradeApplication(+ $appRegistrationId: String!+ $targetVersion: String!+ ) {+ upgradeApplication(+ appRegistrationId: $appRegistrationId+ targetVersion: $targetVersion+ )+ }+ `,+ variables: {+ appRegistrationId: input.appRegistrationId,+ targetVersion: input.targetVersion,+ },+});diff --git a/packages/twenty-server/test/integration/metadata/suites/application/utils/upgrade-application.util.ts b/packages/twenty-server/test/integration/metadata/suites/application/utils/upgrade-application.util.tsnew file mode 100644index 00000000000..b99c9863d6c--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application/utils/upgrade-application.util.ts@@ -0,0 +1,39 @@+import {+ type UpgradeApplicationFactoryInput,+ upgradeApplicationQueryFactory,+} from 'test/integration/metadata/suites/application/utils/upgrade-application-query-factory.util';+import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';++export const upgradeApplication = async ({+ input,+ expectToFail = false,+ token,+}: PerformMetadataQueryParams<UpgradeApplicationFactoryInput>): CommonResponseBody<{+ upgradeApplication: boolean;+}> => {+ const graphqlOperation = upgradeApplicationQueryFactory({+ input,+ });++ const response = await makeMetadataApiRequest(graphqlOperation, token);++ if (expectToFail === true) {+ warnIfNoErrorButExpectedToFail({+ response,+ errorMessage: 'Upgrading the application should have failed but did not',+ });+ }++ if (expectToFail === false) {+ warnIfErrorButNotExpectedToFail({+ response,+ errorMessage: 'Upgrading the application has failed but should not',+ });+ }++ return { data: response.body.data, errors: response.body.errors };+};diff --git a/packages/twenty-server/test/integration/metadata/suites/connected-account/utils/find-application-connected-accounts-query-factory.util.ts b/packages/twenty-server/test/integration/metadata/suites/connected-account/utils/find-application-connected-accounts-query-factory.util.tsnew file mode 100644index 00000000000..474ae978633--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/connected-account/utils/find-application-connected-accounts-query-factory.util.ts@@ -0,0 +1,26 @@+import gql from 'graphql-tag';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';++export type FindApplicationConnectedAccountsFactoryInput = {+ applicationId: string;+};++const DEFAULT_FIND_APPLICATION_CONNECTED_ACCOUNTS_GQL_FIELDS = `+ id+`;++export const findApplicationConnectedAccountsQueryFactory = ({+ input,+ gqlFields = DEFAULT_FIND_APPLICATION_CONNECTED_ACCOUNTS_GQL_FIELDS,+}: PerformMetadataQueryParams<FindApplicationConnectedAccountsFactoryInput>) => ({+ query: gql`+ query ApplicationConnectedAccounts($applicationId: UUID!) {+ applicationConnectedAccounts(applicationId: $applicationId) {+ ${gqlFields}+ }+ }+ `,+ variables: {+ applicationId: input.applicationId,+ },+});diff --git a/packages/twenty-server/test/integration/metadata/suites/connected-account/utils/find-application-connected-accounts.util.ts b/packages/twenty-server/test/integration/metadata/suites/connected-account/utils/find-application-connected-accounts.util.tsnew file mode 100644index 00000000000..a79d9e3571f--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/connected-account/utils/find-application-connected-accounts.util.ts@@ -0,0 +1,45 @@+import {+ type FindApplicationConnectedAccountsFactoryInput,+ findApplicationConnectedAccountsQueryFactory,+} from 'test/integration/metadata/suites/connected-account/utils/find-application-connected-accounts-query-factory.util';+import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';++import { type ApplicationConnectedAccountDTO } from 'src/engine/metadata-modules/connected-account/dtos/application-connected-account.dto';++export const findApplicationConnectedAccounts = async ({+ input,+ gqlFields,+ expectToFail = false,+ token,+}: PerformMetadataQueryParams<FindApplicationConnectedAccountsFactoryInput>): CommonResponseBody<{+ applicationConnectedAccounts: ApplicationConnectedAccountDTO[];+}> => {+ const graphqlOperation = findApplicationConnectedAccountsQueryFactory({+ input,+ gqlFields,+ });++ const response = await makeMetadataApiRequest(graphqlOperation, token);++ if (expectToFail === true) {+ warnIfNoErrorButExpectedToFail({+ response,+ errorMessage:+ 'Finding application connected accounts should have failed but did not',+ });+ }++ if (expectToFail === false) {+ warnIfErrorButNotExpectedToFail({+ response,+ errorMessage:+ 'Finding application connected accounts has failed but should not',+ });+ }++ return { data: response.body.data, errors: response.body.errors };+};diff --git a/packages/twenty-server/test/integration/metadata/suites/connection-provider/utils/find-application-connection-providers-query-factory.util.ts b/packages/twenty-server/test/integration/metadata/suites/connection-provider/utils/find-application-connection-providers-query-factory.util.tsnew file mode 100644index 00000000000..84f0def5b5b--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/connection-provider/utils/find-application-connection-providers-query-factory.util.ts@@ -0,0 +1,28 @@+import gql from 'graphql-tag';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';++export type FindApplicationConnectionProvidersFactoryInput = {+ applicationId: string;+};++const DEFAULT_FIND_APPLICATION_CONNECTION_PROVIDERS_GQL_FIELDS = `+ id+ name+ applicationId+`;++export const findApplicationConnectionProvidersQueryFactory = ({+ input,+ gqlFields = DEFAULT_FIND_APPLICATION_CONNECTION_PROVIDERS_GQL_FIELDS,+}: PerformMetadataQueryParams<FindApplicationConnectionProvidersFactoryInput>) => ({+ query: gql`+ query ApplicationConnectionProviders($applicationId: UUID!) {+ applicationConnectionProviders(applicationId: $applicationId) {+ ${gqlFields}+ }+ }+ `,+ variables: {+ applicationId: input.applicationId,+ },+});diff --git a/packages/twenty-server/test/integration/metadata/suites/connection-provider/utils/find-application-connection-providers.util.ts b/packages/twenty-server/test/integration/metadata/suites/connection-provider/utils/find-application-connection-providers.util.tsnew file mode 100644index 00000000000..e23a097f184--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/connection-provider/utils/find-application-connection-providers.util.ts@@ -0,0 +1,45 @@+import {+ type FindApplicationConnectionProvidersFactoryInput,+ findApplicationConnectionProvidersQueryFactory,+} from 'test/integration/metadata/suites/connection-provider/utils/find-application-connection-providers-query-factory.util';+import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';++import { type ApplicationConnectionProviderDTO } from 'src/engine/core-modules/application/connection-provider/dtos/application-connection-provider.dto';++export const findApplicationConnectionProviders = async ({+ input,+ gqlFields,+ expectToFail = false,+ token,+}: PerformMetadataQueryParams<FindApplicationConnectionProvidersFactoryInput>): CommonResponseBody<{+ applicationConnectionProviders: ApplicationConnectionProviderDTO[];+}> => {+ const graphqlOperation = findApplicationConnectionProvidersQueryFactory({+ input,+ gqlFields,+ });++ const response = await makeMetadataApiRequest(graphqlOperation, token);++ if (expectToFail === true) {+ warnIfNoErrorButExpectedToFail({+ response,+ errorMessage:+ 'Finding application connection providers should have failed but did not',+ });+ }++ if (expectToFail === false) {+ warnIfErrorButNotExpectedToFail({+ response,+ errorMessage:+ 'Finding application connection providers has failed but should not',+ });+ }++ return { data: response.body.data, errors: response.body.errors };+};diff --git a/packages/twenty-server/test/integration/metadata/suites/logic-function/utils/find-many-logic-functions-query-factory.util.ts b/packages/twenty-server/test/integration/metadata/suites/logic-function/utils/find-many-logic-functions-query-factory.util.tsnew file mode 100644index 00000000000..f611f8ff4ed--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/logic-function/utils/find-many-logic-functions-query-factory.util.ts@@ -0,0 +1,20 @@+import gql from 'graphql-tag';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';++const DEFAULT_FIND_MANY_LOGIC_FUNCTIONS_GQL_FIELDS = `+ id+ name+ applicationId+`;++export const findManyLogicFunctionsQueryFactory = ({+ gqlFields = DEFAULT_FIND_MANY_LOGIC_FUNCTIONS_GQL_FIELDS,+}: Partial<PerformMetadataQueryParams<undefined>>) => ({+ query: gql`+ query FindManyLogicFunctions {+ findManyLogicFunctions {+ ${gqlFields}+ }+ }+ `,+});diff --git a/packages/twenty-server/test/integration/metadata/suites/logic-function/utils/find-many-logic-functions.util.ts b/packages/twenty-server/test/integration/metadata/suites/logic-function/utils/find-many-logic-functions.util.tsnew file mode 100644index 00000000000..748d3189d44--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/logic-function/utils/find-many-logic-functions.util.ts@@ -0,0 +1,36 @@+import { findManyLogicFunctionsQueryFactory } from 'test/integration/metadata/suites/logic-function/utils/find-many-logic-functions-query-factory.util';+import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';++import { type LogicFunctionDTO } from 'src/engine/metadata-modules/logic-function/dtos/logic-function.dto';++export const findManyLogicFunctions = async ({+ gqlFields,+ expectToFail = false,+ token,+}: Partial<PerformMetadataQueryParams<undefined>>): CommonResponseBody<{+ findManyLogicFunctions: LogicFunctionDTO[];+}> => {+ const graphqlOperation = findManyLogicFunctionsQueryFactory({ gqlFields });++ const response = await makeMetadataApiRequest(graphqlOperation, token);++ if (expectToFail === true) {+ warnIfNoErrorButExpectedToFail({+ response,+ errorMessage: 'Finding logic functions should have failed but did not',+ });+ }++ if (expectToFail === false) {+ warnIfErrorButNotExpectedToFail({+ response,+ errorMessage: 'Finding logic functions has failed but should not',+ });+ }++ return { data: response.body.data, errors: response.body.errors };+};diff --git a/packages/twenty-server/test/integration/metadata/suites/logic-function/utils/find-one-logic-function-query-factory.util.ts b/packages/twenty-server/test/integration/metadata/suites/logic-function/utils/find-one-logic-function-query-factory.util.tsnew file mode 100644index 00000000000..34957561d79--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/logic-function/utils/find-one-logic-function-query-factory.util.ts@@ -0,0 +1,28 @@+import gql from 'graphql-tag';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';++export type FindOneLogicFunctionFactoryInput = {+ id: string;+};++const DEFAULT_FIND_ONE_LOGIC_FUNCTION_GQL_FIELDS = `+ id+ name+ applicationId+`;++export const findOneLogicFunctionQueryFactory = ({+ input,+ gqlFields = DEFAULT_FIND_ONE_LOGIC_FUNCTION_GQL_FIELDS,+}: PerformMetadataQueryParams<FindOneLogicFunctionFactoryInput>) => ({+ query: gql`+ query FindOneLogicFunction($input: LogicFunctionIdInput!) {+ findOneLogicFunction(input: $input) {+ ${gqlFields}+ }+ }+ `,+ variables: {+ input: { id: input.id },+ },+});diff --git a/packages/twenty-server/test/integration/metadata/suites/logic-function/utils/find-one-logic-function.util.ts b/packages/twenty-server/test/integration/metadata/suites/logic-function/utils/find-one-logic-function.util.tsnew file mode 100644index 00000000000..a1e8480a642--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/logic-function/utils/find-one-logic-function.util.ts@@ -0,0 +1,43 @@+import {+ type FindOneLogicFunctionFactoryInput,+ findOneLogicFunctionQueryFactory,+} from 'test/integration/metadata/suites/logic-function/utils/find-one-logic-function-query-factory.util';+import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';++import { type LogicFunctionDTO } from 'src/engine/metadata-modules/logic-function/dtos/logic-function.dto';++export const findOneLogicFunction = async ({+ input,+ gqlFields,+ expectToFail = false,+ token,+}: PerformMetadataQueryParams<FindOneLogicFunctionFactoryInput>): CommonResponseBody<{+ findOneLogicFunction: LogicFunctionDTO;+}> => {+ const graphqlOperation = findOneLogicFunctionQueryFactory({+ input,+ gqlFields,+ });++ const response = await makeMetadataApiRequest(graphqlOperation, token);++ if (expectToFail === true) {+ warnIfNoErrorButExpectedToFail({+ response,+ errorMessage: 'Finding logic function should have failed but did not',+ });+ }++ if (expectToFail === false) {+ warnIfErrorButNotExpectedToFail({+ response,+ errorMessage: 'Finding logic function has failed but should not',+ });+ }++ return { data: response.body.data, errors: response.body.errors };+};diff --git a/packages/twenty-server/test/integration/metadata/suites/logic-function/utils/get-logic-function-source-code-query-factory.util.ts b/packages/twenty-server/test/integration/metadata/suites/logic-function/utils/get-logic-function-source-code-query-factory.util.tsnew file mode 100644index 00000000000..a71723c41d2--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/logic-function/utils/get-logic-function-source-code-query-factory.util.ts@@ -0,0 +1,19 @@+import gql from 'graphql-tag';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';++export type GetLogicFunctionSourceCodeFactoryInput = {+ id: string;+};++export const getLogicFunctionSourceCodeQueryFactory = ({+ input,+}: PerformMetadataQueryParams<GetLogicFunctionSourceCodeFactoryInput>) => ({+ query: gql`+ query GetLogicFunctionSourceCode($input: LogicFunctionIdInput!) {+ getLogicFunctionSourceCode(input: $input)+ }+ `,+ variables: {+ input: { id: input.id },+ },+});diff --git a/packages/twenty-server/test/integration/metadata/suites/logic-function/utils/get-logic-function-source-code.util.ts b/packages/twenty-server/test/integration/metadata/suites/logic-function/utils/get-logic-function-source-code.util.tsnew file mode 100644index 00000000000..b7e5a37f747--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/logic-function/utils/get-logic-function-source-code.util.ts@@ -0,0 +1,39 @@+import {+ type GetLogicFunctionSourceCodeFactoryInput,+ getLogicFunctionSourceCodeQueryFactory,+} from 'test/integration/metadata/suites/logic-function/utils/get-logic-function-source-code-query-factory.util';+import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';++export const getLogicFunctionSourceCode = async ({+ input,+ expectToFail = false,+ token,+}: PerformMetadataQueryParams<GetLogicFunctionSourceCodeFactoryInput>): CommonResponseBody<{+ getLogicFunctionSourceCode: string | null;+}> => {+ const graphqlOperation = getLogicFunctionSourceCodeQueryFactory({ input });++ const response = await makeMetadataApiRequest(graphqlOperation, token);++ if (expectToFail === true) {+ warnIfNoErrorButExpectedToFail({+ response,+ errorMessage:+ 'Getting logic function source code should have failed but did not',+ });+ }++ if (expectToFail === false) {+ warnIfErrorButNotExpectedToFail({+ response,+ errorMessage:+ 'Getting logic function source code has failed but should not',+ });+ }++ return { data: response.body.data, errors: response.body.errors };+};diff --git a/packages/twenty-server/test/integration/rest/suites/__snapshots__/failing-cross-application-rest-access.integration-spec.ts.snap b/packages/twenty-server/test/integration/rest/suites/__snapshots__/failing-cross-application-rest-access.integration-spec.ts.snapnew file mode 100644index 00000000000..031662ad30e--- /dev/null+++ b/packages/twenty-server/test/integration/rest/suites/__snapshots__/failing-cross-application-rest-access.integration-spec.ts.snap@@ -0,0 +1,85 @@+// Jest Snapshot v1, https://goo.gl/fbAQLP++exports[`Application token REST access to another application should fail with a user-bound application token should refuse the SDK client module of another application 1`] = `+{+ "body": {+ "code": "FORBIDDEN",+ "error": "Error",+ "messages": [+ "An application token can only target its own application",+ ],+ "statusCode": 403,+ },+ "status": 403,+}+`;++exports[`Application token REST access to another application should fail with a user-bound application token should refuse the front component built JS of another application 1`] = `+{+ "body": {+ "code": "FORBIDDEN",+ "error": "Error",+ "messages": [+ "An application token can only reach its own application",+ ],+ "statusCode": 403,+ },+ "status": 403,+}+`;++exports[`Application token REST access to another application should fail with a user-bound application token should refuse the front component shared dependencies of another application 1`] = `+{+ "body": {+ "code": "FORBIDDEN",+ "error": "Error",+ "messages": [+ "An application token can only target its own application",+ ],+ "statusCode": 403,+ },+ "status": 403,+}+`;++exports[`Application token REST access to another application should fail with an application token without user binding should refuse the SDK client module of another application 1`] = `+{+ "body": {+ "code": "FORBIDDEN",+ "error": "Error",+ "messages": [+ "An application token can only target its own application",+ ],+ "statusCode": 403,+ },+ "status": 403,+}+`;++exports[`Application token REST access to another application should fail with an application token without user binding should refuse the front component built JS of another application 1`] = `+{+ "body": {+ "code": "FORBIDDEN",+ "error": "Error",+ "messages": [+ "An application token can only reach its own application",+ ],+ "statusCode": 403,+ },+ "status": 403,+}+`;++exports[`Application token REST access to another application should fail with an application token without user binding should refuse the front component shared dependencies of another application 1`] = `+{+ "body": {+ "code": "FORBIDDEN",+ "error": "Error",+ "messages": [+ "An application token can only target its own application",+ ],+ "statusCode": 403,+ },+ "status": 403,+}+`;diff --git a/packages/twenty-server/test/integration/rest/suites/failing-cross-application-rest-access.integration-spec.ts b/packages/twenty-server/test/integration/rest/suites/failing-cross-application-rest-access.integration-spec.tsnew file mode 100644index 00000000000..9dfa30e2063--- /dev/null+++ b/packages/twenty-server/test/integration/rest/suites/failing-cross-application-rest-access.integration-spec.ts@@ -0,0 +1,119 @@+import { cleanupApplicationAndAppRegistration } from 'test/integration/metadata/suites/application/utils/cleanup-application-and-app-registration.util';+import {+ type ApplicationWithResources,+ setupApplicationWithResources,+} from 'test/integration/metadata/suites/application/utils/setup-application-with-resources.util';+import { makeRestApiRequest } from 'test/integration/rest/utils/make-rest-api-request.util';+import { expectOneNotInternalServerErrorHttpResponseSnapshot } from 'test/integration/utils/expect-one-not-internal-server-error-http-response-snapshot.util';+import { generateAppleAdminApplicationTokenPair } from 'test/integration/utils/generate-apple-admin-application-token-pair.util';+import { generateApplicationTokenPair } from 'test/integration/utils/generate-application-token-pair.util';+import {+ type EachTestingContext,+ eachTestingContextFilter,+} from 'twenty-shared/testing';++import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';++type GlobalTestContext = {+ otherApplication: ApplicationWithResources;+ userBoundToken: string;+ unboundToken: string;+};++type TokenTestContext = {+ token: (globalContext: GlobalTestContext) => string;+};++type RouteTestContext = {+ path: (otherApplication: ApplicationWithResources) => string;+};++const tokenTestCases: EachTestingContext<TokenTestContext>[] = [+ {+ title: 'with a user-bound application token',+ context: { token: (globalContext) => globalContext.userBoundToken },+ },+ {+ title: 'with an application token without user binding',+ context: { token: (globalContext) => globalContext.unboundToken },+ },+];++const routeTestCases: EachTestingContext<RouteTestContext>[] = [+ {+ title: 'front component built JS',+ context: {+ path: ({ frontComponentId }) => `/front-components/${frontComponentId}`,+ },+ },+ {+ title: 'front component shared dependencies',+ context: {+ path: ({ id }) => `/front-component-shared-dependencies/${id}`,+ },+ },+ {+ title: 'SDK client module',+ context: {+ path: ({ id }) => `/sdk-client/${id}/core`,+ },+ },+];++describe('Application token REST access to another application should fail', () => {+ let callingApplication: ApplicationWithResources;+ let globalTestContext: GlobalTestContext;++ beforeAll(async () => {+ callingApplication = await setupApplicationWithResources({+ name: 'Calling Rest Application',+ });+ const otherApplication = await setupApplicationWithResources({+ name: 'Other Rest Application',+ });++ const [userBoundTokenPair, unboundTokenPair] = await Promise.all([+ generateAppleAdminApplicationTokenPair({+ applicationId: callingApplication.id,+ }),+ generateApplicationTokenPair({+ workspaceId: SEED_APPLE_WORKSPACE_ID,+ applicationId: callingApplication.id,+ }),+ ]);++ globalTestContext = {+ otherApplication,+ userBoundToken: userBoundTokenPair.applicationAccessToken.token,+ unboundToken: unboundTokenPair.applicationAccessToken.token,+ };+ }, 120000);++ afterAll(async () => {+ await cleanupApplicationAndAppRegistration({+ applicationUniversalIdentifier: callingApplication.universalIdentifier,+ });+ await cleanupApplicationAndAppRegistration({+ applicationUniversalIdentifier:+ globalTestContext.otherApplication.universalIdentifier,+ });+ });++ describe.each(eachTestingContextFilter(tokenTestCases))(+ '$title',+ ({ context: tokenContext }) => {+ it.each(eachTestingContextFilter(routeTestCases))(+ 'should refuse the $title of another application',+ async ({ context }) => {+ const response = await makeRestApiRequest({+ method: 'get',+ path: context.path(globalTestContext.otherApplication),+ bearer: tokenContext.token(globalTestContext),+ });++ expectOneNotInternalServerErrorHttpResponseSnapshot(response);+ },+ );+ },+ );+});diff --git a/packages/twenty-server/test/integration/rest/suites/successful-application-rest-resource-access.integration-spec.ts b/packages/twenty-server/test/integration/rest/suites/successful-application-rest-resource-access.integration-spec.tsnew file mode 100644index 00000000000..63b3f3712d6--- /dev/null+++ b/packages/twenty-server/test/integration/rest/suites/successful-application-rest-resource-access.integration-spec.ts@@ -0,0 +1,151 @@+import { cleanupApplicationAndAppRegistration } from 'test/integration/metadata/suites/application/utils/cleanup-application-and-app-registration.util';+import {+ type ApplicationWithResources,+ BUILT_FRONT_COMPONENT_CONTENT,+ SHARED_DEPENDENCIES_BUNDLE_CONTENT,+ setupApplicationWithResources,+} from 'test/integration/metadata/suites/application/utils/setup-application-with-resources.util';+import { makeRestApiRequest } from 'test/integration/rest/utils/make-rest-api-request.util';+import { generateAppleAdminApplicationTokenPair } from 'test/integration/utils/generate-apple-admin-application-token-pair.util';+import { generateApplicationTokenPair } from 'test/integration/utils/generate-application-token-pair.util';+import {+ type EachTestingContext,+ eachTestingContextFilter,+} from 'twenty-shared/testing';++import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';++type GlobalTestContext = {+ application: ApplicationWithResources;+ otherApplication: ApplicationWithResources;+ userBoundToken: string;+ unboundToken: string;+};++type CallerTestContext = {+ token: (globalContext: GlobalTestContext) => string;+ targetApplication: (+ globalContext: GlobalTestContext,+ ) => ApplicationWithResources;+};++type RouteTestContext = {+ path: (application: ApplicationWithResources) => string;+ expectedContent: string | undefined;+};++const callerTestCases: EachTestingContext<CallerTestContext>[] = [+ {+ title: 'a user-bound application token on its own application',+ context: {+ token: (globalContext) => globalContext.userBoundToken,+ targetApplication: (globalContext) => globalContext.application,+ },+ },+ {+ title: 'an application token without user binding on its own application',+ context: {+ token: (globalContext) => globalContext.unboundToken,+ targetApplication: (globalContext) => globalContext.application,+ },+ },+ {+ title: 'a member session on an installed application',+ context: {+ token: () => APPLE_JANE_ADMIN_ACCESS_TOKEN,+ targetApplication: (globalContext) => globalContext.otherApplication,+ },+ },+];++const routeTestCases: EachTestingContext<RouteTestContext>[] = [+ {+ title: 'front component built JS',+ context: {+ path: ({ frontComponentId }) => `/front-components/${frontComponentId}`,+ expectedContent: BUILT_FRONT_COMPONENT_CONTENT,+ },+ },+ {+ title: 'front component shared dependencies',+ context: {+ path: ({ id }) => `/front-component-shared-dependencies/${id}`,+ expectedContent: SHARED_DEPENDENCIES_BUNDLE_CONTENT,+ },+ },+ {+ title: 'SDK client metadata module',+ context: {+ path: ({ id }) => `/sdk-client/${id}/metadata`,+ expectedContent: undefined,+ },+ },+];++describe('Application REST resource access should succeed', () => {+ let globalTestContext: GlobalTestContext;++ beforeAll(async () => {+ const application = await setupApplicationWithResources({+ name: 'Own Rest Application',+ });+ const otherApplication = await setupApplicationWithResources({+ name: 'Installed Rest Application',+ });++ const [userBoundTokenPair, unboundTokenPair] = await Promise.all([+ generateAppleAdminApplicationTokenPair({+ applicationId: application.id,+ }),+ generateApplicationTokenPair({+ workspaceId: SEED_APPLE_WORKSPACE_ID,+ applicationId: application.id,+ }),+ ]);++ globalTestContext = {+ application,+ otherApplication,+ userBoundToken: userBoundTokenPair.applicationAccessToken.token,+ unboundToken: unboundTokenPair.applicationAccessToken.token,+ };+ }, 120000);++ afterAll(async () => {+ await cleanupApplicationAndAppRegistration({+ applicationUniversalIdentifier:+ globalTestContext.application.universalIdentifier,+ });+ await cleanupApplicationAndAppRegistration({+ applicationUniversalIdentifier:+ globalTestContext.otherApplication.universalIdentifier,+ });+ });++ describe.each(eachTestingContextFilter(callerTestCases))(+ 'from $title',+ ({ context: callerContext }) => {+ it.each(eachTestingContextFilter(routeTestCases))(+ 'should serve the $title',+ async ({ context }) => {+ const response = await makeRestApiRequest({+ method: 'get',+ path: context.path(+ callerContext.targetApplication(globalTestContext),+ ),+ bearer: callerContext.token(globalTestContext),+ });++ expect(response.status).toBe(200);+ expect(response.headers['content-type']).toMatch(+ /application\/javascript/,+ );++ if (context.expectedContent !== undefined) {+ expect(response.text).toBe(context.expectedContent);+ }+ },+ );+ },+ );+});