The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
[BREAKING_CHANGE] Declare application registration variables through the manifest only (#26856)
Paul Rastoinbe6bd4ee8626
diff --git a/packages/twenty-agent-skills/references/concepts/how-apps-work.md b/packages/twenty-agent-skills/references/concepts/how-apps-work.mdindex 81169f575d4..68c5ac197df 100644--- a/packages/twenty-agent-skills/references/concepts/how-apps-work.md+++ b/packages/twenty-agent-skills/references/concepts/how-apps-work.md@@ -113,3 +113,4 @@ my-app/- **Remotes**: Named connections to Twenty instances. Stored in `~/.twenty/config.json`. Switch with `yarn twenty remote:use <name>`.- **Sync**: `yarn twenty apply` builds, deploys, and installs the app on the active remote in one step. This is the standard way to get code changes onto a Twenty instance.- **Publish**: `yarn twenty app:publish` packages the app for distribution to other instances or the marketplace. Requires a strictly higher semver version than the previously published version.+- **Reserved variable names**: `TWENTY_API_URL`, `TWENTY_APP_ACCESS_TOKEN`, `TWENTY_APP_APPLICATION_ACCESS_TOKEN`, `TWENTY_API_KEY`, `TWENTY_FUNCTIONS_URL` and `APPLICATION_ID` are set by Twenty for every logic function run. A manifest that declares one of them as an application or server variable is rejected on sync and publish.diff --git a/packages/twenty-agent-skills/references/develop-app/logic.md b/packages/twenty-agent-skills/references/develop-app/logic.mdindex 5ed4017d321..36590aa5dc3 100644--- a/packages/twenty-agent-skills/references/develop-app/logic.md+++ b/packages/twenty-agent-skills/references/develop-app/logic.md@@ -21,6 +21,7 @@ Other rules:- Return a bulk summary with per-record results for multi-record actions, including counts for success, no match, and failed records.- Prefer idempotent behavior for jobs and repeated invocations.- Read secrets through the application-config helper, not raw `process.env`.+- Twenty injects `TWENTY_API_URL`, `TWENTY_APP_ACCESS_TOKEN`, `TWENTY_APP_APPLICATION_ACCESS_TOKEN`, `TWENTY_API_KEY`, `TWENTY_FUNCTIONS_URL` and `APPLICATION_ID` into every run. Never declare an application or server variable with one of these names: the manifest is rejected on sync and publish.- Do not hide customer-impacting side effects behind UI-only actions.Soft cap: a `*.logic-function.ts` or `*.post-install.ts` file over 200 lines is a refactor signal.diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql b/packages/twenty-client-sdk/src/metadata/generated/schema.graphqlindex 66b700edd9f..9f7aa12395d 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql@@ -4196,9 +4196,7 @@ type Mutation {updateApplicationRegistration(input: UpdateApplicationRegistrationInput!): ApplicationRegistration!deleteApplicationRegistration(id: String!): Boolean!rotateApplicationRegistrationClientSecret(id: String!): RotateClientSecret!- createApplicationRegistrationVariable(input: CreateApplicationRegistrationVariableInput!): ApplicationRegistrationVariable!updateApplicationRegistrationVariable(input: UpdateApplicationRegistrationVariableInput!): ApplicationRegistrationVariable!- deleteApplicationRegistrationVariable(id: String!): Boolean!completeAppTarballUpload(fileId: UUID!): ApplicationRegistration!uploadAppTarball(file: Upload!, universalIdentifier: String @deprecated(reason: "Ignored: the application universalIdentifier is read from the tarball manifest.")): ApplicationRegistration! @deprecated(reason: "Use createFileUpload with the AppTarball folder and completeAppTarballUpload, which send the tarball straight to file storage.")claimApplicationRegistrationOwnership(applicationRegistrationId: String!): ApplicationRegistration!@@ -5112,14 +5110,6 @@ input UpdateApplicationRegistrationPayload {oAuthScopes: [String!]}-input CreateApplicationRegistrationVariableInput {- applicationRegistrationId: String!- key: String!- value: String!- description: String- isSecret: Boolean-}-input UpdateApplicationRegistrationVariableInput {id: String!update: UpdateApplicationRegistrationVariablePayload!diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.ts b/packages/twenty-client-sdk/src/metadata/generated/schema.tsindex 4ae8eba9215..f32ba297fc7 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.ts+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.ts@@ -3592,9 +3592,7 @@ export interface Mutation {updateApplicationRegistration: ApplicationRegistrationdeleteApplicationRegistration: Scalars['Boolean']rotateApplicationRegistrationClientSecret: RotateClientSecret- createApplicationRegistrationVariable: ApplicationRegistrationVariableupdateApplicationRegistrationVariable: ApplicationRegistrationVariable- deleteApplicationRegistrationVariable: Scalars['Boolean']completeAppTarballUpload: ApplicationRegistration/** @deprecated Use createFileUpload with the AppTarball folder and completeAppTarballUpload, which send the tarball straight to file storage. */uploadAppTarball: ApplicationRegistration@@ -7542,9 +7540,7 @@ export interface MutationGenqlSelection{updateApplicationRegistration?: (ApplicationRegistrationGenqlSelection & { __args: {input: UpdateApplicationRegistrationInput} })deleteApplicationRegistration?: { __args: {id: Scalars['String']} }rotateApplicationRegistrationClientSecret?: (RotateClientSecretGenqlSelection & { __args: {id: Scalars['String']} })- createApplicationRegistrationVariable?: (ApplicationRegistrationVariableGenqlSelection & { __args: {input: CreateApplicationRegistrationVariableInput} })updateApplicationRegistrationVariable?: (ApplicationRegistrationVariableGenqlSelection & { __args: {input: UpdateApplicationRegistrationVariableInput} })- deleteApplicationRegistrationVariable?: { __args: {id: Scalars['String']} }completeAppTarballUpload?: (ApplicationRegistrationGenqlSelection & { __args: {fileId: Scalars['UUID']} })/** @deprecated Use createFileUpload with the AppTarball folder and completeAppTarballUpload, which send the tarball straight to file storage. */uploadAppTarball?: (ApplicationRegistrationGenqlSelection & { __args: {file: Scalars['Upload'], universalIdentifier?: (Scalars['String'] | null)} })@@ -7955,8 +7951,6 @@ export interface UpdateApplicationRegistrationInput {id: Scalars['String'],updatexport interface UpdateApplicationRegistrationPayload {name?: (Scalars['String'] | null),oAuthRedirectUris?: (Scalars['String'][] | null),oAuthScopes?: (Scalars['String'][] | null)}-export interface CreateApplicationRegistrationVariableInput {applicationRegistrationId: Scalars['String'],key: Scalars['String'],value: Scalars['String'],description?: (Scalars['String'] | null),isSecret?: (Scalars['Boolean'] | null)}-export interface UpdateApplicationRegistrationVariableInput {id: Scalars['String'],update: UpdateApplicationRegistrationVariablePayload}export interface UpdateApplicationRegistrationVariablePayload {value?: (Scalars['String'] | null),resetValue?: (Scalars['Boolean'] | null),description?: (Scalars['String'] | null)}diff --git a/packages/twenty-client-sdk/src/metadata/generated/types.ts b/packages/twenty-client-sdk/src/metadata/generated/types.tsindex da8bb8e5153..42cee976551 100644--- a/packages/twenty-client-sdk/src/metadata/generated/types.ts+++ b/packages/twenty-client-sdk/src/metadata/generated/types.ts@@ -105,9 +105,9 @@ export default {431,435,446,- 567,- 571,- 598+ 566,+ 570,+ 597],"types": {"BillingProductDTO": {@@ -9853,33 +9853,15 @@ export default {]}],- "createApplicationRegistrationVariable": [- 206,- {- "input": [- 524,- "CreateApplicationRegistrationVariableInput!"- ]- }- ],"updateApplicationRegistrationVariable": [206,{"input": [- 525,+ 524,"UpdateApplicationRegistrationVariableInput!"]}],- "deleteApplicationRegistrationVariable": [- 8,- {- "id": [- 1,- "String!"- ]- }- ],"completeAppTarballUpload": [78,{@@ -9927,7 +9909,7 @@ export default {258,{"input": [- 527,+ 526,"GrantApplicationCapabilitiesInput!"]}@@ -9960,7 +9942,7 @@ export default {256,{"input": [- 528,+ 527,"TriggerInstallApplicationJobInput!"]}@@ -9969,7 +9951,7 @@ export default {257,{"input": [- 529,+ 528,"TriggerUninstallApplicationJobInput!"]}@@ -9982,7 +9964,7 @@ export default {"UUID!"],"input": [- 530,+ 529,"UpdateApplicationInput!"]}@@ -10012,7 +9994,7 @@ export default {262,{"input": [- 531,+ 530,"CreateOneFieldMetadataInput!"]}@@ -10021,7 +10003,7 @@ export default {262,{"input": [- 533,+ 532,"UpdateOneFieldMetadataInput!"]}@@ -10030,7 +10012,7 @@ export default {262,{"input": [- 535,+ 534,"DeleteOneFieldInput!"]}@@ -10039,7 +10021,7 @@ export default {61,{"input": [- 536,+ 535,"CreateViewGroupInput!"]}@@ -10048,7 +10030,7 @@ export default {61,{"inputs": [- 536,+ 535,"[CreateViewGroupInput!]!"]}@@ -10057,7 +10039,7 @@ export default {61,{"input": [- 537,+ 536,"UpdateViewGroupInput!"]}@@ -10066,7 +10048,7 @@ export default {61,{"inputs": [- 537,+ 536,"[UpdateViewGroupInput!]!"]}@@ -10075,7 +10057,7 @@ export default {61,{"input": [- 539,+ 538,"DeleteViewGroupInput!"]}@@ -10084,7 +10066,7 @@ export default {61,{"input": [- 540,+ 539,"DestroyViewGroupInput!"]}@@ -10106,7 +10088,7 @@ export default {50,{"createRoleInput": [- 541,+ 540,"CreateRoleInput!"]}@@ -10115,7 +10097,7 @@ export default {50,{"updateRoleInput": [- 542,+ 541,"UpdateRoleInput!"]}@@ -10133,7 +10115,7 @@ export default {47,{"upsertObjectPermissionsInput": [- 544,+ 543,"UpsertObjectPermissionsInput!"]}@@ -10142,7 +10124,7 @@ export default {48,{"upsertPermissionFlagsInput": [- 546,+ 545,"UpsertPermissionFlagsInput!"]}@@ -10151,7 +10133,7 @@ export default {42,{"upsertFieldPermissionsInput": [- 547,+ 546,"UpsertFieldPermissionsInput!"]}@@ -10160,7 +10142,7 @@ export default {283,{"input": [- 549,+ 548,"UpsertRowLevelPermissionPredicatesInput!"]}@@ -10191,7 +10173,7 @@ export default {343,{"input": [- 552,+ 551,"SendMessageCampaignInput!"]}@@ -10200,7 +10182,7 @@ export default {341,{"input": [- 553,+ 552,"CancelMessageCampaignInput!"]}@@ -10209,7 +10191,7 @@ export default {342,{"input": [- 554,+ 553,"SendMessageCampaignTestInput!"]}@@ -10227,7 +10209,7 @@ export default {345,{"input": [- 555,+ 554,"CreateMessageSuppressionInput!"]}@@ -10245,7 +10227,7 @@ export default {349,{"input": [- 556,+ 555,"CreateUnsubscribeTopicInput!"]}@@ -10254,7 +10236,7 @@ export default {349,{"input": [- 557,+ 556,"UpdateUnsubscribeTopicInput!"]}@@ -10272,7 +10254,7 @@ export default {329,{"input": [- 558,+ 557,"UpdateMessageChannelInput!"]}@@ -10281,7 +10263,7 @@ export default {339,{"input": [- 560,+ 559,"CreateEmailGroupChannelInput!"]}@@ -10290,7 +10272,7 @@ export default {329,{"input": [- 561,+ 560,"UpdateEmailGroupChannelInput!"]}@@ -10308,7 +10290,7 @@ export default {329,{"input": [- 562,+ 561,"CreateAppMessageChannelInput!"]}@@ -10317,7 +10299,7 @@ export default {329,{"input": [- 563,+ 562,"UpdateAppMessageChannelInput!"]}@@ -10335,7 +10317,7 @@ export default {338,{"input": [- 564,+ 563,"IngestAppMessagesInput!"]}@@ -10344,7 +10326,7 @@ export default {325,{"input": [- 568,+ 567,"CreateEmailingDomainInput!"]}@@ -10371,7 +10353,7 @@ export default {362,{"input": [- 569,+ 568,"RunAgentInput!"]}@@ -10380,7 +10362,7 @@ export default {360,{"input": [- 573,+ 572,"CreateWebhookInput!"]}@@ -10389,7 +10371,7 @@ export default {360,{"input": [- 574,+ 573,"UpdateWebhookInput!"]}@@ -10407,7 +10389,7 @@ export default {403,{"input": [- 576,+ 575,"UpdateMessageFolderInput!"]}@@ -10416,7 +10398,7 @@ export default {403,{"input": [- 578,+ 577,"UpdateMessageFoldersInput!"]}@@ -10425,7 +10407,7 @@ export default {398,{"input": [- 579,+ 578,"UpdateCalendarChannelInput!"]}@@ -10434,7 +10416,7 @@ export default {396,{"input": [- 581,+ 580,"SetAppKeyValueInput!"]}@@ -10455,7 +10437,7 @@ export default {394,{"input": [- 582,+ 581,"EnqueueJobInput!"]}@@ -10464,7 +10446,7 @@ export default {395,{"input": [- 583,+ 582,"EnqueueJobsInput!"]}@@ -10473,7 +10455,7 @@ export default {8,{"input": [- 585,+ 584,"ReportAppConnectionAuthFailureInput!"]}@@ -10537,7 +10519,7 @@ export default {1],"fileAttachments": [- 586,+ 585,"[FileAttachmentInput!]"]}@@ -10566,14 +10548,14 @@ export default {"UUID!"],"answers": [- 587,+ 586,"[AgentChatQuestionAnswerInput!]!"],"modelId": [1],"fileAttachments": [- 586,+ 585,"[FileAttachmentInput!]"]}@@ -10651,7 +10633,7 @@ export default {380,{"input": [- 588,+ 587,"CreateSkillInput!"]}@@ -10660,7 +10642,7 @@ export default {380,{"input": [- 589,+ 588,"UpdateSkillInput!"]}@@ -10718,7 +10700,7 @@ export default {409,{"input": [- 590,+ 589,"UpdateTimelineActivityTypeInput!"]}@@ -10736,7 +10718,7 @@ export default {292,{"input": [- 591,+ 590,"GetAuthorizationUrlForSSOInput!"]}@@ -10902,7 +10884,7 @@ export default {295,{"input": [- 592+ 591]}],@@ -11110,7 +11092,7 @@ export default {8,{"input": [- 593,+ 592,"UpdateWorkspaceMemberSettingsInput!"]}@@ -11144,7 +11126,7 @@ export default {243,{"input": [- 594,+ 593,"SetupOIDCSsoInput!"]}@@ -11153,7 +11135,7 @@ export default {243,{"input": [- 595,+ 594,"SetupSAMLSsoInput!"]}@@ -11162,7 +11144,7 @@ export default {239,{"input": [- 596,+ 595,"DeleteSsoInput!"]}@@ -11171,7 +11153,7 @@ export default {240,{"input": [- 597,+ 596,"EditSsoInput!"]}@@ -11200,7 +11182,7 @@ export default {374,{"type": [- 598,+ 597,"AnalyticsType!"],"name": [@@ -11243,7 +11225,7 @@ export default {364,{"input": [- 599,+ 598,"CreateCalendarEventInput!"]}@@ -11252,7 +11234,7 @@ export default {373,{"input": [- 600,+ 599,"SendEmailInput!"]}@@ -11274,7 +11256,7 @@ export default {"String!"],"connectionParameters": [- 602,+ 601,"EmailAccountConnectionParameters!"],"id": [@@ -11286,7 +11268,7 @@ export default {203,{"input": [- 604,+ 603,"UpdateLabPublicFeatureFlagInput!"]}@@ -11379,7 +11361,7 @@ export default {"String!"],"files": [- 605,+ 604,"[ApplicationFileUploadRequestInput!]!"]}@@ -13125,32 +13107,12 @@ export default {1]},- "CreateApplicationRegistrationVariableInput": {- "applicationRegistrationId": [- 1- ],- "key": [- 1- ],- "value": [- 1- ],- "description": [- 1- ],- "isSecret": [- 8- ],- "__typename": [- 1- ]- },"UpdateApplicationRegistrationVariableInput": {"id": [1],"update": [- 526+ 525],"__typename": [1@@ -13207,7 +13169,7 @@ export default {},"CreateOneFieldMetadataInput": {"field": [- 532+ 531],"__typename": [1@@ -13286,7 +13248,7 @@ export default {3],"update": [- 534+ 533],"__typename": [1@@ -13390,7 +13352,7 @@ export default {3],"update": [- 538+ 537],"__typename": [1@@ -13475,7 +13437,7 @@ export default {},"UpdateRoleInput": {"update": [- 543+ 542],"id": [3@@ -13530,7 +13492,7 @@ export default {3],"objectPermissions": [- 545+ 544],"__typename": [1@@ -13572,7 +13534,7 @@ export default {3],"fieldPermissions": [- 548+ 547],"__typename": [1@@ -13603,10 +13565,10 @@ export default {3],"predicates": [- 550+ 549],"predicateGroups": [- 551+ 550],"__typename": [1@@ -13750,7 +13712,7 @@ export default {3],"update": [- 559+ 558],"__typename": [1@@ -13843,7 +13805,7 @@ export default {3],"messages": [- 565+ 564],"__typename": [1@@ -13866,7 +13828,7 @@ export default {4],"participants": [- 566+ 565],"__typename": [1@@ -13874,7 +13836,7 @@ export default {},"AppMessageParticipantInput": {"role": [- 567+ 566],"handle": [1@@ -13912,7 +13874,7 @@ export default {3],"messages": [- 570+ 569],"__typename": [1@@ -13920,13 +13882,13 @@ export default {},"RunAgentMessageInput": {"role": [- 571+ 570],"content": [1],"attachments": [- 572+ 571],"__typename": [1@@ -13969,7 +13931,7 @@ export default {3],"update": [- 575+ 574],"__typename": [1@@ -13997,7 +13959,7 @@ export default {3],"update": [- 577+ 576],"__typename": [1@@ -14016,7 +13978,7 @@ export default {3],"update": [- 577+ 576],"__typename": [1@@ -14027,7 +13989,7 @@ export default {3],"update": [- 580+ 579],"__typename": [1@@ -14092,7 +14054,7 @@ export default {9],"jobs": [- 584+ 583],"retryLimit": [30@@ -14380,7 +14342,7 @@ export default {1],"files": [- 601+ 600],"__typename": [1@@ -14402,13 +14364,13 @@ export default {1],"IMAP": [- 603+ 602],"SMTP": [- 603+ 602],"CALDAV": [- 603+ 602],"__typename": [1@@ -14473,7 +14435,7 @@ export default {284,{"input": [- 607,+ 606,"LogicFunctionLogsInput!"]}@@ -14504,7 +14466,7 @@ export default {378,{"input": [- 608,+ 607,"CreateRecordExportInput!"]}diff --git a/packages/twenty-docs/developers/extend/apps/config/application.mdx b/packages/twenty-docs/developers/extend/apps/config/application.mdxindex 6c7fd0bae05..9db5410769c 100644--- a/packages/twenty-docs/developers/extend/apps/config/application.mdx+++ b/packages/twenty-docs/developers/extend/apps/config/application.mdx@@ -51,6 +51,7 @@ Notes:- An app can report its own configuration state with [`defineHealthCheck()`](/developers/extend/apps/logic/logic-functions#health-check), for what only the app can know — a key that is present but revoked, a third-party account on the wrong plan. `isRequired` covers what Twenty can see by itself; the health check covers the rest.- Both kinds of variable accept `isRequired: true`. A required variable the workspace has not filled in yet leaves the app unconfigured: its settings page shows a banner naming the missing variables, with a button that jumps to the tab where they are set. Mark as required only what the app genuinely cannot run without — an optional variable with a sensible default should stay optional.- Both kinds of variable accept `isDeprecated: true`. Use it to retire a variable instead of deleting it: keeping the key declared preserves the stored value (deleting it destroys the value the operator entered), and the variable is still injected, so your code can fall back to it — `process.env.NEW_API_KEY ?? process.env.API_KEY`. A deprecated variable disappears from the app's settings once it has no value, and never counts toward the app's configuration check, so `isDeprecated` beats `isRequired`.+- Twenty sets these names for every logic function run, so they are reserved: `TWENTY_API_URL`, `TWENTY_APP_ACCESS_TOKEN`, `TWENTY_APP_APPLICATION_ACCESS_TOKEN`, `TWENTY_API_KEY`, `TWENTY_FUNCTIONS_URL` and `APPLICATION_ID`. A manifest that declares one of them as an application or server variable is rejected when the app is synced or published.- To add your own entries to the app's settings menu (in place of the generated **Variables** page), declare a front component and point a [`defineSettingsMenuItem()`](/developers/extend/apps/layout/front-components#settings-menu-items) at it, in its own file. Declare as many as you need and order them with `position`; `scope` puts an item under the workspace settings or under each member's own settings. The system-managed **General** item (auto-upgrade, App URL, connections) always comes first, and App URL only shows with **Advanced mode** on.## Requested media capabilitiesdiff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.tsindex 76dc2aa6859..50c2fdbc233 100644--- a/packages/twenty-front/src/generated-metadata/graphql.ts+++ b/packages/twenty-front/src/generated-metadata/graphql.ts@@ -1333,14 +1333,6 @@ export type CreateApplicationRegistrationInput = {universalIdentifier?: InputMaybe<Scalars['String']['input']>;};-export type CreateApplicationRegistrationVariableInput = {- applicationRegistrationId: Scalars['String']['input'];- description?: InputMaybe<Scalars['String']['input']>;- isSecret?: InputMaybe<Scalars['Boolean']['input']>;- key: Scalars['String']['input'];- value: Scalars['String']['input'];-};-export type CreateApprovedAccessDomainInput = {domain: Scalars['String']['input'];email: Scalars['String']['input'];@@ -3066,7 +3058,6 @@ export type Mutation = {createAppMessageChannel: MessageChannel;createApplicationFileUploads: CreateApplicationFileUploadsResult;createApplicationRegistration: CreateApplicationRegistration;- createApplicationRegistrationVariable: ApplicationRegistrationVariable;createApprovedAccessDomain: ApprovedAccessDomain;createBillingPaymentMethodSetupIntent: BillingPaymentIntent;createCalendarEvent: CreateCalendarEventOutput;@@ -3113,7 +3104,6 @@ export type Mutation = {deleteAppKeyValue: Scalars['Boolean']['output'];deleteAppMessageChannel: MessageChannel;deleteApplicationRegistration: Scalars['Boolean']['output'];- deleteApplicationRegistrationVariable: Scalars['Boolean']['output'];deleteApprovedAccessDomain: Scalars['Boolean']['output'];deleteChatThread: Scalars['Boolean']['output'];deleteCommandMenuItem: CommandMenuItem;@@ -3457,11 +3447,6 @@ export type MutationCreateApplicationRegistrationArgs = {};-export type MutationCreateApplicationRegistrationVariableArgs = {- input: CreateApplicationRegistrationVariableInput;-};--export type MutationCreateApprovedAccessDomainArgs = {input: CreateApprovedAccessDomainInput;};@@ -3698,11 +3683,6 @@ export type MutationDeleteApplicationRegistrationArgs = {};-export type MutationDeleteApplicationRegistrationVariableArgs = {- id: Scalars['String']['input'];-};--export type MutationDeleteApprovedAccessDomainArgs = {input: DeleteApprovedAccessDomainInput;};diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/application-sync.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/application-sync.service.tsindex 01d0c627fd2..0a9656fb678 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/application-sync.service.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/application-sync.service.ts@@ -26,6 +26,7 @@ import { type FlatApplication } from 'src/engine/core-modules/application/types/import { FileStorageService } from 'src/engine/core-modules/file-storage/services/file-storage.service';import { LOGIC_FUNCTION_DRIVER_FACTORY_TOKEN } from 'src/engine/core-modules/logic-function/logic-function-drivers/constants/logic-function-driver-factory.token';import { type LogicFunctionDriverFactory } from 'src/engine/core-modules/logic-function/logic-function-drivers/logic-function-driver.factory';+import { findReservedVariableNamesInApplicationManifest } from 'src/engine/core-modules/application/utils/find-reserved-variable-names-in-application-manifest.util';import { type AllFlatEntityOperationRecordByMetadataName } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-operation-record-by-metadata-name.type';import { getMetadataFlatEntityMapsKey } from 'src/engine/metadata-modules/flat-entity/utils/get-metadata-flat-entity-maps-key.util';import { FrontComponentEntity } from 'src/engine/metadata-modules/front-component/entities/front-component.entity';@@ -75,6 +76,18 @@ export class ApplicationSyncService {workspaceMigration: WorkspaceMigration;hasSchemaMetadataChanged: boolean;}> {+ // Server variables are written to the registration after this sync, so+ // reserved names are checked here to fail before the workspace changes+ const reservedVariableNames =+ findReservedVariableNamesInApplicationManifest(manifest.application);++ if (reservedVariableNames.length > 0) {+ throw new ApplicationException(+ `Variable names are reserved: ${reservedVariableNames.join(', ')}`,+ ApplicationExceptionCode.INVALID_INPUT,+ );+ }+const ownerFlatApplication: FlatApplication = dryRun? await this.resolveDryRunOwnerFlatApplication({ workspaceId, manifest }): await this.syncApplication({diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration-variable/application-registration-variable.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration-variable/application-registration-variable.service.tsindex bdfef7e83b3..4c063d33ab9 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-registration-variable/application-registration-variable.service.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration-variable/application-registration-variable.service.ts@@ -13,8 +13,10 @@ import {ApplicationRegistrationException,ApplicationRegistrationExceptionCode,} from 'src/engine/core-modules/application/application-registration/application-registration.exception';-import { type CreateApplicationRegistrationVariableInput } from 'src/engine/core-modules/application/application-registration-variable/dtos/create-application-registration-variable.input';import { type UpdateApplicationRegistrationVariableInput } from 'src/engine/core-modules/application/application-registration-variable/dtos/update-application-registration-variable.input';+import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';+import { canCallerReachApplicationRegistrationOrThrow } from 'src/engine/core-modules/application/utils/can-caller-reach-application-registration-or-throw.util';+import { findEngineInjectedEnvVariableNames } from 'src/engine/core-modules/logic-function/logic-function-executor/utils/find-engine-injected-env-variable-names.util';import { type PlaintextString } from 'src/engine/core-modules/secret-encryption/branded-strings/plaintext-string.type';import { SecretEncryptionService } from 'src/engine/core-modules/secret-encryption/secret-encryption.service';import { ApplicationRegistrationVariableDTO } from 'src/engine/core-modules/application/application-registration-variable/dtos/application-registration-variable.dto';@@ -34,14 +36,17 @@ export class ApplicationRegistrationVariableService {private readonly encryptionService: SecretEncryptionService,) {}- async findVariablesWithObfuscatedValues(- applicationRegistrationId: string,- workspaceId: string,- ): Promise<ApplicationRegistrationVariableDTO[]> {- await this.assertRegistrationOwnedByWorkspace(+ async findVariablesWithObfuscatedValues({+ applicationRegistrationId,+ workspaceId,+ }: {+ applicationRegistrationId: string;+ workspaceId: string;+ }): Promise<ApplicationRegistrationVariableDTO[]> {+ await this.assertRegistrationOwnedByWorkspace({applicationRegistrationId,workspaceId,- );+ });return this.findVariablesWithObfuscatedValuesGlobal(applicationRegistrationId,@@ -59,38 +64,26 @@ export class ApplicationRegistrationVariableService {return variables.map((variable) => this.toObfuscatedDTO(variable));}- async createVariable(- input: CreateApplicationRegistrationVariableInput,- workspaceId: string,- ): Promise<ApplicationRegistrationVariableDTO> {- await this.assertRegistrationOwnedByWorkspace(- input.applicationRegistrationId,- workspaceId,- );-- const encryptedValue = this.encryptionService.encryptVersioned(input.value);-- const variable = this.variableRepository.create({- applicationRegistrationId: input.applicationRegistrationId,- key: input.key,- encryptedValue,- description: input.description ?? '',- isSecret: input.isSecret ?? true,- });-- return this.toObfuscatedDTO(await this.variableRepository.save(variable));- }-- async updateVariable(- input: UpdateApplicationRegistrationVariableInput,- workspaceId: string,- ): Promise<ApplicationRegistrationVariableDTO> {+ async updateVariable({+ input,+ workspaceId,+ callingApplication,+ }: {+ input: UpdateApplicationRegistrationVariableInput;+ workspaceId: string;+ callingApplication: FlatApplication | undefined;+ }): Promise<ApplicationRegistrationVariableDTO> {const variable = await this.findVariableOrThrow(input.id);- await this.assertRegistrationOwnedByWorkspace(- variable.applicationRegistrationId,+ await this.assertRegistrationOwnedByWorkspace({+ applicationRegistrationId: variable.applicationRegistrationId,workspaceId,- );+ });++ canCallerReachApplicationRegistrationOrThrow({+ callingApplication,+ applicationRegistrationId: variable.applicationRegistrationId,+ });return this.toObfuscatedDTO(await this.applyVariableUpdate(input));}@@ -105,19 +98,6 @@ export class ApplicationRegistrationVariableService {return this.toObfuscatedDTO(entity);}- async deleteVariable(id: string, workspaceId: string): Promise<boolean> {- const variable = await this.findVariableOrThrow(id);-- await this.assertRegistrationOwnedByWorkspace(- variable.applicationRegistrationId,- workspaceId,- );-- await this.variableRepository.delete(id);-- return true;- }-// Syncs variable schemas from manifest: creates missing, updates metadata, removes staleasync syncVariableSchemas(applicationRegistrationId: string,@@ -130,6 +110,15 @@ export class ApplicationRegistrationVariableService {const declaredKeys = Object.keys(serverVariables);+ const reservedKeys = findEngineInjectedEnvVariableNames(declaredKeys);++ if (reservedKeys.length > 0) {+ throw new ApplicationRegistrationException(+ `Server variable names are reserved: ${reservedKeys.join(', ')}`,+ ApplicationRegistrationExceptionCode.INVALID_INPUT,+ );+ }+const existingVariables = await variableRepository.find({where: { applicationRegistrationId },});@@ -327,17 +316,20 @@ export class ApplicationRegistrationVariableService {};}- private async assertRegistrationOwnedByWorkspace(- registrationId: string,- workspaceId: string,- ): Promise<void> {+ private async assertRegistrationOwnedByWorkspace({+ applicationRegistrationId,+ workspaceId,+ }: {+ applicationRegistrationId: string;+ workspaceId: string;+ }): Promise<void> {const registration = await this.applicationRegistrationRepository.findOne({- where: { id: registrationId, ownerWorkspaceId: workspaceId },+ where: { id: applicationRegistrationId, ownerWorkspaceId: workspaceId },});if (!registration) {throw new ApplicationRegistrationException(- `Application registration with id ${registrationId} not found`,+ `Application registration with id ${applicationRegistrationId} not found`,ApplicationRegistrationExceptionCode.APPLICATION_REGISTRATION_NOT_FOUND,);}diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration-variable/dtos/create-application-registration-variable.input.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration-variable/dtos/create-application-registration-variable.input.tsdeleted file mode 100644index b26aa134c3e..00000000000--- a/packages/twenty-server/src/engine/core-modules/application/application-registration-variable/dtos/create-application-registration-variable.input.ts+++ /dev/null@@ -1,39 +0,0 @@-import { Field, InputType } from '@nestjs/graphql';--import {- IsBoolean,- IsOptional,- IsString,- IsUUID,- MaxLength,-} from 'class-validator';--import { type PlaintextString } from 'src/engine/core-modules/secret-encryption/branded-strings/plaintext-string.type';--@InputType()-export class CreateApplicationRegistrationVariableInput {- @Field()- @IsUUID()- applicationRegistrationId: string;-- @Field()- @IsString()- @MaxLength(256)- key: string;-- @Field(() => String)- @IsString()- @MaxLength(10000)- value: PlaintextString;-- @Field({ nullable: true })- @IsString()- @MaxLength(2000)- @IsOptional()- description?: string;-- @Field({ nullable: true })- @IsBoolean()- @IsOptional()- isSecret?: boolean;-}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 edead16ed63..e4bafbefe1a 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@@ -21,7 +21,6 @@ import type { FileUpload } from 'graphql-upload/processRequest.mjs';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 { ApplicationRegistrationVariableService } from 'src/engine/core-modules/application/application-registration-variable/application-registration-variable.service';-import { CreateApplicationRegistrationVariableInput } from 'src/engine/core-modules/application/application-registration-variable/dtos/create-application-registration-variable.input';import { UpdateApplicationRegistrationVariableInput } from 'src/engine/core-modules/application/application-registration-variable/dtos/update-application-registration-variable.input';import { ApplicationRegistrationExceptionFilter } from 'src/engine/core-modules/application/application-registration/application-registration-exception-filter';import { ApplicationRegistrationAssetUrlService } from 'src/engine/core-modules/application/application-registration/application-registration-asset-url.service';@@ -145,10 +144,13 @@ export class ApplicationRegistrationResolver {@Query(() => ApplicationRegistrationEntity)async findOneApplicationRegistration(@ApplicationTargetArg('id', { kind: 'applicationRegistrationId' })- id: string,+ applicationRegistrationId: string,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,): Promise<ApplicationRegistrationEntity> {- return this.applicationRegistrationService.findOneById(id, workspaceId);+ return this.applicationRegistrationService.findOneById({+ applicationRegistrationId,+ ownerWorkspaceId: workspaceId,+ });}@UseGuards(@@ -158,10 +160,13 @@ export class ApplicationRegistrationResolver {@Query(() => ApplicationRegistrationStatsDTO)async findApplicationRegistrationStats(@ApplicationTargetArg('id', { kind: 'applicationRegistrationId' })- id: string,+ applicationRegistrationId: string,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,): Promise<ApplicationRegistrationStatsDTO> {- return this.applicationRegistrationService.getStats(id, workspaceId);+ return this.applicationRegistrationService.getStats({+ applicationRegistrationId,+ ownerWorkspaceId: workspaceId,+ });}@UseGuards(@@ -174,11 +179,11 @@ export class ApplicationRegistrationResolver {@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,@AuthUser({ allowUndefined: true }) user: UserEntity | undefined,): Promise<CreateApplicationRegistrationDTO> {- return this.applicationRegistrationService.create(+ return this.applicationRegistrationService.create({input,- workspaceId,- user?.id ?? null,- );+ ownerWorkspaceId: workspaceId,+ createdByUserId: user?.id ?? null,+ });}@UseGuards(@@ -187,7 +192,11 @@ export class ApplicationRegistrationResolver {)@Mutation(() => ApplicationRegistrationEntity)async updateApplicationRegistration(- @Args('input') input: UpdateApplicationRegistrationInput,+ @ApplicationTargetArg<UpdateApplicationRegistrationInput>('input', {+ kind: 'applicationRegistrationId',+ idKey: 'id',+ })+ input: UpdateApplicationRegistrationInput,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,): Promise<ApplicationRegistrationEntity> {return this.applicationRegistrationService.update(input, workspaceId);@@ -199,10 +208,14 @@ export class ApplicationRegistrationResolver {)@Mutation(() => Boolean)async deleteApplicationRegistration(- @Args('id') id: string,+ @ApplicationTargetArg('id', { kind: 'applicationRegistrationId' })+ applicationRegistrationId: string,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,): Promise<boolean> {- return this.applicationRegistrationService.delete(id, workspaceId);+ return this.applicationRegistrationService.delete({+ applicationRegistrationId,+ ownerWorkspaceId: workspaceId,+ });}@UseGuards(@@ -212,14 +225,15 @@ export class ApplicationRegistrationResolver {)@Mutation(() => RotateClientSecretDTO)async rotateApplicationRegistrationClientSecret(- @Args('id') id: string,+ @ApplicationTargetArg('id', { kind: 'applicationRegistrationId' })+ applicationRegistrationId: string,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,): Promise<RotateClientSecretDTO> {const clientSecret =- await this.applicationRegistrationService.rotateClientSecret(- id,- workspaceId,- );+ await this.applicationRegistrationService.rotateClientSecret({+ applicationRegistrationId,+ ownerWorkspaceId: workspaceId,+ });return { clientSecret };}@@ -237,23 +251,7 @@ export class ApplicationRegistrationResolver {@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,): Promise<ApplicationRegistrationVariableDTO[]> {return this.applicationRegistrationVariableService.findVariablesWithObfuscatedValues(- applicationRegistrationId,- workspaceId,- );- }-- @UseGuards(- WorkspaceAuthGuard,- SettingsPermissionGuard(PermissionFlagType.API_KEYS_AND_WEBHOOKS),- )- @Mutation(() => ApplicationRegistrationVariableDTO)- async createApplicationRegistrationVariable(- @Args('input') input: CreateApplicationRegistrationVariableInput,- @AuthWorkspace() { id: workspaceId }: WorkspaceEntity,- ): Promise<ApplicationRegistrationVariableDTO> {- return this.applicationRegistrationVariableService.createVariable(- input,- workspaceId,+ { applicationRegistrationId, workspaceId },);}@@ -265,26 +263,14 @@ export class ApplicationRegistrationResolver {async updateApplicationRegistrationVariable(@Args('input') input: UpdateApplicationRegistrationVariableInput,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,+ @AuthApplication({ allowUndefined: true })+ callingApplication: FlatApplication | undefined,): Promise<ApplicationRegistrationVariableDTO> {- return this.applicationRegistrationVariableService.updateVariable(+ return this.applicationRegistrationVariableService.updateVariable({input,workspaceId,- );- }-- @UseGuards(- WorkspaceAuthGuard,- SettingsPermissionGuard(PermissionFlagType.API_KEYS_AND_WEBHOOKS),- )- @Mutation(() => Boolean)- async deleteApplicationRegistrationVariable(- @Args('id') id: string,- @AuthWorkspace() { id: workspaceId }: WorkspaceEntity,- ): Promise<boolean> {- return this.applicationRegistrationVariableService.deleteVariable(- id,- workspaceId,- );+ callingApplication,+ });}@UseGuards(@@ -353,13 +339,13 @@ export class ApplicationRegistrationResolver {@Query(() => String, { nullable: true })async applicationRegistrationTarballUrl(@ApplicationTargetArg('id', { kind: 'applicationRegistrationId' })- id: string,+ applicationRegistrationId: string,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,): Promise<string | null> {- const registration = await this.applicationRegistrationService.findOneById(- id,- workspaceId,- );+ const registration = await this.applicationRegistrationService.findOneById({+ applicationRegistrationId,+ ownerWorkspaceId: workspaceId,+ });if (registration.sourceType !== ApplicationRegistrationSourceType.TARBALL ||diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.service.tsindex c92a53a6027..5d895de2347 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.service.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.service.ts@@ -19,6 +19,7 @@ import { MARKETPLACE_CATALOG_CACHE_ENTITY_ID } from 'src/engine/core-modules/appimport { MARKETPLACE_VETTED_APPLICATIONS } from 'src/engine/core-modules/application/application-marketplace/constants/marketplace-vetted-applications.constant';import { ALL_OAUTH_SCOPES } from 'src/engine/core-modules/application/application-oauth/constants/oauth-scopes';import { ApplicationRegistrationVariableService } from 'src/engine/core-modules/application/application-registration-variable/application-registration-variable.service';+import { findReservedVariableNamesInApplicationManifest } from 'src/engine/core-modules/application/utils/find-reserved-variable-names-in-application-manifest.util';import { ApplicationRegistrationAssetUrlService } from 'src/engine/core-modules/application/application-registration/application-registration-asset-url.service';import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';import {@@ -398,18 +399,21 @@ export class ApplicationRegistrationService {};}- async findOneById(- id: string,- ownerWorkspaceId: string,- ): Promise<ApplicationRegistrationEntity> {+ async findOneById({+ applicationRegistrationId,+ ownerWorkspaceId,+ }: {+ applicationRegistrationId: string;+ ownerWorkspaceId: string;+ }): Promise<ApplicationRegistrationEntity> {const registration = await this.applicationRegistrationRepository.findOne({select: APPLICATION_REGISTRATION_WITHOUT_MANIFEST_SELECT,- where: { id, ownerWorkspaceId },+ where: { id: applicationRegistrationId, ownerWorkspaceId },});if (!registration) {throw new ApplicationRegistrationException(- `Application registration with id ${id} not found`,+ `Application registration with id ${applicationRegistrationId} not found`,ApplicationRegistrationExceptionCode.APPLICATION_REGISTRATION_NOT_FOUND,);}@@ -512,11 +516,15 @@ export class ApplicationRegistrationService {});}- async create(- input: CreateApplicationRegistrationInput,- ownerWorkspaceId: string,- createdByUserId: string | null,- ): Promise<{+ async create({+ input,+ ownerWorkspaceId,+ createdByUserId,+ }: {+ input: CreateApplicationRegistrationInput;+ ownerWorkspaceId: string;+ createdByUserId: string | null;+ }): Promise<{applicationRegistration: ApplicationRegistrationEntity;clientSecret: string;}> {@@ -576,7 +584,10 @@ export class ApplicationRegistrationService {): Promise<ApplicationRegistrationEntity> {const { id, update } = input;- const existingRegistration = await this.findOneById(id, ownerWorkspaceId);+ const existingRegistration = await this.findOneById({+ applicationRegistrationId: id,+ ownerWorkspaceId,+ });await this.applyUpdate({ id, update });@@ -585,7 +596,10 @@ export class ApplicationRegistrationService {existingRegistration,);- return this.findOneById(id, ownerWorkspaceId);+ return this.findOneById({+ applicationRegistrationId: id,+ ownerWorkspaceId,+ });}async updateGlobal(@@ -772,24 +786,34 @@ export class ApplicationRegistrationService {);}- async delete(id: string, ownerWorkspaceId: string): Promise<boolean> {- const applicationRegistration = await this.findOneById(- id,+ async delete({+ applicationRegistrationId,+ ownerWorkspaceId,+ }: {+ applicationRegistrationId: string;+ ownerWorkspaceId: string;+ }): Promise<boolean> {+ const applicationRegistration = await this.findOneById({+ applicationRegistrationId,ownerWorkspaceId,- );+ });// Stored assets (logo, gallery images) go with the registration; deleting// them first also removes the bytes, which the row FK cascade cannot do.try {- await this.serverFileStorageService.deleteByApplicationRegistrationId(id);+ await this.serverFileStorageService.deleteByApplicationRegistrationId(+ applicationRegistrationId,+ );} catch (error) {this.logger.error(- `Failed to delete server files for registration ${id}`,+ `Failed to delete server files for registration ${applicationRegistrationId}`,error,);}- await this.applicationRegistrationRepository.delete(id);+ await this.applicationRegistrationRepository.delete(+ applicationRegistrationId,+ );await this.invalidateMarketplaceAppsCache();@@ -801,18 +825,24 @@ export class ApplicationRegistrationService {return true;}- async rotateClientSecret(- id: string,- ownerWorkspaceId: string,- ): Promise<string> {- await this.findOneById(id, ownerWorkspaceId);+ async rotateClientSecret({+ applicationRegistrationId,+ ownerWorkspaceId,+ }: {+ applicationRegistrationId: string;+ ownerWorkspaceId: string;+ }): Promise<string> {+ await this.findOneById({ applicationRegistrationId, ownerWorkspaceId });const { clientSecret, clientSecretHash } =await this.generateClientSecret();- await this.applicationRegistrationRepository.update(id, {- oAuthClientSecretHash: clientSecretHash,- });+ await this.applicationRegistrationRepository.update(+ applicationRegistrationId,+ {+ oAuthClientSecretHash: clientSecretHash,+ },+ );await this.invalidateMarketplaceAppsCache();@@ -880,6 +910,19 @@ export class ApplicationRegistrationService {return null;}+ const reservedVariableNames =+ findReservedVariableNamesInApplicationManifest(+ params.manifest.application,+ );++ if (reservedVariableNames.length > 0) {+ this.logger.warn(+ `Skipping catalog entry from package ${params.sourcePackage}: variable names are reserved: ${reservedVariableNames.join(', ')}`,+ );++ return null;+ }+if (isDefined(existing)) {return this.updateFromCatalog(existing, params);}@@ -1063,11 +1106,14 @@ export class ApplicationRegistrationService {}));}- async getStats(- applicationRegistrationId: string,- ownerWorkspaceId: string,- ): Promise<ApplicationRegistrationStatsDTO> {- await this.findOneById(applicationRegistrationId, ownerWorkspaceId);+ async getStats({+ applicationRegistrationId,+ ownerWorkspaceId,+ }: {+ applicationRegistrationId: string;+ ownerWorkspaceId: string;+ }): Promise<ApplicationRegistrationStatsDTO> {+ await this.findOneById({ applicationRegistrationId, ownerWorkspaceId });return this.computeStats(applicationRegistrationId);}@@ -1288,10 +1334,10 @@ export class ApplicationRegistrationService {targetWorkspaceSubdomain: string;currentOwnerWorkspaceId: string;}): Promise<ApplicationRegistrationEntity> {- const registration = await this.findOneById(- params.applicationRegistrationId,- params.currentOwnerWorkspaceId,- );+ const registration = await this.findOneById({+ applicationRegistrationId: params.applicationRegistrationId,+ ownerWorkspaceId: params.currentOwnerWorkspaceId,+ });const targetWorkspace = await this.workspaceRepository.findOne({where: { subdomain: params.targetWorkspaceSubdomain },diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-tarball.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-tarball.service.tsindex acb38b2b92c..5f370a70761 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-tarball.service.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-tarball.service.ts@@ -38,6 +38,7 @@ import {type FileUploadStorageLocation,} from 'src/engine/core-modules/file/file-upload/services/file-upload-completion.service';import { FILE_STATUS } from 'src/engine/core-modules/file/types/file-status.type';+import { findReservedVariableNamesInApplicationManifest } from 'src/engine/core-modules/application/utils/find-reserved-variable-names-in-application-manifest.util';import { removeFileFolderFromFileEntityPath } from 'src/engine/core-modules/file/utils/remove-file-folder-from-file-entity-path.utils';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';@@ -396,6 +397,16 @@ export class ApplicationTarballService {);}+ const reservedVariableNames =+ findReservedVariableNamesInApplicationManifest(manifest.application);++ if (reservedVariableNames.length > 0) {+ throw new ApplicationRegistrationException(+ `Variable names are reserved: ${reservedVariableNames.join(', ')}`,+ ApplicationRegistrationExceptionCode.INVALID_INPUT,+ );+ }+const versionValidation =await this.applicationVersionValidationService.validateServerCompatibility(packageJson?.engines?.twenty,diff --git a/packages/twenty-server/src/engine/core-modules/application/utils/__tests__/find-reserved-variable-names-in-application-manifest.util.spec.ts b/packages/twenty-server/src/engine/core-modules/application/utils/__tests__/find-reserved-variable-names-in-application-manifest.util.spec.tsnew file mode 100644index 00000000000..924e437e0b0--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/utils/__tests__/find-reserved-variable-names-in-application-manifest.util.spec.ts@@ -0,0 +1,52 @@+import { findReservedVariableNamesInApplicationManifest } from 'src/engine/core-modules/application/utils/find-reserved-variable-names-in-application-manifest.util';++describe('findReservedVariableNamesInApplicationManifest', () => {+ it('should return no names when the manifest declares no variables', () => {+ expect(findReservedVariableNamesInApplicationManifest({})).toEqual([]);+ });++ it('should ignore names that are not reserved', () => {+ expect(+ findReservedVariableNamesInApplicationManifest({+ serverVariables: { APP_API_KEY: { isSecret: true } },+ applicationVariables: {+ twenty_api_url: {+ universalIdentifier: 'application-variable-id',+ isSecret: false,+ },+ },+ }),+ ).toEqual([]);+ });++ it('should return reserved names from server and application variables', () => {+ expect(+ findReservedVariableNamesInApplicationManifest({+ serverVariables: {+ APP_API_KEY: { isSecret: true },+ TWENTY_API_URL: { isSecret: false },+ },+ applicationVariables: {+ APPLICATION_ID: {+ universalIdentifier: 'application-variable-id',+ isSecret: false,+ },+ },+ }),+ ).toEqual(['TWENTY_API_URL', 'APPLICATION_ID']);+ });++ it('should return a name declared in both kinds of variable once', () => {+ expect(+ findReservedVariableNamesInApplicationManifest({+ serverVariables: { TWENTY_API_KEY: { isSecret: true } },+ applicationVariables: {+ TWENTY_API_KEY: {+ universalIdentifier: 'application-variable-id',+ isSecret: true,+ },+ },+ }),+ ).toEqual(['TWENTY_API_KEY']);+ });+});diff --git a/packages/twenty-server/src/engine/core-modules/application/utils/can-caller-reach-application-registration-or-throw.util.ts b/packages/twenty-server/src/engine/core-modules/application/utils/can-caller-reach-application-registration-or-throw.util.tsnew file mode 100644index 00000000000..446e751ee84--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/utils/can-caller-reach-application-registration-or-throw.util.ts@@ -0,0 +1,33 @@+import { isDefined } from 'twenty-shared/utils';++import {+ ApplicationException,+ ApplicationExceptionCode,+} from 'src/engine/core-modules/application/application.exception';+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';++export const canCallerReachApplicationRegistrationOrThrow = ({+ callingApplication,+ applicationRegistrationId,+}: {+ callingApplication:+ | Pick<FlatApplication, 'applicationRegistrationId' | 'sourceType'>+ | null+ | undefined;+ applicationRegistrationId: string;+}): void => {+ const scopedCallingApplication =+ getScopedCallingApplication(callingApplication);++ if (+ isDefined(scopedCallingApplication) &&+ scopedCallingApplication.applicationRegistrationId !==+ applicationRegistrationId+ ) {+ throw new ApplicationException(+ 'An application token can only reach its own application registration',+ ApplicationExceptionCode.FORBIDDEN,+ );+ }+};diff --git a/packages/twenty-server/src/engine/core-modules/application/utils/find-reserved-variable-names-in-application-manifest.util.ts b/packages/twenty-server/src/engine/core-modules/application/utils/find-reserved-variable-names-in-application-manifest.util.tsnew file mode 100644index 00000000000..41dc063ffb8--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/utils/find-reserved-variable-names-in-application-manifest.util.ts@@ -0,0 +1,18 @@+import { type ApplicationManifest } from 'twenty-shared/application';++import { findEngineInjectedEnvVariableNames } from 'src/engine/core-modules/logic-function/logic-function-executor/utils/find-engine-injected-env-variable-names.util';++export const findReservedVariableNamesInApplicationManifest = ({+ serverVariables,+ applicationVariables,+}: Pick<+ ApplicationManifest,+ 'serverVariables' | 'applicationVariables'+>): string[] => [+ ...new Set(+ findEngineInjectedEnvVariableNames([+ ...Object.keys(serverVariables ?? {}),+ ...Object.keys(applicationVariables ?? {}),+ ]),+ ),+];diff --git a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-executor/constants/engine-injected-env-variable-names.constant.ts b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-executor/constants/engine-injected-env-variable-names.constant.tsnew file mode 100644index 00000000000..246a452b692--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-executor/constants/engine-injected-env-variable-names.constant.ts@@ -0,0 +1,16 @@+import {+ DEFAULT_API_KEY_NAME,+ DEFAULT_API_URL_NAME,+ DEFAULT_APP_ACCESS_TOKEN_NAME,+ DEFAULT_APP_APPLICATION_ACCESS_TOKEN_NAME,+ DEFAULT_FUNCTIONS_URL_NAME,+} from 'twenty-shared/application';++export const ENGINE_INJECTED_ENV_VARIABLE_NAMES = new Set<string>([+ DEFAULT_API_URL_NAME,+ DEFAULT_APP_ACCESS_TOKEN_NAME,+ DEFAULT_APP_APPLICATION_ACCESS_TOKEN_NAME,+ DEFAULT_API_KEY_NAME,+ DEFAULT_FUNCTIONS_URL_NAME,+ 'APPLICATION_ID',+]);diff --git a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-executor/logic-function-executor.service.ts b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-executor/logic-function-executor.service.tsindex 333808b5afa..ef210c1ee0e 100644--- a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-executor/logic-function-executor.service.ts+++ b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-executor/logic-function-executor.service.ts@@ -34,7 +34,6 @@ import { ApplicationService } from 'src/engine/core-modules/application/applicatimport { FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';import { ApplicationTokenService } from 'src/engine/core-modules/auth/token/services/application-token.service';import { BillingUsageService } from 'src/engine/core-modules/billing/services/billing-usage.service';-import { UsageLimitQuotaService } from 'src/engine/core-modules/usage-limit/services/usage-limit-quota.service';import { WorkspaceDomainsService } from 'src/engine/core-modules/domain/workspace-domains/services/workspace-domains.service';import { EventLogEmitterService } from 'src/engine/core-modules/event-logs/emit/event-log-emitter.service';import { LOGIC_FUNCTION_EXECUTED_EVENT } from 'src/engine/core-modules/event-logs/emit/events/workspace-event/logic-function/logic-function-executed';@@ -45,13 +44,15 @@ import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/serviceimport { LogicFunctionDriverFactory } from 'src/engine/core-modules/logic-function/logic-function-drivers/logic-function-driver.factory';import { computeLogicFunctionExecutionCreditsMicro } from 'src/engine/core-modules/logic-function/logic-function-executor/utils/compute-logic-function-execution-credits-micro.util';import { resolveWorkspaceMemberIdForUser } from 'src/engine/core-modules/logic-function/logic-function-executor/utils/resolve-workspace-member-id-for-user.util';+import { LogicFunctionPrebuiltWarmUpService } from 'src/engine/core-modules/logic-function/logic-function-prebuilt-warm-up/logic-function-prebuilt-warm-up.service';import { SecretEncryptionService } from 'src/engine/core-modules/secret-encryption/secret-encryption.service';-import { ThrottlerService } from 'src/engine/core-modules/throttler/throttler.service';import {ThrottlerException,ThrottlerExceptionCode,} from 'src/engine/core-modules/throttler/throttler.exception';+import { ThrottlerService } from 'src/engine/core-modules/throttler/throttler.service';import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';+import { UsageLimitQuotaService } from 'src/engine/core-modules/usage-limit/services/usage-limit-quota.service';import { UsageOperationType } from 'src/engine/core-modules/usage/enums/usage-operation-type.enum';import { UsageResourceType } from 'src/engine/core-modules/usage/enums/usage-resource-type.enum';import { UsageUnit } from 'src/engine/core-modules/usage/enums/usage-unit.enum';@@ -67,7 +68,6 @@ import { FlatLogicFunction } from 'src/engine/metadata-modules/logic-function/tyimport { SubscriptionChannel } from 'src/engine/subscriptions/enums/subscription-channel.enum';import { SubscriptionService } from 'src/engine/subscriptions/subscription.service';import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';-import { LogicFunctionPrebuiltWarmUpService } from 'src/engine/core-modules/logic-function/logic-function-prebuilt-warm-up/logic-function-prebuilt-warm-up.service';import { cleanServerUrl } from 'src/utils/clean-server-url';import { CustomException } from 'src/utils/custom-exception';@@ -487,6 +487,8 @@ export class LogicFunctionExecutorService {});return {+ ...serverVariables,+ ...workspaceVariables,[DEFAULT_API_URL_NAME]: baseUrl ?? '',// Falls back to the application when nobody triggered the run, so a cron// schedule or an install hook keeps working without asking for anything.@@ -497,8 +499,6 @@ export class LogicFunctionExecutorService {[DEFAULT_API_KEY_NAME]: applicationAccessToken.token,[DEFAULT_FUNCTIONS_URL_NAME]: functionsBaseUrl ?? '',APPLICATION_ID: flatApplication.id,- ...serverVariables,- ...workspaceVariables,};}diff --git a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-executor/utils/find-engine-injected-env-variable-names.util.ts b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-executor/utils/find-engine-injected-env-variable-names.util.tsnew file mode 100644index 00000000000..8f09c3fefcf--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-executor/utils/find-engine-injected-env-variable-names.util.ts@@ -0,0 +1,4 @@+import { ENGINE_INJECTED_ENV_VARIABLE_NAMES } from 'src/engine/core-modules/logic-function/logic-function-executor/constants/engine-injected-env-variable-names.constant';++export const findEngineInjectedEnvVariableNames = (keys: string[]): string[] =>+ keys.filter((key) => ENGINE_INJECTED_ENV_VARIABLE_NAMES.has(key));diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-application-variable-validator.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-application-variable-validator.service.tsindex 8d28c9f8d6a..9e24146ce2f 100644--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-application-variable-validator.service.ts+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-application-variable-validator.service.ts@@ -6,6 +6,7 @@ import { ALL_METADATA_NAME } from 'twenty-shared/metadata';import { isDefined } from 'twenty-shared/utils';import { ApplicationVariableEntityExceptionCode } from 'src/engine/core-modules/application/application-variable/application-variable.exception';+import { ENGINE_INJECTED_ENV_VARIABLE_NAMES } from 'src/engine/core-modules/logic-function/logic-function-executor/constants/engine-injected-env-variable-names.constant';import { findFlatEntityByUniversalIdentifier } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-universal-identifier.util';import { type FailedFlatEntityValidation } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/types/failed-flat-entity-validation.type';import { getEmptyFlatEntityValidationError } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/utils/get-flat-entity-validation-error.util';@@ -39,6 +40,16 @@ export class FlatApplicationVariableValidatorService {});}+ if (ENGINE_INJECTED_ENV_VARIABLE_NAMES.has(flatApplicationVariable.key)) {+ const key = flatApplicationVariable.key;++ validationResult.errors.push({+ code: ApplicationVariableEntityExceptionCode.INVALID_APPLICATION_VARIABLE_INPUT,+ message: t`Application variable key ${key} is reserved`,+ userFriendlyMessage: msg`Application variable key ${key} is reserved`,+ });+ }+const existingVariableWithSameKey = Object.values(optimisticFlatApplicationVariableMaps.byUniversalIdentifier,).find(@@ -95,6 +106,7 @@ export class FlatApplicationVariableValidatorService {public validateFlatApplicationVariableUpdate({universalIdentifier,+ flatEntityUpdate,optimisticFlatEntityMapsAndRelatedFlatEntityMaps: {flatApplicationVariableMaps: optimisticFlatApplicationVariableMaps,},@@ -122,6 +134,19 @@ export class FlatApplicationVariableValidatorService {});}+ const keyUpdate = flatEntityUpdate.key;++ if (+ isDefined(keyUpdate) &&+ ENGINE_INJECTED_ENV_VARIABLE_NAMES.has(keyUpdate)+ ) {+ validationResult.errors.push({+ code: ApplicationVariableEntityExceptionCode.INVALID_APPLICATION_VARIABLE_INPUT,+ message: t`Application variable key ${keyUpdate} is reserved`,+ userFriendlyMessage: msg`Application variable key ${keyUpdate} is reserved`,+ });+ }+return validationResult;}}diff --git a/packages/twenty-server/test/integration/graphql/suites/admin-panel/utils/seed-registration-with-variables.util.ts b/packages/twenty-server/test/integration/graphql/suites/admin-panel/utils/seed-registration-with-variables.util.tsindex a3ee4ca8983..34a41cdb3f1 100644--- a/packages/twenty-server/test/integration/graphql/suites/admin-panel/utils/seed-registration-with-variables.util.ts+++ b/packages/twenty-server/test/integration/graphql/suites/admin-panel/utils/seed-registration-with-variables.util.ts@@ -1,11 +1,8 @@import { randomUUID } from 'crypto';-import { createApplicationRegistrationVariable } from 'test/integration/metadata/suites/application-registration-variable/utils/application-registration-variable-api.util';+import { insertApplicationRegistrationVariable } from 'test/integration/metadata/suites/application-registration-variable/utils/insert-application-registration-variable.util';-import {- SEED_APPLE_WORKSPACE_ID,- SEED_YCOMBINATOR_WORKSPACE_ID,-} from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';+import { SEED_YCOMBINATOR_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';export type SeededRegistration = {applicationRegistrationId: string;@@ -27,9 +24,7 @@ export const deleteSeededRegistration = async ();};-// Seeded as Apple-owned so the variables can be created through the-// workspace-scoped API with properly encrypted values, then handed to-// YCombinator: the admin panel is expected to reach any workspace.+// Owned by YCombinator: the admin panel is expected to reach any workspace.export const seedRegistrationOwnedByAnotherWorkspace = async (name: string,): Promise<SeededRegistration> => {@@ -47,41 +42,31 @@ export const seedRegistrationOwnedByAnotherWorkspace = async (randomUUID(),[],[],- SEED_APPLE_WORKSPACE_ID,+ SEED_YCOMBINATOR_WORKSPACE_ID,],);// The row exists from here on, so anything that throws below has to take it// back out: this database is shared by every suite in the run.try {- const { data: secretData } = await createApplicationRegistrationVariable({+ const secretVariableId = await insertApplicationRegistrationVariable({applicationRegistrationId,key: 'ADMIN_SCOPE_API_KEY',value: SECRET_PLAINTEXT_VALUE,isSecret: true,- expectToFail: false,});- const { data: nonSecretData } = await createApplicationRegistrationVariable(- {- applicationRegistrationId,- key: 'ADMIN_SCOPE_PUBLIC_URL',- value: NON_SECRET_PLAINTEXT_VALUE,- isSecret: false,- expectToFail: false,- },- );-- await globalThis.testDataSource.query(- `UPDATE core."applicationRegistration" SET "workspaceId" = $2 WHERE id = $1`,- [applicationRegistrationId, SEED_YCOMBINATOR_WORKSPACE_ID],- );+ const nonSecretVariableId = await insertApplicationRegistrationVariable({+ applicationRegistrationId,+ key: 'ADMIN_SCOPE_PUBLIC_URL',+ value: NON_SECRET_PLAINTEXT_VALUE,+ isSecret: false,+ });return {applicationRegistrationId,- secretVariableId: secretData.createApplicationRegistrationVariable.id,- nonSecretVariableId:- nonSecretData.createApplicationRegistrationVariable.id,+ secretVariableId,+ nonSecretVariableId,};} catch (error) {await deleteSeededRegistration(applicationRegistrationId);diff --git a/packages/twenty-server/test/integration/metadata/suites/application-registration-variable/__snapshots__/failing-application-registration-variable-owner-workspace-scope.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/application-registration-variable/__snapshots__/failing-application-registration-variable-owner-workspace-scope.integration-spec.ts.snapindex 68b23e53a55..534c73152d0 100644--- a/packages/twenty-server/test/integration/metadata/suites/application-registration-variable/__snapshots__/failing-application-registration-variable-owner-workspace-scope.integration-spec.ts.snap+++ b/packages/twenty-server/test/integration/metadata/suites/application-registration-variable/__snapshots__/failing-application-registration-variable-owner-workspace-scope.integration-spec.ts.snap@@ -1,29 +1,5 @@// Jest Snapshot v1, https://goo.gl/fbAQLP-exports[`Application registration variable access outside the owner workspace should fail a registration owned by another workspace should fail to create a variable on it 1`] = `-{- "extensions": {- "code": "NOT_FOUND",- "subCode": "APPLICATION_REGISTRATION_NOT_FOUND",- "userFriendlyMessage": "Application registration not found.",- },- "message": "Application registration with id <applicationRegistrationId> not found",- "name": "NotFoundError",-}-`;--exports[`Application registration variable access outside the owner workspace should fail a registration owned by another workspace should fail to delete one of its variables 1`] = `-{- "extensions": {- "code": "NOT_FOUND",- "subCode": "APPLICATION_REGISTRATION_NOT_FOUND",- "userFriendlyMessage": "Application registration not found.",- },- "message": "Application registration with id <applicationRegistrationId> not found",- "name": "NotFoundError",-}-`;-exports[`Application registration variable access outside the owner workspace should fail a registration owned by another workspace should fail to read its variables 1`] = `{"extensions": {@@ -60,30 +36,6 @@ exports[`Application registration variable access outside the owner workspace sh}`;-exports[`Application registration variable access outside the owner workspace should fail a registration owned by no workspace should fail to create a variable on it 1`] = `-{- "extensions": {- "code": "NOT_FOUND",- "subCode": "APPLICATION_REGISTRATION_NOT_FOUND",- "userFriendlyMessage": "Application registration not found.",- },- "message": "Application registration with id <applicationRegistrationId> not found",- "name": "NotFoundError",-}-`;--exports[`Application registration variable access outside the owner workspace should fail a registration owned by no workspace should fail to delete one of its variables 1`] = `-{- "extensions": {- "code": "NOT_FOUND",- "subCode": "APPLICATION_REGISTRATION_NOT_FOUND",- "userFriendlyMessage": "Application registration not found.",- },- "message": "Application registration with id <applicationRegistrationId> not found",- "name": "NotFoundError",-}-`;-exports[`Application registration variable access outside the owner workspace should fail a registration owned by no workspace should fail to read its variables 1`] = `{"extensions": {diff --git a/packages/twenty-server/test/integration/metadata/suites/application-registration-variable/application-registration-variable.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/application-registration-variable/application-registration-variable.integration-spec.tsindex b4599c7331e..ef9abcf9c08 100644--- a/packages/twenty-server/test/integration/metadata/suites/application-registration-variable/application-registration-variable.integration-spec.ts+++ b/packages/twenty-server/test/integration/metadata/suites/application-registration-variable/application-registration-variable.integration-spec.ts@@ -1,13 +1,10 @@import crypto from 'crypto';-import gql from 'graphql-tag';import {- createApplicationRegistrationVariable,- deleteApplicationRegistrationVariable,findApplicationRegistrationVariables,updateApplicationRegistrationVariable,} from 'test/integration/metadata/suites/application-registration-variable/utils/application-registration-variable-api.util';-import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';+import { insertApplicationRegistrationVariable } from 'test/integration/metadata/suites/application-registration-variable/utils/insert-application-registration-variable.util';const TEST_WORKSPACE_ID = '20202020-1c25-4d02-bf25-6aeccf7ea419';@@ -45,44 +42,33 @@ const deleteRegistrationDirect = async (id: string): Promise<void> => {describe('ApplicationRegistrationVariable (integration)', () => {let registrationId: string;+ let secretVariableId: string;beforeAll(async () => {const registration = await insertRegistrationDirect('Variable Test App');registrationId = registration.id;++ secretVariableId = await insertApplicationRegistrationVariable({+ applicationRegistrationId: registrationId,+ key: 'API_KEY',+ value: 'secret-value-123',+ isSecret: true,+ });++ await insertApplicationRegistrationVariable({+ applicationRegistrationId: registrationId,+ key: 'PUBLIC_URL',+ value: 'https://example.com',+ isSecret: false,+ });});afterAll(async () => {await deleteRegistrationDirect(registrationId);});- describe('CRUD lifecycle', () => {- let variableId: string;-- it('should create a variable', async () => {- const { data } = await createApplicationRegistrationVariable({- applicationRegistrationId: registrationId,- key: 'API_KEY',- value: 'secret-value-123',- description: 'Third-party API key',- isSecret: true,- expectToFail: false,- });-- const variable = data.createApplicationRegistrationVariable;-- expect(variable).toBeDefined();- expect(variable.id).toBeDefined();- expect(variable.key).toBe('API_KEY');- expect(variable.description).toBe('Third-party API key');- expect(variable.isSecret).toBe(true);- expect(variable.isRequired).toBe(false);- expect(variable.isDeprecated).toBe(false);- expect(variable.isFilled).toBe(true);-- variableId = variable.id;- });-+ describe('find and update', () => {it('should find variables for the registration', async () => {const { data } = await findApplicationRegistrationVariables({applicationRegistrationId: registrationId,@@ -91,15 +77,21 @@ describe('ApplicationRegistrationVariable (integration)', () => {const variables = data.findApplicationRegistrationVariables;- expect(variables).toBeDefined();- expect(variables.length).toBe(1);- expect(variables[0].key).toBe('API_KEY');- expect(variables[0].isFilled).toBe(true);+ expect(+ variables.map(({ key, isSecret, isFilled }) => ({+ key,+ isSecret,+ isFilled,+ })),+ ).toEqual([+ { key: 'API_KEY', isSecret: true, isFilled: true },+ { key: 'PUBLIC_URL', isSecret: false, isFilled: true },+ ]);});it('should update the variable value', async () => {const { data } = await updateApplicationRegistrationVariable({- id: variableId,+ id: secretVariableId,value: 'new-secret-value-456',expectToFail: false,});@@ -107,13 +99,13 @@ describe('ApplicationRegistrationVariable (integration)', () => {const variable = data.updateApplicationRegistrationVariable;expect(variable).toBeDefined();- expect(variable.id).toBe(variableId);+ expect(variable.id).toBe(secretVariableId);expect(variable.isFilled).toBe(true);});it('should update the variable description', async () => {const { data } = await updateApplicationRegistrationVariable({- id: variableId,+ id: secretVariableId,description: 'Updated API key description',expectToFail: false,});@@ -123,71 +115,9 @@ describe('ApplicationRegistrationVariable (integration)', () => {expect(variable).toBeDefined();expect(variable.description).toBe('Updated API key description');});-- it('should delete the variable', async () => {- const { data } = await deleteApplicationRegistrationVariable({- id: variableId,- expectToFail: false,- });-- expect(data.deleteApplicationRegistrationVariable).toBe(true);- });-- it('should return empty list after deletion', async () => {- const { data } = await findApplicationRegistrationVariables({- applicationRegistrationId: registrationId,- expectToFail: false,- });-- expect(data.findApplicationRegistrationVariables).toHaveLength(0);- });- });-- describe('non-secret variable', () => {- let variableId: string;-- afterAll(async () => {- if (variableId) {- await deleteApplicationRegistrationVariable({- id: variableId,- });- }- });-- it('should create a non-secret variable', async () => {- const { data } = await createApplicationRegistrationVariable({- applicationRegistrationId: registrationId,- key: 'PUBLIC_URL',- value: 'https://example.com',- description: 'Public webhook URL',- isSecret: false,- expectToFail: false,- });-- const variable = data.createApplicationRegistrationVariable;-- expect(variable).toBeDefined();- expect(variable.key).toBe('PUBLIC_URL');- expect(variable.isSecret).toBe(false);- expect(variable.isFilled).toBe(true);-- variableId = variable.id;- });});describe('error cases', () => {- it('should fail to create a variable for a non-existent registration', async () => {- const { errors } = await createApplicationRegistrationVariable({- applicationRegistrationId: '00000000-0000-0000-0000-000000000000',- key: 'SOME_KEY',- value: 'some-value',- expectToFail: true,- });-- expect(errors).toBeDefined();- expect(errors.length).toBeGreaterThan(0);- });-it('should fail to update a non-existent variable', async () => {const { errors } = await updateApplicationRegistrationVariable({id: '00000000-0000-0000-0000-000000000000',@@ -199,16 +129,6 @@ describe('ApplicationRegistrationVariable (integration)', () => {expect(errors.length).toBeGreaterThan(0);});- it('should fail to delete a non-existent variable', async () => {- const { errors } = await deleteApplicationRegistrationVariable({- id: '00000000-0000-0000-0000-000000000000',- expectToFail: true,- });-- expect(errors).toBeDefined();- expect(errors.length).toBeGreaterThan(0);- });-it('should fail to find variables for a registration not owned by current workspace', async () => {const { errors } = await findApplicationRegistrationVariables({applicationRegistrationId: '00000000-0000-0000-0000-000000000000',@@ -219,76 +139,4 @@ describe('ApplicationRegistrationVariable (integration)', () => {expect(errors.length).toBeGreaterThan(0);});});-- describe('variable via GraphQL createApplicationRegistration', () => {- let gqlRegistrationId: string;-- afterAll(async () => {- if (gqlRegistrationId) {- await globalThis.testDataSource.query(- `DELETE FROM core."applicationRegistration" WHERE id = $1`,- [gqlRegistrationId],- );- }- });-- it('should create a registration via GraphQL and manage variables on it', async () => {- const createResponse = await makeMetadataApiRequest({- query: gql`- mutation CreateApplicationRegistration(- $input: CreateApplicationRegistrationInput!- ) {- createApplicationRegistration(input: $input) {- applicationRegistration {- id- name- }- }- }- `,- variables: {- input: {- name: 'GQL Variable Test App',- },- },- });-- expect(createResponse.body.data).toBeDefined();-- const registration =- createResponse.body.data.createApplicationRegistration- .applicationRegistration;-- expect(registration).toBeDefined();- expect(registration.id).toBeDefined();-- gqlRegistrationId = registration.id;-- const { data: createVarData } =- await createApplicationRegistrationVariable({- applicationRegistrationId: gqlRegistrationId,- key: 'WEBHOOK_SECRET',- value: 'whsec_test123',- description: 'Webhook signing secret',- expectToFail: false,- });-- expect(createVarData.createApplicationRegistrationVariable.key).toBe(- 'WEBHOOK_SECRET',- );- expect(createVarData.createApplicationRegistrationVariable.isFilled).toBe(- true,- );-- const { data: findVarData } = await findApplicationRegistrationVariables({- applicationRegistrationId: gqlRegistrationId,- expectToFail: false,- });-- expect(findVarData.findApplicationRegistrationVariables).toHaveLength(1);- expect(findVarData.findApplicationRegistrationVariables[0].key).toBe(- 'WEBHOOK_SECRET',- );- });- });});diff --git a/packages/twenty-server/test/integration/metadata/suites/application-registration-variable/failing-application-registration-variable-owner-workspace-scope.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/application-registration-variable/failing-application-registration-variable-owner-workspace-scope.integration-spec.tsindex 59a542d1f0d..ad2670d8f51 100644--- a/packages/twenty-server/test/integration/metadata/suites/application-registration-variable/failing-application-registration-variable-owner-workspace-scope.integration-spec.ts+++ b/packages/twenty-server/test/integration/metadata/suites/application-registration-variable/failing-application-registration-variable-owner-workspace-scope.integration-spec.ts@@ -2,11 +2,10 @@ import { randomUUID } from 'crypto';import gql from 'graphql-tag';import {- createApplicationRegistrationVariable,- deleteApplicationRegistrationVariable,findApplicationRegistrationVariables,updateApplicationRegistrationVariable,} from 'test/integration/metadata/suites/application-registration-variable/utils/application-registration-variable-api.util';+import { insertApplicationRegistrationVariable } from 'test/integration/metadata/suites/application-registration-variable/utils/insert-application-registration-variable.util';import { expectOneNotInternalServerErrorSnapshot } from 'test/integration/graphql/utils/expect-one-not-internal-server-error-snapshot.util';import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';import {@@ -14,17 +13,14 @@ import {eachTestingContextFilter,} from 'twenty-shared/testing';-import {- SEED_APPLE_WORKSPACE_ID,- SEED_YCOMBINATOR_WORKSPACE_ID,-} from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';+import { SEED_YCOMBINATOR_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';type TestContext = {ownerWorkspaceId: string | null;};-// The metadata API requests below authenticate as Jane, in the Apple workspace.-// Each case hands the registration to someone else once its variable exists.+// The metadata API requests below authenticate as Jane, in the Apple workspace,+// and each case seeds the registration under another owner.const ownerWorkspaceTestCases: EachTestingContext<TestContext>[] = [{title: 'a registration owned by another workspace',@@ -36,19 +32,6 @@ const ownerWorkspaceTestCases: EachTestingContext<TestContext>[] = [},];-const findVariableIdByKey = async (- applicationRegistrationId: string,- key: string,-): Promise<string | null> => {- const [row] = await globalThis.testDataSource.query(- `SELECT id FROM core."applicationRegistrationVariable"- WHERE "applicationRegistrationId" = $1 AND key = $2`,- [applicationRegistrationId, key],- );-- return row?.id ?? null;-};-const readEncryptedValue = async (variableId: string,): Promise<string | null> => {@@ -88,25 +71,16 @@ describe('Application registration variable access outside the owner workspace srandomUUID(),['http://localhost:3000/callback'],['read'],- SEED_APPLE_WORKSPACE_ID,+ context.ownerWorkspaceId,],);- const { data } = await createApplicationRegistrationVariable({+ foreignVariableId = await insertApplicationRegistrationVariable({applicationRegistrationId: foreignRegistrationId,key: 'FOREIGN_API_KEY',value: 'foreign-secret-value',- isSecret: true,- expectToFail: false,});- foreignVariableId = data.createApplicationRegistrationVariable.id;-- await globalThis.testDataSource.query(- `UPDATE core."applicationRegistration" SET "workspaceId" = $2 WHERE id = $1`,- [foreignRegistrationId, context.ownerWorkspaceId],- );-encryptedValueBeforeAttempt =await readEncryptedValue(foreignVariableId);});@@ -167,34 +141,6 @@ describe('Application registration variable access outside the owner workspace sencryptedValueBeforeAttempt,);});-- it('should fail to create a variable on it', async () => {- const { errors } = await createApplicationRegistrationVariable({- applicationRegistrationId: foreignRegistrationId,- key: 'INJECTED_KEY',- value: 'injected-value',- expectToFail: true,- });-- expectOneNotInternalServerErrorSnapshot({ errors, normalizeMessage });-- expect(- await findVariableIdByKey(foreignRegistrationId, 'INJECTED_KEY'),- ).toBeNull();- });-- it('should fail to delete one of its variables', async () => {- const { errors } = await deleteApplicationRegistrationVariable({- id: foreignVariableId,- expectToFail: true,- });-- expectOneNotInternalServerErrorSnapshot({ errors, normalizeMessage });-- expect(await readEncryptedValue(foreignVariableId)).toBe(- encryptedValueBeforeAttempt,- );- });},);});diff --git a/packages/twenty-server/test/integration/metadata/suites/application-registration-variable/utils/application-registration-variable-api.util.ts b/packages/twenty-server/test/integration/metadata/suites/application-registration-variable/utils/application-registration-variable-api.util.tsindex 925dd6e5567..2fd6af9bb81 100644--- a/packages/twenty-server/test/integration/metadata/suites/application-registration-variable/utils/application-registration-variable-api.util.ts+++ b/packages/twenty-server/test/integration/metadata/suites/application-registration-variable/utils/application-registration-variable-api.util.ts@@ -1,6 +1,4 @@import {- createApplicationRegistrationVariableMutationFactory,- deleteApplicationRegistrationVariableMutationFactory,findApplicationRegistrationVariablesQueryFactory,updateApplicationRegistrationVariableMutationFactory,} from 'test/integration/metadata/suites/application-registration-variable/utils/application-registration-variable-query-factories.util';@@ -66,42 +64,6 @@ export const findApplicationRegistrationVariables = async ({return { data: response.body.data, errors: response.body.errors };};-export const createApplicationRegistrationVariable = async ({- applicationRegistrationId,- key,- value,- description,- isSecret,- expectToFail,- token,-}: {- applicationRegistrationId: string;- key: string;- value: string;- description?: string;- isSecret?: boolean;- expectToFail?: boolean;- token?: string;-}): CommonResponseBody<{- createApplicationRegistrationVariable: VariableFields;-}> => {- const graphqlOperation = createApplicationRegistrationVariableMutationFactory(- {- applicationRegistrationId,- key,- value,- description,- isSecret,- },- );-- const response = await makeMetadataApiRequest(graphqlOperation, token);-- handleExpectation(response, expectToFail, 'Create variable');-- return { data: response.body.data, errors: response.body.errors };-};-export const updateApplicationRegistrationVariable = async ({id,value,@@ -131,25 +93,3 @@ export const updateApplicationRegistrationVariable = async ({return { data: response.body.data, errors: response.body.errors };};--export const deleteApplicationRegistrationVariable = async ({- id,- expectToFail,- token,-}: {- id: string;- expectToFail?: boolean;- token?: string;-}): CommonResponseBody<{- deleteApplicationRegistrationVariable: boolean;-}> => {- const graphqlOperation = deleteApplicationRegistrationVariableMutationFactory(- { id },- );-- const response = await makeMetadataApiRequest(graphqlOperation, token);-- handleExpectation(response, expectToFail, 'Delete variable');-- return { data: response.body.data, errors: response.body.errors };-};diff --git a/packages/twenty-server/test/integration/metadata/suites/application-registration-variable/utils/application-registration-variable-query-factories.util.ts b/packages/twenty-server/test/integration/metadata/suites/application-registration-variable/utils/application-registration-variable-query-factories.util.tsindex 3ac3b20e874..bf51189b8e2 100644--- a/packages/twenty-server/test/integration/metadata/suites/application-registration-variable/utils/application-registration-variable-query-factories.util.ts+++ b/packages/twenty-server/test/integration/metadata/suites/application-registration-variable/utils/application-registration-variable-query-factories.util.ts@@ -31,39 +31,6 @@ export const findApplicationRegistrationVariablesQueryFactory = ({variables: { applicationRegistrationId },});-export const createApplicationRegistrationVariableMutationFactory = ({- applicationRegistrationId,- key,- value,- description,- isSecret,-}: {- applicationRegistrationId: string;- key: string;- value: string;- description?: string;- isSecret?: boolean;-}) => ({- query: gql`- mutation CreateApplicationRegistrationVariable(- $input: CreateApplicationRegistrationVariableInput!- ) {- createApplicationRegistrationVariable(input: $input) {- ${VARIABLE_GQL_FIELDS}- }- }- `,- variables: {- input: {- applicationRegistrationId,- key,- value,- ...(description !== undefined && { description }),- ...(isSecret !== undefined && { isSecret }),- },- },-});-export const updateApplicationRegistrationVariableMutationFactory = ({id,value,@@ -92,16 +59,3 @@ export const updateApplicationRegistrationVariableMutationFactory = ({},},});--export const deleteApplicationRegistrationVariableMutationFactory = ({- id,-}: {- id: string;-}) => ({- query: gql`- mutation DeleteApplicationRegistrationVariable($id: String!) {- deleteApplicationRegistrationVariable(id: $id)- }- `,- variables: { id },-});diff --git a/packages/twenty-server/test/integration/metadata/suites/application-registration-variable/utils/insert-application-registration-variable.util.ts b/packages/twenty-server/test/integration/metadata/suites/application-registration-variable/utils/insert-application-registration-variable.util.tsnew file mode 100644index 00000000000..b367abbdd29--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application-registration-variable/utils/insert-application-registration-variable.util.ts@@ -0,0 +1,32 @@+import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';++import { type PlaintextString } from 'src/engine/core-modules/secret-encryption/branded-strings/plaintext-string.type';+import { type SecretEncryptionService } from 'src/engine/core-modules/secret-encryption/secret-encryption.service';++// Variables are only declared by a manifest sync, so tests insert the row+// directly with a value encrypted the way the server does it.+export const insertApplicationRegistrationVariable = async ({+ applicationRegistrationId,+ key,+ value,+ isSecret = true,+}: {+ applicationRegistrationId: string;+ key: string;+ value: string;+ isSecret?: boolean;+}): Promise<string> => {+ const encryptedValue = getAppProviderByClassName<SecretEncryptionService>(+ 'SecretEncryptionService',+ ).encryptVersioned(value as PlaintextString);++ const [row] = await globalThis.testDataSource.query(+ `INSERT INTO core."applicationRegistrationVariable"+ ("applicationRegistrationId", key, "encryptedValue", "isSecret")+ VALUES ($1, $2, $3, $4)+ RETURNING id`,+ [applicationRegistrationId, key, encryptedValue, isSecret],+ );++ return row.id;+};diff --git a/packages/twenty-server/test/integration/metadata/suites/application-registration/__snapshots__/failing-application-registration-mutation-cross-application-access.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/application-registration/__snapshots__/failing-application-registration-mutation-cross-application-access.integration-spec.ts.snapnew file mode 100644index 00000000000..a814d4dc1fe--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application-registration/__snapshots__/failing-application-registration-mutation-cross-application-access.integration-spec.ts.snap@@ -0,0 +1,97 @@+// Jest Snapshot v1, https://goo.gl/fbAQLP++exports[`Application token mutations on another registration of the same workspace should fail with a user-bound application token should refuse deleteApplicationRegistration and leave the registration unchanged 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 mutations on another registration of the same workspace should fail with a user-bound application token should refuse rotateApplicationRegistrationClientSecret and leave the registration unchanged 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 mutations on another registration of the same workspace should fail with a user-bound application token should refuse updateApplicationRegistration and leave the registration unchanged 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 mutations on another registration of the same workspace should fail with a user-bound application token should refuse updateApplicationRegistrationVariable and leave the registration unchanged 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 mutations on another registration of the same workspace should fail with an application token without user binding should refuse deleteApplicationRegistration and leave the registration unchanged 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 mutations on another registration of the same workspace should fail with an application token without user binding should refuse rotateApplicationRegistrationClientSecret and leave the registration unchanged 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 mutations on another registration of the same workspace should fail with an application token without user binding should refuse updateApplicationRegistration and leave the registration unchanged 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 mutations on another registration of the same workspace should fail with an application token without user binding should refuse updateApplicationRegistrationVariable and leave the registration unchanged 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",+}+`;diff --git a/packages/twenty-server/test/integration/metadata/suites/application-registration/failing-application-registration-mutation-cross-application-access.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/application-registration/failing-application-registration-mutation-cross-application-access.integration-spec.tsnew file mode 100644index 00000000000..1f0ad7b08b1--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application-registration/failing-application-registration-mutation-cross-application-access.integration-spec.ts@@ -0,0 +1,185 @@+import { updateApplicationRegistrationVariable } from 'test/integration/metadata/suites/application-registration-variable/utils/application-registration-variable-api.util';+import { deleteApplicationRegistration } from 'test/integration/metadata/suites/application-registration/utils/delete-application-registration.util';+import { insertApplicationRegistrationWithVariable } from 'test/integration/metadata/suites/application-registration/utils/insert-application-registration-with-variable.util';+import { readApplicationRegistrationState } from 'test/integration/metadata/suites/application-registration/utils/read-application-registration-state.util';+import { rotateApplicationRegistrationClientSecret } from 'test/integration/metadata/suites/application-registration/utils/rotate-application-registration-client-secret.util';+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 { updateApplicationRegistration } from 'test/integration/metadata/suites/application/utils/update-application-registration.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 { SystemPermissionFlag } from 'twenty-shared/constants';+import {+ type EachTestingContext,+ eachTestingContextFilter,+} from 'twenty-shared/testing';++import { type BaseGraphQLError } from 'src/engine/core-modules/graphql/utils/graphql-errors.util';+import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';++type GlobalTestContext = {+ callingApplication: ApplicationWithResources;+ userBoundToken: string;+ unboundToken: string;+};++type TokenTestContext = {+ token: (globalContext: GlobalTestContext) => string;+};++type TargetRegistration = {+ applicationRegistrationId: string;+ variableId: string;+};++type MutationTestContext = {+ requestTargetRegistration: (params: {+ targetRegistration: TargetRegistration;+ token: string;+ }) => Promise<{ errors: BaseGraphQLError[] }>;+};++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 mutationTestCases: EachTestingContext<MutationTestContext>[] = [+ {+ title: 'updateApplicationRegistration',+ context: {+ requestTargetRegistration: ({ targetRegistration, token }) =>+ updateApplicationRegistration({+ id: targetRegistration.applicationRegistrationId,+ update: {+ name: 'Renamed by another application',+ oAuthRedirectUris: ['https://other-app.example.com/callback'],+ },+ token,+ expectToFail: true,+ }),+ },+ },+ {+ title: 'deleteApplicationRegistration',+ context: {+ requestTargetRegistration: ({ targetRegistration, token }) =>+ deleteApplicationRegistration({+ input: { id: targetRegistration.applicationRegistrationId },+ token,+ expectToFail: true,+ }),+ },+ },+ {+ title: 'rotateApplicationRegistrationClientSecret',+ context: {+ requestTargetRegistration: ({ targetRegistration, token }) =>+ rotateApplicationRegistrationClientSecret({+ input: { id: targetRegistration.applicationRegistrationId },+ token,+ expectToFail: true,+ }),+ },+ },+ {+ title: 'updateApplicationRegistrationVariable',+ context: {+ requestTargetRegistration: ({ targetRegistration, token }) =>+ updateApplicationRegistrationVariable({+ id: targetRegistration.variableId,+ value: 'https://other-app.example.com',+ token,+ expectToFail: true,+ }),+ },+ },+];++describe('Application token mutations on another registration of the same workspace should fail', () => {+ let globalTestContext: GlobalTestContext;+ let targetRegistration: TargetRegistration;++ beforeAll(async () => {+ const callingApplication = await setupApplicationWithResources({+ name: 'Registration Mutation Calling Application',+ permissionFlagUniversalIdentifiers: [+ SystemPermissionFlag.APPLICATIONS,+ SystemPermissionFlag.API_KEYS_AND_WEBHOOKS,+ SystemPermissionFlag.ROLES,+ ],+ });++ const [userBoundTokenPair, unboundTokenPair] = await Promise.all([+ generateAppleAdminApplicationTokenPair({+ applicationId: callingApplication.id,+ }),+ generateApplicationTokenPair({+ workspaceId: SEED_APPLE_WORKSPACE_ID,+ applicationId: callingApplication.id,+ }),+ ]);++ globalTestContext = {+ callingApplication,+ userBoundToken: userBoundTokenPair.applicationAccessToken.token,+ unboundToken: unboundTokenPair.applicationAccessToken.token,+ };+ }, 120000);++ beforeEach(async () => {+ targetRegistration = await insertApplicationRegistrationWithVariable({+ name: 'Registration Mutation Target',+ });+ });++ afterEach(async () => {+ await globalThis.testDataSource.query(+ `DELETE FROM core."applicationRegistration" WHERE id = $1`,+ [targetRegistration.applicationRegistrationId],+ );+ });++ afterAll(async () => {+ await cleanupApplicationAndAppRegistration({+ applicationUniversalIdentifier:+ globalTestContext.callingApplication.universalIdentifier,+ });+ });++ describe.each(eachTestingContextFilter(tokenTestCases))(+ '$title',+ ({ context: tokenContext }) => {+ it.each(eachTestingContextFilter(mutationTestCases))(+ 'should refuse $title and leave the registration unchanged',+ async ({ context }) => {+ const stateBeforeAttempt = await readApplicationRegistrationState(+ targetRegistration.applicationRegistrationId,+ );++ const { errors } = await context.requestTargetRegistration({+ targetRegistration,+ token: tokenContext.token(globalTestContext),+ });++ expectOneNotInternalServerErrorSnapshot({ errors });+ expect(+ await readApplicationRegistrationState(+ targetRegistration.applicationRegistrationId,+ ),+ ).toEqual(stateBeforeAttempt);+ },+ );+ },+ );+});diff --git a/packages/twenty-server/test/integration/metadata/suites/application-registration/successful-application-registration-mutations.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/application-registration/successful-application-registration-mutations.integration-spec.tsnew file mode 100644index 00000000000..a817e93b09d--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application-registration/successful-application-registration-mutations.integration-spec.ts@@ -0,0 +1,286 @@+import { updateApplicationRegistrationVariable } from 'test/integration/metadata/suites/application-registration-variable/utils/application-registration-variable-api.util';+import { insertApplicationRegistrationVariable } from 'test/integration/metadata/suites/application-registration-variable/utils/insert-application-registration-variable.util';+import { deleteApplicationRegistration } from 'test/integration/metadata/suites/application-registration/utils/delete-application-registration.util';+import {+ insertApplicationRegistrationWithVariable,+ TARGET_VARIABLE_KEY,+} from 'test/integration/metadata/suites/application-registration/utils/insert-application-registration-with-variable.util';+import {+ type ApplicationRegistrationState,+ readApplicationRegistrationState,+} from 'test/integration/metadata/suites/application-registration/utils/read-application-registration-state.util';+import { rotateApplicationRegistrationClientSecret } from 'test/integration/metadata/suites/application-registration/utils/rotate-application-registration-client-secret.util';+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 { updateApplicationRegistration } from 'test/integration/metadata/suites/application/utils/update-application-registration.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 { SystemPermissionFlag } from 'twenty-shared/constants';+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 = {+ callingApplication: ApplicationWithResources;+ userBoundToken: string;+ unboundToken: string;+};++type TargetRegistration = {+ applicationRegistrationId: string;+ variableId: string;+};++type MutationTestContext = {+ request: (params: {+ targetRegistration: TargetRegistration;+ token: string;+ }) => Promise<unknown>;+ expectStateChange: (params: {+ stateBefore: ApplicationRegistrationState;+ stateAfter: ApplicationRegistrationState;+ }) => void;+};++const sessionAndApiKeyTokenTestCases: EachTestingContext<{+ token: () => string;+}>[] = [+ {+ title: 'with a user session',+ context: { token: () => APPLE_JANE_ADMIN_ACCESS_TOKEN },+ },+ {+ title: 'with an API key',+ context: { token: () => API_KEY_ACCESS_TOKEN },+ },+];++const applicationTokenTestCases: EachTestingContext<{+ token: (globalContext: GlobalTestContext) => string;+}>[] = [+ {+ 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 RENAMED_REGISTRATION_NAME = 'Renamed Registration';+const RENAMED_REDIRECT_URI = 'https://renamed.example.com/callback';++const nonDestructiveMutationTestCases: EachTestingContext<MutationTestContext>[] =+ [+ {+ title: 'updateApplicationRegistration',+ context: {+ request: ({ targetRegistration, token }) =>+ updateApplicationRegistration({+ id: targetRegistration.applicationRegistrationId,+ update: {+ name: RENAMED_REGISTRATION_NAME,+ oAuthRedirectUris: [RENAMED_REDIRECT_URI],+ },+ token,+ expectToFail: false,+ }),+ expectStateChange: ({ stateAfter }) => {+ expect(stateAfter.registration?.name).toBe(RENAMED_REGISTRATION_NAME);+ expect(stateAfter.registration?.oAuthRedirectUris).toEqual([+ RENAMED_REDIRECT_URI,+ ]);+ },+ },+ },+ {+ title: 'rotateApplicationRegistrationClientSecret',+ context: {+ request: ({ targetRegistration, token }) =>+ rotateApplicationRegistrationClientSecret({+ input: { id: targetRegistration.applicationRegistrationId },+ token,+ expectToFail: false,+ }),+ expectStateChange: ({ stateBefore, stateAfter }) => {+ expect(stateAfter.registration?.oAuthClientSecretHash).not.toBe(+ stateBefore.registration?.oAuthClientSecretHash,+ );+ },+ },+ },+ {+ title: 'updateApplicationRegistrationVariable',+ context: {+ request: ({ targetRegistration, token }) =>+ updateApplicationRegistrationVariable({+ id: targetRegistration.variableId,+ value: 'updated-value',+ token,+ expectToFail: false,+ }),+ expectStateChange: ({ stateBefore, stateAfter }) => {+ expect(stateAfter.variables[0].encryptedValue).not.toBe(+ stateBefore.variables[0].encryptedValue,+ );+ },+ },+ },+ ];++const allMutationTestCases: EachTestingContext<MutationTestContext>[] = [+ ...nonDestructiveMutationTestCases,+ {+ title: 'deleteApplicationRegistration',+ context: {+ request: ({ targetRegistration, token }) =>+ deleteApplicationRegistration({+ input: { id: targetRegistration.applicationRegistrationId },+ token,+ expectToFail: false,+ }),+ expectStateChange: ({ stateAfter }) => {+ expect(stateAfter.registration).toBeUndefined();+ expect(stateAfter.variables).toEqual([]);+ },+ },+ },+];++const runMutationAndExpectStateChange = async ({+ context,+ targetRegistration,+ token,+}: {+ context: MutationTestContext;+ targetRegistration: TargetRegistration;+ token: string;+}) => {+ const stateBefore = await readApplicationRegistrationState(+ targetRegistration.applicationRegistrationId,+ );++ await context.request({ targetRegistration, token });++ context.expectStateChange({+ stateBefore,+ stateAfter: await readApplicationRegistrationState(+ targetRegistration.applicationRegistrationId,+ ),+ });+};++describe('Application registration mutations on a registration the workspace owns should succeed', () => {+ let targetRegistration: TargetRegistration;++ beforeEach(async () => {+ targetRegistration = await insertApplicationRegistrationWithVariable({+ name: 'Registration Mutation Target',+ });+ });++ afterEach(async () => {+ await globalThis.testDataSource.query(+ `DELETE FROM core."applicationRegistration" WHERE id = $1`,+ [targetRegistration.applicationRegistrationId],+ );+ });++ describe.each(eachTestingContextFilter(sessionAndApiKeyTokenTestCases))(+ '$title',+ ({ context: tokenContext }) => {+ it.each(eachTestingContextFilter(allMutationTestCases))(+ 'should run $title',+ async ({ context }) => {+ await runMutationAndExpectStateChange({+ context,+ targetRegistration,+ token: tokenContext.token(),+ });+ },+ );+ },+ );+});++describe('Application token mutations on its own registration should succeed', () => {+ let globalTestContext: GlobalTestContext;+ let targetRegistration: TargetRegistration;++ beforeAll(async () => {+ const callingApplication = await setupApplicationWithResources({+ name: 'Own Registration Calling Application',+ permissionFlagUniversalIdentifiers: [+ SystemPermissionFlag.APPLICATIONS,+ SystemPermissionFlag.API_KEYS_AND_WEBHOOKS,+ SystemPermissionFlag.ROLES,+ ],+ });++ const [userBoundTokenPair, unboundTokenPair] = await Promise.all([+ generateAppleAdminApplicationTokenPair({+ applicationId: callingApplication.id,+ }),+ generateApplicationTokenPair({+ workspaceId: SEED_APPLE_WORKSPACE_ID,+ applicationId: callingApplication.id,+ }),+ ]);++ globalTestContext = {+ callingApplication,+ userBoundToken: userBoundTokenPair.applicationAccessToken.token,+ unboundToken: unboundTokenPair.applicationAccessToken.token,+ };+ }, 120000);++ beforeEach(async () => {+ const { applicationRegistrationId } = globalTestContext.callingApplication;++ const variableId = await insertApplicationRegistrationVariable({+ applicationRegistrationId,+ key: TARGET_VARIABLE_KEY,+ value: 'target-secret-value',+ });++ targetRegistration = { applicationRegistrationId, variableId };+ });++ afterEach(async () => {+ await globalThis.testDataSource.query(+ `DELETE FROM core."applicationRegistrationVariable"+ WHERE "applicationRegistrationId" = $1`,+ [targetRegistration.applicationRegistrationId],+ );+ });++ afterAll(async () => {+ await cleanupApplicationAndAppRegistration({+ applicationUniversalIdentifier:+ globalTestContext.callingApplication.universalIdentifier,+ });+ });++ describe.each(eachTestingContextFilter(applicationTokenTestCases))(+ '$title',+ ({ context: tokenContext }) => {+ it.each(eachTestingContextFilter(nonDestructiveMutationTestCases))(+ 'should run $title',+ async ({ context }) => {+ await runMutationAndExpectStateChange({+ context,+ targetRegistration,+ token: tokenContext.token(globalTestContext),+ });+ },+ );+ },+ );+});diff --git a/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/delete-application-registration-query-factory.util.ts b/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/delete-application-registration-query-factory.util.tsnew file mode 100644index 00000000000..9fac470371e--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/delete-application-registration-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 DeleteApplicationRegistrationFactoryInput = {+ id: string;+};++export const deleteApplicationRegistrationQueryFactory = ({+ input,+}: PerformMetadataQueryParams<DeleteApplicationRegistrationFactoryInput>) => ({+ query: gql`+ mutation DeleteApplicationRegistration($id: String!) {+ deleteApplicationRegistration(id: $id)+ }+ `,+ variables: {+ id: input.id,+ },+});diff --git a/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/delete-application-registration.util.ts b/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/delete-application-registration.util.tsnew file mode 100644index 00000000000..c50fdcd63c5--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/delete-application-registration.util.ts@@ -0,0 +1,41 @@+import {+ type DeleteApplicationRegistrationFactoryInput,+ deleteApplicationRegistrationQueryFactory,+} from 'test/integration/metadata/suites/application-registration/utils/delete-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';++export const deleteApplicationRegistration = async ({+ input,+ expectToFail = false,+ token,+}: PerformMetadataQueryParams<DeleteApplicationRegistrationFactoryInput>): CommonResponseBody<{+ deleteApplicationRegistration: boolean;+}> => {+ const graphqlOperation = deleteApplicationRegistrationQueryFactory({+ input,+ });++ const response = await makeMetadataApiRequest(graphqlOperation, token);++ if (expectToFail === true) {+ warnIfNoErrorButExpectedToFail({+ response,+ errorMessage:+ 'Deleting application registration should have failed but did not',+ });+ }++ if (expectToFail === false) {+ warnIfErrorButNotExpectedToFail({+ response,+ errorMessage:+ 'Deleting 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-registration/utils/insert-application-registration-with-variable.util.ts b/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/insert-application-registration-with-variable.util.tsnew file mode 100644index 00000000000..3873e5b6b25--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/insert-application-registration-with-variable.util.ts@@ -0,0 +1,43 @@+import crypto from 'crypto';++import { insertApplicationRegistrationVariable } from 'test/integration/metadata/suites/application-registration-variable/utils/insert-application-registration-variable.util';++import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';++export const TARGET_VARIABLE_KEY = 'TARGET_API_KEY';++// A registration owned by the Apple workspace with a client secret and one+// server variable, so every registration mutation has something to change.+export const insertApplicationRegistrationWithVariable = async ({+ name,+}: {+ name: string;+}): Promise<{ applicationRegistrationId: string; variableId: string }> => {+ const applicationRegistrationId = crypto.randomUUID();++ await globalThis.testDataSource.query(+ `INSERT INTO core."applicationRegistration"+ (id, "universalIdentifier", name, "oAuthClientId",+ "oAuthClientSecretHash", "oAuthRedirectUris", "oAuthScopes",+ "workspaceId")+ VALUES ($1, $2, $3, $4, $5, $6, $7, $8)`,+ [+ applicationRegistrationId,+ crypto.randomUUID(),+ name,+ crypto.randomUUID(),+ 'target-client-secret-hash',+ ['https://target.example.com/callback'],+ ['api'],+ SEED_APPLE_WORKSPACE_ID,+ ],+ );++ const variableId = await insertApplicationRegistrationVariable({+ applicationRegistrationId,+ key: TARGET_VARIABLE_KEY,+ value: 'target-secret-value',+ });++ return { applicationRegistrationId, variableId };+};diff --git a/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/read-application-registration-state.util.ts b/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/read-application-registration-state.util.tsnew file mode 100644index 00000000000..aa3ba873eaf--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/read-application-registration-state.util.ts@@ -0,0 +1,35 @@+import { type ApplicationRegistrationVariableEntity } from 'src/engine/core-modules/application/application-registration-variable/application-registration-variable.entity';+import { type ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';++export type ApplicationRegistrationState = {+ registration:+ | Pick<+ ApplicationRegistrationEntity,+ 'name' | 'oAuthRedirectUris' | 'oAuthScopes' | 'oAuthClientSecretHash'+ >+ | undefined;+ variables: Pick<+ ApplicationRegistrationVariableEntity,+ 'id' | 'key' | 'encryptedValue' | 'description'+ >[];+};++export const readApplicationRegistrationState = async (+ applicationRegistrationId: string,+): Promise<ApplicationRegistrationState> => {+ const [registration] = await globalThis.testDataSource.query(+ `SELECT name, "oAuthRedirectUris", "oAuthScopes", "oAuthClientSecretHash"+ FROM core."applicationRegistration" WHERE id = $1`,+ [applicationRegistrationId],+ );++ const variables = await globalThis.testDataSource.query(+ `SELECT id, key, "encryptedValue", description+ FROM core."applicationRegistrationVariable"+ WHERE "applicationRegistrationId" = $1+ ORDER BY key`,+ [applicationRegistrationId],+ );++ return { registration, variables };+};diff --git a/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/rotate-application-registration-client-secret-query-factory.util.ts b/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/rotate-application-registration-client-secret-query-factory.util.tsnew file mode 100644index 00000000000..66229951549--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/rotate-application-registration-client-secret-query-factory.util.ts@@ -0,0 +1,21 @@+import gql from 'graphql-tag';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';++export type RotateApplicationRegistrationClientSecretFactoryInput = {+ id: string;+};++export const rotateApplicationRegistrationClientSecretQueryFactory = ({+ input,+}: PerformMetadataQueryParams<RotateApplicationRegistrationClientSecretFactoryInput>) => ({+ query: gql`+ mutation RotateApplicationRegistrationClientSecret($id: String!) {+ rotateApplicationRegistrationClientSecret(id: $id) {+ clientSecret+ }+ }+ `,+ variables: {+ id: input.id,+ },+});diff --git a/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/rotate-application-registration-client-secret.util.ts b/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/rotate-application-registration-client-secret.util.tsnew file mode 100644index 00000000000..6be75f09383--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application-registration/utils/rotate-application-registration-client-secret.util.ts@@ -0,0 +1,42 @@+import {+ type RotateApplicationRegistrationClientSecretFactoryInput,+ rotateApplicationRegistrationClientSecretQueryFactory,+} from 'test/integration/metadata/suites/application-registration/utils/rotate-application-registration-client-secret-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 RotateClientSecretDTO } from 'src/engine/core-modules/application/application-registration/dtos/rotate-client-secret.dto';++export const rotateApplicationRegistrationClientSecret = async ({+ input,+ expectToFail = false,+ token,+}: PerformMetadataQueryParams<RotateApplicationRegistrationClientSecretFactoryInput>): CommonResponseBody<{+ rotateApplicationRegistrationClientSecret: RotateClientSecretDTO;+}> => {+ const graphqlOperation =+ rotateApplicationRegistrationClientSecretQueryFactory({ input });++ const response = await makeMetadataApiRequest(graphqlOperation, token);++ if (expectToFail === true) {+ warnIfNoErrorButExpectedToFail({+ response,+ errorMessage:+ 'Rotating application registration client secret should have failed but did not',+ });+ }++ if (expectToFail === false) {+ warnIfErrorButNotExpectedToFail({+ response,+ errorMessage:+ 'Rotating application registration client secret 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-sync-application-reserved-variable-name.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/failing-sync-application-reserved-variable-name.integration-spec.ts.snapnew file mode 100644index 00000000000..e19c4b85e24--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/failing-sync-application-reserved-variable-name.integration-spec.ts.snap@@ -0,0 +1,145 @@+// Jest Snapshot v1, https://goo.gl/fbAQLP++exports[`Sync application should fail on reserved variable names should refuse a manifest declaring a server variable named APPLICATION_ID 1`] = `+{+ "extensions": {+ "code": "BAD_USER_INPUT",+ "subCode": "INVALID_INPUT",+ "userFriendlyMessage": "Invalid input provided.",+ },+ "message": "Variable names are reserved: APPLICATION_ID",+ "name": "UserInputError",+}+`;++exports[`Sync application should fail on reserved variable names should refuse a manifest declaring a server variable named TWENTY_API_KEY 1`] = `+{+ "extensions": {+ "code": "BAD_USER_INPUT",+ "subCode": "INVALID_INPUT",+ "userFriendlyMessage": "Invalid input provided.",+ },+ "message": "Variable names are reserved: TWENTY_API_KEY",+ "name": "UserInputError",+}+`;++exports[`Sync application should fail on reserved variable names should refuse a manifest declaring a server variable named TWENTY_API_URL 1`] = `+{+ "extensions": {+ "code": "BAD_USER_INPUT",+ "subCode": "INVALID_INPUT",+ "userFriendlyMessage": "Invalid input provided.",+ },+ "message": "Variable names are reserved: TWENTY_API_URL",+ "name": "UserInputError",+}+`;++exports[`Sync application should fail on reserved variable names should refuse a manifest declaring a server variable named TWENTY_APP_ACCESS_TOKEN 1`] = `+{+ "extensions": {+ "code": "BAD_USER_INPUT",+ "subCode": "INVALID_INPUT",+ "userFriendlyMessage": "Invalid input provided.",+ },+ "message": "Variable names are reserved: TWENTY_APP_ACCESS_TOKEN",+ "name": "UserInputError",+}+`;++exports[`Sync application should fail on reserved variable names should refuse a manifest declaring a server variable named TWENTY_APP_APPLICATION_ACCESS_TOKEN 1`] = `+{+ "extensions": {+ "code": "BAD_USER_INPUT",+ "subCode": "INVALID_INPUT",+ "userFriendlyMessage": "Invalid input provided.",+ },+ "message": "Variable names are reserved: TWENTY_APP_APPLICATION_ACCESS_TOKEN",+ "name": "UserInputError",+}+`;++exports[`Sync application should fail on reserved variable names should refuse a manifest declaring a server variable named TWENTY_FUNCTIONS_URL 1`] = `+{+ "extensions": {+ "code": "BAD_USER_INPUT",+ "subCode": "INVALID_INPUT",+ "userFriendlyMessage": "Invalid input provided.",+ },+ "message": "Variable names are reserved: TWENTY_FUNCTIONS_URL",+ "name": "UserInputError",+}+`;++exports[`Sync application should fail on reserved variable names should refuse a manifest declaring an application variable named APPLICATION_ID 1`] = `+{+ "extensions": {+ "code": "BAD_USER_INPUT",+ "subCode": "INVALID_INPUT",+ "userFriendlyMessage": "Invalid input provided.",+ },+ "message": "Variable names are reserved: APPLICATION_ID",+ "name": "UserInputError",+}+`;++exports[`Sync application should fail on reserved variable names should refuse a manifest declaring an application variable named TWENTY_API_KEY 1`] = `+{+ "extensions": {+ "code": "BAD_USER_INPUT",+ "subCode": "INVALID_INPUT",+ "userFriendlyMessage": "Invalid input provided.",+ },+ "message": "Variable names are reserved: TWENTY_API_KEY",+ "name": "UserInputError",+}+`;++exports[`Sync application should fail on reserved variable names should refuse a manifest declaring an application variable named TWENTY_API_URL 1`] = `+{+ "extensions": {+ "code": "BAD_USER_INPUT",+ "subCode": "INVALID_INPUT",+ "userFriendlyMessage": "Invalid input provided.",+ },+ "message": "Variable names are reserved: TWENTY_API_URL",+ "name": "UserInputError",+}+`;++exports[`Sync application should fail on reserved variable names should refuse a manifest declaring an application variable named TWENTY_APP_ACCESS_TOKEN 1`] = `+{+ "extensions": {+ "code": "BAD_USER_INPUT",+ "subCode": "INVALID_INPUT",+ "userFriendlyMessage": "Invalid input provided.",+ },+ "message": "Variable names are reserved: TWENTY_APP_ACCESS_TOKEN",+ "name": "UserInputError",+}+`;++exports[`Sync application should fail on reserved variable names should refuse a manifest declaring an application variable named TWENTY_APP_APPLICATION_ACCESS_TOKEN 1`] = `+{+ "extensions": {+ "code": "BAD_USER_INPUT",+ "subCode": "INVALID_INPUT",+ "userFriendlyMessage": "Invalid input provided.",+ },+ "message": "Variable names are reserved: TWENTY_APP_APPLICATION_ACCESS_TOKEN",+ "name": "UserInputError",+}+`;++exports[`Sync application should fail on reserved variable names should refuse a manifest declaring an application variable named TWENTY_FUNCTIONS_URL 1`] = `+{+ "extensions": {+ "code": "BAD_USER_INPUT",+ "subCode": "INVALID_INPUT",+ "userFriendlyMessage": "Invalid input provided.",+ },+ "message": "Variable names are reserved: TWENTY_FUNCTIONS_URL",+ "name": "UserInputError",+}+`;diff --git a/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/failing-upload-application-reserved-variable-name.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/failing-upload-application-reserved-variable-name.integration-spec.ts.snapnew file mode 100644index 00000000000..1cbff9ea805--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/failing-upload-application-reserved-variable-name.integration-spec.ts.snap@@ -0,0 +1,25 @@+// Jest Snapshot v1, https://goo.gl/fbAQLP++exports[`Publish application should fail on reserved variable names should refuse a reserved application variable before creating a registration 1`] = `+{+ "extensions": {+ "code": "BAD_USER_INPUT",+ "subCode": "INVALID_INPUT",+ "userFriendlyMessage": "Invalid input for application registration.",+ },+ "message": "Variable names are reserved: TWENTY_API_URL",+ "name": "UserInputError",+}+`;++exports[`Publish application should fail on reserved variable names should refuse a reserved server variable before creating a registration 1`] = `+{+ "extensions": {+ "code": "BAD_USER_INPUT",+ "subCode": "INVALID_INPUT",+ "userFriendlyMessage": "Invalid input for application registration.",+ },+ "message": "Variable names are reserved: TWENTY_API_URL",+ "name": "UserInputError",+}+`;diff --git a/packages/twenty-server/test/integration/metadata/suites/application/failing-sync-application-reserved-variable-name.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/application/failing-sync-application-reserved-variable-name.integration-spec.tsnew file mode 100644index 00000000000..6c250553427--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application/failing-sync-application-reserved-variable-name.integration-spec.ts@@ -0,0 +1,176 @@+import { expectOneNotInternalServerErrorSnapshot } from 'test/integration/graphql/utils/expect-one-not-internal-server-error-snapshot.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 { 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 {+ type ApplicationVariables,+ type Manifest,+ type ServerVariables,+} from 'twenty-shared/application';+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';++const TEST_APP_ID = 'c572a0e1-0001-4000-a000-000000000001';+const TEST_ROLE_ID = 'c572a0e1-0002-4000-a000-000000000002';+const APPLICATION_SETTING_VARIABLE_ID = 'c572a0e1-0003-4000-a000-000000000003';+const RESERVED_APPLICATION_VARIABLE_ID = 'c572a0e1-0004-4000-a000-000000000004';++const BASELINE_SERVER_VARIABLES: ServerVariables = {+ APP_API_KEY: { description: 'Third-party API key', isSecret: true },+};++const BASELINE_APPLICATION_VARIABLES: ApplicationVariables = {+ APP_SETTING: {+ universalIdentifier: APPLICATION_SETTING_VARIABLE_ID,+ description: 'A workspace setting',+ isSecret: false,+ },+};++// The logic function executor injects these into every run+const RESERVED_NAMES = [+ 'TWENTY_API_URL',+ 'TWENTY_APP_ACCESS_TOKEN',+ 'TWENTY_APP_APPLICATION_ACCESS_TOKEN',+ 'TWENTY_API_KEY',+ 'TWENTY_FUNCTIONS_URL',+ 'APPLICATION_ID',+];++type TestContext = {+ serverVariables: ServerVariables;+ applicationVariables: ApplicationVariables;+};++const testCases: EachTestingContext<TestContext>[] = RESERVED_NAMES.flatMap(+ (reservedName) => [+ {+ title: `a server variable named ${reservedName}`,+ context: {+ serverVariables: {+ ...BASELINE_SERVER_VARIABLES,+ [reservedName]: { description: 'Reserved', isSecret: true },+ },+ applicationVariables: BASELINE_APPLICATION_VARIABLES,+ },+ },+ {+ title: `an application variable named ${reservedName}`,+ context: {+ serverVariables: BASELINE_SERVER_VARIABLES,+ applicationVariables: {+ ...BASELINE_APPLICATION_VARIABLES,+ [reservedName]: {+ universalIdentifier: RESERVED_APPLICATION_VARIABLE_ID,+ description: 'Reserved',+ isSecret: false,+ },+ },+ },+ },+ ],+);++const buildManifest = ({+ serverVariables,+ applicationVariables,+}: {+ serverVariables: ServerVariables;+ applicationVariables: ApplicationVariables;+}): Manifest => {+ const baseManifest = buildBaseManifest({+ appId: TEST_APP_ID,+ roleId: TEST_ROLE_ID,+ });++ return {+ ...baseManifest,+ application: {+ ...baseManifest.application,+ serverVariables,+ applicationVariables,+ },+ };+};++const readDeclaredVariableKeys = async () => {+ const serverVariables = await globalThis.testDataSource.query(+ `SELECT variable.key+ FROM core."applicationRegistrationVariable" variable+ JOIN core."applicationRegistration" registration+ ON registration.id = variable."applicationRegistrationId"+ WHERE registration."universalIdentifier" = $1+ ORDER BY variable.key`,+ [TEST_APP_ID],+ );++ const applicationVariables = await globalThis.testDataSource.query(+ `SELECT variable.key+ FROM core."applicationVariable" variable+ JOIN core."application" application+ ON application.id = variable."applicationId"+ WHERE application."universalIdentifier" = $1+ AND application."workspaceId" = $2+ ORDER BY variable.key`,+ [TEST_APP_ID, SEED_APPLE_WORKSPACE_ID],+ );++ return {+ serverVariableKeys: serverVariables.map(({ key }: { key: string }) => key),+ applicationVariableKeys: applicationVariables.map(+ ({ key }: { key: string }) => key,+ ),+ };+};++describe('Sync application should fail on reserved variable names', () => {+ beforeAll(async () => {+ await setupApplicationForSync({+ applicationUniversalIdentifier: TEST_APP_ID,+ name: 'Reserved Variable Name App',+ description: 'App for testing reserved variable names',+ sourcePath: 'test-reserved-variable-name',+ });++ await syncApplication({+ manifest: buildManifest({+ serverVariables: BASELINE_SERVER_VARIABLES,+ applicationVariables: BASELINE_APPLICATION_VARIABLES,+ }),+ expectToFail: false,+ });++ expect(await readDeclaredVariableKeys()).toEqual({+ serverVariableKeys: ['APP_API_KEY'],+ applicationVariableKeys: ['APP_SETTING'],+ });+ }, 60000);++ afterAll(async () => {+ await cleanupApplicationAndAppRegistration({+ applicationUniversalIdentifier: TEST_APP_ID,+ });+ });++ it.each(eachTestingContextFilter(testCases))(+ 'should refuse a manifest declaring $title',+ async ({ context }) => {+ const { errors } = await syncApplication({+ manifest: buildManifest(context),+ expectToFail: true,+ });++ expectOneNotInternalServerErrorSnapshot({ errors });+ expect(await readDeclaredVariableKeys()).toEqual({+ serverVariableKeys: ['APP_API_KEY'],+ applicationVariableKeys: ['APP_SETTING'],+ });+ },+ 60000,+ );+});diff --git a/packages/twenty-server/test/integration/metadata/suites/application/failing-upload-application-reserved-variable-name.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/application/failing-upload-application-reserved-variable-name.integration-spec.tsnew file mode 100644index 00000000000..8973d78ffd3--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application/failing-upload-application-reserved-variable-name.integration-spec.ts@@ -0,0 +1,162 @@+import { expectOneNotInternalServerErrorSnapshot } from 'test/integration/graphql/utils/expect-one-not-internal-server-error-snapshot.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 { createAppTarball } from 'test/integration/metadata/suites/application/utils/create-app-tarball.util';+import { uploadAppTarball } from 'test/integration/metadata/suites/application/utils/upload-app-tarball.util';+import {+ type ApplicationVariables,+ type ServerVariables,+} from 'twenty-shared/application';+import { v4 as uuidv4 } from 'uuid';++// The upload flow runs cache-lock retries with real delays, so fake timers+// would hang it — mirror the other application suites.+jest.setTimeout(120000);++const buildTarball = ({+ universalIdentifier,+ serverVariables = {},+ applicationVariables = {},+}: {+ universalIdentifier: string;+ serverVariables?: ServerVariables;+ applicationVariables?: ApplicationVariables;+}): Promise<Buffer> => {+ const baseManifest = buildBaseManifest({+ appId: universalIdentifier,+ roleId: uuidv4(),+ });++ return createAppTarball({+ 'manifest.json': JSON.stringify({+ ...baseManifest,+ application: {+ ...baseManifest.application,+ serverVariables,+ applicationVariables,+ },+ }),+ 'package.json': JSON.stringify({+ name: `test-reserved-variable-name-${universalIdentifier}`,+ version: '1.0.0',+ }),+ });+};++const readRegistrationServerVariableKeys = async (+ universalIdentifier: string,+): Promise<string[] | null> => {+ const [registration] = await globalThis.testDataSource.query(+ `SELECT id FROM core."applicationRegistration"+ WHERE "universalIdentifier" = $1`,+ [universalIdentifier],+ );++ if (registration === undefined) {+ return null;+ }++ const variables = await globalThis.testDataSource.query(+ `SELECT key FROM core."applicationRegistrationVariable"+ WHERE "applicationRegistrationId" = $1+ ORDER BY key`,+ [registration.id],+ );++ return variables.map(({ key }: { key: string }) => key);+};++describe('Publish application should fail on reserved variable names', () => {+ const universalIdentifier = uuidv4();+ const applicationVariableAppUniversalIdentifier = uuidv4();++ beforeAll(() => {+ jest.useRealTimers();+ });++ afterAll(async () => {+ await cleanupApplicationAndAppRegistration({+ applicationUniversalIdentifier: universalIdentifier,+ });++ await cleanupApplicationAndAppRegistration({+ applicationUniversalIdentifier: applicationVariableAppUniversalIdentifier,+ });++ jest.useFakeTimers();+ });++ it('should refuse a reserved application variable before creating a registration', async () => {+ const { errors } = await uploadAppTarball({+ tarballBuffer: await buildTarball({+ universalIdentifier: applicationVariableAppUniversalIdentifier,+ applicationVariables: {+ TWENTY_API_URL: {+ universalIdentifier: uuidv4(),+ description: 'Reserved',+ isSecret: false,+ },+ },+ }),+ expectToFail: true,+ });++ expectOneNotInternalServerErrorSnapshot({ errors });+ expect(+ await readRegistrationServerVariableKeys(+ applicationVariableAppUniversalIdentifier,+ ),+ ).toBe(null);++ await uploadAppTarball({+ tarballBuffer: await buildTarball({+ universalIdentifier: applicationVariableAppUniversalIdentifier,+ applicationVariables: {+ APP_SETTING: {+ universalIdentifier: uuidv4(),+ description: 'A workspace setting',+ isSecret: false,+ },+ },+ }),+ expectToFail: false,+ });++ expect(+ await readRegistrationServerVariableKeys(+ applicationVariableAppUniversalIdentifier,+ ),+ ).toEqual([]);+ });++ it('should refuse a reserved server variable before creating a registration', async () => {+ const { errors } = await uploadAppTarball({+ tarballBuffer: await buildTarball({+ universalIdentifier,+ serverVariables: {+ TWENTY_API_URL: { description: 'Reserved', isSecret: false },+ },+ }),+ expectToFail: true,+ });++ expectOneNotInternalServerErrorSnapshot({ errors });+ expect(await readRegistrationServerVariableKeys(universalIdentifier)).toBe(+ null,+ );++ await uploadAppTarball({+ tarballBuffer: await buildTarball({+ universalIdentifier,+ serverVariables: {+ APP_API_KEY: { description: 'Third-party API key', isSecret: true },+ },+ }),+ expectToFail: false,+ });++ expect(+ await readRegistrationServerVariableKeys(universalIdentifier),+ ).toEqual(['APP_API_KEY']);+ });+});diff --git a/packages/twenty-server/test/integration/secret-encryption/application-registration-variable-encryption.integration-spec.ts b/packages/twenty-server/test/integration/secret-encryption/application-registration-variable-encryption.integration-spec.tsindex 2059457269f..e5e295149b3 100644--- a/packages/twenty-server/test/integration/secret-encryption/application-registration-variable-encryption.integration-spec.ts+++ b/packages/twenty-server/test/integration/secret-encryption/application-registration-variable-encryption.integration-spec.ts@@ -4,6 +4,7 @@ import gql from 'graphql-tag';import { isDefined } from 'twenty-shared/utils';import { type DataSource } from 'typeorm';+import { insertApplicationRegistrationVariable } from 'test/integration/metadata/suites/application-registration-variable/utils/insert-application-registration-variable.util';import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';import { buildSecretEncryptionServiceFromEnv } from 'test/integration/upgrade/utils/build-secret-encryption-service.util';@@ -70,29 +71,29 @@ describe('ApplicationRegistrationVariable encryption (integration)', () => {it('encrypts the value on the API write path, persists ciphertext in Postgres, and decrypts back via the API read path', async () => {const plaintext = 'this-is-a-v2-encrypted-secret-value';- const createVariableResponse = await makeMetadataApiRequest({+ const variableId = await insertApplicationRegistrationVariable({+ applicationRegistrationId,+ key: 'TEST_V2_KEY',+ value: '',+ isSecret: false,+ });++ const updateVariableResponse = await makeMetadataApiRequest({query: gql`- mutation CreateVariableForEncryptionTest(- $input: CreateApplicationRegistrationVariableInput!+ mutation UpdateVariableForEncryptionTest(+ $input: UpdateApplicationRegistrationVariableInput!) {- createApplicationRegistrationVariable(input: $input) {+ updateApplicationRegistrationVariable(input: $input) {id}}`,variables: {- input: {- applicationRegistrationId,- key: 'TEST_V2_KEY',- value: plaintext,- isSecret: false,- },+ input: { id: variableId, update: { value: plaintext } },},});- expect(createVariableResponse.body.errors).toBeUndefined();- const variableId =- createVariableResponse.body.data.createApplicationRegistrationVariable.id;+ expect(updateVariableResponse.body.errors).toBeUndefined();const [dbRow] = await dataSource.query(`SELECT "encryptedValue" FROM "core"."applicationRegistrationVariable" WHERE id = $1`,