The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Simplify permissions utils: one event admission path, share keys in sharing (#29529)
Charles Bocheta0dc1a7c1a9b
diff --git a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/triggers/database-event/call-database-event-trigger-jobs.job.ts b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/triggers/database-event/call-database-event-trigger-jobs.job.tsindex 8ad6e20cc06..008123d2071 100644--- a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/triggers/database-event/call-database-event-trigger-jobs.job.ts+++ b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/triggers/database-event/call-database-event-trigger-jobs.job.ts@@ -24,7 +24,6 @@ import {LogicFunctionTriggerJobData,} from 'src/engine/core-modules/logic-function/logic-function-trigger/jobs/logic-function-trigger.job';import { RecordAccessPolicyService } from 'src/engine/permissions/combine/services/record-access-policy.service';-import { resolveEventsReadableByRole } from 'src/engine/permissions/combine/utils/resolve-events-readable-by-role.util';import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/workspace-event-batch.type';@@ -81,10 +80,6 @@ export class CallDatabaseEventTriggerJobsJob {this.recordAccessPolicyService.buildEventRecordAccessGate(workspaceEventBatch,);- const metadataMaps =- await this.recordAccessPolicyService.loadPermissionsMetadataMaps(- workspaceEventBatch.workspaceId,- );for (const [applicationId,@@ -100,11 +95,13 @@ export class CallDatabaseEventTriggerJobsJob {continue;}- const admittedEvents = await resolveEventsReadableByRole({- application,- workspaceEventBatch,- eventRecordAccessGate,- metadataMaps,+ const admittedEvents = await eventRecordAccessGate.resolveReadableEvents({+ authContext: {+ type: 'application',+ workspace: { id: workspaceEventBatch.workspaceId },+ application,+ },+ events: workspaceEventBatch.events,});const logicFunctionPayloads = transformEventBatchToEventPayloads({logicFunctions,diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-trigger/jobs/call-agent-database-event-triggers.job.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-trigger/jobs/call-agent-database-event-triggers.job.tsindex 412cd4e019e..5b92d245845 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-trigger/jobs/call-agent-database-event-triggers.job.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-trigger/jobs/call-agent-database-event-triggers.job.ts@@ -12,8 +12,6 @@ import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queuimport { MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';import { type PermissionsAuthContext } from 'src/engine/permissions/principal/types/permissions-auth-context.type';import { RecordAccessPolicyService } from 'src/engine/permissions/combine/services/record-access-policy.service';-import { isUpdateOfHiddenFieldsOnly } from 'src/engine/permissions/masking/utils/is-update-of-hidden-fields-only.util';-import { omitRestrictedFieldsFromEvent } from 'src/engine/permissions/masking/utils/omit-restricted-fields-from-event.util';import { AGENT_TRIGGER_RUN_LIMITS } from 'src/engine/metadata-modules/ai/ai-agent-trigger/constants/agent-trigger-run-limits.const';import { RunAgentTriggerJob } from 'src/engine/metadata-modules/ai/ai-agent-trigger/jobs/run-agent-trigger.job';import { AgentTriggerThrottlerService } from 'src/engine/metadata-modules/ai/ai-agent-trigger/services/agent-trigger-throttler.service';@@ -44,19 +42,12 @@ export class CallAgentDatabaseEventTriggersJob {objectMetadata,} = workspaceEventBatch;- const {- flatAgentMaps,- flatApplicationMaps,- flatRoleTargetByAgentIdMaps,- flatFieldMetadataMaps,- flatObjectMetadataMaps,- } = await this.workspaceCacheService.getOrRecompute(workspaceId, [- 'flatAgentMaps',- 'flatApplicationMaps',- 'flatRoleTargetByAgentIdMaps',- 'flatFieldMetadataMaps',- 'flatObjectMetadataMaps',- ]);+ const { flatAgentMaps, flatApplicationMaps, flatRoleTargetByAgentIdMaps } =+ await this.workspaceCacheService.getOrRecompute(workspaceId, [+ 'flatAgentMaps',+ 'flatApplicationMaps',+ 'flatRoleTargetByAgentIdMaps',+ ]);const matchingAgentTriggers = findAgentDatabaseEventTriggersMatchingEvent({flatAgentMaps,@@ -85,37 +76,18 @@ export class CallAgentDatabaseEventTriggersJob {application,agentId: flatAgent.id,};- const agentObjectsPermissions =- await this.recordAccessPolicyService.findObjectsPermissions(- agentAuthContext,- );-- if (!isDefined(agentObjectsPermissions)) {- continue;- }-- const admittedRecordIds =- await eventRecordAccessGate.resolveAdmittedRecordIds(agentAuthContext);- const admittedEvents = workspaceEventBatch.events- .filter((event) => admittedRecordIds.has(event.recordId))- .filter(+ const admittedEvents = await eventRecordAccessGate.resolveReadableEvents({+ authContext: agentAuthContext,+ // Masking can drop the actor fields, so the agent's own writes are skipped first+ events: workspaceEventBatch.events.filter((event) =>!isDatabaseEventCausedByAgent({event,eventName,agentId: flatAgent.id,}),- )- .map((event) =>- omitRestrictedFieldsFromEvent({- event,- objectMetadata,- objectsPermissions: agentObjectsPermissions,- flatObjectMetadataMaps,- flatFieldMetadataMaps,- }),- )- .filter((event) => !isUpdateOfHiddenFieldsOnly(event));+ ),+ });const eventsToRunOn = filterEventsByUpdatedFields({events: admittedEvents,diff --git a/packages/twenty-server/src/engine/metadata-modules/role/role.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/role/role.resolver.tsindex fec790b9210..aea3aa6e95b 100644--- a/packages/twenty-server/src/engine/metadata-modules/role/role.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/role/role.resolver.ts@@ -65,7 +65,6 @@ import { UpsertRowLevelPermissionPredicatesResultDTO } from 'src/engine/metadataimport { RowLevelPermissionPredicateGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/row-level-permission-predicate/filters/row-level-permission-predicate-graphql-api-exception.filter';import { RowLevelPermissionPredicateService } from 'src/engine/metadata-modules/row-level-permission-predicate/services/row-level-permission-predicate.service';import { UserRoleService } from 'src/engine/permissions/role-assignment/user-role.service';-import { resolveRoleIdsForUser } from 'src/engine/permissions/principal/utils/resolve-role-ids-for-user.util';import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';@@ -225,13 +224,12 @@ export class RoleResolver {return undefined;}- return resolveRoleIdsForUser({- userRoleId: await this.userRoleService.getRoleIdForUserWorkspace({+ return [+ await this.userRoleService.getRoleIdForUserWorkspace({workspaceId,userWorkspaceId: actingUserWorkspaceId,}),- applicationRoleId: undefined,- });+ ];}@Mutation(() => [ObjectPermissionDTO])diff --git a/packages/twenty-server/src/engine/permissions/combine/services/record-access-policy.service.ts b/packages/twenty-server/src/engine/permissions/combine/services/record-access-policy.service.tsindex 903b6377cd7..a7fa606943c 100644--- a/packages/twenty-server/src/engine/permissions/combine/services/record-access-policy.service.ts+++ b/packages/twenty-server/src/engine/permissions/combine/services/record-access-policy.service.ts@@ -27,6 +27,7 @@ import {type PermissionsObjectAccessRequest,} from 'src/engine/permissions/combine/types/row-access-policy.type';import { type PermissionsPrincipalsWithRolesContext } from 'src/engine/permissions/principal/types/permissions-principals-with-roles-context.type';+import { getPermissionsPrincipalRoleIds } from 'src/engine/permissions/principal/utils/get-permissions-principal-role-ids.util';import { getPermissionsPrincipalShareKeys } from 'src/engine/permissions/principal/utils/get-permissions-principal-share-keys.util';import { resolvePermissionsShareGrant } from 'src/engine/permissions/record-share/utils/resolve-permissions-share-grant.util';import { isObjectOperationDeniedToPrincipal } from 'src/engine/permissions/role/utils/is-object-operation-denied-to-principal.util';@@ -38,6 +39,7 @@ import { type WorkspaceTransactionScope } from 'src/engine/twenty-orm/types/workimport { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';import { type RecordShare } from 'src/engine/permissions/record-share/types/record-share.type';+import { filterReadableEvents } from 'src/engine/permissions/combine/utils/filter-readable-events.util';import { findPermissionsAdmittedRecordIds } from 'src/engine/permissions/combine/utils/find-permissions-admitted-record-ids.util';import { resolveEventRecordSnapshots } from 'src/engine/permissions/combine/utils/resolve-event-record-snapshots.util';import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';@@ -291,11 +293,11 @@ export class RecordAccessPolicyService {}// Event snapshots go through the same grant paths as the principal's queries- buildEventRecordAccessGate({+ buildEventRecordAccessGate<TEvent extends ObjectRecordEvent>({workspaceId,objectMetadata,events,- }: WorkspaceEventBatch<ObjectRecordEvent>): EventRecordAccessGate {+ }: WorkspaceEventBatch<TEvent>): EventRecordAccessGate<TEvent> {// One lookup per object for the whole batch: operands only ever ask for// records of the batch, so later calls are served from what was fetchedconst recordSharesByRecordIdByObject = new Map<@@ -368,27 +370,64 @@ export class RecordAccessPolicyService {}));let metadataMaps: Promise<PermissionsMetadataMaps> | undefined;+ const loadMetadataMaps = () =>+ (metadataMaps ??= this.loadPermissionsMetadataMaps(workspaceId));++ const findAdmittedRecordIds = async (+ principal: PermissionsPrincipalsWithRolesContext,+ ) =>+ findPermissionsAdmittedRecordIds({+ principal,+ metadataMaps: await loadMetadataMaps(),+ flatObjectMetadata: objectMetadata,+ operationType: 'select',+ records: resolveEventRecordSnapshots(events),+ context: {+ shouldIgnoreSoftDeleteDefaultFilter: true,+ fetchRecordShares,+ findPrivateRecordStates,+ },+ });return {resolveAdmittedRecordIds: async (authContext) => {const principal = await this.resolvePrincipalsWithRoles(authContext);+ return isDefined(principal)+ ? findAdmittedRecordIds(principal)+ : new Set<string>();+ },+ resolveReadableEvents: async ({+ authContext,+ events: candidateEvents,+ }) => {+ const principal = await this.resolvePrincipalsWithRoles(authContext);+if (!isDefined(principal)) {- return new Set<string>();+ return [];+ }++ const principalMetadataMaps = await loadMetadataMaps();++ // A role missing from the cache must not fall through to share or creator admission+ if (+ getPermissionsPrincipalRoleIds(principal).some(+ (roleId) =>+ !isDefined(principalMetadataMaps.rolesPermissions[roleId]),+ )+ ) {+ return [];}- return findPermissionsAdmittedRecordIds({- principal,- metadataMaps: await (metadataMaps ??=- this.loadPermissionsMetadataMaps(workspaceId)),- flatObjectMetadata: objectMetadata,- operationType: 'select',- records: resolveEventRecordSnapshots(events),- context: {- shouldIgnoreSoftDeleteDefaultFilter: true,- fetchRecordShares,- findPrivateRecordStates,- },+ return filterReadableEvents({+ events: candidateEvents,+ admittedRecordIds: await findAdmittedRecordIds(principal),+ objectMetadata,+ objectsPermissions: getPermissionsPrincipalObjectsPermissions({+ principal,+ metadataMaps: principalMetadataMaps,+ }),+ metadataMaps: principalMetadataMaps,});},};diff --git a/packages/twenty-server/src/engine/permissions/combine/types/event-record-access-gate.type.ts b/packages/twenty-server/src/engine/permissions/combine/types/event-record-access-gate.type.tsindex 5fdbe76c482..2433f43b13f 100644--- a/packages/twenty-server/src/engine/permissions/combine/types/event-record-access-gate.type.ts+++ b/packages/twenty-server/src/engine/permissions/combine/types/event-record-access-gate.type.ts@@ -1,9 +1,17 @@/* @license Enterprise */+import { type ObjectRecordEvent } from 'twenty-shared/database-events';+import { type PermissionsAuthContext } from 'src/engine/permissions/principal/types/permissions-auth-context.type';-export type EventRecordAccessGate = {+export type EventRecordAccessGate<+ TEvent extends ObjectRecordEvent = ObjectRecordEvent,+> = {resolveAdmittedRecordIds: (authContext: PermissionsAuthContext,) => Promise<Set<string>>;+ resolveReadableEvents: (args: {+ authContext: PermissionsAuthContext;+ events: TEvent[];+ }) => Promise<TEvent[]>;};diff --git a/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/filter-readable-events.util.spec.ts b/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/filter-readable-events.util.spec.tsnew file mode 100644index 00000000000..a66d06d9026--- /dev/null+++ b/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/filter-readable-events.util.spec.ts@@ -0,0 +1,140 @@+import { type ObjectRecordUpdateEvent } from 'twenty-shared/database-events';+import {+ FieldMetadataType,+ type ObjectPermissions,+ type ObjectsPermissions,+} from 'twenty-shared/types';++import { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/constant/create-empty-flat-entity-maps.constant';+import { addFlatEntityToFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/add-flat-entity-to-flat-entity-maps-or-throw.util';+import { getFlatFieldMetadataMock } from 'src/engine/metadata-modules/flat-field-metadata/__mocks__/get-flat-field-metadata.mock';+import { getFlatObjectMetadataMock } from 'src/engine/metadata-modules/flat-object-metadata/__mocks__/get-flat-object-metadata.mock';+import { filterReadableEvents } from 'src/engine/permissions/combine/utils/filter-readable-events.util';++const OBJECT_METADATA_ID = 'invoice-object-id';++const invoice = getFlatObjectMetadataMock({+ id: OBJECT_METADATA_ID,+ universalIdentifier: OBJECT_METADATA_ID,+});++const flatObjectMetadataMaps = addFlatEntityToFlatEntityMapsOrThrow({+ flatEntity: invoice,+ flatEntityMaps: createEmptyFlatEntityMaps(),+});++const flatFieldMetadataMaps = [+ getFlatFieldMetadataMock({+ id: 'name-field-id',+ universalIdentifier: 'name-field-id',+ objectMetadataId: OBJECT_METADATA_ID,+ type: FieldMetadataType.TEXT,+ name: 'name',+ }),+ getFlatFieldMetadataMock({+ id: 'secret-field-id',+ universalIdentifier: 'secret-field-id',+ objectMetadataId: OBJECT_METADATA_ID,+ type: FieldMetadataType.TEXT,+ name: 'secret',+ }),+].reduce(+ (maps, flatEntity) =>+ addFlatEntityToFlatEntityMapsOrThrow({ flatEntity, flatEntityMaps: maps }),+ createEmptyFlatEntityMaps(),+);++const READ_ACCESS: ObjectPermissions = {+ canReadObjectRecords: true,+ canUpdateObjectRecords: false,+ canSoftDeleteObjectRecords: false,+ canDestroyObjectRecords: false,+ restrictedFields: {},+ rowLevelPermissionPredicates: [],+ rowLevelPermissionPredicateGroups: [],+};++const buildUpdateEvent = ({+ recordId,+ updatedFields,+}: {+ recordId: string;+ updatedFields: ('name' | 'secret')[];+}): ObjectRecordUpdateEvent => ({+ recordId,+ properties: {+ updatedFields,+ before: { id: recordId, name: 'Old', secret: 'old' },+ after: { id: recordId, name: 'New', secret: 'new' },+ diff: Object.fromEntries(+ updatedFields.map((fieldName) => [+ fieldName,+ { before: 'old', after: 'new' },+ ]),+ ),+ },+});++const filter = ({+ events,+ objectsPermissions,+}: {+ events: ObjectRecordUpdateEvent[];+ objectsPermissions: ObjectsPermissions;+}) =>+ filterReadableEvents({+ events,+ admittedRecordIds: new Set(['record-1', 'record-2']),+ objectMetadata: invoice,+ objectsPermissions,+ metadataMaps: { flatObjectMetadataMaps, flatFieldMetadataMaps },+ });++const SECRET_HIDDEN: ObjectsPermissions = {+ [OBJECT_METADATA_ID]: {+ ...READ_ACCESS,+ restrictedFields: {+ 'secret-field-id': { canRead: false, canUpdate: false },+ },+ },+};++describe('filterReadableEvents', () => {+ it('should drop events on records that were not admitted', () => {+ const events = filter({+ events: [+ buildUpdateEvent({ recordId: 'record-1', updatedFields: ['name'] }),+ buildUpdateEvent({ recordId: 'record-3', updatedFields: ['name'] }),+ ],+ objectsPermissions: { [OBJECT_METADATA_ID]: READ_ACCESS },+ });++ expect(events.map((event) => event.recordId)).toEqual(['record-1']);+ });++ it('should omit a field the principal cannot read', () => {+ const [event] = filter({+ events: [+ buildUpdateEvent({+ recordId: 'record-1',+ updatedFields: ['name', 'secret'],+ }),+ ],+ objectsPermissions: SECRET_HIDDEN,+ });++ expect(event.properties.after).toEqual({ id: 'record-1', name: 'New' });+ expect(event.properties.updatedFields).toEqual(['name']);+ });++ it('should drop an update that only changed hidden fields', () => {+ expect(+ filter({+ events: [+ buildUpdateEvent({ recordId: 'record-2', updatedFields: ['secret'] }),+ ],+ objectsPermissions: SECRET_HIDDEN,+ }),+ ).toEqual([]);+ });+});diff --git a/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/resolve-events-readable-by-role.util.spec.ts b/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/resolve-events-readable-by-role.util.spec.tsdeleted file mode 100644index 3e96e5362d9..00000000000--- a/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/resolve-events-readable-by-role.util.spec.ts+++ /dev/null@@ -1,121 +0,0 @@-import { type ObjectRecordUpdateEvent } from 'twenty-shared/database-events';-import { FieldMetadataType, type ObjectPermissions } from 'twenty-shared/types';--import { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/constant/create-empty-flat-entity-maps.constant';-import { addFlatEntityToFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/add-flat-entity-to-flat-entity-maps-or-throw.util';-import { getFlatFieldMetadataMock } from 'src/engine/metadata-modules/flat-field-metadata/__mocks__/get-flat-field-metadata.mock';-import { getFlatObjectMetadataMock } from 'src/engine/metadata-modules/flat-object-metadata/__mocks__/get-flat-object-metadata.mock';-import { resolveEventsReadableByRole } from 'src/engine/permissions/combine/utils/resolve-events-readable-by-role.util';--const OBJECT_METADATA_ID = 'invoice-object-id';-const OWNING_APPLICATION_ID = 'stripe-application-id';-const OTHER_APPLICATION_ID = 'other-application-id';-const ROLE_ID = 'role-id';--const invoice = getFlatObjectMetadataMock({- id: OBJECT_METADATA_ID,- universalIdentifier: OBJECT_METADATA_ID,- applicationId: OWNING_APPLICATION_ID,-});--const flatObjectMetadataMaps = addFlatEntityToFlatEntityMapsOrThrow({- flatEntity: invoice,- flatEntityMaps: createEmptyFlatEntityMaps(),-});--const flatFieldMetadataMaps = [- getFlatFieldMetadataMock({- id: 'name-field-id',- universalIdentifier: 'name-field-id',- objectMetadataId: OBJECT_METADATA_ID,- type: FieldMetadataType.TEXT,- name: 'name',- applicationId: OWNING_APPLICATION_ID,- }),- getFlatFieldMetadataMock({- id: 'secret-field-id',- universalIdentifier: 'secret-field-id',- objectMetadataId: OBJECT_METADATA_ID,- type: FieldMetadataType.TEXT,- name: 'secret',- applicationId: OWNING_APPLICATION_ID,- disabledFieldPermissionActions: ['canReadFieldValue'],- }),-].reduce(- (maps, flatEntity) =>- addFlatEntityToFlatEntityMapsOrThrow({ flatEntity, flatEntityMaps: maps }),- createEmptyFlatEntityMaps(),-);--const FULL_ACCESS: ObjectPermissions = {- canReadObjectRecords: true,- canUpdateObjectRecords: true,- canSoftDeleteObjectRecords: true,- canDestroyObjectRecords: true,- restrictedFields: {},- rowLevelPermissionPredicates: [],- rowLevelPermissionPredicateGroups: [],-};--const updateEvent: ObjectRecordUpdateEvent = {- recordId: 'record-1',- properties: {- updatedFields: ['name', 'secret'],- before: { id: 'record-1', name: 'Old', secret: 'old' },- after: { id: 'record-1', name: 'New', secret: 'new' },- diff: {- name: { before: 'Old', after: 'New' },- secret: { before: 'old', after: 'new' },- },- },-};--const resolveForApplication = (applicationId: string) =>- resolveEventsReadableByRole({- application: { id: applicationId, defaultRoleId: ROLE_ID },- workspaceEventBatch: {- name: 'invoice.updated',- workspaceId: 'workspace-id',- objectMetadata: invoice,- events: [updateEvent],- },- eventRecordAccessGate: {- resolveAdmittedRecordIds: async () => new Set(['record-1']),- },- metadataMaps: {- rolesPermissions: { [ROLE_ID]: { [OBJECT_METADATA_ID]: FULL_ACCESS } },- flatApplicationMaps: {- byId: {- [applicationId]: {- id: applicationId,- defaultRoleId: ROLE_ID,- deletedAt: null,- },- },- },- flatRowLevelPermissionPredicateMaps: createEmptyFlatEntityMaps(),- flatRowLevelPermissionPredicateGroupMaps: createEmptyFlatEntityMaps(),- flatFieldMetadataMaps,- flatObjectMetadataMaps,- featureFlagsMap: {},- },- });--describe('resolveEventsReadableByRole', () => {- it('should omit a field whose read is disabled from another application event', async () => {- const [event] = await resolveForApplication(OTHER_APPLICATION_ID);-- expect(event.properties.after).toEqual({ id: 'record-1', name: 'New' });- expect(event.properties.updatedFields).toEqual(['name']);- });-- it('should keep the field for the application that owns it', async () => {- const [event] = await resolveForApplication(OWNING_APPLICATION_ID);-- expect(event.properties.after).toEqual({- id: 'record-1',- name: 'New',- secret: 'new',- });- });-});diff --git a/packages/twenty-server/src/engine/permissions/combine/utils/filter-readable-events.util.ts b/packages/twenty-server/src/engine/permissions/combine/utils/filter-readable-events.util.tsnew file mode 100644index 00000000000..4d5df9c682f--- /dev/null+++ b/packages/twenty-server/src/engine/permissions/combine/utils/filter-readable-events.util.ts@@ -0,0 +1,36 @@+import { type ObjectRecordEvent } from 'twenty-shared/database-events';+import { type ObjectsPermissions } from 'twenty-shared/types';++import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';+import { type PermissionsMetadataMaps } from 'src/engine/permissions/combine/types/row-access-policy.type';+import { isUpdateOfHiddenFieldsOnly } from 'src/engine/permissions/masking/utils/is-update-of-hidden-fields-only.util';+import { omitRestrictedFieldsFromEvent } from 'src/engine/permissions/masking/utils/omit-restricted-fields-from-event.util';++export const filterReadableEvents = <TEvent extends ObjectRecordEvent>({+ events,+ admittedRecordIds,+ objectMetadata,+ objectsPermissions,+ metadataMaps,+}: {+ events: TEvent[];+ admittedRecordIds: Set<string>;+ objectMetadata: Pick<FlatObjectMetadata, 'id' | 'nameSingular'>;+ objectsPermissions: ObjectsPermissions;+ metadataMaps: Pick<+ PermissionsMetadataMaps,+ 'flatObjectMetadataMaps' | 'flatFieldMetadataMaps'+ >;+}): TEvent[] =>+ events+ .filter((event) => admittedRecordIds.has(event.recordId))+ .map((event) =>+ omitRestrictedFieldsFromEvent({+ event,+ objectMetadata,+ objectsPermissions,+ flatObjectMetadataMaps: metadataMaps.flatObjectMetadataMaps,+ flatFieldMetadataMaps: metadataMaps.flatFieldMetadataMaps,+ }),+ )+ .filter((event) => !isUpdateOfHiddenFieldsOnly(event));diff --git a/packages/twenty-server/src/engine/permissions/combine/utils/resolve-events-readable-by-role.util.ts b/packages/twenty-server/src/engine/permissions/combine/utils/resolve-events-readable-by-role.util.tsdeleted file mode 100644index 9a902246678..00000000000--- a/packages/twenty-server/src/engine/permissions/combine/utils/resolve-events-readable-by-role.util.ts+++ /dev/null@@ -1,60 +0,0 @@-import { type ObjectRecordEvent } from 'twenty-shared/database-events';-import { isDefined } from 'twenty-shared/utils';--import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';-import { type EventRecordAccessGate } from 'src/engine/permissions/combine/types/event-record-access-gate.type';-import { type PermissionsMetadataMaps } from 'src/engine/permissions/combine/types/row-access-policy.type';-import { isUpdateOfHiddenFieldsOnly } from 'src/engine/permissions/masking/utils/is-update-of-hidden-fields-only.util';-import { omitRestrictedFieldsFromEvent } from 'src/engine/permissions/masking/utils/omit-restricted-fields-from-event.util';-import { getPermissionsPrincipalObjectsPermissions } from 'src/engine/permissions/role/utils/get-permissions-principal-objects-permissions.util';-import { type WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/workspace-event-batch.type';-import { type PermissionsPrincipalsWithRolesContext } from 'src/engine/permissions/principal/types/permissions-principals-with-roles-context.type';--export const resolveEventsReadableByRole = async <- TEvent extends ObjectRecordEvent,->({- application,- workspaceEventBatch,- eventRecordAccessGate,- metadataMaps,-}: {- application: Pick<FlatApplication, 'id' | 'defaultRoleId'>;- workspaceEventBatch: WorkspaceEventBatch<TEvent>;- eventRecordAccessGate: EventRecordAccessGate;- metadataMaps: PermissionsMetadataMaps;-}): Promise<TEvent[]> => {- const { id: applicationId, defaultRoleId: roleId } = application;-- if (!isDefined(roleId) || !isDefined(metadataMaps.rolesPermissions[roleId])) {- return [];- }-- const principal: PermissionsPrincipalsWithRolesContext = {- workspaceId: workspaceEventBatch.workspaceId,- mainPrincipal: { type: 'application', roleId, applicationId },- applicationPrincipal: { type: 'application', roleId, applicationId },- };- const objectsPermissions = getPermissionsPrincipalObjectsPermissions({- principal,- metadataMaps,- });- const admittedRecordIds =- await eventRecordAccessGate.resolveAdmittedRecordIds({- type: 'application',- workspace: { id: workspaceEventBatch.workspaceId },- application,- });-- return workspaceEventBatch.events- .filter((event) => admittedRecordIds.has(event.recordId))- .map((event) =>- omitRestrictedFieldsFromEvent({- event,- objectMetadata: workspaceEventBatch.objectMetadata,- objectsPermissions,- flatObjectMetadataMaps: metadataMaps.flatObjectMetadataMaps,- flatFieldMetadataMaps: metadataMaps.flatFieldMetadataMaps,- }),- )- .filter((event) => !isUpdateOfHiddenFieldsOnly(event));-};diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/resolve-principal-ids-from-auth-context.util.spec.ts b/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/resolve-principal-ids-from-auth-context.util.spec.tsdeleted file mode 100644index 31dd1bbd688..00000000000--- a/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/resolve-principal-ids-from-auth-context.util.spec.ts+++ /dev/null@@ -1,125 +0,0 @@-import { EVERYONE_PRINCIPAL_ID } from 'twenty-shared/constants';--import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';-import { resolvePrincipalIdsFromAuthContext } from 'src/engine/permissions/principal/utils/resolve-principal-ids-from-auth-context.util';--const USER_WORKSPACE_ID = 'user-workspace-1';-const USER_ROLE_ID = 'user-role-1';-const WORKSPACE_MEMBER_ID = 'workspace-member-1';-const APPLICATION_ROLE_ID = 'application-role-1';-const API_KEY_ID = 'api-key-1';-const API_KEY_ROLE_ID = 'api-key-role-1';--const userWorkspaceRoleMap = { [USER_WORKSPACE_ID]: USER_ROLE_ID };-const apiKeyRoleMap = { [API_KEY_ID]: API_KEY_ROLE_ID };--const resolve = (authContext: WorkspaceAuthContext) =>- resolvePrincipalIdsFromAuthContext({- authContext,- userWorkspaceRoleMap,- apiKeyRoleMap,- });--describe('resolvePrincipalIdsFromAuthContext', () => {- it('should resolve everyone, the workspace member and the role for a user', () => {- expect(- resolve({- type: 'user',- workspace: { id: 'workspace-1' },- userWorkspaceId: USER_WORKSPACE_ID,- user: { id: 'user-1' },- workspaceMemberId: WORKSPACE_MEMBER_ID,- workspaceMember: { id: WORKSPACE_MEMBER_ID },- } as unknown as WorkspaceAuthContext),- ).toEqual([EVERYONE_PRINCIPAL_ID, WORKSPACE_MEMBER_ID, USER_ROLE_ID]);- });-- it('should add the application role when an application acts on the user behalf', () => {- expect(- resolve({- type: 'user',- workspace: { id: 'workspace-1' },- userWorkspaceId: USER_WORKSPACE_ID,- user: { id: 'user-1' },- workspaceMemberId: WORKSPACE_MEMBER_ID,- workspaceMember: { id: WORKSPACE_MEMBER_ID },- application: { defaultRoleId: APPLICATION_ROLE_ID },- } as unknown as WorkspaceAuthContext),- ).toEqual([- EVERYONE_PRINCIPAL_ID,- WORKSPACE_MEMBER_ID,- USER_ROLE_ID,- APPLICATION_ROLE_ID,- ]);- });-- it('should resolve everyone alone for a user without a role', () => {- expect(- resolve({- type: 'user',- workspace: { id: 'workspace-1' },- userWorkspaceId: 'unknown-user-workspace',- user: { id: 'user-1' },- workspaceMemberId: WORKSPACE_MEMBER_ID,- workspaceMember: { id: WORKSPACE_MEMBER_ID },- } as unknown as WorkspaceAuthContext),- ).toEqual([EVERYONE_PRINCIPAL_ID, WORKSPACE_MEMBER_ID]);- });-- it('should resolve everyone and the api key role for an api key', () => {- expect(- resolve({- type: 'apiKey',- workspace: { id: 'workspace-1' },- apiKey: { id: API_KEY_ID },- } as unknown as WorkspaceAuthContext),- ).toEqual([EVERYONE_PRINCIPAL_ID, API_KEY_ROLE_ID]);- });-- it('should resolve everyone and the application role for an application', () => {- expect(- resolve({- type: 'application',- workspace: { id: 'workspace-1' },- application: {- id: 'application-1',- defaultRoleId: APPLICATION_ROLE_ID,- },- } as unknown as WorkspaceAuthContext),- ).toEqual([EVERYONE_PRINCIPAL_ID, APPLICATION_ROLE_ID]);- });-- it('should not count the agent role carried by the token as a principal', () => {- expect(- resolve({- type: 'user',- workspace: { id: 'workspace-1' },- userWorkspaceId: USER_WORKSPACE_ID,- user: { id: 'user-1' },- workspaceMemberId: WORKSPACE_MEMBER_ID,- workspaceMember: { id: WORKSPACE_MEMBER_ID },- agentId: 'agent-1',- } as unknown as WorkspaceAuthContext),- ).toEqual([EVERYONE_PRINCIPAL_ID, WORKSPACE_MEMBER_ID, USER_ROLE_ID]);- });-- it('should resolve everyone alone for a pending activation user', () => {- expect(- resolve({- type: 'pendingActivationUser',- workspace: { id: 'workspace-1' },- userWorkspaceId: USER_WORKSPACE_ID,- user: { id: 'user-1' },- } as unknown as WorkspaceAuthContext),- ).toEqual([EVERYONE_PRINCIPAL_ID]);- });-- it('should resolve no gate for a system request', () => {- expect(- resolve({- type: 'system',- workspace: { id: 'workspace-1' },- } as unknown as WorkspaceAuthContext),- ).toBeUndefined();- });-});diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/resolve-role-ids-from-auth-context.util.spec.ts b/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/resolve-role-ids-from-auth-context.util.spec.tsdeleted file mode 100644index cb2aa533bc6..00000000000--- a/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/resolve-role-ids-from-auth-context.util.spec.ts+++ /dev/null@@ -1,103 +0,0 @@-import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';-import { resolveRoleIdsFromAuthContext } from 'src/engine/permissions/principal/utils/resolve-role-ids-from-auth-context.util';--const USER_WORKSPACE_ID = 'user-workspace-1';-const USER_ROLE_ID = 'user-role-1';-const APPLICATION_ROLE_ID = 'application-role-1';-const API_KEY_ID = 'api-key-1';-const API_KEY_ROLE_ID = 'api-key-role-1';--const userWorkspaceRoleMap = { [USER_WORKSPACE_ID]: USER_ROLE_ID };-const apiKeyRoleMap = { [API_KEY_ID]: API_KEY_ROLE_ID };--const buildUserContext = (application?: {- defaultRoleId: string | null;-}): WorkspaceAuthContext =>- ({- type: 'user',- workspace: { id: 'workspace-1' },- userWorkspaceId: USER_WORKSPACE_ID,- user: { id: 'user-1' },- workspaceMemberId: 'workspace-member-1',- workspaceMember: { id: 'workspace-member-1' },- ...(application ? { application } : {}),- }) as unknown as WorkspaceAuthContext;--const resolve = (authContext: WorkspaceAuthContext) =>- resolveRoleIdsFromAuthContext({- authContext,- userWorkspaceRoleMap,- apiKeyRoleMap,- });--describe('resolveRoleIdsFromAuthContext', () => {- it('should resolve the user role alone for a plain user request', () => {- expect(resolve(buildUserContext())).toEqual([USER_ROLE_ID]);- });-- it('should resolve both roles when an application acts on the user behalf', () => {- expect(- resolve(buildUserContext({ defaultRoleId: APPLICATION_ROLE_ID })),- ).toEqual([USER_ROLE_ID, APPLICATION_ROLE_ID]);- });-- it('should add no bound when the application declares no role', () => {- expect(resolve(buildUserContext({ defaultRoleId: null }))).toEqual([- USER_ROLE_ID,- ]);- });-- it('should resolve the role once when the application declares the user own role', () => {- expect(resolve(buildUserContext({ defaultRoleId: USER_ROLE_ID }))).toEqual([- USER_ROLE_ID,- ]);- });-- it('should resolve nothing when the user has no role, even with an application', () => {- const contextWithUnknownUserWorkspace = {- ...buildUserContext({ defaultRoleId: APPLICATION_ROLE_ID }),- userWorkspaceId: 'unknown-user-workspace',- } as WorkspaceAuthContext;-- expect(resolve(contextWithUnknownUserWorkspace)).toEqual([]);- });-- it('should resolve the api key role', () => {- expect(- resolve({- type: 'apiKey',- workspace: { id: 'workspace-1' },- apiKey: { id: API_KEY_ID },- } as unknown as WorkspaceAuthContext),- ).toEqual([API_KEY_ROLE_ID]);- });-- it('should resolve the application role for an application-only request', () => {- expect(- resolve({- type: 'application',- workspace: { id: 'workspace-1' },- application: { defaultRoleId: APPLICATION_ROLE_ID },- } as unknown as WorkspaceAuthContext),- ).toEqual([APPLICATION_ROLE_ID]);- });-- it('should resolve nothing for an application-only request with no declared role', () => {- expect(- resolve({- type: 'application',- workspace: { id: 'workspace-1' },- application: { defaultRoleId: null },- } as unknown as WorkspaceAuthContext),- ).toEqual([]);- });-- it('should resolve nothing for a system request', () => {- expect(- resolve({- type: 'system',- workspace: { id: 'workspace-1' },- } as unknown as WorkspaceAuthContext),- ).toEqual([]);- });-});diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/resolve-principal-ids-from-auth-context.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/resolve-principal-ids-from-auth-context.util.tsdeleted file mode 100644index 0a4ae1ed810..00000000000--- a/packages/twenty-server/src/engine/permissions/principal/utils/resolve-principal-ids-from-auth-context.util.ts+++ /dev/null@@ -1,37 +0,0 @@-import { EVERYONE_PRINCIPAL_ID } from 'twenty-shared/constants';-import { isDefined } from 'twenty-shared/utils';--import { isSystemAuthContext } from 'src/engine/core-modules/auth/guards/is-system-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 { type UserWorkspaceRoleMap } from 'src/engine/metadata-modules/role-target/types/user-workspace-role-map.type';-import { resolveRoleIdsFromAuthContext } from 'src/engine/permissions/principal/utils/resolve-role-ids-from-auth-context.util';--export const resolvePrincipalIdsFromAuthContext = ({- authContext,- userWorkspaceRoleMap,- apiKeyRoleMap,-}: {- authContext: WorkspaceAuthContext;- userWorkspaceRoleMap: UserWorkspaceRoleMap;- apiKeyRoleMap: Record<string, string>;-}): string[] | undefined => {- if (isSystemAuthContext(authContext)) {- return undefined;- }-- // an agent only narrows access: a record shared with its role stays hidden- const roleIds = resolveRoleIdsFromAuthContext({- authContext,- userWorkspaceRoleMap,- apiKeyRoleMap,- });-- const principalIds = [- EVERYONE_PRINCIPAL_ID,- isUserAuthContext(authContext) ? authContext.workspaceMemberId : undefined,- ...roleIds,- ].filter(isDefined);-- return [...new Set(principalIds)];-};diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/resolve-role-ids-for-user.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/resolve-role-ids-for-user.util.tsdeleted file mode 100644index 159ee007e2f..00000000000--- a/packages/twenty-server/src/engine/permissions/principal/utils/resolve-role-ids-for-user.util.ts+++ /dev/null@@ -1,19 +0,0 @@-import { isDefined } from 'twenty-shared/utils';--// An application acting for a user is bounded by both the user's role and its own-export const resolveRoleIdsForUser = ({- userRoleId,- applicationRoleId,-}: {- userRoleId: string | null | undefined;- applicationRoleId: string | null | undefined;-}): string[] => {- // The application's role must never stand in for a missing user role.- if (!isDefined(userRoleId)) {- return [];- }-- return isDefined(applicationRoleId) && applicationRoleId !== userRoleId- ? [userRoleId, applicationRoleId]- : [userRoleId];-};diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/resolve-role-ids-from-auth-context.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/resolve-role-ids-from-auth-context.util.tsdeleted file mode 100644index 44b6c9d74c2..00000000000--- a/packages/twenty-server/src/engine/permissions/principal/utils/resolve-role-ids-from-auth-context.util.ts+++ /dev/null@@ -1,39 +0,0 @@-import { isDefined } from 'twenty-shared/utils';--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 { type UserWorkspaceRoleMap } from 'src/engine/metadata-modules/role-target/types/user-workspace-role-map.type';-import { resolveRoleIdsForUser } from 'src/engine/permissions/principal/utils/resolve-role-ids-for-user.util';--export const resolveRoleIdsFromAuthContext = ({- authContext,- userWorkspaceRoleMap,- apiKeyRoleMap,-}: {- authContext: WorkspaceAuthContext;- userWorkspaceRoleMap: UserWorkspaceRoleMap;- apiKeyRoleMap: Record<string, string>;-}): string[] => {- if (isUserAuthContext(authContext)) {- return resolveRoleIdsForUser({- userRoleId: userWorkspaceRoleMap[authContext.userWorkspaceId],- applicationRoleId: authContext.application?.defaultRoleId,- });- }-- if (isApiKeyAuthContext(authContext)) {- const apiKeyRoleId = apiKeyRoleMap[authContext.apiKey.id];-- return isDefined(apiKeyRoleId) ? [apiKeyRoleId] : [];- }-- if (isApplicationAuthContext(authContext)) {- const applicationRoleId = authContext.application.defaultRoleId;-- return isDefined(applicationRoleId) ? [applicationRoleId] : [];- }-- return [];-};diff --git a/packages/twenty-server/src/engine/permissions/record-share/services/record-sharing.service.ts b/packages/twenty-server/src/engine/permissions/record-share/services/record-sharing.service.tsindex 2a1befff31c..446c79e08b1 100644--- a/packages/twenty-server/src/engine/permissions/record-share/services/record-sharing.service.ts+++ b/packages/twenty-server/src/engine/permissions/record-share/services/record-sharing.service.ts@@ -7,6 +7,7 @@ import {RecordSharePrincipalType,RecordShareRowCause,} from 'twenty-shared/types';+import { EVERYONE_PRINCIPAL_ID } from 'twenty-shared/constants';import { isDefined } from 'twenty-shared/utils';import { type UserWorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';@@ -39,10 +40,10 @@ import { type RecordPermissionsDTO } from 'src/engine/permissions/record-permissimport { type RecordTargetInput } from 'src/engine/permissions/record-permissions/dtos/record-target.input';import { RecordPermissionsService } from 'src/engine/permissions/record-permissions/services/record-permissions.service';import { type WorkspaceTransactionScope } from 'src/engine/twenty-orm/types/workspace-transaction-scope.type';-import { resolvePrincipalIdsFromAuthContext } from 'src/engine/permissions/principal/utils/resolve-principal-ids-from-auth-context.util';import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';import { buildPermissionsPrincipalRoleMaps } from 'src/engine/permissions/principal/utils/build-permissions-principal-role-maps.util';import { getPermissionsPrincipalRoleIds } from 'src/engine/permissions/principal/utils/get-permissions-principal-role-ids.util';+import { getPermissionsPrincipalShareKeys } from 'src/engine/permissions/principal/utils/get-permissions-principal-share-keys.util';import { resolvePermissionsPrincipalsWithRoles } from 'src/engine/permissions/principal/utils/resolve-permissions-principals-with-roles.util';import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';@@ -476,12 +477,6 @@ export class RecordSharingService {'flatWorkspaceMemberMaps','roleIdsWithAllRecordsAccess',]);- const principalIds =- resolvePrincipalIdsFromAuthContext({- authContext,- userWorkspaceRoleMap,- apiKeyRoleMap,- }) ?? [];const principal = resolvePermissionsPrincipalsWithRoles({authContext,roleMaps: buildPermissionsPrincipalRoleMaps({@@ -516,7 +511,12 @@ export class RecordSharingService {privateRecordState?.createdByWorkspaceMemberId ?? undefined;const viewerAccessLevel = resolveViewerRecordShareAccessLevel({recordShares: shares,- principalIds,+ principalIds: [+ EVERYONE_PRINCIPAL_ID,+ ...(isDefined(principal)+ ? getPermissionsPrincipalShareKeys(principal)+ : []),+ ],implicitAccessLevels: isShareable? [isPrivate ? null : RecordShareAccessLevel.READ_WRITE,diff --git a/packages/twenty-server/src/engine/permissions/view/utils/__tests__/resolve-view-child-entity-view-id.util.spec.ts b/packages/twenty-server/src/engine/permissions/view/utils/__tests__/resolve-view-child-entity-view-ids.util.spec.tssimilarity index 57%rename from packages/twenty-server/src/engine/permissions/view/utils/__tests__/resolve-view-child-entity-view-id.util.spec.tsrename to packages/twenty-server/src/engine/permissions/view/utils/__tests__/resolve-view-child-entity-view-ids.util.spec.tsindex 854534efcd3..7112d3bd1db 100644--- a/packages/twenty-server/src/engine/permissions/view/utils/__tests__/resolve-view-child-entity-view-id.util.spec.ts+++ b/packages/twenty-server/src/engine/permissions/view/utils/__tests__/resolve-view-child-entity-view-ids.util.spec.ts@@ -1,48 +1,21 @@-import { resolveViewChildEntityViewId } from 'src/engine/permissions/view/utils/resolve-view-child-entity-view-id.util';import { resolveViewChildEntityViewIds } from 'src/engine/permissions/view/utils/resolve-view-child-entity-view-ids.util';-describe('resolveViewChildEntityViewId', () => {+describe('resolveViewChildEntityViewIds', () => {it('reads the view named by the input', () => {expect(- resolveViewChildEntityViewId({+ resolveViewChildEntityViewIds({args: { input: { viewId: 'view-id' } },body: undefined,}),- ).toBe('view-id');- });-- it('reads the view named by the first of a bulk create', () => {- expect(- resolveViewChildEntityViewId({- args: { inputs: [{ viewId: 'view-id' }] },- body: undefined,- }),- ).toBe('view-id');+ ).toEqual(['view-id']);});it('falls back to the REST body', () => {expect(- resolveViewChildEntityViewId({ args: {}, body: { viewId: 'view-id' } }),- ).toBe('view-id');+ resolveViewChildEntityViewIds({ args: {}, body: { viewId: 'view-id' } }),+ ).toEqual(['view-id']);});- it('returns null when no view is named', () => {- expect(- resolveViewChildEntityViewId({ args: {}, body: undefined }),- ).toBeNull();- });-- it('does not accept an empty string as a named view', () => {- expect(- resolveViewChildEntityViewId({- args: { input: { viewId: '' } },- body: undefined,- }),- ).toBeNull();- });-});--describe('resolveViewChildEntityViewIds', () => {it('resolves all distinct views across bulk create inputs', () => {expect(resolveViewChildEntityViewIds({diff --git a/packages/twenty-server/src/engine/permissions/view/utils/resolve-view-child-entity-view-id.util.ts b/packages/twenty-server/src/engine/permissions/view/utils/resolve-view-child-entity-view-id.util.tsdeleted file mode 100644index ff60f3c7b1e..00000000000--- a/packages/twenty-server/src/engine/permissions/view/utils/resolve-view-child-entity-view-id.util.ts+++ /dev/null@@ -1,11 +0,0 @@-import { resolveViewChildEntityViewIds } from 'src/engine/permissions/view/utils/resolve-view-child-entity-view-ids.util';--export const resolveViewChildEntityViewId = ({- args,- body,-}: {- args:- | { input?: { viewId?: unknown }; inputs?: { viewId?: unknown }[] }- | undefined;- body: { viewId?: unknown } | undefined;-}): string | null => resolveViewChildEntityViewIds({ args, body })[0] ?? null;diff --git a/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/listeners/workflow-database-event-trigger.listener.ts b/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/listeners/workflow-database-event-trigger.listener.tsindex 663d18ee430..1f3027bf7a7 100644--- a/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/listeners/workflow-database-event-trigger.listener.ts+++ b/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/listeners/workflow-database-event-trigger.listener.ts@@ -44,7 +44,6 @@ import {type BaseDatabaseEventTriggerSettings,type UpdateEventTriggerSettings,} from 'src/modules/workflow/workflow-trigger/automated-trigger/constants/automated-trigger-settings';-import { resolveEventsReadableByRole } from 'src/engine/permissions/combine/utils/resolve-events-readable-by-role.util';import { type CoreDispatchIds } from 'src/engine/core-modules/workflow/types/workflow-automated-trigger-maps.type';import {WorkflowTriggerJob,@@ -514,18 +513,16 @@ export class WorkflowDatabaseEventTriggerListener {return [];}- return resolveEventsReadableByRole({- application,- workspaceEventBatch,- eventRecordAccessGate:- this.recordAccessPolicyService.buildEventRecordAccessGate(- workspaceEventBatch,- ),- metadataMaps:- await this.recordAccessPolicyService.loadPermissionsMetadataMaps(- workspaceEventBatch.workspaceId,- ),- });+ return this.recordAccessPolicyService+ .buildEventRecordAccessGate(workspaceEventBatch)+ .resolveReadableEvents({+ authContext: {+ type: 'application',+ workspace: { id: workspaceEventBatch.workspaceId },+ application,+ },+ events: workspaceEventBatch.events,+ });}private shouldTriggerJob({