The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Enforce disabled object permission actions per principal (#29011)
Charles Bochet7e4ecba2aaaa
diff --git a/packages/twenty-server/src/database/commands/agent-history/__tests__/agent-history-migration.postgres.spec.ts b/packages/twenty-server/src/database/commands/agent-history/__tests__/agent-history-migration.postgres.spec.tsindex fc0343dfa1f..670b26a5e94 100644--- a/packages/twenty-server/src/database/commands/agent-history/__tests__/agent-history-migration.postgres.spec.ts+++ b/packages/twenty-server/src/database/commands/agent-history/__tests__/agent-history-migration.postgres.spec.ts@@ -113,6 +113,7 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);userWorkspaceRoleMap: {},apiKeyRoleMap: {},flatRoleTargetByAgentIdMaps: {},+ flatApplicationMaps: { byId: {}, idByUniversalIdentifier: {} },roleIdsWithAllRecordsAccess: [],eventEmitterService: { emitDatabaseBatchEvent },recordStock: {diff --git a/packages/twenty-server/src/engine/core-modules/record-crud/services/common-api-context-builder.service.ts b/packages/twenty-server/src/engine/core-modules/record-crud/services/common-api-context-builder.service.tsindex f36c53e05d5..5916c6f0f9d 100644--- a/packages/twenty-server/src/engine/core-modules/record-crud/services/common-api-context-builder.service.ts+++ b/packages/twenty-server/src/engine/core-modules/record-crud/services/common-api-context-builder.service.ts@@ -7,10 +7,6 @@ import { isDefined } from 'twenty-shared/utils';import { buildFieldSelection } from 'src/engine/api/common/common-select-fields/utils/build-field-selection.util';import { type CommonBaseQueryRunnerContext } from 'src/engine/api/common/types/common-base-query-runner-context.type';import { type CommonSelectedFields } from 'src/engine/api/common/types/common-selected-fields-result.type';-import { ApiKeyRoleService } from 'src/engine/core-modules/api-key/services/api-key-role.service';-import { isApiKeyAuthContext } from 'src/engine/core-modules/auth/guards/is-api-key-auth-context.guard';-import { isApplicationAuthContext } from 'src/engine/core-modules/auth/guards/is-application-auth-context.guard';-import { isUserAuthContext } from 'src/engine/core-modules/auth/guards/is-user-auth-context.guard';import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';import {RecordCrudException,@@ -22,8 +18,8 @@ import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';import { buildObjectIdByNameMaps } from 'src/engine/metadata-modules/flat-object-metadata/utils/build-object-id-by-name-maps.util';-import { UserRoleService } from 'src/engine/metadata-modules/user-role/user-role.service';import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';+import { resolveRolePermissionConfig } from 'src/engine/twenty-orm/utils/resolve-role-permission-config.util';import { getObjectsPermissionsFromRolePermissionConfig } from 'src/engine/twenty-orm/utils/get-objects-permissions-from-role-permission-config.util';import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';@@ -41,8 +37,6 @@ export class CommonApiContextBuilderService {constructor(private readonly workspaceManyOrAllFlatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,private readonly workspaceCacheService: WorkspaceCacheService,- private readonly userRoleService: UserRoleService,- private readonly apiKeyRoleService: ApiKeyRoleService,) {}async build({@@ -141,54 +135,46 @@ export class CommonApiContextBuilderService {authContext: WorkspaceAuthContext;rolePermissionConfig?: RolePermissionConfig;}): Promise<ObjectsPermissions> {- const workspaceId = authContext.workspace.id;-- const { rolesPermissions } =- await this.workspaceCacheService.getOrRecompute(workspaceId, [+ const {+ rolesPermissions,+ flatObjectMetadataMaps,+ flatApplicationMaps,+ userWorkspaceRoleMap,+ apiKeyRoleMap,+ flatRoleTargetByAgentIdMaps,+ } = await this.workspaceCacheService.getOrRecompute(+ authContext.workspace.id,+ ['rolesPermissions',- ]);+ 'flatObjectMetadataMaps',+ 'flatApplicationMaps',+ 'userWorkspaceRoleMap',+ 'apiKeyRoleMap',+ 'flatRoleTargetByAgentIdMaps',+ ],+ );- if (isDefined(rolePermissionConfig)) {- return getObjectsPermissionsFromRolePermissionConfig({- rolesPermissions,- rolePermissionConfig,+ const resolvedRolePermissionConfig =+ rolePermissionConfig ??+ resolveRolePermissionConfig({+ authContext,+ userWorkspaceRoleMap,+ apiKeyRoleMap,+ flatRoleTargetByAgentIdMaps,});- }- let roleId: string;-- if (isApiKeyAuthContext(authContext)) {- roleId = await this.apiKeyRoleService.getRoleIdForApiKeyId(- authContext.apiKey.id,- workspaceId,- );- } else if (- isApplicationAuthContext(authContext) &&- isDefined(authContext.application.defaultRoleId)- ) {- roleId = authContext.application.defaultRoleId;- } else if (isUserAuthContext(authContext)) {- const userWorkspaceRoleId =- await this.userRoleService.getRoleIdForUserWorkspace({- userWorkspaceId: authContext.userWorkspaceId,- workspaceId,- });-- if (!isDefined(userWorkspaceRoleId)) {- throw new RecordCrudException(- 'No role found for user workspace',- RecordCrudExceptionCode.INVALID_REQUEST,- );- }-- roleId = userWorkspaceRoleId;- } else {+ if (!isDefined(resolvedRolePermissionConfig)) {throw new RecordCrudException(- 'Invalid auth context - no authentication mechanism found',+ 'No role found for this auth context',RecordCrudExceptionCode.INVALID_REQUEST,);}- return rolesPermissions[roleId] ?? {};+ return getObjectsPermissionsFromRolePermissionConfig({+ rolesPermissions,+ rolePermissionConfig: resolvedRolePermissionConfig,+ flatObjectMetadataMaps,+ flatApplicationMaps,+ });}}diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/database-tool.provider.spec.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/database-tool.provider.spec.tsindex d4c66c5f68f..91704433a1e 100644--- a/packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/database-tool.provider.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/database-tool.provider.spec.ts@@ -93,6 +93,7 @@ describe('DatabaseToolProvider', () => {[roleId]: composedObjectPermissionsByObjectId,[userRoleId]: composedObjectPermissionsByObjectId,},+ flatApplicationMaps: { byId: {}, idByUniversalIdentifier: {} },flatObjectPermissionMaps: {byUniversalIdentifier: Object.fromEntries(explicitPermissionRows.map((row, index) => [diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/providers/database-tool.provider.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/providers/database-tool.provider.tsindex 75f4108827d..463893b1e5c 100644--- a/packages/twenty-server/src/engine/core-modules/tool-provider/providers/database-tool.provider.ts+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/providers/database-tool.provider.ts@@ -70,15 +70,25 @@ export class DatabaseToolProvider implements ToolProvider {const toolNames = options?.toolNames;const descriptors: (ToolIndexEntry | ToolDescriptor)[] = [];- const { rolesPermissions, flatObjectPermissionMaps } =+ const { rolesPermissions, flatObjectPermissionMaps, flatApplicationMaps } =await this.workspaceCacheService.getOrRecompute(context.workspaceId, ['rolesPermissions','flatObjectPermissionMaps',+ 'flatApplicationMaps',]);+ const { flatObjectMetadataMaps, flatFieldMetadataMaps } =+ await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(+ {+ workspaceId: context.workspaceId,+ flatMapsKeys: ['flatObjectMetadataMaps', 'flatFieldMetadataMaps'],+ },+ );const objectPermissions = getObjectsPermissionsFromRolePermissionConfig({rolesPermissions,rolePermissionConfig: context.rolePermissionConfig,+ flatObjectMetadataMaps,+ flatApplicationMaps,});if (Object.keys(objectPermissions).length === 0) {@@ -109,14 +119,6 @@ export class DatabaseToolProvider implements ToolProvider {}}- const { flatObjectMetadataMaps, flatFieldMetadataMaps } =- await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(- {- workspaceId: context.workspaceId,- flatMapsKeys: ['flatObjectMetadataMaps', 'flatFieldMetadataMaps'],- },- );-const allFlatObjects = getDatabaseCrudToolFlatObjects(flatObjectMetadataMaps.byUniversalIdentifier,);diff --git a/packages/twenty-server/src/engine/metadata-modules/permissions/permissions.service.ts b/packages/twenty-server/src/engine/metadata-modules/permissions/permissions.service.tsindex 45d2d8da03d..61ee1556a06 100644--- a/packages/twenty-server/src/engine/metadata-modules/permissions/permissions.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/permissions/permissions.service.ts@@ -4,6 +4,7 @@ import { msg } from '@lingui/core/macro';import { PermissionFlagType } from 'twenty-shared/constants';import { isDefined } from 'twenty-shared/utils';+import { computeObjectsPermissionsForRolePermissionConfig } from 'src/engine/twenty-orm/utils/compute-objects-permissions-for-role-permission-config.util';import { ApiKeyRoleService } from 'src/engine/core-modules/api-key/services/api-key-role.service';import {ApplicationException,@@ -51,11 +52,15 @@ export class PermissionsService {flatRoleMaps,flatRolePermissionFlagMaps,rolesPermissions,+ flatObjectMetadataMaps,+ flatApplicationMaps,} = await this.workspaceCacheService.getOrRecompute(workspaceId, ['userWorkspaceRoleMap','flatRoleMaps','flatRolePermissionFlagMaps','rolesPermissions',+ 'flatObjectMetadataMaps',+ 'flatApplicationMaps',]);const flatRole = this.findUserWorkspaceFlatRoleOrThrow({@@ -77,7 +82,12 @@ export class PermissionsService {return {permissionFlags,- objectsPermissions: rolesPermissions[flatRole.id] ?? {},+ objectsPermissions: computeObjectsPermissionsForRolePermissionConfig({+ intersectionOf: { userWorkspaceRoleId: flatRole.id },+ rolesPermissions,+ flatObjectMetadataMaps,+ flatApplicationMaps,+ }),};}diff --git a/packages/twenty-server/src/engine/twenty-orm/datasource/workspace-data-source.service.ts b/packages/twenty-server/src/engine/twenty-orm/datasource/workspace-data-source.service.tsindex 7ac9d0c3a48..f1d28b8448c 100644--- a/packages/twenty-server/src/engine/twenty-orm/datasource/workspace-data-source.service.ts+++ b/packages/twenty-server/src/engine/twenty-orm/datasource/workspace-data-source.service.ts@@ -125,6 +125,7 @@ export class WorkspaceDataSourceServiceroleIdsWithAllRecordsAccess: workspaceContext.roleIdsWithAllRecordsAccess,apiKeyRoleMap: workspaceContext.apiKeyRoleMap,flatRoleTargetByAgentIdMaps: workspaceContext.flatRoleTargetByAgentIdMaps,+ flatApplicationMaps: workspaceContext.flatApplicationMaps,eventEmitterService: this.workspaceEventEmitter,recordStock: this.workspaceRecordStockService,coreDataSource: this.coreDataSource,diff --git a/packages/twenty-server/src/engine/twenty-orm/datasource/workspace-data-source.ts b/packages/twenty-server/src/engine/twenty-orm/datasource/workspace-data-source.tsindex 12dd9ba0670..6a4c9c08b99 100644--- a/packages/twenty-server/src/engine/twenty-orm/datasource/workspace-data-source.ts+++ b/packages/twenty-server/src/engine/twenty-orm/datasource/workspace-data-source.ts@@ -210,6 +210,8 @@ export class WorkspaceDataSource {resolveObjectRecordsPermissions({rolePermissionConfig: repositoryRolePermissionConfig,objectPermissionsByRoleId: this.objectPermissionsByRoleId,+ flatObjectMetadataMaps: this.internalContext.flatObjectMetadataMaps,+ flatApplicationMaps: this.internalContext.flatApplicationMaps,});return new WorkspaceRepository<T>({diff --git a/packages/twenty-server/src/engine/twenty-orm/interfaces/workspace-internal-context.interface.ts b/packages/twenty-server/src/engine/twenty-orm/interfaces/workspace-internal-context.interface.tsindex d5c053b22d4..a8e1eaf3dfa 100644--- a/packages/twenty-server/src/engine/twenty-orm/interfaces/workspace-internal-context.interface.ts+++ b/packages/twenty-server/src/engine/twenty-orm/interfaces/workspace-internal-context.interface.ts@@ -1,6 +1,7 @@import { type DataSource } from 'typeorm';import { type FeatureFlagKey } from 'twenty-shared/types';+import { type FlatApplicationCacheMaps } from 'src/engine/core-modules/application/types/flat-application-cache-maps.type';import { type BillingEntitlements } from 'src/engine/core-modules/billing/types/billing-entitlements.type';import { type WorkspaceRecordStockService } from 'src/engine/core-modules/usage-limit/services/workspace-record-stock.service';import { type FlatRoleTargetByAgentIdMaps } from 'src/engine/metadata-modules/flat-agent/types/flat-role-target-by-agent-id-maps.type';@@ -29,6 +30,7 @@ export interface WorkspaceInternalContext {roleIdsWithAllRecordsAccess: string[];apiKeyRoleMap: Record<string, string>;flatRoleTargetByAgentIdMaps: FlatRoleTargetByAgentIdMaps;+ flatApplicationMaps: FlatApplicationCacheMaps;eventEmitterService: Pick<WorkspaceEventEmitter, 'emitDatabaseBatchEvent'>;recordStock: Pick<WorkspaceRecordStockService,diff --git a/packages/twenty-server/src/engine/twenty-orm/storage/orm-workspace-context.storage.ts b/packages/twenty-server/src/engine/twenty-orm/storage/orm-workspace-context.storage.tsindex c7ac7375e50..696a4dc6b82 100644--- a/packages/twenty-server/src/engine/twenty-orm/storage/orm-workspace-context.storage.ts+++ b/packages/twenty-server/src/engine/twenty-orm/storage/orm-workspace-context.storage.ts@@ -6,6 +6,7 @@ import {} from 'twenty-shared/types';import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';+import { type FlatApplicationCacheMaps } from 'src/engine/core-modules/application/types/flat-application-cache-maps.type';import { type BillingEntitlements } from 'src/engine/core-modules/billing/types/billing-entitlements.type';import { type FlatRoleTargetByAgentIdMaps } from 'src/engine/metadata-modules/flat-agent/types/flat-role-target-by-agent-id-maps.type';import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';@@ -30,6 +31,7 @@ export type ORMWorkspaceContext = {userWorkspaceRoleMap: UserWorkspaceRoleMap;apiKeyRoleMap: Record<string, string>;flatRoleTargetByAgentIdMaps: FlatRoleTargetByAgentIdMaps;+ flatApplicationMaps: FlatApplicationCacheMaps;flatRowLevelPermissionPredicateMaps: FlatRowLevelPermissionPredicateMaps;flatRowLevelPermissionPredicateGroupMaps: FlatRowLevelPermissionPredicateGroupMaps;flatValidationRuleMaps?: FlatValidationRuleMaps;diff --git a/packages/twenty-server/src/engine/twenty-orm/types/application-default-role-maps.type.ts b/packages/twenty-server/src/engine/twenty-orm/types/application-default-role-maps.type.tsnew file mode 100644index 00000000000..976df268aa7--- /dev/null+++ b/packages/twenty-server/src/engine/twenty-orm/types/application-default-role-maps.type.ts@@ -0,0 +1,7 @@+import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';++export type ApplicationDefaultRoleMaps = {+ byId: Partial<+ Record<string, Pick<FlatApplication, 'id' | 'defaultRoleId' | 'deletedAt'>>+ >;+};diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/compute-objects-permissions-for-role-permission-config.util.spec.ts b/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/compute-objects-permissions-for-role-permission-config.util.spec.tsnew file mode 100644index 00000000000..82a8656d05e--- /dev/null+++ b/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/compute-objects-permissions-for-role-permission-config.util.spec.ts@@ -0,0 +1,100 @@+import { type ObjectPermissions } from 'twenty-shared/types';++import { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/constant/create-empty-flat-entity-maps.constant';+import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';+import { getFlatObjectMetadataMock } from 'src/engine/metadata-modules/flat-object-metadata/__mocks__/get-flat-object-metadata.mock';+import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';+import { type ApplicationDefaultRoleMaps } from 'src/engine/twenty-orm/types/application-default-role-maps.type';+import { type RoleIdsBySource } from 'src/engine/twenty-orm/types/role-permission-config.type';+import { computeObjectsPermissionsForRolePermissionConfig } from 'src/engine/twenty-orm/utils/compute-objects-permissions-for-role-permission-config.util';++const INVOICE_ID = 'invoice-id';++const FULL_ACCESS: ObjectPermissions = {+ canReadObjectRecords: true,+ canUpdateObjectRecords: true,+ canSoftDeleteObjectRecords: true,+ canDestroyObjectRecords: true,+ restrictedFields: {},+ rowLevelPermissionPredicates: [],+ rowLevelPermissionPredicateGroups: [],+};++const flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata> =+ createEmptyFlatEntityMaps();++flatObjectMetadataMaps.byUniversalIdentifier.invoice =+ getFlatObjectMetadataMock({+ id: INVOICE_ID,+ universalIdentifier: 'invoice',+ applicationId: 'owning-application-id',+ disabledObjectPermissionActions: ['canDestroyObjectRecords'],+ });+flatObjectMetadataMaps.universalIdentifierById[INVOICE_ID] = 'invoice';++const flatApplicationMaps: ApplicationDefaultRoleMaps = {+ byId: {+ 'owning-application-id': {+ id: 'owning-application-id',+ defaultRoleId: 'owning-application-role-id',+ deletedAt: null,+ },+ 'other-application-id': {+ id: 'other-application-id',+ defaultRoleId: 'other-application-role-id',+ deletedAt: null,+ },+ },+};++const rolesPermissions = Object.fromEntries(+ [+ 'user-role-id',+ 'owning-application-role-id',+ 'other-application-role-id',+ ].map((roleId) => [roleId, { [INVOICE_ID]: FULL_ACCESS }]),+);++describe('computeObjectsPermissionsForRolePermissionConfig', () => {+ it.each<{+ actor: string;+ intersectionOf: RoleIdsBySource;+ canDestroy: boolean;+ }>([+ {+ actor: 'the owning application',+ intersectionOf: { applicationRoleId: 'owning-application-role-id' },+ canDestroy: true,+ },+ {+ actor: 'another application',+ intersectionOf: { applicationRoleId: 'other-application-role-id' },+ canDestroy: false,+ },+ {+ actor: 'a user',+ intersectionOf: { userWorkspaceRoleId: 'user-role-id' },+ canDestroy: false,+ },+ {+ actor: 'a user through the owning application',+ intersectionOf: {+ userWorkspaceRoleId: 'user-role-id',+ applicationRoleId: 'owning-application-role-id',+ },+ canDestroy: false,+ },+ ])(+ 'disabled action allowed for $actor: $canDestroy',+ ({ intersectionOf, canDestroy }) => {+ expect(+ computeObjectsPermissionsForRolePermissionConfig({+ intersectionOf,+ rolesPermissions,+ flatObjectMetadataMaps,+ flatApplicationMaps,+ })[INVOICE_ID]?.canDestroyObjectRecords,+ ).toBe(canDestroy);+ },+ );+});diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/get-objects-permissions-from-role-permission-config.util.spec.ts b/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/get-objects-permissions-from-role-permission-config.util.spec.tsindex ca4d0586c8e..ee86a01e937 100644--- a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/get-objects-permissions-from-role-permission-config.util.spec.ts+++ b/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/get-objects-permissions-from-role-permission-config.util.spec.ts@@ -1,9 +1,19 @@import { type ObjectsPermissionsByRoleId } from 'twenty-shared/types';+import { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/constant/create-empty-flat-entity-maps.constant';+import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';+import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';import { getObjectsPermissionsFromRolePermissionConfig } from 'src/engine/twenty-orm/utils/get-objects-permissions-from-role-permission-config.util';+import { type ApplicationDefaultRoleMaps } from 'src/engine/twenty-orm/types/application-default-role-maps.type';const OBJECT_ID = 'object-1';+const EMPTY_FLAT_OBJECT_METADATA_MAPS: FlatEntityMaps<FlatObjectMetadata> =+ createEmptyFlatEntityMaps();+const EMPTY_APPLICATION_DEFAULT_ROLE_MAPS: ApplicationDefaultRoleMaps = {+ byId: {},+};+const agentRolePermissions = {[OBJECT_ID]: {canReadObjectRecords: true,@@ -38,6 +48,8 @@ describe('getObjectsPermissionsFromRolePermissionConfig', () => {expect(getObjectsPermissionsFromRolePermissionConfig({rolesPermissions,+ flatObjectMetadataMaps: EMPTY_FLAT_OBJECT_METADATA_MAPS,+ flatApplicationMaps: EMPTY_APPLICATION_DEFAULT_ROLE_MAPS,rolePermissionConfig: {intersectionOf: { agentRoleId: 'agent-role-id' },},@@ -49,6 +61,8 @@ describe('getObjectsPermissionsFromRolePermissionConfig', () => {expect(getObjectsPermissionsFromRolePermissionConfig({rolesPermissions,+ flatObjectMetadataMaps: EMPTY_FLAT_OBJECT_METADATA_MAPS,+ flatApplicationMaps: EMPTY_APPLICATION_DEFAULT_ROLE_MAPS,rolePermissionConfig: {intersectionOf: {userWorkspaceRoleId: 'default-role-id',@@ -63,6 +77,8 @@ describe('getObjectsPermissionsFromRolePermissionConfig', () => {expect(getObjectsPermissionsFromRolePermissionConfig({rolesPermissions,+ flatObjectMetadataMaps: EMPTY_FLAT_OBJECT_METADATA_MAPS,+ flatApplicationMaps: EMPTY_APPLICATION_DEFAULT_ROLE_MAPS,rolePermissionConfig: {intersectionOf: {agentRoleId: 'agent-role-id',@@ -77,6 +93,8 @@ describe('getObjectsPermissionsFromRolePermissionConfig', () => {expect(getObjectsPermissionsFromRolePermissionConfig({rolesPermissions,+ flatObjectMetadataMaps: EMPTY_FLAT_OBJECT_METADATA_MAPS,+ flatApplicationMaps: EMPTY_APPLICATION_DEFAULT_ROLE_MAPS,rolePermissionConfig: {intersectionOf: {userWorkspaceRoleId: 'default-role-id',@@ -91,6 +109,8 @@ describe('getObjectsPermissionsFromRolePermissionConfig', () => {expect(getObjectsPermissionsFromRolePermissionConfig({rolesPermissions,+ flatObjectMetadataMaps: EMPTY_FLAT_OBJECT_METADATA_MAPS,+ flatApplicationMaps: EMPTY_APPLICATION_DEFAULT_ROLE_MAPS,rolePermissionConfig: {intersectionOf: {agentRoleId: 'agent-role-id',@@ -105,6 +125,8 @@ describe('getObjectsPermissionsFromRolePermissionConfig', () => {expect(getObjectsPermissionsFromRolePermissionConfig({rolesPermissions,+ flatObjectMetadataMaps: EMPTY_FLAT_OBJECT_METADATA_MAPS,+ flatApplicationMaps: EMPTY_APPLICATION_DEFAULT_ROLE_MAPS,rolePermissionConfig: { shouldBypassPermissionChecks: true },}),).toEqual({});@@ -114,6 +136,8 @@ describe('getObjectsPermissionsFromRolePermissionConfig', () => {expect(getObjectsPermissionsFromRolePermissionConfig({rolesPermissions,+ flatObjectMetadataMaps: EMPTY_FLAT_OBJECT_METADATA_MAPS,+ flatApplicationMaps: EMPTY_APPLICATION_DEFAULT_ROLE_MAPS,rolePermissionConfig: {intersectionOf: { apiKeyRoleId: 'missing-role-id' },},@@ -125,6 +149,8 @@ describe('getObjectsPermissionsFromRolePermissionConfig', () => {expect(getObjectsPermissionsFromRolePermissionConfig({rolesPermissions,+ flatObjectMetadataMaps: EMPTY_FLAT_OBJECT_METADATA_MAPS,+ flatApplicationMaps: EMPTY_APPLICATION_DEFAULT_ROLE_MAPS,rolePermissionConfig: {intersectionOf: {agentRoleId: null,@@ -139,6 +165,8 @@ describe('getObjectsPermissionsFromRolePermissionConfig', () => {expect(getObjectsPermissionsFromRolePermissionConfig({rolesPermissions,+ flatObjectMetadataMaps: EMPTY_FLAT_OBJECT_METADATA_MAPS,+ flatApplicationMaps: EMPTY_APPLICATION_DEFAULT_ROLE_MAPS,rolePermissionConfig: { intersectionOf: {} },}),).toEqual({});diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/compute-objects-permissions-for-role-permission-config.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/compute-objects-permissions-for-role-permission-config.util.tsnew file mode 100644index 00000000000..6afc6608e4a--- /dev/null+++ b/packages/twenty-server/src/engine/twenty-orm/utils/compute-objects-permissions-for-role-permission-config.util.ts@@ -0,0 +1,64 @@+import {+ type ObjectsPermissions,+ type ObjectsPermissionsByRoleId,+} from 'twenty-shared/types';+import { isDefined } from 'twenty-shared/utils';++import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';+import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';+import { type ApplicationDefaultRoleMaps } from 'src/engine/twenty-orm/types/application-default-role-maps.type';+import { type RoleIdsBySource } from 'src/engine/twenty-orm/types/role-permission-config.type';+import { computePermissionIntersection } from 'src/engine/twenty-orm/utils/compute-permission-intersection.util';+import { getRoleIdsToIntersect } from 'src/engine/twenty-orm/utils/get-role-ids-to-intersect.util';+import { restrictObjectsPermissionsToDisabledActions } from 'src/engine/twenty-orm/utils/restrict-objects-permissions-to-disabled-actions.util';++const buildApplicationIdByDefaultRoleId = (+ flatApplicationMaps: ApplicationDefaultRoleMaps,+): Partial<Record<string, string>> =>+ Object.fromEntries(+ Object.values(flatApplicationMaps.byId).flatMap((flatApplication) =>+ isDefined(flatApplication?.defaultRoleId) &&+ !isDefined(flatApplication.deletedAt)+ ? [[flatApplication.defaultRoleId, flatApplication.id]]+ : [],+ ),+ );++export const computeObjectsPermissionsForRolePermissionConfig = ({+ intersectionOf,+ rolesPermissions,+ flatObjectMetadataMaps,+ flatApplicationMaps,+}: {+ intersectionOf: RoleIdsBySource;+ rolesPermissions: ObjectsPermissionsByRoleId;+ flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;+ flatApplicationMaps: ApplicationDefaultRoleMaps;+}): ObjectsPermissions => {+ const roleIds = getRoleIdsToIntersect(intersectionOf);++ if (!isDefined(roleIds)) {+ return {};+ }++ const applicationIdByDefaultRoleId =+ buildApplicationIdByDefaultRoleId(flatApplicationMaps);++ const permissionsPerRole = roleIds.map((roleId) => {+ const rolePermissions = rolesPermissions[roleId];++ return isDefined(rolePermissions)+ ? restrictObjectsPermissionsToDisabledActions({+ objectsPermissions: rolePermissions,+ flatObjectMetadataMaps,+ actingApplicationId: applicationIdByDefaultRoleId[roleId],+ })+ : undefined;+ });++ if (!permissionsPerRole.every(isDefined)) {+ return {};+ }++ return computePermissionIntersection(permissionsPerRole);+};diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/get-objects-permissions-from-role-permission-config.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/get-objects-permissions-from-role-permission-config.util.tsindex 7e9a931574a..af0af4c8ff6 100644--- a/packages/twenty-server/src/engine/twenty-orm/utils/get-objects-permissions-from-role-permission-config.util.ts+++ b/packages/twenty-server/src/engine/twenty-orm/utils/get-objects-permissions-from-role-permission-config.util.ts@@ -2,34 +2,32 @@ import {type ObjectsPermissions,type ObjectsPermissionsByRoleId,} from 'twenty-shared/types';-import { isDefined } from 'twenty-shared/utils';+import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';+import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';-import { computePermissionIntersection } from 'src/engine/twenty-orm/utils/compute-permission-intersection.util';-import { getRoleIdsToIntersect } from 'src/engine/twenty-orm/utils/get-role-ids-to-intersect.util';+import { computeObjectsPermissionsForRolePermissionConfig } from 'src/engine/twenty-orm/utils/compute-objects-permissions-for-role-permission-config.util';+import { type ApplicationDefaultRoleMaps } from 'src/engine/twenty-orm/types/application-default-role-maps.type';export const getObjectsPermissionsFromRolePermissionConfig = ({rolesPermissions,rolePermissionConfig,+ flatObjectMetadataMaps,+ flatApplicationMaps,}: {rolesPermissions: ObjectsPermissionsByRoleId;rolePermissionConfig: RolePermissionConfig;+ flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;+ flatApplicationMaps: ApplicationDefaultRoleMaps;}): ObjectsPermissions => {if ('shouldBypassPermissionChecks' in rolePermissionConfig) {return {};}- const roleIds = getRoleIdsToIntersect(rolePermissionConfig.intersectionOf);-- if (!isDefined(roleIds)) {- return {};- }-- const permissionsPerRole = roleIds.map((roleId) => rolesPermissions[roleId]);-- if (!permissionsPerRole.every(isDefined)) {- return {};- }-- return computePermissionIntersection(permissionsPerRole);+ return computeObjectsPermissionsForRolePermissionConfig({+ intersectionOf: rolePermissionConfig.intersectionOf,+ rolesPermissions,+ flatObjectMetadataMaps,+ flatApplicationMaps,+ });};diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/resolve-object-records-permissions.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/resolve-object-records-permissions.util.tsindex 79d9fca0b67..f373119b5fa 100644--- a/packages/twenty-server/src/engine/twenty-orm/utils/resolve-object-records-permissions.util.ts+++ b/packages/twenty-server/src/engine/twenty-orm/utils/resolve-object-records-permissions.util.ts@@ -4,16 +4,22 @@ import {} from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';-import { computePermissionIntersection } from 'src/engine/twenty-orm/utils/compute-permission-intersection.util';+import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';+import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';-import { getRoleIdsToIntersect } from 'src/engine/twenty-orm/utils/get-role-ids-to-intersect.util';+import { computeObjectsPermissionsForRolePermissionConfig } from 'src/engine/twenty-orm/utils/compute-objects-permissions-for-role-permission-config.util';+import { type ApplicationDefaultRoleMaps } from 'src/engine/twenty-orm/types/application-default-role-maps.type';export const resolveObjectRecordsPermissions = ({rolePermissionConfig,objectPermissionsByRoleId,+ flatObjectMetadataMaps,+ flatApplicationMaps,}: {rolePermissionConfig?: RolePermissionConfig;objectPermissionsByRoleId: ObjectsPermissionsByRoleId;+ flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;+ flatApplicationMaps: ApplicationDefaultRoleMaps;}): {objectRecordsPermissions: ObjectsPermissions;shouldBypassPermissionChecks: boolean;@@ -33,23 +39,13 @@ export const resolveObjectRecordsPermissions = ({};}- const roleIds = getRoleIdsToIntersect(rolePermissionConfig.intersectionOf);-- if (!isDefined(roleIds)) {- return {- objectRecordsPermissions: {},- shouldBypassPermissionChecks: false,- };- }-- const allRolePermissions = roleIds.map(- (roleId) => objectPermissionsByRoleId[roleId],- );-return {- objectRecordsPermissions: allRolePermissions.every(isDefined)- ? computePermissionIntersection(allRolePermissions)- : {},+ objectRecordsPermissions: computeObjectsPermissionsForRolePermissionConfig({+ intersectionOf: rolePermissionConfig.intersectionOf,+ rolesPermissions: objectPermissionsByRoleId,+ flatObjectMetadataMaps,+ flatApplicationMaps,+ }),shouldBypassPermissionChecks: false,};};diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/restrict-objects-permissions-to-disabled-actions.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/restrict-objects-permissions-to-disabled-actions.util.tsnew file mode 100644index 00000000000..65efe8f2c6c--- /dev/null+++ b/packages/twenty-server/src/engine/twenty-orm/utils/restrict-objects-permissions-to-disabled-actions.util.ts@@ -0,0 +1,47 @@+import { type ObjectsPermissions } from 'twenty-shared/types';+import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';++import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';+import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';+import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';++export const restrictObjectsPermissionsToDisabledActions = ({+ objectsPermissions,+ flatObjectMetadataMaps,+ actingApplicationId,+}: {+ objectsPermissions: ObjectsPermissions;+ flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;+ actingApplicationId: string | undefined;+}): ObjectsPermissions => {+ let restrictedObjectsPermissions: ObjectsPermissions | undefined;++ for (const [objectMetadataId, objectPermissions] of Object.entries(+ objectsPermissions,+ )) {+ const flatObjectMetadata = findFlatEntityByIdInFlatEntityMaps({+ flatEntityId: objectMetadataId,+ flatEntityMaps: flatObjectMetadataMaps,+ });+ const disabledObjectPermissionActions =+ flatObjectMetadata?.disabledObjectPermissionActions;++ if (+ !isDefined(flatObjectMetadata) ||+ !isNonEmptyArray(disabledObjectPermissionActions) ||+ flatObjectMetadata.applicationId === actingApplicationId+ ) {+ continue;+ }++ restrictedObjectsPermissions ??= { ...objectsPermissions };+ restrictedObjectsPermissions[objectMetadataId] = {+ ...objectPermissions,+ ...Object.fromEntries(+ disabledObjectPermissionActions.map((action) => [action, false]),+ ),+ };+ }++ return restrictedObjectsPermissions ?? objectsPermissions;+};diff --git a/packages/twenty-server/src/engine/twenty-orm/workspace-orm.manager.ts b/packages/twenty-server/src/engine/twenty-orm/workspace-orm.manager.tsindex 788c1b13b03..d74fb1d24fa 100644--- a/packages/twenty-server/src/engine/twenty-orm/workspace-orm.manager.ts+++ b/packages/twenty-server/src/engine/twenty-orm/workspace-orm.manager.ts@@ -149,6 +149,7 @@ export class WorkspaceOrmManager {userWorkspaceRoleMap,apiKeyRoleMap,flatRoleTargetByAgentIdMaps,+ flatApplicationMaps,flatRowLevelPermissionPredicateMaps,flatRowLevelPermissionPredicateGroupMaps,} = await this.workspaceCacheService.getOrRecompute(workspaceId, [@@ -162,6 +163,7 @@ export class WorkspaceOrmManager {'userWorkspaceRoleMap','apiKeyRoleMap','flatRoleTargetByAgentIdMaps',+ 'flatApplicationMaps','flatRowLevelPermissionPredicateMaps','flatRowLevelPermissionPredicateGroupMaps',]);@@ -198,6 +200,7 @@ export class WorkspaceOrmManager {userWorkspaceRoleMap,apiKeyRoleMap,flatRoleTargetByAgentIdMaps,+ flatApplicationMaps,};}@@ -246,6 +249,7 @@ export class WorkspaceOrmManager {userWorkspaceRoleMap: {},apiKeyRoleMap: {},flatRoleTargetByAgentIdMaps: {},+ flatApplicationMaps: { byId: {}, idByUniversalIdentifier: {} },};}}diff --git a/packages/twenty-server/src/modules/call-recording/services/call-recording.service.ts b/packages/twenty-server/src/modules/call-recording/services/call-recording.service.tsindex 6c7807b90ee..4d8a2be20f0 100644--- a/packages/twenty-server/src/modules/call-recording/services/call-recording.service.ts+++ b/packages/twenty-server/src/modules/call-recording/services/call-recording.service.ts@@ -48,6 +48,8 @@ export class CallRecordingService {resolveObjectRecordsPermissions({rolePermissionConfig,objectPermissionsByRoleId: workspaceContext.permissionsPerRoleId,+ flatObjectMetadataMaps: workspaceContext.flatObjectMetadataMaps,+ flatApplicationMaps: workspaceContext.flatApplicationMaps,});const callRecordingObjectMetadataId =workspaceContext.objectIdByNameSingular.callRecording;diff --git a/packages/twenty-server/src/modules/dashboard/services/dashboard-duplication.service.ts b/packages/twenty-server/src/modules/dashboard/services/dashboard-duplication.service.tsindex 42e8deeaac3..d4e8fedc29f 100644--- a/packages/twenty-server/src/modules/dashboard/services/dashboard-duplication.service.ts+++ b/packages/twenty-server/src/modules/dashboard/services/dashboard-duplication.service.ts@@ -163,6 +163,8 @@ export class DashboardDuplicationService {resolveObjectRecordsPermissions({rolePermissionConfig,objectPermissionsByRoleId: workspaceContext.permissionsPerRoleId,+ flatObjectMetadataMaps: workspaceContext.flatObjectMetadataMaps,+ flatApplicationMaps: workspaceContext.flatApplicationMaps,});if (shouldBypassPermissionChecks) {