Skip to content

The open alternative to Salesforce, designed for AI.

Add an application role target kind (#29463)

Paul Rastoinbfba20a75f05
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-42/__tests__/2-42-workspace-command-1789757500000-sync-message-record-page.command.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-42/__tests__/2-42-workspace-command-1789757500000-sync-message-record-page.command.spec.ts
index a263c1726e8..3438a468b92 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-42/__tests__/2-42-workspace-command-1789757500000-sync-message-record-page.command.spec.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-42/__tests__/2-42-workspace-command-1789757500000-sync-message-record-page.command.spec.ts
@@ -339,6 +339,7 @@ describe('SyncMessageRecordPageCommand', () => {
STANDARD_APPLICATION.universalIdentifier,
workspaceCustomApplicationUniversalIdentifier:
WORKSPACE_CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER,
+ flatApplicationMaps: { byId: {}, idByUniversalIdentifier: {} },
},
workspaceId: WORKSPACE_ID,
});
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/__tests__/2-43-workspace-command-1790266078807-sync-attachment-record-page.command.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/__tests__/2-43-workspace-command-1790266078807-sync-attachment-record-page.command.spec.ts
index aa2e5091669..89e7800d952 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/__tests__/2-43-workspace-command-1790266078807-sync-attachment-record-page.command.spec.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/__tests__/2-43-workspace-command-1790266078807-sync-attachment-record-page.command.spec.ts
@@ -408,6 +408,7 @@ describe('SyncAttachmentRecordPageCommand', () => {
STANDARD_APPLICATION.universalIdentifier,
workspaceCustomApplicationUniversalIdentifier:
WORKSPACE_CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER,
+ flatApplicationMaps: { byId: {}, idByUniversalIdentifier: {} },
},
workspaceId: WORKSPACE_ID,
});
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-55/2-55-instance-command-fast-1793627583457-add-application-role-target.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-55/2-55-instance-command-fast-1793627583457-add-application-role-target.ts
new file mode 100644
index 00000000000..63a1969a95a
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-55/2-55-instance-command-fast-1793627583457-add-application-role-target.ts
@@ -0,0 +1,28 @@
+import { QueryRunner } from 'typeorm';
+
+import { RegisteredInstanceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-instance-command.decorator';
+import { FastInstanceCommand } from 'src/engine/core-modules/upgrade/interfaces/fast-instance-command.interface';
+
+@RegisteredInstanceCommand('2.55.0', 1793627583457)
+export class AddApplicationRoleTargetFastInstanceCommand implements FastInstanceCommand {
+ public async up(queryRunner: QueryRunner): Promise<void> {
+ await queryRunner.query('ALTER TABLE "core"."roleTarget" ADD "targetApplicationId" uuid');
+ await queryRunner.query('ALTER TABLE "core"."role" ADD "canBeAssignedToApplications" boolean NOT NULL DEFAULT false');
+ await queryRunner.query('CREATE INDEX "IDX_ROLE_TARGET_TARGET_APPLICATION_ID" ON "core"."roleTarget" ("targetApplicationId") ');
+ await queryRunner.query('ALTER TABLE "core"."roleTarget" ADD CONSTRAINT "IDX_ROLE_TARGET_UNIQUE_TARGET_APPLICATION" UNIQUE ("workspaceId", "targetApplicationId")');
+ await queryRunner.query('ALTER TABLE "core"."roleTarget" ADD CONSTRAINT "FK_3f78f147358cb6d12a82ec02a96" FOREIGN KEY ("targetApplicationId") REFERENCES "core"."application"("id") ON DELETE CASCADE ON UPDATE NO ACTION');
+ await queryRunner.query('ALTER TABLE "core"."roleTarget" DROP CONSTRAINT "CHK_role_target_single_entity"');
+ await queryRunner.query('ALTER TABLE "core"."roleTarget" ADD CONSTRAINT "CHK_role_target_single_entity" CHECK ((("agentId" IS NOT NULL)::int + ("userWorkspaceId" IS NOT NULL)::int + ("apiKeyId" IS NOT NULL)::int + ("webhookId" IS NOT NULL)::int + ("targetApplicationId" IS NOT NULL)::int) = 1)');
+ }
+
+ public async down(queryRunner: QueryRunner): Promise<void> {
+ await queryRunner.query('DELETE FROM "core"."roleTarget" WHERE "targetApplicationId" IS NOT NULL');
+ await queryRunner.query('ALTER TABLE "core"."roleTarget" DROP CONSTRAINT "CHK_role_target_single_entity"');
+ await queryRunner.query('ALTER TABLE "core"."roleTarget" ADD CONSTRAINT "CHK_role_target_single_entity" CHECK ((("agentId" IS NOT NULL)::int + ("userWorkspaceId" IS NOT NULL)::int + ("apiKeyId" IS NOT NULL)::int + ("webhookId" IS NOT NULL)::int) = 1)');
+ await queryRunner.query('ALTER TABLE "core"."roleTarget" DROP CONSTRAINT "FK_3f78f147358cb6d12a82ec02a96"');
+ await queryRunner.query('ALTER TABLE "core"."roleTarget" DROP CONSTRAINT "IDX_ROLE_TARGET_UNIQUE_TARGET_APPLICATION"');
+ await queryRunner.query('DROP INDEX "core"."IDX_ROLE_TARGET_TARGET_APPLICATION_ID"');
+ await queryRunner.query('ALTER TABLE "core"."role" DROP COLUMN "canBeAssignedToApplications"');
+ await queryRunner.query('ALTER TABLE "core"."roleTarget" DROP COLUMN "targetApplicationId"');
+ }
+}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-55/add-application-role-target-upgrade-command-name.constant.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-55/add-application-role-target-upgrade-command-name.constant.ts
new file mode 100644
index 00000000000..7e1f02df82e
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-55/add-application-role-target-upgrade-command-name.constant.ts
@@ -0,0 +1,2 @@
+export const ADD_APPLICATION_ROLE_TARGET_UPGRADE_COMMAND_NAME =
+ '2.55.0_AddApplicationRoleTargetFastInstanceCommand_1793627583457';
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.ts
index 1cdc4bad082..d94bf47dbce 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.ts
@@ -279,6 +279,7 @@ import { AddRelationFieldMetadataIdToRowLevelPermissionPredicateFastInstanceComm
import { IndexTemporaryFileExpirationSlowInstanceCommand } from 'src/database/commands/upgrade-version-command/2-55/2-55-instance-command-slow-1793462047826-index-temporary-file-expiration';
import { EnableUserHealthCheckFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-55/2-55-instance-command-fast-1793473469981-enable-user-health-check';
import { AddSettingsMenuItemSlugFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-55/2-55-instance-command-fast-1793618487873-add-settings-menu-item-slug';
+import { AddApplicationRoleTargetFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-55/2-55-instance-command-fast-1793627583457-add-application-role-target';
export const INSTANCE_COMMANDS = [
AddViewFieldGroupIdIndexOnViewFieldFastInstanceCommand,
@@ -560,4 +561,5 @@ export const INSTANCE_COMMANDS = [
IndexTemporaryFileExpirationSlowInstanceCommand,
EnableUserHealthCheckFastInstanceCommand,
AddSettingsMenuItemSlugFastInstanceCommand,
+ AddApplicationRoleTargetFastInstanceCommand,
];
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-agent-manifest-to-universal-flat-role-target.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-agent-manifest-to-universal-flat-role-target.util.ts
index a4a80950b51..ed9e82b311c 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-agent-manifest-to-universal-flat-role-target.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-agent-manifest-to-universal-flat-role-target.util.ts
@@ -24,6 +24,7 @@ export const fromAgentManifestToUniversalFlatRoleTarget = ({
userWorkspaceId: null,
apiKeyId: null,
webhookUniversalIdentifier: null,
+ targetApplicationUniversalIdentifier: null,
createdAt: now,
updatedAt: now,
};
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-role-manifest-to-universal-flat-role.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-role-manifest-to-universal-flat-role.util.ts
index 1a08903179f..d12ea3ab2e6 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-role-manifest-to-universal-flat-role.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-role-manifest-to-universal-flat-role.util.ts
@@ -31,6 +31,7 @@ export const fromRoleManifestToUniversalFlatRole = ({
canBeAssignedToUsers: roleManifest.canBeAssignedToUsers ?? true,
canBeAssignedToAgents: roleManifest.canBeAssignedToAgents ?? true,
canBeAssignedToApiKeys: roleManifest.canBeAssignedToApiKeys ?? true,
+ canBeAssignedToApplications: false,
roleTargetUniversalIdentifiers: [],
objectPermissionUniversalIdentifiers: [],
fieldPermissionUniversalIdentifiers: [],
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/build-all-flat-entity-operation-record-by-metadata-name-from-from-to.util.spec.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/build-all-flat-entity-operation-record-by-metadata-name-from-from-to.util.spec.ts
index b2e37804a1d..f4d8dbd32c1 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/build-all-flat-entity-operation-record-by-metadata-name-from-from-to.util.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/build-all-flat-entity-operation-record-by-metadata-name-from-from-to.util.spec.ts
@@ -59,6 +59,8 @@ const ROLE_TARGET: FlatRoleTarget = {
apiKeyId: null,
webhookId: null,
webhookUniversalIdentifier: null,
+ targetApplicationId: null,
+ targetApplicationUniversalIdentifier: null,
};
const WEBHOOK: FlatWebhook = {
@@ -439,6 +441,25 @@ describe('buildAllFlatEntityOperationRecordByMetadataNameFromFromTo', () => {
});
});
+ it('keeps a role assignable to applications when its manifest is synced back', () => {
+ const buildAllFlatEntityMapsWithRole = (flatRole: FlatRole) =>
+ withRole(flatRole)(createEmptyAllFlatEntityMaps());
+
+ const result = buildAllFlatEntityOperationRecordByMetadataNameFromFromTo({
+ fromAllFlatEntityMaps: buildAllFlatEntityMapsWithRole({
+ ...ROLE,
+ canBeAssignedToApplications: true,
+ }),
+ toAllUniversalFlatEntityMaps: buildAllFlatEntityMapsWithRole({
+ ...ROLE,
+ canBeAssignedToApplications: false,
+ }),
+ buildOptions: BUILD_OPTIONS,
+ });
+
+ expect(result).toEqual({});
+ });
+
it('uses the app default when creating a layout', () => {
const result = buildAllFlatEntityOperationRecordByMetadataNameFromFromTo({
fromAllFlatEntityMaps: createEmptyAllFlatEntityMaps(),
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/classify-application-flat-entities.util.spec.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/classify-application-flat-entities.util.spec.ts
index 368765132a5..ead1266b37c 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/classify-application-flat-entities.util.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/classify-application-flat-entities.util.spec.ts
@@ -235,7 +235,7 @@ describe('classifyApplicationFlatEntities', () => {
it('should exclude a member role assignment as runtime state', () => {
expect(entryOf(ROLE_TARGET_UID)).toMatchObject({
status: ApplicationExportCoverageStatus.EXCLUDED,
- reason: 'member, API key or webhook role assignment',
+ reason: 'member, API key, webhook or application role assignment',
});
});
@@ -251,7 +251,7 @@ describe('classifyApplicationFlatEntities', () => {
expect(entryOf(FOREIGN_ROLE_TARGET_UID)).toMatchObject({
metadataName: 'roleTarget',
status: ApplicationExportCoverageStatus.EXCLUDED,
- reason: 'member, API key or webhook role assignment',
+ reason: 'member, API key, webhook or application role assignment',
});
});
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/reconstruct-agents-manifest.util.spec.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/reconstruct-agents-manifest.util.spec.ts
index 5a58265aa5c..f3fbe90896d 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/reconstruct-agents-manifest.util.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/reconstruct-agents-manifest.util.spec.ts
@@ -118,6 +118,7 @@ const buildFlatRoleTarget = ({
roleId: `${roleUniversalIdentifier}-id`,
agentId: `${agentUniversalIdentifier}-id`,
webhookId: null,
+ targetApplicationId: null,
};
};
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/can-manifest-express-flat-entity.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/can-manifest-express-flat-entity.util.ts
index 24662369bd6..eb14cb39217 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/can-manifest-express-flat-entity.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/can-manifest-express-flat-entity.util.ts
@@ -10,6 +10,7 @@ const WORKSPACE_BOUND_PROPERTIES = [
'userWorkspaceId',
'apiKeyId',
'webhookId',
+ 'targetApplicationId',
'workflowVersionId',
'coreWorkflowVersionId',
'targetRecordId',
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/classify-application-flat-entities.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/classify-application-flat-entities.util.ts
index 32f299d0edd..fac27cf0578 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/classify-application-flat-entities.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/classify-application-flat-entities.util.ts
@@ -93,10 +93,12 @@ const classifyFlatEntity = ({
return ('userWorkspaceId' in flatEntity &&
isDefined(flatEntity.userWorkspaceId)) ||
('apiKeyId' in flatEntity && isDefined(flatEntity.apiKeyId)) ||
- ('webhookId' in flatEntity && isDefined(flatEntity.webhookId))
+ ('webhookId' in flatEntity && isDefined(flatEntity.webhookId)) ||
+ ('targetApplicationId' in flatEntity &&
+ isDefined(flatEntity.targetApplicationId))
? {
status: ApplicationExportCoverageStatus.EXCLUDED,
- reason: 'member, API key or webhook role assignment',
+ reason: 'member, API key, webhook or application role assignment',
}
: { status: ApplicationExportCoverageStatus.UNSUPPORTED };
case 'commandMenuItem':
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/utils/from-create-agent-input-to-flat-agent.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/utils/from-create-agent-input-to-flat-agent.util.ts
index 99ceba4162d..dddf0e1a107 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/utils/from-create-agent-input-to-flat-agent.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/utils/from-create-agent-input-to-flat-agent.util.ts
@@ -85,6 +85,8 @@ export const fromCreateAgentInputToFlatAgent = ({
apiKeyId: null,
webhookId: null,
webhookUniversalIdentifier: null,
+ targetApplicationId: null,
+ targetApplicationUniversalIdentifier: null,
createdAt,
updatedAt: createdAt,
universalIdentifier: v4(),
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/utils/from-update-agent-input-to-flat-agent-to-update.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/utils/from-update-agent-input-to-flat-agent-to-update.util.ts
index 85be5c00b4c..3f6561bc504 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/utils/from-update-agent-input-to-flat-agent-to-update.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/utils/from-update-agent-input-to-flat-agent-to-update.util.ts
@@ -85,6 +85,8 @@ const computeAgentFlatRoleTargetToUpdate = ({
apiKeyId: null,
webhookId: null,
webhookUniversalIdentifier: null,
+ targetApplicationId: null,
+ targetApplicationUniversalIdentifier: null,
createdAt: updatedAt,
updatedAt,
universalIdentifier: v4(),
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-entity-properties-configuration-by-metadata-name.constant.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-entity-properties-configuration-by-metadata-name.constant.ts
index 9b8f2ff8932..048e5c1e330 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-entity-properties-configuration-by-metadata-name.constant.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-entity-properties-configuration-by-metadata-name.constant.ts
@@ -896,6 +896,11 @@ export const ALL_ENTITY_PROPERTIES_CONFIGURATION_BY_METADATA_NAME = {
toStringify: false,
universalProperty: undefined,
},
+ canBeAssignedToApplications: {
+ toCompare: false,
+ toStringify: false,
+ universalProperty: undefined,
+ },
isEditable: {
toCompare: false,
toStringify: false,
@@ -933,6 +938,11 @@ export const ALL_ENTITY_PROPERTIES_CONFIGURATION_BY_METADATA_NAME = {
toStringify: false,
universalProperty: 'webhookUniversalIdentifier',
},
+ targetApplicationId: {
+ toCompare: false,
+ toStringify: false,
+ universalProperty: undefined,
+ },
agentId: {
toCompare: true,
toStringify: false,
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-many-to-one-metadata-foreign-key.constant.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-many-to-one-metadata-foreign-key.constant.ts
index 2bafdebf751..4d0f1fd60e4 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-many-to-one-metadata-foreign-key.constant.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-many-to-one-metadata-foreign-key.constant.ts
@@ -185,6 +185,7 @@ export const ALL_MANY_TO_ONE_METADATA_FOREIGN_KEY = {
webhook: {
foreignKey: 'webhookId',
},
+ targetApplication: null,
workspace: null,
application: null,
},
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-many-to-one-metadata-relations.constant.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-many-to-one-metadata-relations.constant.ts
index 274503d596b..49341e04d90 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-many-to-one-metadata-relations.constant.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-many-to-one-metadata-relations.constant.ts
@@ -334,6 +334,7 @@ export const ALL_MANY_TO_ONE_METADATA_RELATIONS = {
isNullable: true,
universalForeignKey: 'webhookUniversalIdentifier',
},
+ targetApplication: null,
workspace: null,
application: null,
},
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/workspace-owned-properties-by-metadata-name.constant.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/workspace-owned-properties-by-metadata-name.constant.ts
index abe76b3ce76..ab25eaf2093 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/workspace-owned-properties-by-metadata-name.constant.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/workspace-owned-properties-by-metadata-name.constant.ts
@@ -11,6 +11,7 @@ export const WORKSPACE_OWNED_PROPERTIES_BY_METADATA_NAME: Partial<{
agentChatChannel: ['name', 'icon', 'color', 'position'],
mcpServer: ['isActive'],
pageLayout: ['isFirstTabPinned'],
+ role: ['canBeAssignedToApplications'],
view: ['createdByUserWorkspaceId'],
workflow: ['createdByUserWorkspaceId', 'workspaceWorkflowId', 'visibility'],
};
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/__tests__/keep-workspace-owned-properties.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/__tests__/keep-workspace-owned-properties.util.spec.ts
index e3ae1239247..f5ddd8005f9 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/__tests__/keep-workspace-owned-properties.util.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/__tests__/keep-workspace-owned-properties.util.spec.ts
@@ -102,15 +102,17 @@ describe('keepWorkspaceOwnedProperties', () => {
it('should return the standard entities untouched for a metadata without workspace-owned properties', () => {
const toFlatEntityMaps = {
byUniversalIdentifier: {
- 'role-universal-identifier': { label: 'Manager' },
+ 'webhook-universal-identifier': { targetUrl: 'https://example.com' },
},
};
const result = keepWorkspaceOwnedProperties({
- metadataName: 'role',
+ metadataName: 'webhook',
fromFlatEntityMaps: {
byUniversalIdentifier: {
- 'role-universal-identifier': { label: 'Renamed by the workspace' },
+ 'webhook-universal-identifier': {
+ targetUrl: 'https://workspace.example.com',
+ },
},
},
toFlatEntityMaps,
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/validators/utils/__tests__/validate-enum-flat-field-metadata.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/validators/utils/__tests__/validate-enum-flat-field-metadata.util.spec.ts
index dc60cd3aa29..10071afb962 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/validators/utils/__tests__/validate-enum-flat-field-metadata.util.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/validators/utils/__tests__/validate-enum-flat-field-metadata.util.spec.ts
@@ -67,6 +67,7 @@ const validateOptionColor = ({
flatFieldMetadata.applicationUniversalIdentifier,
workspaceCustomApplicationUniversalIdentifier:
WORKSPACE_CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER,
+ flatApplicationMaps: { byId: {}, idByUniversalIdentifier: {} },
},
});
};
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-role-target/types/flat-role-target.type.ts b/packages/twenty-server/src/engine/metadata-modules/flat-role-target/types/flat-role-target.type.ts
index 39a4c374641..f5978fc4f51 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-role-target/types/flat-role-target.type.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-role-target/types/flat-role-target.type.ts
@@ -1,4 +1,6 @@
import { type FlatEntityFrom } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-from.type';
import { type RoleTargetEntity } from 'src/engine/metadata-modules/role-target/role-target.entity';
-export type FlatRoleTarget = FlatEntityFrom<RoleTargetEntity>;
+export type FlatRoleTarget = FlatEntityFrom<RoleTargetEntity> & {
+ targetApplicationUniversalIdentifier: string | null;
+};
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-role-target/utils/from-role-target-entity-to-flat-role-target.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-role-target/utils/from-role-target-entity-to-flat-role-target.util.ts
index fd8ea995cf5..797e5541957 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-role-target/utils/from-role-target-entity-to-flat-role-target.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-role-target/utils/from-role-target-entity-to-flat-role-target.util.ts
@@ -1,8 +1,37 @@
+import { isDefined } from 'twenty-shared/utils';
+
+import {
+ FlatEntityMapsException,
+ FlatEntityMapsExceptionCode,
+} from 'src/engine/metadata-modules/flat-entity/exceptions/flat-entity-maps.exception';
import { fromEntityToScalarEntity } from 'src/engine/metadata-modules/flat-entity/utils/from-entity-to-scalar-entity.util';
import { type FlatRoleTarget } from 'src/engine/metadata-modules/flat-role-target/types/flat-role-target.type';
import { type FromEntityToFlatEntityArgs } from 'src/engine/workspace-cache/types/from-entity-to-flat-entity-args.type';
import { resolveManyToOneRelationIdsToUniversalIdentifiers } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/utils/resolve-many-to-one-relation-ids-to-universal-identifiers.util';
+const resolveTargetApplicationUniversalIdentifier = ({
+ entity: roleTargetEntity,
+ applicationIdToUniversalIdentifierMap,
+}: FromEntityToFlatEntityArgs<'roleTarget'>): string | null => {
+ const { targetApplicationId } = roleTargetEntity;
+
+ if (!isDefined(targetApplicationId)) {
+ return null;
+ }
+
+ const targetApplicationUniversalIdentifier =
+ applicationIdToUniversalIdentifierMap.get(targetApplicationId);
+
+ if (!isDefined(targetApplicationUniversalIdentifier)) {
+ throw new FlatEntityMapsException(
+ `Application with id ${targetApplicationId} not found for roleTarget ${roleTargetEntity.id}`,
+ FlatEntityMapsExceptionCode.ENTITY_NOT_FOUND,
+ );
+ }
+
+ return targetApplicationUniversalIdentifier;
+};
+
export const fromRoleTargetEntityToFlatRoleTarget = (
args: FromEntityToFlatEntityArgs<'roleTarget'>,
): FlatRoleTarget => {
@@ -22,5 +51,7 @@ export const fromRoleTargetEntityToFlatRoleTarget = (
return {
...roleTargetScalarEntity,
...relationUniversalIdentifiers,
+ targetApplicationUniversalIdentifier:
+ resolveTargetApplicationUniversalIdentifier(args),
};
};
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-role/utils/build-workspace-custom-application-flat-role.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-role/utils/build-workspace-custom-application-flat-role.util.ts
index b17d0c6d4b9..ab6bc36eb41 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-role/utils/build-workspace-custom-application-flat-role.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-role/utils/build-workspace-custom-application-flat-role.util.ts
@@ -38,6 +38,7 @@ export const buildWorkspaceCustomApplicationFlatRole = ({
canBeAssignedToUsers: false,
canBeAssignedToAgents: false,
canBeAssignedToApiKeys: false,
+ canBeAssignedToApplications: false,
workspaceId,
createdAt: now,
updatedAt: now,
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-role/utils/from-create-role-input-to-flat-role-to-create.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-role/utils/from-create-role-input-to-flat-role-to-create.util.ts
index 3da685ccc2c..1f0efde0f2c 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-role/utils/from-create-role-input-to-flat-role-to-create.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-role/utils/from-create-role-input-to-flat-role-to-create.util.ts
@@ -46,6 +46,7 @@ export const fromCreateRoleInputToFlatRoleToCreate = ({
canBeAssignedToUsers: createRoleInput.canBeAssignedToUsers ?? true,
canBeAssignedToAgents: createRoleInput.canBeAssignedToAgents ?? true,
canBeAssignedToApiKeys: createRoleInput.canBeAssignedToApiKeys ?? true,
+ canBeAssignedToApplications: false,
isEditable: true,
workspaceId,
createdAt: now,
diff --git a/packages/twenty-server/src/engine/metadata-modules/role-target/role-target.entity.ts b/packages/twenty-server/src/engine/metadata-modules/role-target/role-target.entity.ts
index bcc2a117837..f3cd8353453 100644
--- a/packages/twenty-server/src/engine/metadata-modules/role-target/role-target.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/role-target/role-target.entity.ts
@@ -12,8 +12,10 @@ import {
UpdateDateColumn,
} from 'typeorm';
+import { ADD_APPLICATION_ROLE_TARGET_UPGRADE_COMMAND_NAME } from 'src/database/commands/upgrade-version-command/2-55/add-application-role-target-upgrade-command-name.constant';
import { ADD_WEBHOOK_ID_TO_ROLE_TARGET_UPGRADE_COMMAND_NAME } from 'src/database/commands/upgrade-version-command/2-55/add-webhook-id-to-role-target-upgrade-command-name.constant';
import { ApiKeyEntity } from 'src/engine/core-modules/api-key/api-key.entity';
+import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';
import { WasIntroducedInUpgrade } from 'src/engine/core-modules/upgrade/decorators/was-introduced-in-upgrade.decorator';
import { AgentEntity } from 'src/engine/metadata-modules/ai/ai-agent/entities/agent.entity';
import { RoleEntity } from 'src/engine/metadata-modules/role/role.entity';
@@ -28,14 +30,19 @@ import { SyncableEntity } from 'src/engine/workspace-manager/types/syncable-enti
@Unique('IDX_ROLE_TARGET_UNIQUE_AGENT', ['workspaceId', 'agentId'])
@Unique('IDX_ROLE_TARGET_UNIQUE_API_KEY', ['workspaceId', 'apiKeyId'])
@Unique('IDX_ROLE_TARGET_UNIQUE_WEBHOOK', ['workspaceId', 'webhookId'])
+@Unique('IDX_ROLE_TARGET_UNIQUE_TARGET_APPLICATION', [
+ 'workspaceId',
+ 'targetApplicationId',
+])
@Index('IDX_ROLE_TARGET_WORKSPACE_ID', ['userWorkspaceId', 'workspaceId'])
@Index('IDX_ROLE_TARGET_AGENT_ID', ['agentId'])
@Index('IDX_ROLE_TARGET_API_KEY_ID', ['apiKeyId'])
@Index('IDX_ROLE_TARGET_WEBHOOK_ID', ['webhookId'])
+@Index('IDX_ROLE_TARGET_TARGET_APPLICATION_ID', ['targetApplicationId'])
@Index('IDX_ROLE_TARGET_ROLE_ID', ['roleId'])
@Check(
'CHK_role_target_single_entity',
- '(("agentId" IS NOT NULL)::int + ("userWorkspaceId" IS NOT NULL)::int + ("apiKeyId" IS NOT NULL)::int + ("webhookId" IS NOT NULL)::int) = 1',
+ '(("agentId" IS NOT NULL)::int + ("userWorkspaceId" IS NOT NULL)::int + ("apiKeyId" IS NOT NULL)::int + ("webhookId" IS NOT NULL)::int + ("targetApplicationId" IS NOT NULL)::int) = 1',
)
export class RoleTargetEntity extends SyncableEntity {
@PrimaryGeneratedColumn('uuid')
@@ -83,6 +90,19 @@ export class RoleTargetEntity extends SyncableEntity {
@JoinColumn({ name: 'webhookId' })
webhook: Relation<WebhookEntity> | null;
+ @WasIntroducedInUpgrade({
+ upgradeCommandName: ADD_APPLICATION_ROLE_TARGET_UPGRADE_COMMAND_NAME,
+ })
+ @Column({ nullable: true, type: 'uuid' })
+ targetApplicationId: string | null;
+
+ @ManyToOne(() => ApplicationEntity, {
+ onDelete: 'CASCADE',
+ nullable: true,
+ })
+ @JoinColumn({ name: 'targetApplicationId' })
+ targetApplication: Relation<ApplicationEntity> | null;
+
@CreateDateColumn({ type: 'timestamptz' })
createdAt: Date;
diff --git a/packages/twenty-server/src/engine/metadata-modules/role-target/utils/from-create-role-target-input-to-flat-role-target-to-create.util.ts b/packages/twenty-server/src/engine/metadata-modules/role-target/utils/from-create-role-target-input-to-flat-role-target-to-create.util.ts
index cf4730126af..15bdfd0d188 100644
--- a/packages/twenty-server/src/engine/metadata-modules/role-target/utils/from-create-role-target-input-to-flat-role-target-to-create.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/role-target/utils/from-create-role-target-input-to-flat-role-target-to-create.util.ts
@@ -66,6 +66,8 @@ export const fromCreateRoleTargetInputToFlatRoleTargetToCreate = ({
apiKeyId: null,
webhookId: null,
webhookUniversalIdentifier,
+ targetApplicationId: null,
+ targetApplicationUniversalIdentifier: null,
createdAt: now.toISOString(),
updatedAt: now.toISOString(),
universalIdentifier: universalIdentifier ?? v4(),
diff --git a/packages/twenty-server/src/engine/metadata-modules/role/role.entity.ts b/packages/twenty-server/src/engine/metadata-modules/role/role.entity.ts
index 16b8290f1c6..72457fe0343 100644
--- a/packages/twenty-server/src/engine/metadata-modules/role/role.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/role/role.entity.ts
@@ -9,6 +9,7 @@ import {
UpdateDateColumn,
} from 'typeorm';
+import { ADD_APPLICATION_ROLE_TARGET_UPGRADE_COMMAND_NAME } from 'src/database/commands/upgrade-version-command/2-55/add-application-role-target-upgrade-command-name.constant';
import { ADD_AGENT_CHAT_CHANNEL_UPGRADE_COMMAND_NAME } from 'src/database/commands/upgrade-version-command/2-51/add-agent-chat-channel-upgrade-command-name.constant';
import { WasIntroducedInUpgrade } from 'src/engine/core-modules/upgrade/decorators/was-introduced-in-upgrade.decorator';
import { FieldPermissionEntity } from 'src/engine/metadata-modules/object-permission/field-permission/field-permission.entity';
@@ -77,6 +78,12 @@ export class RoleEntity extends SyncableEntity implements Required<RoleEntity> {
@Column({ nullable: false, default: true })
canBeAssignedToApiKeys: boolean;
+ @WasIntroducedInUpgrade({
+ upgradeCommandName: ADD_APPLICATION_ROLE_TARGET_UPGRADE_COMMAND_NAME,
+ })
+ @Column({ nullable: false, default: false })
+ canBeAssignedToApplications: boolean;
+
@OneToMany(
() => RoleTargetEntity,
(roleTargets: RoleTargetEntity) => roleTargets.role,
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/role-metadata/create-standard-role-flat-metadata.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/role-metadata/create-standard-role-flat-metadata.util.ts
index 328fd4994c6..c1efdb8d010 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/role-metadata/create-standard-role-flat-metadata.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/role-metadata/create-standard-role-flat-metadata.util.ts
@@ -69,6 +69,7 @@ export const createStandardRoleFlatMetadata = ({
canBeAssignedToUsers,
canBeAssignedToAgents,
canBeAssignedToApiKeys,
+ canBeAssignedToApplications: false,
workspaceId,
applicationId: twentyStandardApplicationId,
applicationUniversalIdentifier:
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service.ts
index 7012c4e08ee..b567bd47b64 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service.ts
@@ -19,6 +19,7 @@ import { AllFlatEntityOperationByMetadataName } from 'src/engine/metadata-module
import { getFlatEntityMapsExceptionContext } from 'src/engine/metadata-modules/flat-entity/utils/get-flat-entity-maps-exception-context.util';
import { transpileFlatEntityOperationArrayToRecord } from 'src/engine/metadata-modules/flat-entity/utils/transpile-flat-entity-operation-array-to-record.util';
import { MetadataSideEffectEngineService } from 'src/engine/metadata-modules/metadata-side-effect/services/metadata-side-effect-engine.service';
+import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
import { MetadataEventEmitter } from 'src/engine/subscriptions/metadata-event/metadata-event-emitter';
import { WorkspaceMigrationV2Exception } from 'src/engine/workspace-manager/workspace-migration.exception';
import {
@@ -89,6 +90,7 @@ export class WorkspaceMigrationValidateBuildAndRunService {
private readonly metricsService: MetricsService,
private readonly logger: LoggerService,
private readonly applicationService: ApplicationService,
+ private readonly workspaceCacheService: WorkspaceCacheService,
twentyConfigService: TwentyConfigService,
) {
const logLevels = twentyConfigService.get('LOG_LEVELS');
@@ -121,6 +123,11 @@ export class WorkspaceMigrationValidateBuildAndRunService {
{ workspaceId: buildArgs.workspaceId },
);
+ const { flatApplicationMaps } =
+ await this.workspaceCacheService.getOrRecompute(buildArgs.workspaceId, [
+ 'flatApplicationMaps',
+ ]);
+
const buildStart = performance.now();
const validateAndBuildResult =
await this.workspaceMigrationBuildOrchestratorService
@@ -130,6 +137,7 @@ export class WorkspaceMigrationValidateBuildAndRunService {
...buildArgs.buildOptions,
workspaceCustomApplicationUniversalIdentifier:
workspaceCustomFlatApplication.universalIdentifier,
+ flatApplicationMaps,
},
})
.catch((error) => {
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-role-target.type.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-role-target.type.ts
index c75b0c65f38..97b37457883 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-role-target.type.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-role-target.type.ts
@@ -1,7 +1,9 @@
import { type RoleTargetEntity } from 'src/engine/metadata-modules/role-target/role-target.entity';
import { type UniversalFlatEntityFrom } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-entity-from.type';
-export type UniversalFlatRoleTarget = UniversalFlatEntityFrom<
- RoleTargetEntity,
- 'roleTarget'
->;
+export type UniversalFlatRoleTarget = Omit<
+ UniversalFlatEntityFrom<RoleTargetEntity, 'roleTarget'>,
+ 'targetApplicationId'
+> & {
+ targetApplicationUniversalIdentifier: string | null;
+};
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-builder-options.type.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-builder-options.type.ts
index d1817f007e0..936452b7ed9 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-builder-options.type.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-builder-options.type.ts
@@ -1,3 +1,4 @@
+import { type FlatApplicationCacheMaps } from 'src/engine/core-modules/application/types/flat-application-cache-maps.type';
import { type InferDeletionFromMissingEntities } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/infer-deletion-from-missing-entities.type';
export type WorkspaceMigrationBuilderOptions = {
@@ -7,8 +8,9 @@ export type WorkspaceMigrationBuilderOptions = {
applicationDefaultRoleUniversalIdentifier?: string;
};
-// The migration runner resolves the workspace Custom application for every build.
+// The migration runner resolves the workspace Custom application and the application maps for every build.
export type WorkspaceMigrationValidationBuildOptions =
WorkspaceMigrationBuilderOptions & {
workspaceCustomApplicationUniversalIdentifier: string;
+ flatApplicationMaps: FlatApplicationCacheMaps;
};
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/__tests__/flat-mcp-server-validator.service.spec.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/__tests__/flat-mcp-server-validator.service.spec.ts
index 3e8e98b9279..f22d59402fd 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/__tests__/flat-mcp-server-validator.service.spec.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/__tests__/flat-mcp-server-validator.service.spec.ts
@@ -110,6 +110,7 @@ const buildValidationArgs = (
applicationUniversalIdentifier: APPLICATION_UNIVERSAL_IDENTIFIER,
workspaceCustomApplicationUniversalIdentifier:
WORKSPACE_CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER,
+ flatApplicationMaps: { byId: {}, idByUniversalIdentifier: {} },
},
};
};
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/__tests__/flat-settings-menu-item-validator.service.spec.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/__tests__/flat-settings-menu-item-validator.service.spec.ts
index 9380914c30c..a767bc3a66a 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/__tests__/flat-settings-menu-item-validator.service.spec.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/__tests__/flat-settings-menu-item-validator.service.spec.ts
@@ -90,6 +90,7 @@ const buildCommonValidationArgs = (
applicationUniversalIdentifier: APPLICATION_UNIVERSAL_IDENTIFIER,
workspaceCustomApplicationUniversalIdentifier:
WORKSPACE_CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER,
+ flatApplicationMaps: { byId: {}, idByUniversalIdentifier: {} },
},
};
};
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/__tests__/flat-skill-validator.service.spec.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/__tests__/flat-skill-validator.service.spec.ts
index 67af894c8be..3c4f870610c 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/__tests__/flat-skill-validator.service.spec.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/__tests__/flat-skill-validator.service.spec.ts
@@ -62,6 +62,7 @@ const validateWorkspaceUpdate = (
WORKSPACE_CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER,
workspaceCustomApplicationUniversalIdentifier:
WORKSPACE_CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER,
+ flatApplicationMaps: { byId: {}, idByUniversalIdentifier: {} },
},
flatEntityUpdate,
universalIdentifier: standardSkill.universalIdentifier,
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-role-target-validator.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-role-target-validator.service.ts
index 511a5999c0a..a9521ee14a6 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-role-target-validator.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-role-target-validator.service.ts
@@ -10,6 +10,7 @@ import { FailedFlatEntityValidation } from 'src/engine/workspace-manager/workspa
import { getEmptyFlatEntityValidationError } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/utils/get-flat-entity-validation-error.util';
import { FlatEntityUpdateValidationArgs } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/universal-flat-entity-update-validation-args.type';
import { UniversalFlatEntityValidationArgs } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/universal-flat-entity-validation-args.type';
+import { validateFlatRoleTargetApplicationTarget } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-flat-role-target-application-target.util';
import { validateFlatRoleTargetAssignationAvailability } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-flat-role-target-assignation-availability.util';
import { validateFlatRoleTargetRoleIsEntitled } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-flat-role-target-role-is-entitled.util';
import { validateFlatRoleTargetTargetsOnlyOneEntity } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-flat-role-target-targets-only-one-entity.util';
@@ -71,6 +72,12 @@ export class FlatRoleTargetValidatorService {
flatRole: referencedRole,
flatRoleTarget: flatRoleTargetToValidate,
}),
+ ...validateFlatRoleTargetApplicationTarget({
+ flatRole: referencedRole,
+ flatRoleTarget: flatRoleTargetToValidate,
+ flatRoleTargetMaps: optimisticFlatRoleTargetMaps,
+ buildOptions,
+ }),
);
const entitlementError = validateFlatRoleTargetRoleIsEntitled({
@@ -188,6 +195,12 @@ export class FlatRoleTargetValidatorService {
flatRole: referencedRole,
flatRoleTarget: updatedFlatRoleTarget,
}),
+ ...validateFlatRoleTargetApplicationTarget({
+ flatRole: referencedRole,
+ flatRoleTarget: updatedFlatRoleTarget,
+ flatRoleTargetMaps: optimisticFlatRoleTargetMaps,
+ buildOptions,
+ }),
);
if (
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-flat-role-target-application-target.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-flat-role-target-application-target.util.ts
new file mode 100644
index 00000000000..3a98929c222
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-flat-role-target-application-target.util.ts
@@ -0,0 +1,112 @@
+import { msg, t } from '@lingui/core/macro';
+import { isDefined } from 'twenty-shared/utils';
+
+import { findActiveFlatApplicationByUniversalIdentifier } from 'src/engine/core-modules/application/utils/find-active-flat-application-by-universal-identifier.util';
+import { isOAuthOnlyApplication } from 'src/engine/core-modules/application/utils/is-oauth-only-application.util';
+import { RoleTargetExceptionCode } from 'src/engine/metadata-modules/role/exceptions/role-target.exception';
+import { TWENTY_STANDARD_APPLICATION } from 'src/engine/workspace-manager/twenty-standard-application/constants/twenty-standard-applications';
+import { type MetadataUniversalFlatEntityMaps } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/metadata-universal-flat-entity-maps.type';
+import { type UniversalFlatRole } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-role.type';
+import { type UniversalFlatRoleTarget } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-role-target.type';
+import { type FlatEntityValidationError } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/types/failed-flat-entity-validation.type';
+import { type WorkspaceMigrationValidationBuildOptions } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-builder-options.type';
+
+type ValidateFlatRoleTargetApplicationTargetArgs = {
+ flatRole: UniversalFlatRole;
+ flatRoleTarget: UniversalFlatRoleTarget;
+ flatRoleTargetMaps: MetadataUniversalFlatEntityMaps<'roleTarget'>;
+ buildOptions: WorkspaceMigrationValidationBuildOptions;
+};
+
+export const validateFlatRoleTargetApplicationTarget = ({
+ flatRole,
+ flatRoleTarget,
+ flatRoleTargetMaps,
+ buildOptions: {
+ applicationUniversalIdentifier,
+ workspaceCustomApplicationUniversalIdentifier,
+ flatApplicationMaps,
+ },
+}: ValidateFlatRoleTargetApplicationTargetArgs): FlatEntityValidationError[] => {
+ const { targetApplicationUniversalIdentifier } = flatRoleTarget;
+
+ if (!isDefined(targetApplicationUniversalIdentifier)) {
+ return [];
+ }
+
+ const errors: FlatEntityValidationError[] = [];
+
+ if (
+ applicationUniversalIdentifier !==
+ workspaceCustomApplicationUniversalIdentifier ||
+ flatRoleTarget.applicationUniversalIdentifier !==
+ workspaceCustomApplicationUniversalIdentifier
+ ) {
+ errors.push({
+ code: RoleTargetExceptionCode.ROLE_CANNOT_BE_ASSIGNED_TO_ENTITY,
+ message: t`Only the workspace custom application can assign roles to applications`,
+ userFriendlyMessage: msg`Only the workspace can assign roles to applications`,
+ });
+ }
+
+ if (
+ flatRole.applicationUniversalIdentifier !==
+ workspaceCustomApplicationUniversalIdentifier
+ ) {
+ const roleLabel = flatRole.label;
+
+ errors.push({
+ code: RoleTargetExceptionCode.ROLE_CANNOT_BE_ASSIGNED_TO_ENTITY,
+ message: t`Role "${roleLabel}" must be owned by the workspace custom application to be assigned to an application`,
+ userFriendlyMessage: msg`Role "${roleLabel}" cannot be assigned to applications`,
+ });
+ }
+
+ const targetFlatApplication = findActiveFlatApplicationByUniversalIdentifier(
+ flatApplicationMaps,
+ targetApplicationUniversalIdentifier,
+ );
+
+ if (!isDefined(targetFlatApplication)) {
+ errors.push({
+ code: RoleTargetExceptionCode.INVALID_ROLE_TARGET_DATA,
+ message: t`Target application not found`,
+ userFriendlyMessage: msg`Target application not found`,
+ });
+ } else if (
+ targetApplicationUniversalIdentifier ===
+ TWENTY_STANDARD_APPLICATION.universalIdentifier ||
+ targetApplicationUniversalIdentifier ===
+ workspaceCustomApplicationUniversalIdentifier ||
+ isOAuthOnlyApplication(targetFlatApplication)
+ ) {
+ const applicationName = targetFlatApplication.name;
+
+ errors.push({
+ code: RoleTargetExceptionCode.ROLE_CANNOT_BE_ASSIGNED_TO_ENTITY,
+ message: t`Application "${applicationName}" cannot be assigned a role: only installed applications can`,
+ userFriendlyMessage: msg`Application "${applicationName}" cannot be assigned a role`,
+ });
+ }
+
+ const hasOtherRoleTargetForSameApplication = Object.values(
+ flatRoleTargetMaps.byUniversalIdentifier,
+ ).some(
+ (otherFlatRoleTarget) =>
+ isDefined(otherFlatRoleTarget) &&
+ otherFlatRoleTarget.universalIdentifier !==
+ flatRoleTarget.universalIdentifier &&
+ otherFlatRoleTarget.targetApplicationUniversalIdentifier ===
+ targetApplicationUniversalIdentifier,
+ );
+
+ if (hasOtherRoleTargetForSameApplication) {
+ errors.push({
+ code: RoleTargetExceptionCode.INVALID_ROLE_TARGET_DATA,
+ message: t`Application already has a role assigned`,
+ userFriendlyMessage: msg`Application already has a role assigned`,
+ });
+ }
+
+ return errors;
+};
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-flat-role-target-assignation-availability.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-flat-role-target-assignation-availability.util.ts
index 1a667ba8d15..e4ec79bc659 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-flat-role-target-assignation-availability.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-flat-role-target-assignation-availability.util.ts
@@ -50,6 +50,14 @@ export const validateFlatRoleTargetAssignationAvailability = ({
userFriendlyMessage: msg`Role "${roleLabel}" cannot be assigned to webhooks`,
});
}
+ } else if (isDefined(flatRoleTarget.targetApplicationUniversalIdentifier)) {
+ if (!flatRole.canBeAssignedToApplications) {
+ errors.push({
+ code: RoleTargetExceptionCode.ROLE_CANNOT_BE_ASSIGNED_TO_ENTITY,
+ message: t`Role "${roleLabel}" cannot be assigned to applications`,
+ userFriendlyMessage: msg`Role "${roleLabel}" cannot be assigned to applications`,
+ });
+ }
}
return errors;
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-flat-role-target-targets-only-one-entity.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-flat-role-target-targets-only-one-entity.util.ts
index 23d7f4016d4..c4bff691b41 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-flat-role-target-targets-only-one-entity.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-flat-role-target-targets-only-one-entity.util.ts
@@ -15,6 +15,7 @@ export const validateFlatRoleTargetTargetsOnlyOneEntity = ({
const definedIdentifiersCount = [
isDefined(flatRoleTarget.apiKeyId),
isDefined(flatRoleTarget.webhookUniversalIdentifier),
+ isDefined(flatRoleTarget.targetApplicationUniversalIdentifier),
isDefined(flatRoleTarget.userWorkspaceId),
isDefined(flatRoleTarget.agentUniversalIdentifier),
].filter(Boolean).length;
@@ -22,8 +23,8 @@ export const validateFlatRoleTargetTargetsOnlyOneEntity = ({
if (definedIdentifiersCount !== 1) {
errors.push({
code: RoleTargetExceptionCode.ROLE_TARGET_MISSING_IDENTIFIER,
- message: t`Role target must have exactly one of: apiKeyId, userWorkspaceId, agentUniversalIdentifier, or webhookUniversalIdentifier`,
- userFriendlyMessage: msg`Role target must have exactly one of: apiKeyId, userWorkspaceId, agentUniversalIdentifier, or webhookUniversalIdentifier`,
+ message: t`Role target must have exactly one of: apiKeyId, userWorkspaceId, agentUniversalIdentifier, webhookUniversalIdentifier, or targetApplicationUniversalIdentifier`,
+ userFriendlyMessage: msg`Role target must have exactly one of: apiKeyId, userWorkspaceId, agentUniversalIdentifier, webhookUniversalIdentifier, or targetApplicationUniversalIdentifier`,
});
}
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/role-target/services/create-role-target-action-handler.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/role-target/services/create-role-target-action-handler.service.ts
index 0f5cabb36ab..e29c80645f0 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/role-target/services/create-role-target-action-handler.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/role-target/services/create-role-target-action-handler.service.ts
@@ -1,15 +1,22 @@
import { Injectable } from '@nestjs/common';
+import { isDefined } from 'twenty-shared/utils';
import { v4 } from 'uuid';
import { WorkspaceMigrationRunnerActionHandler } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/interfaces/workspace-migration-runner-action-handler-service.interface';
+import { findActiveFlatApplicationByUniversalIdentifier } from 'src/engine/core-modules/application/utils/find-active-flat-application-by-universal-identifier.util';
+import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
import { getUniversalFlatEntityEmptyForeignKeyAggregators } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/utils/reset-universal-flat-entity-foreign-key-aggregators.util';
import { resolveUniversalRelationIdentifiersToIds } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/utils/resolve-universal-relation-identifiers-to-ids.util';
import {
FlatCreateRoleTargetAction,
UniversalCreateRoleTargetAction,
} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/role-target/types/workspace-migration-role-target-action.type';
+import {
+ WorkspaceMigrationRunnerException,
+ WorkspaceMigrationRunnerExceptionCode,
+} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/exceptions/workspace-migration-runner.exception';
import {
WorkspaceMigrationActionRunnerArgs,
WorkspaceMigrationActionRunnerContext,
@@ -20,6 +27,10 @@ export class CreateRoleTargetActionHandlerService extends WorkspaceMigrationRunn
'create',
'roleTarget',
) {
+ constructor(private readonly workspaceCacheService: WorkspaceCacheService) {
+ super();
+ }
+
override async transpileUniversalActionToFlatAction({
action,
allFlatEntityMaps,
@@ -47,6 +58,11 @@ export class CreateRoleTargetActionHandlerService extends WorkspaceMigrationRunn
roleId,
agentId,
webhookId,
+ targetApplicationId: await this.resolveTargetApplicationId({
+ workspaceId,
+ targetApplicationUniversalIdentifier:
+ action.flatEntity.targetApplicationUniversalIdentifier,
+ }),
applicationId: flatApplication.id,
id: action.id ?? v4(),
workspaceId,
@@ -55,6 +71,38 @@ export class CreateRoleTargetActionHandlerService extends WorkspaceMigrationRunn
};
}
+ private async resolveTargetApplicationId({
+ workspaceId,
+ targetApplicationUniversalIdentifier,
+ }: {
+ workspaceId: string;
+ targetApplicationUniversalIdentifier: string | null;
+ }): Promise<string | null> {
+ if (!isDefined(targetApplicationUniversalIdentifier)) {
+ return null;
+ }
+
+ const { flatApplicationMaps } =
+ await this.workspaceCacheService.getOrRecompute(workspaceId, [
+ 'flatApplicationMaps',
+ ]);
+
+ const targetFlatApplication =
+ findActiveFlatApplicationByUniversalIdentifier(
+ flatApplicationMaps,
+ targetApplicationUniversalIdentifier,
+ );
+
+ if (!isDefined(targetFlatApplication)) {
+ throw new WorkspaceMigrationRunnerException({
+ message: `Could not find target application with universal identifier: ${targetApplicationUniversalIdentifier}`,
+ code: WorkspaceMigrationRunnerExceptionCode.APPLICATION_NOT_FOUND,
+ });
+ }
+
+ return targetFlatApplication.id;
+ }
+
async executeForMetadata(
context: WorkspaceMigrationActionRunnerContext<FlatCreateRoleTargetAction>,
): Promise<void> {
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/workspace-schema-migration-runner-action-handlers.module.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/workspace-schema-migration-runner-action-handlers.module.ts
index 8033066403f..d1d3248db17 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/workspace-schema-migration-runner-action-handlers.module.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/workspace-schema-migration-runner-action-handlers.module.ts
@@ -132,6 +132,7 @@ import { DeleteWorkflowRunsDeferredActionHandlerWorkspaceService } from 'src/eng
import { ValidateForeignKeyDeferredActionHandlerService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/deferred-action-handlers/services/validate-foreign-key-deferred-action-handler.service';
import { SecretEncryptionModule } from 'src/engine/core-modules/secret-encryption/secret-encryption.module';
import { WorkflowDeletionModule } from 'src/modules/workflow/workflow-deletion/workflow-deletion.module';
+import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';
@Module({
imports: [
@@ -139,6 +140,7 @@ import { WorkflowDeletionModule } from 'src/modules/workflow/workflow-deletion/w
MetricsModule,
SecretEncryptionModule,
WorkflowDeletionModule,
+ WorkspaceCacheModule,
],
providers: [
CreateWorkflowActionHandlerService,
diff --git a/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/successful-sync-application-workspace-migration.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/successful-sync-application-workspace-migration.integration-spec.ts.snap
index cfc2111f20d..fde283aea90 100644
--- a/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/successful-sync-application-workspace-migration.integration-spec.ts.snap
+++ b/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/successful-sync-application-workspace-migration.integration-spec.ts.snap
@@ -89,6 +89,7 @@ exports[`syncApplication should create a TEXT field on the standard Company obje
"canAccessAllTools": false,
"canBeAssignedToAgents": true,
"canBeAssignedToApiKeys": true,
+ "canBeAssignedToApplications": false,
"canBeAssignedToUsers": true,
"canDestroyAllObjectRecords": false,
"canReadAllObjectRecords": false,
@@ -1290,6 +1291,7 @@ exports[`syncApplication should delete old field and create equivalent one when
"canAccessAllTools": false,
"canBeAssignedToAgents": true,
"canBeAssignedToApiKeys": true,
+ "canBeAssignedToApplications": false,
"canBeAssignedToUsers": true,
"canDestroyAllObjectRecords": false,
"canReadAllObjectRecords": false,
@@ -3026,6 +3028,7 @@ exports[`syncApplication should return workspace migration actions on initial sy
"canAccessAllTools": false,
"canBeAssignedToAgents": true,
"canBeAssignedToApiKeys": true,
+ "canBeAssignedToApplications": false,
"canBeAssignedToUsers": true,
"canDestroyAllObjectRecords": false,
"canReadAllObjectRecords": false,