Skip to content

The open alternative to Salesforce, designed for AI.

Make the permissions principal role ids, member id and acting application (#29434)

Charles Bochet0ef4fe5bdfe0
diff --git a/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-base.handler.ts b/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-base.handler.ts
index c99cf330634..783cb518a07 100644
--- a/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-base.handler.ts
+++ b/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-base.handler.ts
@@ -146,7 +146,10 @@ export abstract class RestApiBaseHandler {
principal: buildPermissionsPrincipal({
workspaceId: authContext.workspace.id,
rolePermissionConfig,
- authContext,
+ workspaceMemberId: isUserAuthContext(authContext)
+ ? authContext.workspaceMemberId
+ : undefined,
+ flatApplicationMaps,
}),
objectsPermissions: getObjectsPermissionsFromRolePermissionConfig({
rolesPermissions,
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.ts
index 4c32e22a4a5..4dcdc07ad8d 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
@@ -24,6 +24,7 @@ import { type RolePermissionConfig } from 'src/engine/permissions/principal/type
import { resolveRolePermissionConfig } from 'src/engine/permissions/principal/utils/resolve-role-permission-config.util';
import { getObjectsPermissionsFromRolePermissionConfig } from 'src/engine/permissions/role/utils/get-objects-permissions-from-role-permission-config.util';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
+import { isUserAuthContext } from 'src/engine/core-modules/auth/guards/is-user-auth-context.guard';
export type CommonApiContext = {
queryRunnerContext: CommonBaseQueryRunnerContext;
@@ -190,7 +191,10 @@ export class CommonApiContextBuilderService {
principal: buildPermissionsPrincipal({
workspaceId: authContext.workspace.id,
rolePermissionConfig: resolvedRolePermissionConfig,
- authContext,
+ workspaceMemberId: isUserAuthContext(authContext)
+ ? authContext.workspaceMemberId
+ : undefined,
+ flatApplicationMaps,
}),
};
}
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.ts
index a79be34c0ee..d73d4e43301 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
@@ -40,6 +40,7 @@ import { RECORDS_TOOL_WIDGET_NAME, ToolCategory } from 'twenty-shared/ai';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
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 { isUserAuthContext } from 'src/engine/core-modules/auth/guards/is-user-auth-context.guard';
@Injectable()
export class DatabaseToolProvider implements ToolProvider {
@@ -105,7 +106,11 @@ export class DatabaseToolProvider implements ToolProvider {
const principal = buildPermissionsPrincipal({
workspaceId: context.workspaceId,
rolePermissionConfig: context.rolePermissionConfig,
- authContext: context.authContext,
+ workspaceMemberId:
+ isDefined(context.authContext) && isUserAuthContext(context.authContext)
+ ? context.authContext.workspaceMemberId
+ : undefined,
+ flatApplicationMaps,
});
const { explicitObjectGrantsRoleId } = context;
diff --git a/packages/twenty-server/src/engine/core-modules/user/services/workspace-flat-workspace-member-map-cache.service.ts b/packages/twenty-server/src/engine/core-modules/user/services/workspace-flat-workspace-member-map-cache.service.ts
index 6451b8cbb0f..3af23201552 100644
--- a/packages/twenty-server/src/engine/core-modules/user/services/workspace-flat-workspace-member-map-cache.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/user/services/workspace-flat-workspace-member-map-cache.service.ts
@@ -47,6 +47,7 @@ export class WorkspaceFlatWorkspaceMemberMapCacheService extends WorkspaceCacheP
})
.find({ withDeleted: true }),
buildSystemAuthContext(workspaceId),
+ { lite: true },
);
return buildFlatWorkspaceMemberMaps({
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.ts
index 42518a91386..5b075fcce5e 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
@@ -22,6 +22,7 @@ import { isDatabaseEventCausedByAgent } from 'src/engine/metadata-modules/ai/ai-
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
import { type WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/workspace-event-batch.type';
import { filterEventsByUpdatedFields } from 'src/engine/workspace-event-emitter/utils/filter-events-by-updated-fields.util';
+import { buildPermissionsPrincipal } from 'src/engine/permissions/principal/utils/build-permissions-principal.util';
@Processor(MessageQueue.triggerQueue)
export class CallAgentDatabaseEventTriggersJob {
@@ -83,10 +84,13 @@ export class CallAgentDatabaseEventTriggersJob {
}
const admittedRecordIds =
- await eventRecordAccessGate.resolveAdmittedRecordIds({
- workspaceId: workspaceEventBatch.workspaceId,
- intersectionOf: { agentRoleId },
- });
+ await eventRecordAccessGate.resolveAdmittedRecordIds(
+ buildPermissionsPrincipal({
+ workspaceId: workspaceEventBatch.workspaceId,
+ roleId: agentRoleId,
+ applicationId: undefined,
+ }),
+ );
const admittedEvents = workspaceEventBatch.events
.filter((event) => admittedRecordIds.has(event.recordId))
.filter(
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-sharing.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-sharing.service.ts
index dd0945d45ae..fada3f2dc1f 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-sharing.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-sharing.service.ts
@@ -54,7 +54,6 @@ import { PermissionsService } from 'src/engine/permissions/permissions.service';
import { type OperationType } from 'src/engine/permissions/role/utils/validate-operation-is-permitted-or-throw.util';
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
-import { type WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
const READABLE_THREAD_IDS_BATCH_SIZE = 1000;
@@ -319,52 +318,39 @@ export class AgentChatSharingService {
const threadFlatObjectMetadata =
await this.getThreadObjectMetadata(workspaceId);
- return this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const members = await this.workspaceOrmManager
- .getRepository<WorkspaceMemberWorkspaceEntity>('workspaceMember', {
- shouldBypassPermissionChecks: true,
- })
- .find({ where: { id: In([...roleIdByMemberId.keys()]) } });
- const hypotheticalRecordShareAccessLevel =
- shouldConsiderNewShares && canManageSharing
- ? RecordShareAccessLevel.READ_WRITE
- : undefined;
- const admittedMemberIds = new Set(
- (
- await Promise.all(
- members.map(async (member) => {
- const roleId = roleIdByMemberId.get(member.id);
-
- if (!isDefined(roleId)) {
- return undefined;
- }
-
- const grants = await Promise.all(
- AGENT_CHAT_REPLY_OPERATION_TYPES.map((operationType) =>
- this.recordAccessPolicyService.hasAccessToRecords({
- principal: {
- workspaceId,
- intersectionOf: { userWorkspaceRoleId: roleId },
- workspaceMember: member,
- },
- flatObjectMetadata: threadFlatObjectMetadata,
- recordIds: [threadId],
- operationType,
- hypotheticalRecordShareAccessLevel,
- }),
- ),
- );
-
- return grants.every(Boolean) ? member.id : undefined;
- }),
- )
- ).filter(isDefined),
- );
+ const hypotheticalRecordShareAccessLevel =
+ shouldConsiderNewShares && canManageSharing
+ ? RecordShareAccessLevel.READ_WRITE
+ : undefined;
+ const admittedMemberIds = new Set(
+ (
+ await Promise.all(
+ [...roleIdByMemberId.entries()].map(async ([memberId, roleId]) => {
+ const grants = await Promise.all(
+ AGENT_CHAT_REPLY_OPERATION_TYPES.map((operationType) =>
+ this.recordAccessPolicyService.hasAccessToRecords({
+ principal: {
+ workspaceId,
+ roleIds: [roleId],
+ workspaceMemberId: memberId,
+ },
+ flatObjectMetadata: threadFlatObjectMetadata,
+ recordIds: [threadId],
+ operationType,
+ hypotheticalRecordShareAccessLevel,
+ }),
+ ),
+ );
- return candidateMemberIds.filter((memberId) =>
- admittedMemberIds.has(memberId),
- );
- }, authContext);
+ return grants.every(Boolean) ? memberId : undefined;
+ }),
+ )
+ ).filter(isDefined),
+ );
+
+ return candidateMemberIds.filter((memberId) =>
+ admittedMemberIds.has(memberId),
+ );
}
async getPrivateRecordInsertSql(
diff --git a/packages/twenty-server/src/engine/metadata-modules/webhook/jobs/call-webhook-jobs.job.ts b/packages/twenty-server/src/engine/metadata-modules/webhook/jobs/call-webhook-jobs.job.ts
index 871bd3aca92..4e7053dc818 100644
--- a/packages/twenty-server/src/engine/metadata-modules/webhook/jobs/call-webhook-jobs.job.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/webhook/jobs/call-webhook-jobs.job.ts
@@ -20,6 +20,7 @@ import { transformEventBatchToWebhookEvents } from 'src/engine/metadata-modules/
import { findFlatRoleTargetFromForeignKey } from 'src/engine/metadata-modules/flat-role-target/utils/find-flat-role-target-from-foreign-key.util';
import { RecordAccessPolicyService } from 'src/engine/permissions/combine/services/record-access-policy.service';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
+import { buildPermissionsPrincipal } from 'src/engine/permissions/principal/utils/build-permissions-principal.util';
const WEBHOOK_JOBS_CHUNK_SIZE = 20;
@@ -93,10 +94,13 @@ export class CallWebhookJobsJob {
const admittedRecordIds =
admittedRecordIdsByRoleId.get(webhookRoleId) ??
- eventRecordAccessGate.resolveAdmittedRecordIds({
- workspaceId: workspaceEventBatch.workspaceId,
- intersectionOf: { webhookRoleId },
- });
+ eventRecordAccessGate.resolveAdmittedRecordIds(
+ buildPermissionsPrincipal({
+ workspaceId: workspaceEventBatch.workspaceId,
+ roleId: webhookRoleId,
+ applicationId: undefined,
+ }),
+ );
admittedRecordIdsByRoleId.set(webhookRoleId, admittedRecordIds);
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.ts
index 2b044a3cfe7..65713e870a8 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
@@ -20,6 +20,7 @@ import { getPermissionsPrincipalShareKeys } from 'src/engine/permissions/princip
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';
import { isObjectOperationDisabledToPrincipal } from 'src/engine/permissions/role/utils/is-object-operation-disabled-to-principal.util';
+import { hasWorkspaceMemberBoundPredicates } from 'src/engine/permissions/rls/utils/has-workspace-member-bound-predicates.util';
import { isRolePermittingOperation } from 'src/engine/permissions/role/utils/is-role-permitting-operation.util';
import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace-repository';
import { type WorkspaceTransactionScope } from 'src/engine/twenty-orm/types/workspace-transaction-scope.type';
@@ -147,7 +148,7 @@ export class RecordAccessPolicyService {
'flatRowLevelPermissionPredicateGroupMaps',
]);
- return {
+ const metadataMaps: PermissionsMetadataMaps = {
flatObjectMetadataMaps,
flatFieldMetadataMaps: flatFieldMetadataMapsOrm,
featureFlagsMap,
@@ -156,6 +157,19 @@ export class RecordAccessPolicyService {
flatRowLevelPermissionPredicateMaps,
flatRowLevelPermissionPredicateGroupMaps,
};
+
+ if (
+ !hasWorkspaceMemberBoundPredicates(flatRowLevelPermissionPredicateMaps)
+ ) {
+ return metadataMaps;
+ }
+
+ const { flatWorkspaceMemberMaps } =
+ await this.workspaceCacheService.getOrRecompute(workspaceId, [
+ 'flatWorkspaceMemberMaps',
+ ]);
+
+ return { ...metadataMaps, flatWorkspaceMemberMaps };
}
// Event snapshots go through the same grant paths as the principal's queries
diff --git a/packages/twenty-server/src/engine/permissions/combine/types/row-access-policy.type.ts b/packages/twenty-server/src/engine/permissions/combine/types/row-access-policy.type.ts
index b04ca5ad9e7..bbed5faeec5 100644
--- a/packages/twenty-server/src/engine/permissions/combine/types/row-access-policy.type.ts
+++ b/packages/twenty-server/src/engine/permissions/combine/types/row-access-policy.type.ts
@@ -6,6 +6,7 @@ import {
type RecordShareAccessLevel,
} from 'twenty-shared/types';
+import { type FlatWorkspaceMemberMaps } from 'src/engine/core-modules/user/types/flat-workspace-member-maps.type';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
@@ -27,6 +28,7 @@ export type PermissionsMetadataMaps = {
flatApplicationMaps: ApplicationDefaultRoleMaps;
flatRowLevelPermissionPredicateMaps: FlatRowLevelPermissionPredicateMaps;
flatRowLevelPermissionPredicateGroupMaps: FlatRowLevelPermissionPredicateGroupMaps;
+ flatWorkspaceMemberMaps?: FlatWorkspaceMemberMaps;
};
export type PermissionsRowAccessRequest = {
diff --git a/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/build-permissions-condition.util.spec.ts b/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/build-permissions-condition.util.spec.ts
index cd4c9afa9cd..2129c655df7 100644
--- a/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/build-permissions-condition.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/build-permissions-condition.util.spec.ts
@@ -125,18 +125,19 @@ const buildConditionOutcome = (
const readEverything: PermissionsPrincipal = {
workspaceId: 'workspace-id',
- intersectionOf: { userWorkspaceRoleId: FULL_ACCESS_ROLE_ID },
- workspaceMember: { id: 'member-1' },
+ roleIds: [FULL_ACCESS_ROLE_ID],
+ workspaceMemberId: 'member-1',
};
const owningApplication: PermissionsPrincipal = {
workspaceId: 'workspace-id',
- intersectionOf: { applicationRoleId: APPLICATION_ROLE_ID },
+ roleIds: [APPLICATION_ROLE_ID],
+ applicationId: APPLICATION_ID,
};
const withoutObjectPermission: PermissionsPrincipal = {
...readEverything,
- intersectionOf: { userWorkspaceRoleId: ROLE_WITHOUT_PERMISSION_ID },
+ roleIds: [ROLE_WITHOUT_PERMISSION_ID],
};
const build = ({
@@ -291,7 +292,7 @@ describe('buildPermissionsCondition', () => {
});
const withoutCompanyPermission: PermissionsPrincipal = {
...readEverything,
- intersectionOf: { userWorkspaceRoleId: 'role-2', apiKeyRoleId: 'role-3' },
+ roleIds: ['role-2', 'role-3'],
};
it('narrows a principal without object permission to the records named for them', () => {
@@ -344,7 +345,7 @@ describe('buildPermissionsCondition', () => {
expect(
buildForCompany({
workspaceId: 'workspace-id',
- intersectionOf: { userWorkspaceRoleId: null },
+ roleIds: [],
}),
).toEqual({ kind: 'denied' });
});
diff --git a/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/find-permissions-admitted-record-ids.util.spec.ts b/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/find-permissions-admitted-record-ids.util.spec.ts
index fb3d0e7af34..baf794d2a64 100644
--- a/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/find-permissions-admitted-record-ids.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/find-permissions-admitted-record-ids.util.spec.ts
@@ -101,17 +101,17 @@ const fullAccess = {
const rolePrincipal: PermissionsPrincipal = {
workspaceId: 'workspace-id',
- intersectionOf: { userWorkspaceRoleId: MEMBER_ROLE_ID },
+ roleIds: [MEMBER_ROLE_ID],
};
const memberPrincipal: PermissionsPrincipal = {
...rolePrincipal,
- workspaceMember: { id: MEMBER_ID },
+ workspaceMemberId: MEMBER_ID,
};
const deniedPrincipal: PermissionsPrincipal = {
...memberPrincipal,
- intersectionOf: { userWorkspaceRoleId: 'missing-role' },
+ roleIds: ['missing-role'],
};
const filterByStatus = (status: string) =>
diff --git a/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/has-access-to-all-records.util.spec.ts b/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/has-access-to-all-records.util.spec.ts
index 52b03feac7a..f900dfdda81 100644
--- a/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/has-access-to-all-records.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/has-access-to-all-records.util.spec.ts
@@ -17,6 +17,10 @@ const APPLICATION_ID = 'application-id';
const APPLICATION_ROLE_ID = 'application-role';
const READ_ONLY_ROLE_ID = 'read-only-role';
const OTHER_APPLICATION_ROLE_ID = 'other-application-role';
+const APPLICATION_ID_BY_ROLE_ID: Record<string, string> = {
+ [APPLICATION_ROLE_ID]: APPLICATION_ID,
+ [OTHER_APPLICATION_ROLE_ID]: 'other-application-id',
+};
const flatObjectMetadata = {
...COMPANY_FLAT_OBJECT_MOCK,
@@ -46,11 +50,8 @@ const hasAccess = ({
const request: PermissionsObjectAccessRequest = {
principal: {
workspaceId: 'workspace-id',
- intersectionOf: [APPLICATION_ROLE_ID, OTHER_APPLICATION_ROLE_ID].includes(
- roleId,
- )
- ? { applicationRoleId: roleId }
- : { userWorkspaceRoleId: roleId },
+ roleIds: [roleId],
+ applicationId: APPLICATION_ID_BY_ROLE_ID[roleId],
},
metadataMaps: {
flatFieldMetadataMaps: createEmptyFlatEntityMaps(),
diff --git a/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/resolve-permissions-row-access-outcome.util.spec.ts b/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/resolve-permissions-row-access-outcome.util.spec.ts
index 11c27d434fa..48d39c1ab8e 100644
--- a/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/resolve-permissions-row-access-outcome.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/resolve-permissions-row-access-outcome.util.spec.ts
@@ -35,12 +35,13 @@ const readOnlyPermissions: ObjectPermissions = {
const readOnlyPrincipal: PermissionsPrincipal = {
workspaceId: 'workspace-id',
- intersectionOf: { userWorkspaceRoleId: READ_ONLY_ROLE_ID },
+ roleIds: [READ_ONLY_ROLE_ID],
};
const owningApplicationPrincipal: PermissionsPrincipal = {
workspaceId: 'workspace-id',
- intersectionOf: { applicationRoleId: APPLICATION_ROLE_ID },
+ roleIds: [APPLICATION_ROLE_ID],
+ applicationId: APPLICATION_ID,
};
const resolveOutcome = ({
@@ -101,7 +102,7 @@ describe('resolvePermissionsRowAccessOutcome', () => {
resolveOutcome({
principal: {
...readOnlyPrincipal,
- intersectionOf: { userWorkspaceRoleId: 'missing-role' },
+ roleIds: ['missing-role'],
},
}),
).toBe(false);
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.ts
index d91571fb988..c99c387ebcf 100644
--- 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.ts
@@ -5,9 +5,10 @@ import { type EventRecordAccessGate } from 'src/engine/permissions/combine/types
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 { type PermissionsPrincipal } from 'src/engine/permissions/principal/types/permissions-principal.type';
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 { buildPermissionsPrincipal } from 'src/engine/permissions/principal/utils/build-permissions-principal.util';
+import { resolvePermissionsPrincipalActingApplicationId } from 'src/engine/permissions/principal/utils/resolve-permissions-principal-acting-application-id.util';
export const resolveEventsReadableByRole = async <
TEvent extends ObjectRecordEvent,
@@ -26,10 +27,14 @@ export const resolveEventsReadableByRole = async <
return [];
}
- const principal: PermissionsPrincipal = {
+ const principal = buildPermissionsPrincipal({
workspaceId: workspaceEventBatch.workspaceId,
- intersectionOf: { applicationRoleId: roleId },
- };
+ roleId,
+ applicationId: resolvePermissionsPrincipalActingApplicationId({
+ intersectionOf: { applicationRoleId: roleId },
+ flatApplicationMaps: metadataMaps.flatApplicationMaps,
+ }),
+ });
const objectsPermissions = getPermissionsPrincipalObjectsPermissions({
principal,
metadataMaps,
diff --git a/packages/twenty-server/src/engine/permissions/permissions.service.ts b/packages/twenty-server/src/engine/permissions/permissions.service.ts
index 7ec34845549..23446551dd8 100644
--- a/packages/twenty-server/src/engine/permissions/permissions.service.ts
+++ b/packages/twenty-server/src/engine/permissions/permissions.service.ts
@@ -4,7 +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/permissions/role/utils/compute-objects-permissions-for-role-permission-config.util';
+import { computeObjectsPermissionsForRoles } from 'src/engine/permissions/role/utils/compute-objects-permissions-for-roles.util';
import { ApiKeyRoleService } from 'src/engine/core-modules/api-key/services/api-key-role.service';
import {
ApplicationException,
@@ -84,8 +84,8 @@ export class PermissionsService {
return {
permissionFlags,
- objectsPermissions: computeObjectsPermissionsForRolePermissionConfig({
- intersectionOf: { userWorkspaceRoleId: flatRole.id },
+ objectsPermissions: computeObjectsPermissionsForRoles({
+ roleIds: [flatRole.id],
rolesPermissions,
flatObjectMetadataMaps,
flatFieldMetadataMaps,
diff --git a/packages/twenty-server/src/engine/permissions/principal/types/permissions-principal.type.ts b/packages/twenty-server/src/engine/permissions/principal/types/permissions-principal.type.ts
index 923680f4eba..bf86461f1d9 100644
--- a/packages/twenty-server/src/engine/permissions/principal/types/permissions-principal.type.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/types/permissions-principal.type.ts
@@ -1,16 +1,8 @@
/* @license Enterprise */
-import { type RoleIdsBySource } from 'src/engine/permissions/principal/types/role-permission-config.type';
-import { type WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
-
-export type PermissionsPrincipalWorkspaceMember = Pick<
- WorkspaceMemberWorkspaceEntity,
- 'id'
-> &
- Partial<WorkspaceMemberWorkspaceEntity>;
-
export type PermissionsPrincipal = {
workspaceId: string;
- intersectionOf: RoleIdsBySource;
- workspaceMember?: PermissionsPrincipalWorkspaceMember;
+ roleIds: string[];
+ workspaceMemberId?: string;
+ applicationId?: string;
};
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/build-permissions-principal.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/build-permissions-principal.util.ts
index 10cf97ab954..16111b224c6 100644
--- a/packages/twenty-server/src/engine/permissions/principal/utils/build-permissions-principal.util.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/build-permissions-principal.util.ts
@@ -1,32 +1,56 @@
/* @license Enterprise */
-import { isDefined } from 'twenty-shared/utils';
-
-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 ApplicationDefaultRoleMaps } from 'src/engine/permissions/principal/types/application-default-role-maps.type';
import { type PermissionsPrincipal } from 'src/engine/permissions/principal/types/permissions-principal.type';
import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
+import { getRoleIdsToIntersect } from 'src/engine/permissions/principal/utils/get-role-ids-to-intersect.util';
+import { resolvePermissionsPrincipalActingApplicationId } from 'src/engine/permissions/principal/utils/resolve-permissions-principal-acting-application-id.util';
+
+type BuildRolePermissionsPrincipalArgs = {
+ workspaceId: string;
+ roleId: string;
+ applicationId: string | undefined;
+};
-// Undefined when the caller bypasses permission checks: there is no system principal
-export const buildPermissionsPrincipal = ({
- workspaceId,
- rolePermissionConfig,
- authContext,
-}: {
+type BuildConfigPermissionsPrincipalArgs = {
workspaceId: string;
rolePermissionConfig: RolePermissionConfig;
- authContext?: WorkspaceAuthContext;
-}): PermissionsPrincipal | undefined => {
+ workspaceMemberId: string | undefined;
+ flatApplicationMaps: ApplicationDefaultRoleMaps;
+};
+
+export function buildPermissionsPrincipal(
+ args: BuildRolePermissionsPrincipalArgs,
+): PermissionsPrincipal;
+export function buildPermissionsPrincipal(
+ args: BuildConfigPermissionsPrincipalArgs,
+): PermissionsPrincipal | undefined;
+export function buildPermissionsPrincipal(
+ args: BuildRolePermissionsPrincipalArgs | BuildConfigPermissionsPrincipalArgs,
+): PermissionsPrincipal | undefined {
+ if ('roleId' in args) {
+ return {
+ workspaceId: args.workspaceId,
+ roleIds: [args.roleId],
+ applicationId: args.applicationId,
+ };
+ }
+
+ const { workspaceId, rolePermissionConfig, workspaceMemberId } = args;
+
if (!('intersectionOf' in rolePermissionConfig)) {
return undefined;
}
+ const { intersectionOf } = rolePermissionConfig;
+
return {
workspaceId,
- intersectionOf: rolePermissionConfig.intersectionOf,
- workspaceMember:
- isDefined(authContext) && isUserAuthContext(authContext)
- ? authContext.workspaceMember
- : undefined,
+ roleIds: getRoleIdsToIntersect(intersectionOf) ?? [],
+ workspaceMemberId,
+ applicationId: resolvePermissionsPrincipalActingApplicationId({
+ intersectionOf,
+ flatApplicationMaps: args.flatApplicationMaps,
+ }),
};
-};
+}
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principal-role-ids.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principal-role-ids.util.ts
deleted file mode 100644
index 5fdf8fd64a8..00000000000
--- a/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principal-role-ids.util.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/* @license Enterprise */
-
-import { type PermissionsPrincipal } from 'src/engine/permissions/principal/types/permissions-principal.type';
-import { getRoleIdsToIntersect } from 'src/engine/permissions/principal/utils/get-role-ids-to-intersect.util';
-
-export const getPermissionsPrincipalRoleIds = (
- principal: PermissionsPrincipal,
-): string[] => getRoleIdsToIntersect(principal.intersectionOf) ?? [];
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principal-share-keys.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principal-share-keys.util.ts
index ff61524c1e0..a5d0652ca21 100644
--- a/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principal-share-keys.util.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principal-share-keys.util.ts
@@ -3,27 +3,11 @@
import { isDefined } from 'twenty-shared/utils';
import { type PermissionsPrincipal } from 'src/engine/permissions/principal/types/permissions-principal.type';
-import { getPermissionsPrincipalRoleIds } from 'src/engine/permissions/principal/utils/get-permissions-principal-role-ids.util';
-// An agent acting for someone only narrows their access, so a record shared with its role stays hidden
export const getPermissionsPrincipalShareKeys = (
principal: PermissionsPrincipal,
-): string[] => {
- const { agentRoleId, ...otherRoleIdsBySource } = principal.intersectionOf;
- const otherRoleIds = Object.values(otherRoleIdsBySource);
- const isAgentNarrowing = otherRoleIds.some(isDefined);
-
- return [
- ...new Set(
- [
- principal.workspaceMember?.id,
- ...getPermissionsPrincipalRoleIds(principal).filter(
- (roleId) =>
- !isAgentNarrowing ||
- roleId !== agentRoleId ||
- otherRoleIds.includes(roleId),
- ),
- ].filter(isDefined),
- ),
- ];
-};
+): string[] => [
+ ...new Set(
+ [principal.workspaceMemberId, ...principal.roleIds].filter(isDefined),
+ ),
+];
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/is-permissions-principal-owning-object.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/is-permissions-principal-owning-object.util.ts
index 3fbae442855..3db6657faf1 100644
--- a/packages/twenty-server/src/engine/permissions/principal/utils/is-permissions-principal-owning-object.util.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/is-permissions-principal-owning-object.util.ts
@@ -3,21 +3,14 @@
import { isDefined } from 'twenty-shared/utils';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
-import { type ApplicationDefaultRoleMaps } from 'src/engine/permissions/principal/types/application-default-role-maps.type';
import { type PermissionsPrincipal } from 'src/engine/permissions/principal/types/permissions-principal.type';
-import { resolvePermissionsPrincipalActingApplicationId } from 'src/engine/permissions/principal/utils/resolve-permissions-principal-acting-application-id.util';
export const isPermissionsPrincipalOwningObject = ({
principal,
- flatApplicationMaps,
flatObjectMetadata,
}: {
- principal: Pick<PermissionsPrincipal, 'intersectionOf'>;
- flatApplicationMaps: ApplicationDefaultRoleMaps;
+ principal: Pick<PermissionsPrincipal, 'applicationId'>;
flatObjectMetadata: Pick<FlatObjectMetadata, 'applicationId'>;
}): boolean =>
- isDefined(flatObjectMetadata.applicationId) &&
- resolvePermissionsPrincipalActingApplicationId({
- intersectionOf: principal.intersectionOf,
- flatApplicationMaps,
- }) === flatObjectMetadata.applicationId;
+ isDefined(principal.applicationId) &&
+ principal.applicationId === flatObjectMetadata.applicationId;
diff --git a/packages/twenty-server/src/engine/permissions/private-record/utils/resolve-permissions-creator-workspace-member-id.util.ts b/packages/twenty-server/src/engine/permissions/private-record/utils/resolve-permissions-creator-workspace-member-id.util.ts
index 5410fd7c18c..e250d80e75a 100644
--- a/packages/twenty-server/src/engine/permissions/private-record/utils/resolve-permissions-creator-workspace-member-id.util.ts
+++ b/packages/twenty-server/src/engine/permissions/private-record/utils/resolve-permissions-creator-workspace-member-id.util.ts
@@ -12,5 +12,5 @@ export const resolvePermissionsCreatorWorkspaceMemberId = (
flatObjectMetadata: request.flatObjectMetadata,
flatFieldMetadataMaps: request.metadataMaps.flatFieldMetadataMaps,
})
- ? request.principal.workspaceMember?.id
+ ? request.principal.workspaceMemberId
: undefined;
diff --git a/packages/twenty-server/src/engine/permissions/record-share/services/record-share-principal.service.ts b/packages/twenty-server/src/engine/permissions/record-share/services/record-share-principal.service.ts
index 0ea3a86d03e..f479b94b7ad 100644
--- a/packages/twenty-server/src/engine/permissions/record-share/services/record-share-principal.service.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/services/record-share-principal.service.ts
@@ -17,7 +17,6 @@ import { type RecordShareInput } from 'src/engine/permissions/record-share/types
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { type WorkspaceTransactionScope } from 'src/engine/twenty-orm/types/workspace-transaction-scope.type';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
-import { type WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
type RecordSharePrincipal = Pick<
RecordShareInput,
@@ -127,7 +126,7 @@ export class RecordSharePrincipalService {
const rolePrincipal: PermissionsPrincipal = {
workspaceId,
- intersectionOf: { userWorkspaceRoleId: roleId },
+ roleIds: [roleId],
};
if (
@@ -153,15 +152,10 @@ export class RecordSharePrincipalService {
continue;
}
- const workspaceMember = await transactionScope
- .getRepository<WorkspaceMemberWorkspaceEntity>('workspaceMember', {
- shouldBypassPermissionChecks: true,
- })
- .findOne({ where: { id: principal.principalId } });
const hasGrant = await this.recordAccessPolicyService.hasAccessToRecords({
principal: {
...rolePrincipal,
- workspaceMember: workspaceMember ?? undefined,
+ workspaceMemberId: principal.principalId,
},
flatObjectMetadata,
operationType: 'select',
diff --git a/packages/twenty-server/src/engine/permissions/rls/types/row-level-permission-workspace-member.type.ts b/packages/twenty-server/src/engine/permissions/rls/types/row-level-permission-workspace-member.type.ts
new file mode 100644
index 00000000000..c4005c619ff
--- /dev/null
+++ b/packages/twenty-server/src/engine/permissions/rls/types/row-level-permission-workspace-member.type.ts
@@ -0,0 +1,9 @@
+/* @license Enterprise */
+
+import { type WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
+
+export type RowLevelPermissionWorkspaceMember = Pick<
+ WorkspaceMemberWorkspaceEntity,
+ 'id'
+> &
+ Partial<WorkspaceMemberWorkspaceEntity>;
diff --git a/packages/twenty-server/src/engine/permissions/rls/utils/build-row-level-permission-record-filter.util.ts b/packages/twenty-server/src/engine/permissions/rls/utils/build-row-level-permission-record-filter.util.ts
index 9108710bab5..37a982c4207 100644
--- a/packages/twenty-server/src/engine/permissions/rls/utils/build-row-level-permission-record-filter.util.ts
+++ b/packages/twenty-server/src/engine/permissions/rls/utils/build-row-level-permission-record-filter.util.ts
@@ -16,7 +16,7 @@ import {
type RecordFilterGroup,
} from 'twenty-shared/utils';
-import { type PermissionsPrincipalWorkspaceMember } from 'src/engine/permissions/principal/types/permissions-principal.type';
+import { type RowLevelPermissionWorkspaceMember } from 'src/engine/permissions/rls/types/row-level-permission-workspace-member.type';
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 OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
@@ -41,7 +41,7 @@ type BuildRecordFilterForRoleArgs = {
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
objectMetadata: FlatObjectMetadata;
roleId: string;
- workspaceMember?: PermissionsPrincipalWorkspaceMember;
+ workspaceMember?: RowLevelPermissionWorkspaceMember;
};
const resolveWorkspaceMemberBoundPredicateValue = ({
@@ -55,7 +55,7 @@ const resolveWorkspaceMemberBoundPredicateValue = ({
workspaceMemberFieldMetadataId: string;
targetFieldMetadata: OrmFlatFieldMetadata;
flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
- workspaceMember: PermissionsPrincipalWorkspaceMember | undefined;
+ workspaceMember: RowLevelPermissionWorkspaceMember | undefined;
}): RowLevelPermissionPredicateValue | null => {
const workspaceMemberFieldMetadata = findFlatEntityByIdInFlatEntityMaps({
flatEntityId: workspaceMemberFieldMetadataId,
diff --git a/packages/twenty-server/src/engine/permissions/rls/utils/has-workspace-member-bound-predicates.util.ts b/packages/twenty-server/src/engine/permissions/rls/utils/has-workspace-member-bound-predicates.util.ts
new file mode 100644
index 00000000000..f3136fbe57a
--- /dev/null
+++ b/packages/twenty-server/src/engine/permissions/rls/utils/has-workspace-member-bound-predicates.util.ts
@@ -0,0 +1,18 @@
+/* @license Enterprise */
+
+import { isDefined } from 'twenty-shared/utils';
+
+import { type FlatRowLevelPermissionPredicateMaps } from 'src/engine/metadata-modules/row-level-permission-predicate/types/flat-row-level-permission-predicate-maps.type';
+
+export const hasWorkspaceMemberBoundPredicates = (
+ flatRowLevelPermissionPredicateMaps: Pick<
+ FlatRowLevelPermissionPredicateMaps,
+ 'byUniversalIdentifier'
+ >,
+): boolean =>
+ Object.values(flatRowLevelPermissionPredicateMaps.byUniversalIdentifier).some(
+ (predicate) =>
+ isDefined(predicate) &&
+ !isDefined(predicate.deletedAt) &&
+ isDefined(predicate.workspaceMemberFieldMetadataId),
+ );
diff --git a/packages/twenty-server/src/engine/permissions/rls/utils/resolve-row-level-permission-record-filter.util.ts b/packages/twenty-server/src/engine/permissions/rls/utils/resolve-row-level-permission-record-filter.util.ts
index ed808bfab3d..cd04f00e4f7 100644
--- a/packages/twenty-server/src/engine/permissions/rls/utils/resolve-row-level-permission-record-filter.util.ts
+++ b/packages/twenty-server/src/engine/permissions/rls/utils/resolve-row-level-permission-record-filter.util.ts
@@ -6,7 +6,6 @@ import { isDefined } from 'twenty-shared/utils';
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 { type PermissionsPrincipal } from 'src/engine/permissions/principal/types/permissions-principal.type';
-import { getPermissionsPrincipalRoleIds } from 'src/engine/permissions/principal/utils/get-permissions-principal-role-ids.util';
import { buildRowLevelPermissionRecordFilter } from 'src/engine/permissions/rls/utils/build-row-level-permission-record-filter.util';
export const resolveRowLevelPermissionRecordFilter = ({
@@ -18,7 +17,7 @@ export const resolveRowLevelPermissionRecordFilter = ({
metadataMaps: PermissionsMetadataMaps;
flatObjectMetadata: FlatObjectMetadata;
}): RecordGqlOperationFilter | null => {
- const roleIds = getPermissionsPrincipalRoleIds(principal);
+ const { roleIds, workspaceMemberId } = principal;
if (roleIds.length === 0) {
return null;
@@ -33,7 +32,11 @@ export const resolveRowLevelPermissionRecordFilter = ({
flatObjectMetadataMaps: metadataMaps.flatObjectMetadataMaps,
objectMetadata: flatObjectMetadata,
roleIds,
- workspaceMember: principal.workspaceMember,
+ workspaceMember: isDefined(workspaceMemberId)
+ ? (metadataMaps.flatWorkspaceMemberMaps?.byId[workspaceMemberId] ?? {
+ id: workspaceMemberId,
+ })
+ : undefined,
});
return isDefined(recordFilter) && Object.keys(recordFilter).length > 0
diff --git a/packages/twenty-server/src/engine/permissions/rls/utils/resolve-workspace-member-predicate-value.util.ts b/packages/twenty-server/src/engine/permissions/rls/utils/resolve-workspace-member-predicate-value.util.ts
index 073be39975f..9e00e47310e 100644
--- a/packages/twenty-server/src/engine/permissions/rls/utils/resolve-workspace-member-predicate-value.util.ts
+++ b/packages/twenty-server/src/engine/permissions/rls/utils/resolve-workspace-member-predicate-value.util.ts
@@ -7,7 +7,7 @@ import {
import { isNonEmptyString } from '@sniptt/guards';
import { isDefined, isPlainObject } from 'twenty-shared/utils';
-import { type PermissionsPrincipalWorkspaceMember } from 'src/engine/permissions/principal/types/permissions-principal.type';
+import { type RowLevelPermissionWorkspaceMember } from 'src/engine/permissions/rls/types/row-level-permission-workspace-member.type';
import { RelationType } from 'src/engine/metadata-modules/field-metadata/interfaces/relation-type.interface';
import { computeMorphOrRelationFieldJoinColumnName } from 'src/engine/metadata-modules/field-metadata/utils/compute-morph-or-relation-field-join-column-name.util';
import { isCompositeFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-composite-field-metadata-type.util';
@@ -15,7 +15,7 @@ import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-fiel
import { isMorphOrRelationFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-morph-or-relation-flat-field-metadata.util';
type ResolveWorkspaceMemberPredicateValueArgs = {
- workspaceMember: PermissionsPrincipalWorkspaceMember;
+ workspaceMember: RowLevelPermissionWorkspaceMember;
workspaceMemberFieldMetadata: OrmFlatFieldMetadata;
workspaceMemberSubFieldName: string | null;
};
diff --git a/packages/twenty-server/src/engine/permissions/role/utils/__tests__/compute-objects-permissions-for-role-permission-config.util.spec.ts b/packages/twenty-server/src/engine/permissions/role/utils/__tests__/compute-objects-permissions-for-role-permission-config.util.spec.ts
deleted file mode 100644
index e5ca60c6fcc..00000000000
--- a/packages/twenty-server/src/engine/permissions/role/utils/__tests__/compute-objects-permissions-for-role-permission-config.util.spec.ts
+++ /dev/null
@@ -1,237 +0,0 @@
-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 { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
-import { getFlatFieldMetadataMock } from 'src/engine/metadata-modules/flat-field-metadata/__mocks__/get-flat-field-metadata.mock';
-import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.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/permissions/principal/types/application-default-role-maps.type';
-import { type RoleIdsBySource } from 'src/engine/permissions/principal/types/role-permission-config.type';
-import { computeObjectsPermissionsForRolePermissionConfig } from 'src/engine/permissions/role/utils/compute-objects-permissions-for-role-permission-config.util';
-
-const INVOICE_ID = 'invoice-id';
-const AMOUNT_FIELD_ID = 'amount-field-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 flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata> =
- createEmptyFlatEntityMaps();
-
-flatFieldMetadataMaps.byUniversalIdentifier.amount = getFlatFieldMetadataMock({
- id: AMOUNT_FIELD_ID,
- universalIdentifier: 'amount',
- objectMetadataId: INVOICE_ID,
- type: FieldMetadataType.NUMBER,
- applicationId: 'owning-application-id',
- disabledFieldPermissionActions: ['canUpdateFieldValue'],
-});
-flatFieldMetadataMaps.universalIdentifierById[AMOUNT_FIELD_ID] = 'amount';
-
-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,
- },
- {
- actor: "a user holding the owning application's default role",
- intersectionOf: { userWorkspaceRoleId: 'owning-application-role-id' },
- canDestroy: false,
- },
- {
- actor: "an API key holding the owning application's default role",
- intersectionOf: { apiKeyRoleId: 'owning-application-role-id' },
- canDestroy: false,
- },
- {
- actor: "an agent holding the owning application's default role",
- intersectionOf: { agentRoleId: 'owning-application-role-id' },
- canDestroy: false,
- },
- {
- actor: 'the owning application with a user holding its default role',
- intersectionOf: {
- userWorkspaceRoleId: 'owning-application-role-id',
- applicationRoleId: 'owning-application-role-id',
- },
- canDestroy: false,
- },
- ])(
- 'disabled actions allowed for $actor: $canDestroy',
- ({ intersectionOf, canDestroy }) => {
- const invoicePermissions =
- computeObjectsPermissionsForRolePermissionConfig({
- intersectionOf,
- rolesPermissions,
- flatObjectMetadataMaps,
- flatFieldMetadataMaps,
- flatApplicationMaps,
- })[INVOICE_ID];
-
- expect(invoicePermissions?.canDestroyObjectRecords).toBe(canDestroy);
- expect(
- invoicePermissions?.restrictedFields[AMOUNT_FIELD_ID]?.canUpdate ===
- false,
- ).toBe(!canDestroy);
- expect(
- invoicePermissions?.restrictedFields[AMOUNT_FIELD_ID]?.canRead,
- ).not.toBe(false);
- },
- );
-
- it('should keep the label identifier readable and restrict the inverse of a relation or morph relation', () => {
- const COMPANY_ID = 'company-id';
- const objectMaps: FlatEntityMaps<FlatObjectMetadata> =
- createEmptyFlatEntityMaps();
-
- objectMaps.byUniversalIdentifier.invoice = getFlatObjectMetadataMock({
- id: INVOICE_ID,
- universalIdentifier: 'invoice',
- applicationId: 'owning-application-id',
- labelIdentifierFieldMetadataId: 'invoice-name-field-id',
- });
- objectMaps.universalIdentifierById[INVOICE_ID] = 'invoice';
- objectMaps.byUniversalIdentifier.company = getFlatObjectMetadataMock({
- id: COMPANY_ID,
- universalIdentifier: 'company',
- });
- objectMaps.universalIdentifierById[COMPANY_ID] = 'company';
-
- const fieldMaps: FlatEntityMaps<FlatFieldMetadata> =
- createEmptyFlatEntityMaps();
-
- for (const flatFieldMetadata of [
- getFlatFieldMetadataMock({
- id: 'invoice-name-field-id',
- universalIdentifier: 'invoice-name',
- objectMetadataId: INVOICE_ID,
- type: FieldMetadataType.TEXT,
- applicationId: 'owning-application-id',
- disabledFieldPermissionActions: ['canReadFieldValue'],
- }),
- getFlatFieldMetadataMock({
- id: 'invoice-customer-field-id',
- universalIdentifier: 'invoice-customer',
- objectMetadataId: INVOICE_ID,
- type: FieldMetadataType.RELATION,
- applicationId: 'owning-application-id',
- relationTargetObjectMetadataId: COMPANY_ID,
- relationTargetFieldMetadataId: 'company-invoices-field-id',
- disabledFieldPermissionActions: ['canReadFieldValue'],
- }),
- getFlatFieldMetadataMock({
- id: 'invoice-payer-company-field-id',
- universalIdentifier: 'invoice-payer-company',
- objectMetadataId: INVOICE_ID,
- type: FieldMetadataType.MORPH_RELATION,
- morphId: 'invoice-payer',
- applicationId: 'owning-application-id',
- relationTargetObjectMetadataId: COMPANY_ID,
- relationTargetFieldMetadataId: 'company-paid-invoices-field-id',
- disabledFieldPermissionActions: ['canReadFieldValue'],
- }),
- ]) {
- fieldMaps.byUniversalIdentifier[flatFieldMetadata.universalIdentifier] =
- flatFieldMetadata;
- fieldMaps.universalIdentifierById[flatFieldMetadata.id] =
- flatFieldMetadata.universalIdentifier;
- }
-
- const objectsPermissions = computeObjectsPermissionsForRolePermissionConfig(
- {
- intersectionOf: { userWorkspaceRoleId: 'user-role-id' },
- rolesPermissions: {
- 'user-role-id': {
- [INVOICE_ID]: FULL_ACCESS,
- [COMPANY_ID]: FULL_ACCESS,
- },
- },
- flatObjectMetadataMaps: objectMaps,
- flatFieldMetadataMaps: fieldMaps,
- flatApplicationMaps,
- },
- );
-
- expect(
- objectsPermissions[INVOICE_ID]?.restrictedFields['invoice-name-field-id']
- ?.canRead,
- ).not.toBe(false);
- expect(
- objectsPermissions[COMPANY_ID]?.restrictedFields[
- 'company-invoices-field-id'
- ]?.canRead,
- ).toBe(false);
- expect(
- objectsPermissions[COMPANY_ID]?.restrictedFields[
- 'company-paid-invoices-field-id'
- ]?.canRead,
- ).toBe(false);
- });
-});
diff --git a/packages/twenty-server/src/engine/permissions/role/utils/__tests__/get-objects-permissions-from-role-permission-config.util.spec.ts b/packages/twenty-server/src/engine/permissions/role/utils/__tests__/get-objects-permissions-from-role-permission-config.util.spec.ts
index 0106f630f4f..7b74894bafc 100644
--- a/packages/twenty-server/src/engine/permissions/role/utils/__tests__/get-objects-permissions-from-role-permission-config.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/role/utils/__tests__/get-objects-permissions-from-role-permission-config.util.spec.ts
@@ -1,4 +1,8 @@
-import { type ObjectsPermissionsByRoleId } from 'twenty-shared/types';
+import {
+ FieldMetadataType,
+ type ObjectPermissions,
+ 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';
@@ -6,6 +10,10 @@ import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-fiel
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { getObjectsPermissionsFromRolePermissionConfig } from 'src/engine/permissions/role/utils/get-objects-permissions-from-role-permission-config.util';
import { type ApplicationDefaultRoleMaps } from 'src/engine/permissions/principal/types/application-default-role-maps.type';
+import { getFlatFieldMetadataMock } from 'src/engine/metadata-modules/flat-field-metadata/__mocks__/get-flat-field-metadata.mock';
+import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+import { getFlatObjectMetadataMock } from 'src/engine/metadata-modules/flat-object-metadata/__mocks__/get-flat-object-metadata.mock';
+import { type RoleIdsBySource } from 'src/engine/permissions/principal/types/role-permission-config.type';
const OBJECT_ID = 'object-1';
@@ -184,3 +192,228 @@ describe('getObjectsPermissionsFromRolePermissionConfig', () => {
).toEqual({});
});
});
+
+const INVOICE_ID = 'invoice-id';
+const AMOUNT_FIELD_ID = 'amount-field-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 flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata> =
+ createEmptyFlatEntityMaps();
+
+flatFieldMetadataMaps.byUniversalIdentifier.amount = getFlatFieldMetadataMock({
+ id: AMOUNT_FIELD_ID,
+ universalIdentifier: 'amount',
+ objectMetadataId: INVOICE_ID,
+ type: FieldMetadataType.NUMBER,
+ applicationId: 'owning-application-id',
+ disabledFieldPermissionActions: ['canUpdateFieldValue'],
+});
+flatFieldMetadataMaps.universalIdentifierById[AMOUNT_FIELD_ID] = 'amount';
+
+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 disabledActionRolesPermissions = Object.fromEntries(
+ [
+ 'user-role-id',
+ 'owning-application-role-id',
+ 'other-application-role-id',
+ ].map((roleId) => [roleId, { [INVOICE_ID]: FULL_ACCESS }]),
+);
+
+describe('getObjectsPermissionsFromRolePermissionConfig disabled actions', () => {
+ 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,
+ },
+ {
+ actor: "a user holding the owning application's default role",
+ intersectionOf: { userWorkspaceRoleId: 'owning-application-role-id' },
+ canDestroy: false,
+ },
+ {
+ actor: "an API key holding the owning application's default role",
+ intersectionOf: { apiKeyRoleId: 'owning-application-role-id' },
+ canDestroy: false,
+ },
+ {
+ actor: "an agent holding the owning application's default role",
+ intersectionOf: { agentRoleId: 'owning-application-role-id' },
+ canDestroy: false,
+ },
+ {
+ actor: 'the owning application with a user holding its default role',
+ intersectionOf: {
+ userWorkspaceRoleId: 'owning-application-role-id',
+ applicationRoleId: 'owning-application-role-id',
+ },
+ canDestroy: false,
+ },
+ ])(
+ 'disabled actions allowed for $actor: $canDestroy',
+ ({ intersectionOf, canDestroy }) => {
+ const invoicePermissions = getObjectsPermissionsFromRolePermissionConfig({
+ rolePermissionConfig: { intersectionOf },
+ rolesPermissions: disabledActionRolesPermissions,
+ flatObjectMetadataMaps,
+ flatFieldMetadataMaps,
+ flatApplicationMaps,
+ })[INVOICE_ID];
+
+ expect(invoicePermissions?.canDestroyObjectRecords).toBe(canDestroy);
+ expect(
+ invoicePermissions?.restrictedFields[AMOUNT_FIELD_ID]?.canUpdate ===
+ false,
+ ).toBe(!canDestroy);
+ expect(
+ invoicePermissions?.restrictedFields[AMOUNT_FIELD_ID]?.canRead,
+ ).not.toBe(false);
+ },
+ );
+
+ it('should keep the label identifier readable and restrict the inverse of a relation or morph relation', () => {
+ const COMPANY_ID = 'company-id';
+ const objectMaps: FlatEntityMaps<FlatObjectMetadata> =
+ createEmptyFlatEntityMaps();
+
+ objectMaps.byUniversalIdentifier.invoice = getFlatObjectMetadataMock({
+ id: INVOICE_ID,
+ universalIdentifier: 'invoice',
+ applicationId: 'owning-application-id',
+ labelIdentifierFieldMetadataId: 'invoice-name-field-id',
+ });
+ objectMaps.universalIdentifierById[INVOICE_ID] = 'invoice';
+ objectMaps.byUniversalIdentifier.company = getFlatObjectMetadataMock({
+ id: COMPANY_ID,
+ universalIdentifier: 'company',
+ });
+ objectMaps.universalIdentifierById[COMPANY_ID] = 'company';
+
+ const fieldMaps: FlatEntityMaps<FlatFieldMetadata> =
+ createEmptyFlatEntityMaps();
+
+ for (const flatFieldMetadata of [
+ getFlatFieldMetadataMock({
+ id: 'invoice-name-field-id',
+ universalIdentifier: 'invoice-name',
+ objectMetadataId: INVOICE_ID,
+ type: FieldMetadataType.TEXT,
+ applicationId: 'owning-application-id',
+ disabledFieldPermissionActions: ['canReadFieldValue'],
+ }),
+ getFlatFieldMetadataMock({
+ id: 'invoice-customer-field-id',
+ universalIdentifier: 'invoice-customer',
+ objectMetadataId: INVOICE_ID,
+ type: FieldMetadataType.RELATION,
+ applicationId: 'owning-application-id',
+ relationTargetObjectMetadataId: COMPANY_ID,
+ relationTargetFieldMetadataId: 'company-invoices-field-id',
+ disabledFieldPermissionActions: ['canReadFieldValue'],
+ }),
+ getFlatFieldMetadataMock({
+ id: 'invoice-payer-company-field-id',
+ universalIdentifier: 'invoice-payer-company',
+ objectMetadataId: INVOICE_ID,
+ type: FieldMetadataType.MORPH_RELATION,
+ morphId: 'invoice-payer',
+ applicationId: 'owning-application-id',
+ relationTargetObjectMetadataId: COMPANY_ID,
+ relationTargetFieldMetadataId: 'company-paid-invoices-field-id',
+ disabledFieldPermissionActions: ['canReadFieldValue'],
+ }),
+ ]) {
+ fieldMaps.byUniversalIdentifier[flatFieldMetadata.universalIdentifier] =
+ flatFieldMetadata;
+ fieldMaps.universalIdentifierById[flatFieldMetadata.id] =
+ flatFieldMetadata.universalIdentifier;
+ }
+
+ const objectsPermissions = getObjectsPermissionsFromRolePermissionConfig({
+ rolePermissionConfig: {
+ intersectionOf: { userWorkspaceRoleId: 'user-role-id' },
+ },
+ rolesPermissions: {
+ 'user-role-id': {
+ [INVOICE_ID]: FULL_ACCESS,
+ [COMPANY_ID]: FULL_ACCESS,
+ },
+ },
+ flatObjectMetadataMaps: objectMaps,
+ flatFieldMetadataMaps: fieldMaps,
+ flatApplicationMaps,
+ });
+
+ expect(
+ objectsPermissions[INVOICE_ID]?.restrictedFields['invoice-name-field-id']
+ ?.canRead,
+ ).not.toBe(false);
+ expect(
+ objectsPermissions[COMPANY_ID]?.restrictedFields[
+ 'company-invoices-field-id'
+ ]?.canRead,
+ ).toBe(false);
+ expect(
+ objectsPermissions[COMPANY_ID]?.restrictedFields[
+ 'company-paid-invoices-field-id'
+ ]?.canRead,
+ ).toBe(false);
+ });
+});
diff --git a/packages/twenty-server/src/engine/permissions/role/utils/compute-objects-permissions-for-role-permission-config.util.ts b/packages/twenty-server/src/engine/permissions/role/utils/compute-objects-permissions-for-roles.util.ts
similarity index 66%
rename from packages/twenty-server/src/engine/permissions/role/utils/compute-objects-permissions-for-role-permission-config.util.ts
rename to packages/twenty-server/src/engine/permissions/role/utils/compute-objects-permissions-for-roles.util.ts
index e303657dc5f..c21278a9c95 100644
--- a/packages/twenty-server/src/engine/permissions/role/utils/compute-objects-permissions-for-role-permission-config.util.ts
+++ b/packages/twenty-server/src/engine/permissions/role/utils/compute-objects-permissions-for-roles.util.ts
@@ -1,42 +1,39 @@
+/* @license Enterprise */
+
import {
type ObjectsPermissions,
type ObjectsPermissionsByRoleId,
} from 'twenty-shared/types';
-import { isDefined } from 'twenty-shared/utils';
+import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { type ApplicationDefaultRoleMaps } from 'src/engine/permissions/principal/types/application-default-role-maps.type';
-import { type RoleIdsBySource } from 'src/engine/permissions/principal/types/role-permission-config.type';
+import { type PermissionsPrincipal } from 'src/engine/permissions/principal/types/permissions-principal.type';
import { computePermissionIntersection } from 'src/engine/permissions/role/utils/compute-permission-intersection.util';
-import { getRoleIdsToIntersect } from 'src/engine/permissions/principal/utils/get-role-ids-to-intersect.util';
-import { resolvePermissionsPrincipalActingApplicationId } from 'src/engine/permissions/principal/utils/resolve-permissions-principal-acting-application-id.util';
import { restrictObjectsPermissionsToDisabledActions } from 'src/engine/permissions/role/utils/restrict-objects-permissions-to-disabled-actions.util';
-export const computeObjectsPermissionsForRolePermissionConfig = ({
- intersectionOf,
+export const computeObjectsPermissionsForRoles = ({
+ roleIds,
+ applicationId,
rolesPermissions,
flatObjectMetadataMaps,
flatFieldMetadataMaps,
flatApplicationMaps,
-}: {
- intersectionOf: RoleIdsBySource;
+}: Pick<PermissionsPrincipal, 'roleIds' | 'applicationId'> & {
rolesPermissions: ObjectsPermissionsByRoleId;
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
flatApplicationMaps: ApplicationDefaultRoleMaps;
}): ObjectsPermissions => {
- const roleIds = getRoleIdsToIntersect(intersectionOf);
-
- if (!isDefined(roleIds)) {
+ if (!isNonEmptyArray(roleIds)) {
return {};
}
- const actingApplicationId = resolvePermissionsPrincipalActingApplicationId({
- intersectionOf,
- flatApplicationMaps,
- });
+ const actingApplicationRoleId = isDefined(applicationId)
+ ? flatApplicationMaps.byId[applicationId]?.defaultRoleId
+ : undefined;
const permissionsPerRole = roleIds.map((roleId) => {
const rolePermissions = rolesPermissions[roleId];
@@ -47,9 +44,7 @@ export const computeObjectsPermissionsForRolePermissionConfig = ({
flatObjectMetadataMaps,
flatFieldMetadataMaps,
actingApplicationId:
- roleId === intersectionOf.applicationRoleId
- ? actingApplicationId
- : undefined,
+ roleId === actingApplicationRoleId ? applicationId : undefined,
})
: undefined;
});
diff --git a/packages/twenty-server/src/engine/permissions/role/utils/get-objects-permissions-from-role-permission-config.util.ts b/packages/twenty-server/src/engine/permissions/role/utils/get-objects-permissions-from-role-permission-config.util.ts
index 21c34622d5a..c85bfa9ac06 100644
--- a/packages/twenty-server/src/engine/permissions/role/utils/get-objects-permissions-from-role-permission-config.util.ts
+++ b/packages/twenty-server/src/engine/permissions/role/utils/get-objects-permissions-from-role-permission-config.util.ts
@@ -7,8 +7,10 @@ import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/typ
import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
-import { computeObjectsPermissionsForRolePermissionConfig } from 'src/engine/permissions/role/utils/compute-objects-permissions-for-role-permission-config.util';
+import { computeObjectsPermissionsForRoles } from 'src/engine/permissions/role/utils/compute-objects-permissions-for-roles.util';
import { type ApplicationDefaultRoleMaps } from 'src/engine/permissions/principal/types/application-default-role-maps.type';
+import { getRoleIdsToIntersect } from 'src/engine/permissions/principal/utils/get-role-ids-to-intersect.util';
+import { resolvePermissionsPrincipalActingApplicationId } from 'src/engine/permissions/principal/utils/resolve-permissions-principal-acting-application-id.util';
export const getObjectsPermissionsFromRolePermissionConfig = ({
rolesPermissions,
@@ -27,8 +29,14 @@ export const getObjectsPermissionsFromRolePermissionConfig = ({
return {};
}
- return computeObjectsPermissionsForRolePermissionConfig({
- intersectionOf: rolePermissionConfig.intersectionOf,
+ const { intersectionOf } = rolePermissionConfig;
+
+ return computeObjectsPermissionsForRoles({
+ roleIds: getRoleIdsToIntersect(intersectionOf) ?? [],
+ applicationId: resolvePermissionsPrincipalActingApplicationId({
+ intersectionOf,
+ flatApplicationMaps,
+ }),
rolesPermissions,
flatObjectMetadataMaps,
flatFieldMetadataMaps,
diff --git a/packages/twenty-server/src/engine/permissions/role/utils/get-permissions-principal-objects-permissions.util.ts b/packages/twenty-server/src/engine/permissions/role/utils/get-permissions-principal-objects-permissions.util.ts
index 9e08889b0ec..406eb22fb43 100644
--- a/packages/twenty-server/src/engine/permissions/role/utils/get-permissions-principal-objects-permissions.util.ts
+++ b/packages/twenty-server/src/engine/permissions/role/utils/get-permissions-principal-objects-permissions.util.ts
@@ -5,7 +5,7 @@ import { isDefined } from 'twenty-shared/utils';
import { type PermissionsMetadataMaps } from 'src/engine/permissions/combine/types/row-access-policy.type';
import { type PermissionsPrincipal } from 'src/engine/permissions/principal/types/permissions-principal.type';
-import { computeObjectsPermissionsForRolePermissionConfig } from 'src/engine/permissions/role/utils/compute-objects-permissions-for-role-permission-config.util';
+import { computeObjectsPermissionsForRoles } from 'src/engine/permissions/role/utils/compute-objects-permissions-for-roles.util';
const objectsPermissionsByMetadataMapsByPrincipal = new WeakMap<
PermissionsPrincipal,
@@ -35,8 +35,9 @@ export const getPermissionsPrincipalObjectsPermissions = ({
return cachedObjectsPermissions;
}
- const objectsPermissions = computeObjectsPermissionsForRolePermissionConfig({
- intersectionOf: principal.intersectionOf,
+ const objectsPermissions = computeObjectsPermissionsForRoles({
+ roleIds: principal.roleIds,
+ applicationId: principal.applicationId,
rolesPermissions: metadataMaps.rolesPermissions,
flatObjectMetadataMaps: metadataMaps.flatObjectMetadataMaps,
flatFieldMetadataMaps: metadataMaps.flatFieldMetadataMaps,
diff --git a/packages/twenty-server/src/engine/permissions/role/utils/is-object-operation-disabled-to-principal.util.ts b/packages/twenty-server/src/engine/permissions/role/utils/is-object-operation-disabled-to-principal.util.ts
index 14f020d3c6d..f9b635e08c0 100644
--- a/packages/twenty-server/src/engine/permissions/role/utils/is-object-operation-disabled-to-principal.util.ts
+++ b/packages/twenty-server/src/engine/permissions/role/utils/is-object-operation-disabled-to-principal.util.ts
@@ -6,16 +6,14 @@ import { isObjectOperationDisabled } from 'src/engine/permissions/role/utils/is-
export const isObjectOperationDisabledToPrincipal = ({
principal,
- metadataMaps,
flatObjectMetadata,
operationType,
-}: PermissionsObjectAccessRequest): boolean =>
+}: Omit<PermissionsObjectAccessRequest, 'metadataMaps'>): boolean =>
isObjectOperationDisabled({
objectMetadata: flatObjectMetadata,
operationType,
}) &&
!isPermissionsPrincipalOwningObject({
principal,
- flatApplicationMaps: metadataMaps.flatApplicationMaps,
flatObjectMetadata,
});
diff --git a/packages/twenty-server/src/engine/permissions/role/utils/resolve-object-records-permissions.util.ts b/packages/twenty-server/src/engine/permissions/role/utils/resolve-object-records-permissions.util.ts
index 6328fa51285..f6788dea074 100644
--- a/packages/twenty-server/src/engine/permissions/role/utils/resolve-object-records-permissions.util.ts
+++ b/packages/twenty-server/src/engine/permissions/role/utils/resolve-object-records-permissions.util.ts
@@ -8,7 +8,7 @@ import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/typ
import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
-import { computeObjectsPermissionsForRolePermissionConfig } from 'src/engine/permissions/role/utils/compute-objects-permissions-for-role-permission-config.util';
+import { getObjectsPermissionsFromRolePermissionConfig } from 'src/engine/permissions/role/utils/get-objects-permissions-from-role-permission-config.util';
import { type ApplicationDefaultRoleMaps } from 'src/engine/permissions/principal/types/application-default-role-maps.type';
export const resolveObjectRecordsPermissions = ({
@@ -43,8 +43,8 @@ export const resolveObjectRecordsPermissions = ({
}
return {
- objectRecordsPermissions: computeObjectsPermissionsForRolePermissionConfig({
- intersectionOf: rolePermissionConfig.intersectionOf,
+ objectRecordsPermissions: getObjectsPermissionsFromRolePermissionConfig({
+ rolePermissionConfig,
rolesPermissions: objectPermissionsByRoleId,
flatObjectMetadataMaps,
flatFieldMetadataMaps,
diff --git a/packages/twenty-server/src/engine/subscriptions/object-record-event/object-record-event-publisher.ts b/packages/twenty-server/src/engine/subscriptions/object-record-event/object-record-event-publisher.ts
index dc71e1eb0c8..83377523d87 100644
--- a/packages/twenty-server/src/engine/subscriptions/object-record-event/object-record-event-publisher.ts
+++ b/packages/twenty-server/src/engine/subscriptions/object-record-event/object-record-event-publisher.ts
@@ -53,6 +53,7 @@ import { getRoleIdsToIntersect } from 'src/engine/permissions/principal/utils/ge
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/workspace-event-batch.type';
import { parseEventNameOrThrow } from 'src/engine/workspace-event-emitter/utils/parse-event-name';
+import { buildPermissionsPrincipal } from 'src/engine/permissions/principal/utils/build-permissions-principal.util';
type StreamPermissionsContext = {
flatRowLevelPermissionPredicateMaps: FlatRowLevelPermissionPredicateMaps;
@@ -123,7 +124,6 @@ export class ObjectRecordEventPublisher {
streamData,
workspaceEventBatch: eventBatch,
permissionsContext,
- flatWorkspaceMemberMaps,
workspaceMemberIdByUserId,
eventRecordAccessGate,
});
@@ -150,7 +150,6 @@ export class ObjectRecordEventPublisher {
streamData,
workspaceEventBatch,
permissionsContext,
- flatWorkspaceMemberMaps,
workspaceMemberIdByUserId,
eventRecordAccessGate,
}: {
@@ -158,7 +157,6 @@ export class ObjectRecordEventPublisher {
streamData: EventStreamData;
workspaceEventBatch: WorkspaceEventBatch<ObjectRecordEvent>;
permissionsContext: StreamPermissionsContext;
- flatWorkspaceMemberMaps: FlatWorkspaceMemberMaps;
workspaceMemberIdByUserId: Map<string, string>;
eventRecordAccessGate: EventRecordAccessGate;
}): Promise<void> {
@@ -208,13 +206,12 @@ export class ObjectRecordEventPublisher {
}),
};
- const principal: PermissionsPrincipal = {
+ const principal: PermissionsPrincipal = buildPermissionsPrincipal({
workspaceId: workspaceEventBatch.workspaceId,
- intersectionOf: rolePermissionConfig.intersectionOf,
- workspaceMember: isDefined(subscriberAuthContext.workspaceMemberId)
- ? flatWorkspaceMemberMaps.byId[subscriberAuthContext.workspaceMemberId]
- : undefined,
- };
+ rolePermissionConfig,
+ workspaceMemberId: subscriberAuthContext.workspaceMemberId,
+ flatApplicationMaps: permissionsContext.flatApplicationMaps,
+ }) ?? { workspaceId: workspaceEventBatch.workspaceId, roleIds: [] };
const admittedRecordIds =
await eventRecordAccessGate.resolveAdmittedRecordIds(principal);
@@ -354,7 +351,7 @@ export class ObjectRecordEventPublisher {
const { selectedFields } = this.commonSelectFieldsBuilder.buildFromDepth({
readableObjectMetadataIds:
await this.commonSelectFieldsBuilder.findReadableObjectMetadataIds({
- principal: { ...principal, workspaceMember: undefined },
+ principal: { ...principal, workspaceMemberId: undefined },
objectsPermissions,
flatObjectMetadataMaps,
}),
diff --git a/packages/twenty-server/src/engine/twenty-orm/__tests__/workspace-orm.manager.spec.ts b/packages/twenty-server/src/engine/twenty-orm/__tests__/workspace-orm.manager.spec.ts
index 07d1b76ad18..a720963a64f 100644
--- a/packages/twenty-server/src/engine/twenty-orm/__tests__/workspace-orm.manager.spec.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/__tests__/workspace-orm.manager.spec.ts
@@ -30,6 +30,8 @@ describe('workspace context sharing enforcement', () => {
useValue: {
getOrRecompute: jest.fn().mockResolvedValue({
flatObjectMetadataMaps: createEmptyFlatEntityMaps(),
+ flatRowLevelPermissionPredicateMaps:
+ createEmptyFlatEntityMaps(),
featureFlagsMap: {},
}),
},
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.ts
index 82485cd0a32..22d4c9641cb 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
@@ -117,6 +117,7 @@ export class WorkspaceDataSourceService
workspaceContext.flatRowLevelPermissionPredicateMaps,
flatRowLevelPermissionPredicateGroupMaps:
workspaceContext.flatRowLevelPermissionPredicateGroupMaps,
+ flatWorkspaceMemberMaps: workspaceContext.flatWorkspaceMemberMaps,
flatValidationRuleMaps: workspaceContext.flatValidationRuleMaps,
objectIdByNameSingular: workspaceContext.objectIdByNameSingular,
featureFlagsMap: workspaceContext.featureFlagsMap,
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.ts
index 1a1f741843f..fa087ca9833 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
@@ -14,6 +14,7 @@ import { type UserWorkspaceRoleMap } from 'src/engine/metadata-modules/role-targ
import { type FlatRowLevelPermissionPredicateGroupMaps } from 'src/engine/metadata-modules/row-level-permission-predicate/types/flat-row-level-permission-predicate-group-maps.type';
import { type FlatRowLevelPermissionPredicateMaps } from 'src/engine/metadata-modules/row-level-permission-predicate/types/flat-row-level-permission-predicate-maps.type';
import { type WorkspaceEventEmitter } from 'src/engine/workspace-event-emitter/workspace-event-emitter';
+import { type FlatWorkspaceMemberMaps } from 'src/engine/core-modules/user/types/flat-workspace-member-maps.type';
export interface WorkspaceInternalContext {
workspaceId: string;
@@ -22,6 +23,7 @@ export interface WorkspaceInternalContext {
flatIndexMaps: FlatEntityMaps<FlatIndexMetadata>;
flatRowLevelPermissionPredicateMaps: FlatRowLevelPermissionPredicateMaps;
flatRowLevelPermissionPredicateGroupMaps: FlatRowLevelPermissionPredicateGroupMaps;
+ flatWorkspaceMemberMaps?: FlatWorkspaceMemberMaps;
flatValidationRuleMaps?: FlatValidationRuleMaps;
objectIdByNameSingular: Record<string, string>;
featureFlagsMap: Record<FeatureFlagKey, boolean>;
diff --git a/packages/twenty-server/src/engine/twenty-orm/repository/workspace-repository.ts b/packages/twenty-server/src/engine/twenty-orm/repository/workspace-repository.ts
index 41e00ade9f6..4c6cd7c5ddc 100644
--- a/packages/twenty-server/src/engine/twenty-orm/repository/workspace-repository.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/repository/workspace-repository.ts
@@ -109,6 +109,7 @@ import {
type WorkspaceRelationShape,
type WorkspaceTableShape,
} from 'src/engine/twenty-orm/table-shape/types/workspace-table-shape.type';
+import { buildPermissionsPrincipal } from 'src/engine/permissions/principal/utils/build-permissions-principal.util';
const ALWAYS_FALSE_CONDITION = '1=0';
const MUTATION_EVENT_ACTIONS_BY_KIND: Record<
@@ -2284,22 +2285,22 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
return isObjectOperationDisabledToPrincipal({
principal: this.resolvePermissionsPrincipal(),
- metadataMaps: this.resolvePermissionsMetadataMaps(),
flatObjectMetadata,
operationType,
});
}
private resolvePermissionsPrincipal(): PermissionsPrincipal {
- return (this.permissionsPrincipal ??= {
+ return (this.permissionsPrincipal ??= buildPermissionsPrincipal({
workspaceId: this.options.internalContext.workspaceId,
- intersectionOf:
- 'intersectionOf' in this.options.rolePermissionConfig
- ? this.options.rolePermissionConfig.intersectionOf
- : {},
- workspaceMember: isUserAuthContext(this.options.authContext)
- ? this.options.authContext.workspaceMember
+ rolePermissionConfig: this.options.rolePermissionConfig,
+ workspaceMemberId: isUserAuthContext(this.options.authContext)
+ ? this.options.authContext.workspaceMemberId
: undefined,
+ flatApplicationMaps: this.options.internalContext.flatApplicationMaps,
+ }) ?? {
+ workspaceId: this.options.internalContext.workspaceId,
+ roleIds: [],
});
}
@@ -2315,6 +2316,8 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
this.options.internalContext.flatRowLevelPermissionPredicateMaps,
flatRowLevelPermissionPredicateGroupMaps:
this.options.internalContext.flatRowLevelPermissionPredicateGroupMaps,
+ flatWorkspaceMemberMaps:
+ this.options.internalContext.flatWorkspaceMemberMaps,
});
}
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.ts
index 789eb4c4946..2cd0cbd853f 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
@@ -17,6 +17,7 @@ import { type FlatValidationRuleMaps } from 'src/engine/metadata-modules/flat-va
import { type UserWorkspaceRoleMap } from 'src/engine/metadata-modules/role-target/types/user-workspace-role-map.type';
import { type FlatRowLevelPermissionPredicateGroupMaps } from 'src/engine/metadata-modules/row-level-permission-predicate/types/flat-row-level-permission-predicate-group-maps.type';
import { type FlatRowLevelPermissionPredicateMaps } from 'src/engine/metadata-modules/row-level-permission-predicate/types/flat-row-level-permission-predicate-maps.type';
+import { type FlatWorkspaceMemberMaps } from 'src/engine/core-modules/user/types/flat-workspace-member-maps.type';
export type ORMWorkspaceContext = {
authContext: WorkspaceAuthContext;
@@ -33,6 +34,7 @@ export type ORMWorkspaceContext = {
flatApplicationMaps: FlatApplicationCacheMaps;
flatRowLevelPermissionPredicateMaps: FlatRowLevelPermissionPredicateMaps;
flatRowLevelPermissionPredicateGroupMaps: FlatRowLevelPermissionPredicateGroupMaps;
+ flatWorkspaceMemberMaps?: FlatWorkspaceMemberMaps;
flatValidationRuleMaps?: FlatValidationRuleMaps;
};
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.ts
index 69a6bac60ee..17e561ba5dd 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
@@ -29,6 +29,9 @@ import { WorkspaceDataSourceService } from 'src/engine/twenty-orm/datasource/wor
import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace-repository';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
import { convertClassNameToObjectMetadataName } from 'src/engine/workspace-manager/utils/convert-class-to-object-metadata-name.util';
+import { hasWorkspaceMemberBoundPredicates } from 'src/engine/permissions/rls/utils/has-workspace-member-bound-predicates.util';
+import { type FlatWorkspaceMemberMaps } from 'src/engine/core-modules/user/types/flat-workspace-member-maps.type';
+import { type FlatRowLevelPermissionPredicateMaps } from 'src/engine/metadata-modules/row-level-permission-predicate/types/flat-row-level-permission-predicate-maps.type';
@Injectable()
export class WorkspaceOrmManager {
@@ -169,6 +172,12 @@ export class WorkspaceOrmManager {
const { idByNameSingular: objectIdByNameSingular } =
buildObjectIdByNameMaps(flatObjectMetadataMaps);
+ const flatWorkspaceMemberMaps =
+ await this.loadWorkspaceMemberMapsForRowLevelPermissions({
+ workspaceId,
+ flatRowLevelPermissionPredicateMaps,
+ });
+
const flatValidationRuleMaps = isValidationRuleEnforcementEnabled({
featureFlagsMap,
billingEntitlements,
@@ -189,6 +198,7 @@ export class WorkspaceOrmManager {
flatIndexMaps,
flatRowLevelPermissionPredicateMaps,
flatRowLevelPermissionPredicateGroupMaps,
+ flatWorkspaceMemberMaps,
flatValidationRuleMaps,
objectIdByNameSingular,
featureFlagsMap,
@@ -201,6 +211,27 @@ export class WorkspaceOrmManager {
};
}
+ private async loadWorkspaceMemberMapsForRowLevelPermissions({
+ workspaceId,
+ flatRowLevelPermissionPredicateMaps,
+ }: {
+ workspaceId: string;
+ flatRowLevelPermissionPredicateMaps: FlatRowLevelPermissionPredicateMaps;
+ }): Promise<FlatWorkspaceMemberMaps | undefined> {
+ if (
+ !hasWorkspaceMemberBoundPredicates(flatRowLevelPermissionPredicateMaps)
+ ) {
+ return undefined;
+ }
+
+ const { flatWorkspaceMemberMaps } =
+ await this.workspaceCacheService.getOrRecompute(workspaceId, [
+ 'flatWorkspaceMemberMaps',
+ ]);
+
+ return flatWorkspaceMemberMaps;
+ }
+
private async loadLiteWorkspaceContext(
authContext: WorkspaceAuthContext,
): Promise<ORMWorkspaceContext> {
diff --git a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/chat-thread-sharing.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/chat-thread-sharing.integration-spec.ts
index ea7e395183a..47d34a242ec 100644
--- a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/chat-thread-sharing.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/chat-thread-sharing.integration-spec.ts
@@ -998,10 +998,8 @@ describe('Conversations through the record API', () => {
.buildEventRecordAccessGate(batch)
.resolveAdmittedRecordIds({
workspaceId: SEED_APPLE_WORKSPACE_ID,
- intersectionOf: { userWorkspaceRoleId: roleId },
- workspaceMember: {
- id: workspaceMemberId,
- },
+ roleIds: [roleId],
+ workspaceMemberId: workspaceMemberId,
});
return admittedRecordIds.has(threadId);
diff --git a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-level-sharing-restricted-record-surfaces.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-level-sharing-restricted-record-surfaces.integration-spec.ts
index cec9d497ea0..16f31729fed 100644
--- a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-level-sharing-restricted-record-surfaces.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-level-sharing-restricted-record-surfaces.integration-spec.ts
@@ -310,10 +310,8 @@ describe('A restricted record on an object open by default', () => {
})
.resolveAdmittedRecordIds({
workspaceId: workspaceId,
- intersectionOf: { userWorkspaceRoleId: memberRole.id },
- workspaceMember: {
- id: WORKSPACE_MEMBER_DATA_SEED_IDS.JONY,
- },
+ roleIds: [memberRole.id],
+ workspaceMemberId: WORKSPACE_MEMBER_DATA_SEED_IDS.JONY,
});
expect([...admittedRecordIds]).toEqual([OPEN_COMPANY_ID]);
diff --git a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-sharing-beyond-role.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-sharing-beyond-role.integration-spec.ts
index 0eb46c98f88..df98c083db1 100644
--- a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-sharing-beyond-role.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-sharing-beyond-role.integration-spec.ts
@@ -256,8 +256,8 @@ describe('Records shared beyond the role that can access their object', () => {
const buildJonyPrincipal = () => ({
workspaceId,
- intersectionOf: { userWorkspaceRoleId: memberRoleId },
- workspaceMember: { id: WORKSPACE_MEMBER_DATA_SEED_IDS.JONY },
+ roleIds: [memberRoleId],
+ workspaceMemberId: WORKSPACE_MEMBER_DATA_SEED_IDS.JONY,
});
expect(
@@ -520,10 +520,8 @@ describe('Records shared beyond the role that can access their object', () => {
})
.resolveAdmittedRecordIds({
workspaceId: workspaceId,
- intersectionOf: { userWorkspaceRoleId: memberRoleId },
- workspaceMember: {
- id: WORKSPACE_MEMBER_DATA_SEED_IDS.JONY,
- },
+ roleIds: [memberRoleId],
+ workspaceMemberId: WORKSPACE_MEMBER_DATA_SEED_IDS.JONY,
});
};
diff --git a/packages/twenty-server/test/integration/twenty-orm/record-access-policy.integration-spec.ts b/packages/twenty-server/test/integration/twenty-orm/record-access-policy.integration-spec.ts
index 6915d02c185..ae8b3185ef8 100644
--- a/packages/twenty-server/test/integration/twenty-orm/record-access-policy.integration-spec.ts
+++ b/packages/twenty-server/test/integration/twenty-orm/record-access-policy.integration-spec.ts
@@ -24,7 +24,7 @@ describe('RecordAccessPolicyService', () => {
let recordAccessPolicyService: RecordAccessPolicyService;
const missingRolePrincipal: PermissionsPrincipal = {
workspaceId: SEED_APPLE_WORKSPACE_ID,
- intersectionOf: { userWorkspaceRoleId: randomUUID() },
+ roleIds: [randomUUID()],
};
// Other suites wipe every person, so the record under test is created here
@@ -70,7 +70,7 @@ describe('RecordAccessPolicyService', () => {
adminPrincipal = {
workspaceId: SEED_APPLE_WORKSPACE_ID,
- intersectionOf: { userWorkspaceRoleId: adminRoleId },
+ roleIds: [adminRoleId],
};
});