The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Derive permission universal identifiers from their role and target (#25966)
Weiko73977239272d
diff --git a/packages/twenty-sdk/src/cli/__tests__/apps/rich-app/__integration__/app-dev/expected-manifest.ts b/packages/twenty-sdk/src/cli/__tests__/apps/rich-app/__integration__/app-dev/expected-manifest.tsindex 79c32e16369..eaf6d822719 100644--- a/packages/twenty-sdk/src/cli/__tests__/apps/rich-app/__integration__/app-dev/expected-manifest.ts+++ b/packages/twenty-sdk/src/cli/__tests__/apps/rich-app/__integration__/app-dev/expected-manifest.ts@@ -699,7 +699,7 @@ export const EXPECTED_MANIFEST: Manifest = {description: 'Default role for function Twenty client',fieldPermissions: [{- universalIdentifier: 'dbc86ced-bd2c-5874-93f1-1f72c5111991',+ universalIdentifier: 'd0b74fcb-3993-5ff9-bbd6-d76ea9b6493f',canReadFieldValue: false,canUpdateFieldValue: false,fieldUniversalIdentifier: '58a0a314-d7ea-4865-9850-7fb84e72f30b',@@ -709,7 +709,7 @@ export const EXPECTED_MANIFEST: Manifest = {label: 'Default function role',objectPermissions: [{- universalIdentifier: '99c7c326-04ca-5c8b-ad11-da6c5b819813',+ universalIdentifier: 'fab82874-880a-556f-93d9-626610bb0770',canDestroyObjectRecords: false,canReadObjectRecords: true,canSoftDeleteObjectRecords: false,@@ -717,7 +717,7 @@ export const EXPECTED_MANIFEST: Manifest = {objectUniversalIdentifier: '54b589ca-eeed-4950-a176-358418b85c05',},{- universalIdentifier: 'd92786b1-eedb-50f6-9397-7a6c2591578a',+ universalIdentifier: '518fbc62-c198-5e31-8df8-c79402aa84b4',canDestroyObjectRecords: false,canReadObjectRecords: true,canSoftDeleteObjectRecords: false,diff --git a/packages/twenty-sdk/src/cli/utilities/build/manifest/manifest-build.ts b/packages/twenty-sdk/src/cli/utilities/build/manifest/manifest-build.tsindex b31e17e8ed8..105fbc9aeaa 100644--- a/packages/twenty-sdk/src/cli/utilities/build/manifest/manifest-build.ts+++ b/packages/twenty-sdk/src/cli/utilities/build/manifest/manifest-build.ts@@ -103,6 +103,7 @@ export const buildManifest = async (let applicationConfig: ApplicationConfig | undefined;const objectConfigs: ObjectConfig[] = [];+ const roleConfigs: RoleConfig[] = [];const objects: ObjectManifest[] = [];const fields: FieldManifest[] = [];const indexes: IndexManifest[] = [];@@ -221,8 +222,7 @@ export const buildManifest = async (appPath,filePath,});- const roleConfig = fromRoleConfigToRoleManifest(extract.config);- roles.push(roleConfig);+ roleConfigs.push(extract.config);errors.push(...extract.errors);warnings.push(...(extract.warnings ?? []));rolesFilePaths.push(relativePath);@@ -582,6 +582,15 @@ export const buildManifest = async (objects.push(objectManifest);}++ for (const roleConfig of roleConfigs) {+ roles.push(+ fromRoleConfigToRoleManifest({+ roleConfig,+ applicationUniversalIdentifier: applicationConfig.universalIdentifier,+ }),+ );+ }}if (postInstallLogicFunctions.length > 1) {diff --git a/packages/twenty-sdk/src/cli/utilities/build/manifest/utils/__tests__/from-role-config-to-role-manifest.spec.ts b/packages/twenty-sdk/src/cli/utilities/build/manifest/utils/__tests__/from-role-config-to-role-manifest.spec.tsindex 6ef4319cc66..72645242253 100644--- a/packages/twenty-sdk/src/cli/utilities/build/manifest/utils/__tests__/from-role-config-to-role-manifest.spec.ts+++ b/packages/twenty-sdk/src/cli/utilities/build/manifest/utils/__tests__/from-role-config-to-role-manifest.spec.ts@@ -4,19 +4,94 @@ import {RowLevelPermissionPredicateGroupLogicalOperator,RowLevelPermissionPredicateOperand,} from '@/sdk/define';+import {+ getFieldPermissionUniversalIdentifier,+ getObjectPermissionUniversalIdentifier,+} from 'twenty-shared/application';+const APPLICATION_UNIVERSAL_IDENTIFIER = '5a0c6f3e-8d2b-4c1a-9e7f-3b4d5c6e7f80';const ROLE_UNIVERSAL_IDENTIFIER = 'c3c1dc2e-1a08-4de5-abb7-2139b3d99343';const OBJECT_UNIVERSAL_IDENTIFIER = '39101b39-1c16-4148-9e82-45dc271bb90d';const FIELD_UNIVERSAL_IDENTIFIER = '0e49f2e4-1e45-433d-bf49-79acc0b06d0e';const PREDICATE_UNIVERSAL_IDENTIFIER = '22222222-0000-4000-8000-000000000000';const GROUP_UNIVERSAL_IDENTIFIER = '11111111-0000-4000-8000-000000000000';+const OBJECT_PERMISSION_UNIVERSAL_IDENTIFIER =+ '33333333-0000-4000-8000-000000000000';+const FIELD_PERMISSION_UNIVERSAL_IDENTIFIER =+ '44444444-0000-4000-8000-000000000000';const baseConfig: RoleConfig = {universalIdentifier: ROLE_UNIVERSAL_IDENTIFIER,label: 'Partner',};+const convert = (roleConfig: RoleConfig) =>+ fromRoleConfigToRoleManifest({+ roleConfig,+ applicationUniversalIdentifier: APPLICATION_UNIVERSAL_IDENTIFIER,+ });+describe('fromRoleConfigToRoleManifest', () => {+ it('derives the universalIdentifier of object and field permissions that omit it', () => {+ const manifest = convert({+ ...baseConfig,+ objectPermissions: [+ {+ objectUniversalIdentifier: OBJECT_UNIVERSAL_IDENTIFIER,+ canReadObjectRecords: true,+ },+ ],+ fieldPermissions: [+ {+ objectUniversalIdentifier: OBJECT_UNIVERSAL_IDENTIFIER,+ fieldUniversalIdentifier: FIELD_UNIVERSAL_IDENTIFIER,+ canReadFieldValue: false,+ },+ ],+ });++ expect(manifest.objectPermissions?.[0]?.universalIdentifier).toBe(+ getObjectPermissionUniversalIdentifier({+ applicationUniversalIdentifier: APPLICATION_UNIVERSAL_IDENTIFIER,+ roleUniversalIdentifier: ROLE_UNIVERSAL_IDENTIFIER,+ objectUniversalIdentifier: OBJECT_UNIVERSAL_IDENTIFIER,+ }),+ );+ expect(manifest.fieldPermissions?.[0]?.universalIdentifier).toBe(+ getFieldPermissionUniversalIdentifier({+ applicationUniversalIdentifier: APPLICATION_UNIVERSAL_IDENTIFIER,+ roleUniversalIdentifier: ROLE_UNIVERSAL_IDENTIFIER,+ fieldUniversalIdentifier: FIELD_UNIVERSAL_IDENTIFIER,+ }),+ );+ });++ it('keeps the universalIdentifier an object or field permission provides', () => {+ const manifest = convert({+ ...baseConfig,+ objectPermissions: [+ {+ universalIdentifier: OBJECT_PERMISSION_UNIVERSAL_IDENTIFIER,+ objectUniversalIdentifier: OBJECT_UNIVERSAL_IDENTIFIER,+ },+ ],+ fieldPermissions: [+ {+ universalIdentifier: FIELD_PERMISSION_UNIVERSAL_IDENTIFIER,+ objectUniversalIdentifier: OBJECT_UNIVERSAL_IDENTIFIER,+ fieldUniversalIdentifier: FIELD_UNIVERSAL_IDENTIFIER,+ },+ ],+ });++ expect(manifest.objectPermissions?.[0]?.universalIdentifier).toBe(+ OBJECT_PERMISSION_UNIVERSAL_IDENTIFIER,+ );+ expect(manifest.fieldPermissions?.[0]?.universalIdentifier).toBe(+ FIELD_PERMISSION_UNIVERSAL_IDENTIFIER,+ );+ });+it('passes predicates through with their explicit universalIdentifier', () => {const config: RoleConfig = {...baseConfig,@@ -30,7 +105,7 @@ describe('fromRoleConfigToRoleManifest', () => {],};- const manifest = fromRoleConfigToRoleManifest(config);+ const manifest = convert(config);const predicate = manifest.rowLevelPermissionPredicates?.[0];expect(predicate?.universalIdentifier).toBe(PREDICATE_UNIVERSAL_IDENTIFIER);@@ -53,7 +128,7 @@ describe('fromRoleConfigToRoleManifest', () => {],};- const manifest = fromRoleConfigToRoleManifest(config);+ const manifest = convert(config);expect(manifest.rowLevelPermissionPredicateGroups).toHaveLength(1);expect(@@ -62,7 +137,7 @@ describe('fromRoleConfigToRoleManifest', () => {});it('defaults predicate collections to empty arrays', () => {- const manifest = fromRoleConfigToRoleManifest(baseConfig);+ const manifest = convert(baseConfig);expect(manifest.rowLevelPermissionPredicates).toEqual([]);expect(manifest.rowLevelPermissionPredicateGroups).toEqual([]);diff --git a/packages/twenty-sdk/src/cli/utilities/build/manifest/utils/from-role-config-to-role-manifest.ts b/packages/twenty-sdk/src/cli/utilities/build/manifest/utils/from-role-config-to-role-manifest.tsindex ba169975336..13b8e0e8fae 100644--- a/packages/twenty-sdk/src/cli/utilities/build/manifest/utils/from-role-config-to-role-manifest.ts+++ b/packages/twenty-sdk/src/cli/utilities/build/manifest/utils/from-role-config-to-role-manifest.ts@@ -1,31 +1,42 @@import { type RoleConfig } from '@/sdk/define/roles/role-config';-import { type RoleManifest } from 'twenty-shared/application';-import { v5 as uuidv5 } from 'uuid';+import {+ getFieldPermissionUniversalIdentifier,+ getObjectPermissionUniversalIdentifier,+ type RoleManifest,+} from 'twenty-shared/application';-const ROLE_UNIVERSAL_IDENTIFIER_NAMESPACE =- 'b403ec59-4d80-4f22-85e6-717a192dc9cb';--export const fromRoleConfigToRoleManifest = (- roleConfig: RoleConfig,-): RoleManifest => {+export const fromRoleConfigToRoleManifest = ({+ roleConfig,+ applicationUniversalIdentifier,+}: {+ roleConfig: RoleConfig;+ applicationUniversalIdentifier: string;+}): RoleManifest => {return {...roleConfig,objectPermissions: (roleConfig.objectPermissions ?? []).map((objectPermission) => ({...objectPermission,- universalIdentifier: uuidv5(- `${roleConfig.universalIdentifier}:${objectPermission.objectUniversalIdentifier}`,- ROLE_UNIVERSAL_IDENTIFIER_NAMESPACE,- ),+ universalIdentifier:+ objectPermission.universalIdentifier ??+ getObjectPermissionUniversalIdentifier({+ applicationUniversalIdentifier,+ roleUniversalIdentifier: roleConfig.universalIdentifier,+ objectUniversalIdentifier:+ objectPermission.objectUniversalIdentifier,+ }),}),),fieldPermissions: (roleConfig.fieldPermissions ?? []).map((fieldPermission) => ({...fieldPermission,- universalIdentifier: uuidv5(- `${roleConfig.universalIdentifier}:${fieldPermission.objectUniversalIdentifier}:${fieldPermission.fieldUniversalIdentifier}`,- ROLE_UNIVERSAL_IDENTIFIER_NAMESPACE,- ),+ universalIdentifier:+ fieldPermission.universalIdentifier ??+ getFieldPermissionUniversalIdentifier({+ applicationUniversalIdentifier,+ roleUniversalIdentifier: roleConfig.universalIdentifier,+ fieldUniversalIdentifier: fieldPermission.fieldUniversalIdentifier,+ }),}),),rowLevelPermissionPredicateGroups:diff --git a/packages/twenty-sdk/src/sdk/define/roles/role-config.ts b/packages/twenty-sdk/src/sdk/define/roles/role-config.tsindex e5d77f5655c..ef02c7b3055 100644--- a/packages/twenty-sdk/src/sdk/define/roles/role-config.ts+++ b/packages/twenty-sdk/src/sdk/define/roles/role-config.ts@@ -1,13 +1,3 @@-import type {- FieldPermissionManifest,- ObjectPermissionManifest,- RoleManifest,-} from 'twenty-shared/application';+import type { RoleManifest } from 'twenty-shared/application';-export type RoleConfig = Omit<- RoleManifest,- 'objectPermissions' | 'fieldPermissions'-> & {- objectPermissions?: Omit<ObjectPermissionManifest, 'universalIdentifier'>[];- fieldPermissions?: Omit<FieldPermissionManifest, 'universalIdentifier'>[];-};+export type RoleConfig = RoleManifest;diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/2-41-upgrade-version-command.module.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/2-41-upgrade-version-command.module.tsindex 7ae6d958dba..e98e49bcb99 100644--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/2-41-upgrade-version-command.module.ts+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/2-41-upgrade-version-command.module.ts@@ -11,6 +11,7 @@ import { MakeNotesAndTasksInheritTheirTargetsCommand } from 'src/database/commanimport { MoveMessageCampaignCommandsToCampaignFlagCommand } from 'src/database/commands/upgrade-version-command/2-41/2-41-workspace-command-1789468244000-move-message-campaign-commands-to-campaign-flag.command';import { RemoveSeeActiveVersionCommandMenuItemCommand } from 'src/database/commands/upgrade-version-command/2-41/2-41-workspace-command-1789470915878-remove-see-active-version-command-menu-item.command';import { NormalizeWorkflowRecordCrudRichTextFieldsCommand } from 'src/database/commands/upgrade-version-command/2-41/2-41-workspace-command-1789482628000-normalize-workflow-record-crud-rich-text-fields.command';+import { BackfillDeterministicPermissionUniversalIdentifiersCommand } from 'src/database/commands/upgrade-version-command/2-41/2-41-workspace-command-1789553327000-backfill-deterministic-permission-universal-identifiers.command';import { ApplicationModule } from 'src/engine/core-modules/application/application.module';import { WorkflowVersionCoreModule } from 'src/engine/core-modules/workflow/workflow-version-core.module';import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';@@ -40,6 +41,7 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspaceMoveMessageCampaignCommandsToCampaignFlagCommand,RemoveSeeActiveVersionCommandMenuItemCommand,NormalizeWorkflowRecordCrudRichTextFieldsCommand,+ BackfillDeterministicPermissionUniversalIdentifiersCommand,],})export class V2_41_UpgradeVersionCommandModule {}diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/2-41-workspace-command-1789553327000-backfill-deterministic-permission-universal-identifiers.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/2-41-workspace-command-1789553327000-backfill-deterministic-permission-universal-identifiers.command.tsnew file mode 100644index 00000000000..300c48e3ca5--- /dev/null+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/2-41-workspace-command-1789553327000-backfill-deterministic-permission-universal-identifiers.command.ts@@ -0,0 +1,200 @@+import { InjectDataSource } from '@nestjs/typeorm';++import { Command } from 'nest-commander';+import {+ getFieldPermissionUniversalIdentifier,+ getObjectPermissionUniversalIdentifier,+ getRolePermissionFlagUniversalIdentifier,+} from 'twenty-shared/application';+import { isDefined } from 'twenty-shared/utils';+import { DataSource } from 'typeorm';++import { ProvisionedWorkspaceCommandRunner } from 'src/database/commands/command-runners/provisioned-workspace.command-runner';+import { WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';+import { type RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspace.command-runner';+import { ApplicationService } from 'src/engine/core-modules/application/application.service';+import { RegisteredWorkspaceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-workspace-command.decorator';+import { type SyncableFlatEntity } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-from.type';+import { withDerivedFieldMetadataMaps } from 'src/engine/metadata-modules/flat-entity/utils/with-derived-field-metadata-maps.util';+import { FieldPermissionEntity } from 'src/engine/metadata-modules/object-permission/field-permission/field-permission.entity';+import { ObjectPermissionEntity } from 'src/engine/metadata-modules/object-permission/object-permission.entity';+import { RolePermissionFlagEntity } from 'src/engine/metadata-modules/role-permission-flag/role-permission-flag.entity';+import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';++type UniversalIdentifierUpdate = {+ id: string;+ universalIdentifier: string;+};++const computeUniversalIdentifierUpdates = <+ TFlatEntity extends SyncableFlatEntity,+>({+ flatEntities,+ getUniversalIdentifier,+}: {+ flatEntities: TFlatEntity[];+ getUniversalIdentifier: (flatEntity: TFlatEntity) => string;+}): UniversalIdentifierUpdate[] =>+ flatEntities+ .map((flatEntity) => ({+ flatEntity,+ universalIdentifier: getUniversalIdentifier(flatEntity),+ }))+ .filter(+ ({ flatEntity, universalIdentifier }) =>+ flatEntity.universalIdentifier !== universalIdentifier,+ )+ .map(({ flatEntity, universalIdentifier }) => ({+ id: flatEntity.id,+ universalIdentifier,+ }));++@RegisteredWorkspaceCommand('2.41.0', 1789553327000)+@Command({+ name: 'upgrade:2-41:backfill-deterministic-permission-universal-identifiers',+ description:+ 'Recompute the universal identifier of every role permission flag, and of object and field permissions owned by the workspace custom application, from their application, role and target.',+})+export class BackfillDeterministicPermissionUniversalIdentifiersCommand extends ProvisionedWorkspaceCommandRunner {+ constructor(+ protected readonly workspaceIteratorService: WorkspaceIteratorService,+ private readonly applicationService: ApplicationService,+ private readonly workspaceCacheService: WorkspaceCacheService,+ @InjectDataSource()+ private readonly coreDataSource: DataSource,+ ) {+ super(workspaceIteratorService);+ }++ override async runOnWorkspace({+ workspaceId,+ options,+ }: RunOnWorkspaceArgs): Promise<void> {+ const isDryRun = options.dryRun ?? false;++ const { workspaceCustomFlatApplication } =+ await this.applicationService.findWorkspaceTwentyStandardAndCustomApplicationOrThrow(+ { workspaceId },+ );++ const {+ flatObjectPermissionMaps,+ flatFieldPermissionMaps,+ flatRolePermissionFlagMaps,+ } = await this.workspaceCacheService.getOrRecompute(workspaceId, [+ 'flatObjectPermissionMaps',+ 'flatFieldPermissionMaps',+ 'flatRolePermissionFlagMaps',+ ]);++ const isOwnedByWorkspaceCustomApplication = (+ flatEntity: SyncableFlatEntity,+ ) => flatEntity.applicationId === workspaceCustomFlatApplication.id;++ const objectPermissionUpdates = computeUniversalIdentifierUpdates({+ flatEntities: Object.values(flatObjectPermissionMaps.byUniversalIdentifier)+ .filter(isDefined)+ .filter(isOwnedByWorkspaceCustomApplication),+ getUniversalIdentifier: (flatObjectPermission) =>+ getObjectPermissionUniversalIdentifier({+ applicationUniversalIdentifier:+ flatObjectPermission.applicationUniversalIdentifier,+ roleUniversalIdentifier: flatObjectPermission.roleUniversalIdentifier,+ objectUniversalIdentifier:+ flatObjectPermission.objectMetadataUniversalIdentifier,+ }),+ });++ const fieldPermissionUpdates = computeUniversalIdentifierUpdates({+ flatEntities: Object.values(flatFieldPermissionMaps.byUniversalIdentifier)+ .filter(isDefined)+ .filter(isOwnedByWorkspaceCustomApplication),+ getUniversalIdentifier: (flatFieldPermission) =>+ getFieldPermissionUniversalIdentifier({+ applicationUniversalIdentifier:+ flatFieldPermission.applicationUniversalIdentifier,+ roleUniversalIdentifier: flatFieldPermission.roleUniversalIdentifier,+ fieldUniversalIdentifier:+ flatFieldPermission.fieldMetadataUniversalIdentifier,+ }),+ });++ const rolePermissionFlagUpdates = computeUniversalIdentifierUpdates({+ flatEntities: Object.values(+ flatRolePermissionFlagMaps.byUniversalIdentifier,+ ).filter(isDefined),+ getUniversalIdentifier: (flatRolePermissionFlag) =>+ getRolePermissionFlagUniversalIdentifier({+ applicationUniversalIdentifier:+ flatRolePermissionFlag.applicationUniversalIdentifier,+ roleUniversalIdentifier: flatRolePermissionFlag.roleUniversalIdentifier,+ permissionFlagUniversalIdentifier:+ flatRolePermissionFlag.permissionFlagUniversalIdentifier,+ }),+ });++ const updateCount =+ objectPermissionUpdates.length ++ fieldPermissionUpdates.length ++ rolePermissionFlagUpdates.length;++ if (updateCount === 0) {+ this.logger.log(+ `No permission universal identifiers to backfill for workspace ${workspaceId}`,+ );++ return;+ }++ this.logger.log(+ `${isDryRun ? '[DRY RUN] ' : ''}Backfilling ${objectPermissionUpdates.length} object permission, ${fieldPermissionUpdates.length} field permission and ${rolePermissionFlagUpdates.length} role permission flag universal identifier(s) for workspace ${workspaceId}`,+ );++ if (isDryRun) {+ return;+ }++ await this.coreDataSource.transaction(async (entityManager) => {+ for (const { id, universalIdentifier } of objectPermissionUpdates) {+ await entityManager.update(+ ObjectPermissionEntity,+ { id, workspaceId },+ { universalIdentifier },+ );+ }++ for (const { id, universalIdentifier } of fieldPermissionUpdates) {+ await entityManager.update(+ FieldPermissionEntity,+ { id, workspaceId },+ { universalIdentifier },+ );+ }++ for (const { id, universalIdentifier } of rolePermissionFlagUpdates) {+ await entityManager.update(+ RolePermissionFlagEntity,+ { id, workspaceId },+ { universalIdentifier },+ );+ }+ });++ await this.workspaceCacheService.invalidateAndRecompute(+ workspaceId,+ withDerivedFieldMetadataMaps([+ 'flatObjectPermissionMaps',+ 'flatFieldPermissionMaps',+ 'flatRolePermissionFlagMaps',+ 'flatRoleMaps',+ 'flatPermissionFlagMaps',+ 'flatObjectMetadataMaps',+ 'flatFieldMetadataMaps',+ ]),+ );++ this.logger.log(+ `Backfilled ${updateCount} permission universal identifier(s) for workspace ${workspaceId}`,+ );+ }+}diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-field-permission-manifest-to-universal-flat-field-permission.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-field-permission-manifest-to-universal-flat-field-permission.util.tsindex 1bc066732ca..3b1761f24d2 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-field-permission-manifest-to-universal-flat-field-permission.util.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-field-permission-manifest-to-universal-flat-field-permission.util.ts@@ -1,4 +1,7 @@-import { type FieldPermissionManifest } from 'twenty-shared/application';+import {+ type FieldPermissionManifest,+ getFieldPermissionUniversalIdentifier,+} from 'twenty-shared/application';import { type UniversalFlatFieldPermission } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-field-permission.type';export const fromFieldPermissionManifestToUniversalFlatFieldPermission = ({@@ -13,7 +16,14 @@ export const fromFieldPermissionManifestToUniversalFlatFieldPermission = ({now: string;}): UniversalFlatFieldPermission => {return {- universalIdentifier: fieldPermissionManifest.universalIdentifier,+ universalIdentifier:+ fieldPermissionManifest.universalIdentifier ??+ getFieldPermissionUniversalIdentifier({+ applicationUniversalIdentifier,+ roleUniversalIdentifier,+ fieldUniversalIdentifier:+ fieldPermissionManifest.fieldUniversalIdentifier,+ }),applicationUniversalIdentifier,roleUniversalIdentifier,objectMetadataUniversalIdentifier:diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-object-permission-manifest-to-universal-flat-object-permission.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-object-permission-manifest-to-universal-flat-object-permission.util.tsindex e556e3dfda8..a3dcbcb8296 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-object-permission-manifest-to-universal-flat-object-permission.util.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-object-permission-manifest-to-universal-flat-object-permission.util.ts@@ -1,4 +1,7 @@-import { type ObjectPermissionManifest } from 'twenty-shared/application';+import {+ getObjectPermissionUniversalIdentifier,+ type ObjectPermissionManifest,+} from 'twenty-shared/application';import { type UniversalFlatObjectPermission } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-object-permission.type';export const fromObjectPermissionManifestToUniversalFlatObjectPermission = ({@@ -13,7 +16,14 @@ export const fromObjectPermissionManifestToUniversalFlatObjectPermission = ({now: string;}): UniversalFlatObjectPermission => {return {- universalIdentifier: objectPermissionManifest.universalIdentifier,+ universalIdentifier:+ objectPermissionManifest.universalIdentifier ??+ getObjectPermissionUniversalIdentifier({+ applicationUniversalIdentifier,+ roleUniversalIdentifier,+ objectUniversalIdentifier:+ objectPermissionManifest.objectUniversalIdentifier,+ }),applicationUniversalIdentifier,roleUniversalIdentifier,objectMetadataUniversalIdentifier:diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-permission-flag-to-universal-flat-role-permission-flag.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-permission-flag-to-universal-flat-role-permission-flag.util.tsindex 1bab442cdaf..2d26e561f12 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-permission-flag-to-universal-flat-role-permission-flag.util.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-permission-flag-to-universal-flat-role-permission-flag.util.ts@@ -1,10 +1,7 @@-import { v5 } from 'uuid';+import { getRolePermissionFlagUniversalIdentifier } from 'twenty-shared/application';import { type UniversalFlatRolePermissionFlag } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-role-permission-flag.type';-export const ROLE_PERMISSION_FLAG_UUID_NAMESPACE =- 'b9a3b3b3-58a3-4f6c-9c1f-3a4f6c9c1f3a';-export const fromPermissionFlagToUniversalFlatRolePermissionFlag = ({permissionFlagUniversalIdentifier,roleUniversalIdentifier,@@ -16,13 +13,12 @@ export const fromPermissionFlagToUniversalFlatRolePermissionFlag = ({applicationUniversalIdentifier: string;now: string;}): UniversalFlatRolePermissionFlag => {- const universalIdentifier = v5(- `${roleUniversalIdentifier}:${permissionFlagUniversalIdentifier}`,- ROLE_PERMISSION_FLAG_UUID_NAMESPACE,- );-return {- universalIdentifier,+ universalIdentifier: getRolePermissionFlagUniversalIdentifier({+ applicationUniversalIdentifier,+ roleUniversalIdentifier,+ permissionFlagUniversalIdentifier,+ }),applicationUniversalIdentifier,roleUniversalIdentifier,permissionFlagUniversalIdentifier,diff --git a/packages/twenty-server/src/engine/core-modules/application/application-marketplace/marketplace-query.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/marketplace-query.service.tsindex d415e21e63f..067f8766e94 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-marketplace/marketplace-query.service.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/marketplace-query.service.ts@@ -1,6 +1,10 @@import { Injectable } from '@nestjs/common';-import { type RoleManifest } from 'twenty-shared/application';+import {+ getFieldPermissionUniversalIdentifier,+ getObjectPermissionUniversalIdentifier,+ type RoleManifest,+} from 'twenty-shared/application';import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';import { CoreEntityCacheService } from 'src/engine/core-entity-cache/services/core-entity-cache.service';@@ -89,6 +93,7 @@ export class MarketplaceQueryService {this.applicationRegistrationAssetUrlService.buildGalleryImageUrls(registration,);+ const manifest = registration.manifest;const installCount =await this.applicationService.countInstalledWorkspacesForApplication(@@ -149,14 +154,27 @@ export class MarketplaceQueryService {installCount,defaultRoleUniversalIdentifier:registration.manifest?.application?.defaultRoleUniversalIdentifier,- roles: registration.manifest?.roles?.map((role) =>- this.toMarketplaceAppRoleDTO(role),- ),+ roles: isDefined(manifest)+ ? manifest.roles?.map((role) =>+ this.toMarketplaceAppRoleDTO({+ role,+ applicationUniversalIdentifier:+ manifest.application?.universalIdentifier ??+ registration.universalIdentifier,+ }),+ )+ : undefined,manifest: registration.manifest ?? undefined,};}- private toMarketplaceAppRoleDTO(role: RoleManifest): MarketplaceAppRoleDTO {+ private toMarketplaceAppRoleDTO({+ role,+ applicationUniversalIdentifier,+ }: {+ role: RoleManifest;+ applicationUniversalIdentifier: string;+ }): MarketplaceAppRoleDTO {return {universalIdentifier: role.universalIdentifier,label: role.label,@@ -171,7 +189,13 @@ export class MarketplaceQueryService {permissionFlagUniversalIdentifiers:role.permissionFlagUniversalIdentifiers,objectPermissions: role.objectPermissions?.map((permission) => ({- universalIdentifier: permission.universalIdentifier,+ universalIdentifier:+ permission.universalIdentifier ??+ getObjectPermissionUniversalIdentifier({+ applicationUniversalIdentifier,+ roleUniversalIdentifier: role.universalIdentifier,+ objectUniversalIdentifier: permission.objectUniversalIdentifier,+ }),objectUniversalIdentifier: permission.objectUniversalIdentifier,canReadObjectRecords: permission.canReadObjectRecords,canUpdateObjectRecords: permission.canUpdateObjectRecords,@@ -179,7 +203,13 @@ export class MarketplaceQueryService {canDestroyObjectRecords: permission.canDestroyObjectRecords,})),fieldPermissions: role.fieldPermissions?.map((permission) => ({- universalIdentifier: permission.universalIdentifier,+ universalIdentifier:+ permission.universalIdentifier ??+ getFieldPermissionUniversalIdentifier({+ applicationUniversalIdentifier,+ roleUniversalIdentifier: role.universalIdentifier,+ fieldUniversalIdentifier: permission.fieldUniversalIdentifier,+ }),objectUniversalIdentifier: permission.objectUniversalIdentifier,fieldUniversalIdentifier: permission.fieldUniversalIdentifier,canReadFieldValue: permission.canReadFieldValue,diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-field-permission/utils/from-create-field-permission-input-to-universal-flat-field-permission.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-field-permission/utils/from-create-field-permission-input-to-universal-flat-field-permission.util.tsindex c7957d87e04..0e687828178 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-field-permission/utils/from-create-field-permission-input-to-universal-flat-field-permission.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/flat-field-permission/utils/from-create-field-permission-input-to-universal-flat-field-permission.util.ts@@ -1,3 +1,4 @@+import { getFieldPermissionUniversalIdentifier } from 'twenty-shared/application';import { v4 } from 'uuid';import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';@@ -43,7 +44,11 @@ export const fromCreateFieldPermissionInputToUniversalFlatFieldPermission = ({return {id: v4(),- universalIdentifier: v4(),+ universalIdentifier: getFieldPermissionUniversalIdentifier({+ applicationUniversalIdentifier: flatApplication.universalIdentifier,+ roleUniversalIdentifier,+ fieldUniversalIdentifier: fieldMetadataUniversalIdentifier,+ }),applicationUniversalIdentifier: flatApplication.universalIdentifier,roleUniversalIdentifier,objectMetadataUniversalIdentifier,diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-object-permission/utils/from-create-object-permission-input-to-universal-flat-object-permission.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-object-permission/utils/from-create-object-permission-input-to-universal-flat-object-permission.util.tsindex 4dc78d93436..7b1b0563460 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-object-permission/utils/from-create-object-permission-input-to-universal-flat-object-permission.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/flat-object-permission/utils/from-create-object-permission-input-to-universal-flat-object-permission.util.ts@@ -1,3 +1,4 @@+import { getObjectPermissionUniversalIdentifier } from 'twenty-shared/application';import { v4 } from 'uuid';import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';@@ -25,7 +26,6 @@ export const fromCreateObjectPermissionInputToUniversalFlatObjectPermission = ({canUpdateObjectRecords,canSoftDeleteObjectRecords,canDestroyObjectRecords,- universalIdentifier,} = createObjectPermissionInput;const now = new Date().toISOString();@@ -40,7 +40,11 @@ export const fromCreateObjectPermissionInputToUniversalFlatObjectPermission = ({});return {id: v4(),- universalIdentifier: universalIdentifier ?? v4(),+ universalIdentifier: getObjectPermissionUniversalIdentifier({+ applicationUniversalIdentifier: flatApplication.universalIdentifier,+ roleUniversalIdentifier,+ objectUniversalIdentifier: objectMetadataUniversalIdentifier,+ }),applicationUniversalIdentifier: flatApplication.universalIdentifier,roleUniversalIdentifier,objectMetadataUniversalIdentifier,diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-role-permission-flag/utils/from-create-role-permission-flag-input-to-flat-role-permission-flag-to-create.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-role-permission-flag/utils/from-create-role-permission-flag-input-to-flat-role-permission-flag-to-create.util.tsindex ca2560c7fca..f9e560bdfa5 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-role-permission-flag/utils/from-create-role-permission-flag-input-to-flat-role-permission-flag-to-create.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/flat-role-permission-flag/utils/from-create-role-permission-flag-input-to-flat-role-permission-flag-to-create.util.ts@@ -1,3 +1,4 @@+import { getRolePermissionFlagUniversalIdentifier } from 'twenty-shared/application';import { v4 } from 'uuid';import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';@@ -21,8 +22,7 @@ export const fromCreateRolePermissionFlagInputToFlatRolePermissionFlagToCreate =>): UniversalFlatRolePermissionFlag & {id: string;} => {- const { roleId, permissionFlagId, universalIdentifier } =- createRolePermissionFlagInput;+ const { roleId, permissionFlagId } = createRolePermissionFlagInput;const now = new Date().toISOString();const { permissionFlagUniversalIdentifier, roleUniversalIdentifier } =@@ -34,7 +34,11 @@ export const fromCreateRolePermissionFlagInputToFlatRolePermissionFlagToCreate =return {id: v4(),- universalIdentifier: universalIdentifier ?? v4(),+ universalIdentifier: getRolePermissionFlagUniversalIdentifier({+ applicationUniversalIdentifier: flatApplication.universalIdentifier,+ roleUniversalIdentifier,+ permissionFlagUniversalIdentifier,+ }),applicationUniversalIdentifier: flatApplication.universalIdentifier,permissionFlagUniversalIdentifier,roleUniversalIdentifier,diff --git a/packages/twenty-server/src/engine/metadata-modules/object-permission/dtos/create-object-permission.input.ts b/packages/twenty-server/src/engine/metadata-modules/object-permission/dtos/create-object-permission.input.tsindex bf3103ac603..9514b6b67e4 100644--- a/packages/twenty-server/src/engine/metadata-modules/object-permission/dtos/create-object-permission.input.ts+++ b/packages/twenty-server/src/engine/metadata-modules/object-permission/dtos/create-object-permission.input.ts@@ -5,5 +5,4 @@ export type CreateObjectPermissionInput = {canUpdateObjectRecords?: boolean;canSoftDeleteObjectRecords?: boolean;canDestroyObjectRecords?: boolean;- universalIdentifier?: string;};diff --git a/packages/twenty-server/src/engine/metadata-modules/role-permission-flag/dtos/create-role-permission-flag.input.ts b/packages/twenty-server/src/engine/metadata-modules/role-permission-flag/dtos/create-role-permission-flag.input.tsindex cf44b27fc56..5c6ead7fcae 100644--- a/packages/twenty-server/src/engine/metadata-modules/role-permission-flag/dtos/create-role-permission-flag.input.ts+++ b/packages/twenty-server/src/engine/metadata-modules/role-permission-flag/dtos/create-role-permission-flag.input.ts@@ -1,5 +1,4 @@export type CreateRolePermissionFlagInput = {roleId: string;permissionFlagId: string;- universalIdentifier?: string;};diff --git a/packages/twenty-server/test/integration/metadata/suites/application/successful-sync-application-derived-permission-identifiers.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/application/successful-sync-application-derived-permission-identifiers.integration-spec.tsnew file mode 100644index 00000000000..5801400af9d--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application/successful-sync-application-derived-permission-identifiers.integration-spec.ts@@ -0,0 +1,177 @@+import { findManyApplications } from 'test/integration/graphql/utils/find-many-applications.util';+import { buildBaseManifest } from 'test/integration/metadata/suites/application/utils/build-base-manifest.util';+import { syncApplication } from 'test/integration/metadata/suites/application/utils/sync-application.util';+import { upsertFieldPermissions } from 'test/integration/metadata/suites/field-permission/utils/upsert-field-permissions.util';+import { findManyObjectMetadata } from 'test/integration/metadata/suites/object-metadata/utils/find-many-object-metadata.util';+import { upsertObjectPermissions } from 'test/integration/metadata/suites/object-permission/utils/upsert-object-permissions.util';+import { upsertPermissionFlags } from 'test/integration/metadata/suites/role-permission-flag/utils/upsert-permission-flags.util';+import { createOneRole } from 'test/integration/metadata/suites/role/utils/create-one-role.util';+import { deleteOneRole } from 'test/integration/metadata/suites/role/utils/delete-one-role.util';+import { jestExpectToBeDefined } from 'test/utils/jest-expect-to-be-defined.util.test';+import {+ PermissionFlagType,+ SystemPermissionFlag,+} from 'twenty-shared/constants';+import { STANDARD_OBJECTS } from 'twenty-shared/metadata';++import { WORKSPACE_CUSTOM_APPLICATION_NAME } from 'src/engine/core-modules/application/constants/workspace-custom-application.constant';+import { STANDARD_ROLE } from 'src/engine/workspace-manager/twenty-standard-application/constants/standard-role.constant';++const ROLE_LABEL = 'Derived Permission Identifiers Role';++const PERMISSION_METADATA_NAMES = [+ 'objectPermission',+ 'fieldPermission',+ 'rolePermissionFlag',+];++describe('Sync application should derive the permission identifiers the metadata API derives', () => {+ it('should plan no permission action for a manifest declaring permissions created through the metadata API without their universal identifiers', async () => {+ const { objects } = await findManyObjectMetadata({+ expectToFail: false,+ input: { filter: {}, paging: { first: 1000 } },+ gqlFields: `+ id+ nameSingular+ fieldsList {+ id+ name+ }+ `,+ });+ const personObject = objects.find(+ ({ nameSingular }) => nameSingular === 'person',+ );++ jestExpectToBeDefined(personObject);++ const personJobTitleField = personObject.fieldsList?.find(+ ({ name }) => name === 'jobTitle',+ );++ jestExpectToBeDefined(personJobTitleField);++ const { data: applicationsData } = await findManyApplications({+ expectToFail: false,+ });+ const customApplication = applicationsData.findManyApplications.find(+ ({ name }) => name === WORKSPACE_CUSTOM_APPLICATION_NAME,+ );++ jestExpectToBeDefined(customApplication);++ const { data: createdRoleData } = await createOneRole({+ expectToFail: false,+ input: {+ label: ROLE_LABEL,+ canUpdateAllSettings: false,+ canAccessAllTools: false,+ canReadAllObjectRecords: false,+ canUpdateAllObjectRecords: false,+ canSoftDeleteAllObjectRecords: false,+ canDestroyAllObjectRecords: false,+ canBeAssignedToUsers: true,+ },+ gqlFields: 'id universalIdentifier',+ });+ const createdRole = createdRoleData.createOneRole;++ try {+ const createdRoleUniversalIdentifier = createdRole.universalIdentifier;++ jestExpectToBeDefined(createdRoleUniversalIdentifier);++ await upsertObjectPermissions({+ expectToFail: false,+ input: {+ roleId: createdRole.id,+ objectPermissions: [+ {+ objectMetadataId: personObject.id,+ canReadObjectRecords: true,+ canUpdateObjectRecords: false,+ canSoftDeleteObjectRecords: false,+ canDestroyObjectRecords: false,+ },+ ],+ },+ });+ await upsertFieldPermissions({+ expectToFail: false,+ input: {+ roleId: createdRole.id,+ fieldPermissions: [+ {+ objectMetadataId: personObject.id,+ fieldMetadataId: personJobTitleField.id,+ canReadFieldValue: false,+ canUpdateFieldValue: false,+ },+ ],+ },+ });+ await upsertPermissionFlags({+ expectToFail: false,+ input: {+ roleId: createdRole.id,+ permissionFlagKeys: [PermissionFlagType.EXPORT_CSV],+ },+ });++ const dryRun = await syncApplication({+ manifest: buildBaseManifest({+ appId: customApplication.universalIdentifier,+ roleId: STANDARD_ROLE.admin.universalIdentifier,+ overrides: {+ roles: [+ {+ universalIdentifier: createdRoleUniversalIdentifier,+ label: ROLE_LABEL,+ objectPermissions: [+ {+ objectUniversalIdentifier:+ STANDARD_OBJECTS.person.universalIdentifier,+ canReadObjectRecords: true,+ canUpdateObjectRecords: false,+ canSoftDeleteObjectRecords: false,+ canDestroyObjectRecords: false,+ },+ ],+ fieldPermissions: [+ {+ objectUniversalIdentifier:+ STANDARD_OBJECTS.person.universalIdentifier,+ fieldUniversalIdentifier:+ STANDARD_OBJECTS.person.fields.jobTitle+ .universalIdentifier,+ canReadFieldValue: false,+ canUpdateFieldValue: false,+ },+ ],+ permissionFlagUniversalIdentifiers: [+ SystemPermissionFlag.EXPORT_CSV,+ ],+ },+ ],+ },+ }),+ dryRun: true,+ inferDeletionFromMissingEntities: false,+ expectToFail: false,+ });++ expect(dryRun.errors).toBeUndefined();++ const permissionActions = dryRun.data.syncApplication.actions.filter(+ ({ metadataName }) => PERMISSION_METADATA_NAMES.includes(metadataName),+ );++ expect(permissionActions).toEqual([]);+ } finally {+ await deleteOneRole({+ expectToFail: false,+ input: { idToDelete: createdRole.id },+ });+ }+ }, 60000);+});diff --git a/packages/twenty-server/test/integration/metadata/suites/application/utils/sync-application.util.ts b/packages/twenty-server/test/integration/metadata/suites/application/utils/sync-application.util.tsindex f31ca0de563..bb4dd5994dd 100644--- a/packages/twenty-server/test/integration/metadata/suites/application/utils/sync-application.util.ts+++ b/packages/twenty-server/test/integration/metadata/suites/application/utils/sync-application.util.ts@@ -1,4 +1,5 @@import { type Manifest } from 'twenty-shared/application';+import { type SyncAction } from 'twenty-shared/metadata';import { syncApplicationQueryFactory } from 'test/integration/metadata/suites/application/utils/sync-application-query-factory.util';import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';@@ -7,7 +8,7 @@ import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/type WorkspaceMigration = {applicationUniversalIdentifier: string;- actions: unknown[];+ actions: SyncAction[];};export const syncApplication = async ({diff --git a/packages/twenty-shared/src/application/roleManifestType.ts b/packages/twenty-shared/src/application/roleManifestType.tsindex b1b4af926b0..afc8139515a 100644--- a/packages/twenty-shared/src/application/roleManifestType.ts+++ b/packages/twenty-shared/src/application/roleManifestType.ts@@ -5,7 +5,7 @@ import {type RowLevelPermissionPredicateValue,} from '@/types';-export type ObjectPermissionManifest = SyncableEntityOptions & {+export type ObjectPermissionManifest = Partial<SyncableEntityOptions> & {objectUniversalIdentifier: string;canReadObjectRecords?: boolean;canUpdateObjectRecords?: boolean;@@ -13,7 +13,7 @@ export type ObjectPermissionManifest = SyncableEntityOptions & {canDestroyObjectRecords?: boolean;};-export type FieldPermissionManifest = SyncableEntityOptions & {+export type FieldPermissionManifest = Partial<SyncableEntityOptions> & {objectUniversalIdentifier: string;fieldUniversalIdentifier: string;canReadFieldValue?: boolean;