Skip to content

The open alternative to Salesforce, designed for AI.

Take row-level rules from the roles the permission config intersects (#27911)

Paul Rastoin0cda0bc01d29
diff --git a/packages/twenty-server/src/engine/twenty-orm/datasource/workspace-data-source.ts b/packages/twenty-server/src/engine/twenty-orm/datasource/workspace-data-source.ts
index 5c9dad57b9d..061a39d3053 100644
--- a/packages/twenty-server/src/engine/twenty-orm/datasource/workspace-data-source.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/datasource/workspace-data-source.ts
@@ -26,6 +26,7 @@ import { runInRollbackSafeTransaction } from 'src/engine/twenty-orm/datasource/u
import { WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace-repository';
import { type WorkspaceTableShape } from 'src/engine/twenty-orm/table-shape/types/workspace-table-shape.type';
import { buildWorkspaceTableShape } from 'src/engine/twenty-orm/table-shape/utils/build-workspace-table-shape.util';
+import { getRoleIdsFromRolePermissionConfig } from 'src/engine/twenty-orm/utils/get-role-ids-from-role-permission-config.util';
import { resolveObjectRecordsPermissions } from 'src/engine/twenty-orm/utils/resolve-object-records-permissions.util';
const tableShapeCacheByFlatObjectMetadataMaps = new WeakMap<
@@ -216,6 +217,9 @@ export class WorkspaceDataSource {
authContext: this.authContext,
executor,
objectRecordsPermissions,
+ roleIds: isDefined(rolePermissionConfig)
+ ? getRoleIdsFromRolePermissionConfig(rolePermissionConfig)
+ : [],
shouldBypassPermissionChecks,
shouldSkipEventEmission: shouldSkipEventEmission ?? false,
tableShapeByObjectMetadataId: (targetObjectMetadataId) =>
diff --git a/packages/twenty-server/src/engine/twenty-orm/repository/__tests__/workspace-repository.spec.ts b/packages/twenty-server/src/engine/twenty-orm/repository/__tests__/workspace-repository.spec.ts
index 09a708459fb..75fdcc395b5 100644
--- a/packages/twenty-server/src/engine/twenty-orm/repository/__tests__/workspace-repository.spec.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/repository/__tests__/workspace-repository.spec.ts
@@ -129,6 +129,7 @@ const buildRepository = ({
restrictedFields: {},
},
},
+ roleIds: [ROLE_ID],
shouldBypassPermissionChecks,
shouldSkipEventEmission,
tableShapeByObjectMetadataId: () => tableShape,
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 6707474b16b..b84805cdc26 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
@@ -66,7 +66,6 @@ import {
import { isChildRecordBoundAtDeletion } from 'src/engine/twenty-orm/utils/is-child-record-bound-at-deletion.util';
import { isOwningApplicationAuthContext } from 'src/engine/twenty-orm/utils/is-owning-application-auth-context.util';
import { resolvePrincipalIdsFromAuthContext } from 'src/engine/twenty-orm/utils/resolve-principal-ids-from-auth-context.util';
-import { resolveRoleIdsFromAuthContext } from 'src/engine/twenty-orm/utils/resolve-role-ids-from-auth-context.util';
import { resolveInheritedReadabilityChildLinks } from 'src/engine/core-modules/record-share/utils/resolve-inherited-readability-child-links.util';
import { resolveInheritedReadabilityParents } from 'src/engine/core-modules/record-share/utils/resolve-inherited-readability-parents.util';
import { resolveRowLevelPermissionRecordFilter } from 'src/engine/twenty-orm/utils/resolve-row-level-permission-record-filter.util';
@@ -142,6 +141,7 @@ type WorkspaceRepositoryOptions<TEntity extends ObjectLiteral> = {
authContext: WorkspaceAuthContext;
executor: QueryExecutor;
objectRecordsPermissions: ObjectsPermissions;
+ roleIds: string[];
shouldBypassPermissionChecks: boolean;
// Suppresses database events and their snapshot SELECT, for bulk system writes only: webhooks, workflow triggers
// and timeline activities will NOT fire
@@ -1070,6 +1070,7 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
objectMetadata: this.options.flatObjectMetadata,
internalContext: this.options.internalContext,
authContext: this.options.authContext,
+ roleIds: this.options.roleIds,
shouldBypassPermissionChecks: this.options.shouldBypassPermissionChecks,
});
@@ -2485,7 +2486,7 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
objectsPermissions: this.options.objectRecordsPermissions,
principalIds: resolvePrincipalIdsFromAuthContext(roleMaps),
canAccessAllRecords: canRolesAccessAllRecords({
- roleIds: resolveRoleIdsFromAuthContext(roleMaps),
+ roleIds: this.options.roleIds,
roleIdsWithAllRecordsAccess:
this.options.internalContext.roleIdsWithAllRecordsAccess,
}),
@@ -2498,6 +2499,7 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
resolveRowLevelPermissionRecordFilter({
internalContext: this.options.internalContext,
authContext: this.options.authContext,
+ roleIds: this.options.roleIds,
objectMetadata,
}),
};
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/resolve-row-level-permission-record-filter.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/resolve-row-level-permission-record-filter.util.ts
index d4a7b1a0422..90c4622c3a4 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/resolve-row-level-permission-record-filter.util.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/utils/resolve-row-level-permission-record-filter.util.ts
@@ -8,23 +8,18 @@ import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/wo
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { type WorkspaceInternalContext } from 'src/engine/twenty-orm/interfaces/workspace-internal-context.interface';
import { buildRowLevelPermissionRecordFilter } from 'src/engine/twenty-orm/utils/build-row-level-permission-record-filter.util';
-import { resolveRoleIdsFromAuthContext } from 'src/engine/twenty-orm/utils/resolve-role-ids-from-auth-context.util';
export const resolveRowLevelPermissionRecordFilter = ({
internalContext,
authContext,
+ roleIds,
objectMetadata,
}: {
internalContext: WorkspaceInternalContext;
authContext: WorkspaceAuthContext;
+ roleIds: string[];
objectMetadata: FlatObjectMetadata;
}): RecordGqlOperationFilter | null => {
- const roleIds = resolveRoleIdsFromAuthContext({
- authContext,
- userWorkspaceRoleMap: internalContext.userWorkspaceRoleMap,
- apiKeyRoleMap: internalContext.apiKeyRoleMap,
- });
-
const recordFilter = buildRowLevelPermissionRecordFilter({
flatRowLevelPermissionPredicateMaps:
internalContext.flatRowLevelPermissionPredicateMaps,
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/validate-rls-predicates-for-records.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/validate-rls-predicates-for-records.util.ts
index 62c2c8f9b42..030d2525a0c 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/validate-rls-predicates-for-records.util.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/utils/validate-rls-predicates-for-records.util.ts
@@ -6,6 +6,7 @@ import { type ObjectLiteral } from 'typeorm';
import { type WorkspaceInternalContext } from 'src/engine/twenty-orm/interfaces/workspace-internal-context.interface';
+import { isSystemAuthContext } from 'src/engine/core-modules/auth/guards/is-system-auth-context.guard';
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import {
@@ -20,6 +21,7 @@ type ValidateRLSPredicatesForRecordsArgs<T extends ObjectLiteral> = {
objectMetadata: FlatObjectMetadata;
internalContext: WorkspaceInternalContext;
authContext: WorkspaceAuthContext;
+ roleIds: string[];
shouldBypassPermissionChecks: boolean;
};
@@ -28,15 +30,17 @@ export const validateRLSPredicatesForRecords = <T extends ObjectLiteral>({
objectMetadata,
internalContext,
authContext,
+ roleIds,
shouldBypassPermissionChecks,
}: ValidateRLSPredicatesForRecordsArgs<T>): void => {
- if (shouldBypassPermissionChecks) {
+ if (shouldBypassPermissionChecks || isSystemAuthContext(authContext)) {
return;
}
const recordFilter = resolveRowLevelPermissionRecordFilter({
internalContext,
authContext,
+ roleIds,
objectMetadata,
});
diff --git a/packages/twenty-server/src/modules/emailing/services/message-campaign-audience.service.ts b/packages/twenty-server/src/modules/emailing/services/message-campaign-audience.service.ts
index f0d0bce31bc..f315bc736c0 100644
--- a/packages/twenty-server/src/modules/emailing/services/message-campaign-audience.service.ts
+++ b/packages/twenty-server/src/modules/emailing/services/message-campaign-audience.service.ts
@@ -14,6 +14,7 @@ import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager
import { MessageSuppressionService } from 'src/modules/emailing/services/message-suppression.service';
import { MessageListMemberWorkspaceEntity } from 'src/modules/emailing/standard-objects/message-list-member.workspace-entity';
import { PersonWorkspaceEntity } from 'src/modules/person/standard-objects/person.workspace-entity';
+import { buildEmailingRolePermissionConfig } from 'src/modules/emailing/utils/build-emailing-role-permission-config.util';
@Injectable()
export class MessageCampaignAudienceService {
@@ -147,7 +148,7 @@ export class MessageCampaignAudienceService {
}> {
const listMemberRepository = this.workspaceOrmManager.getRepository(
MessageListMemberWorkspaceEntity,
- { intersectionOf: { userWorkspaceRoleId: roleId } },
+ buildEmailingRolePermissionConfig(roleId),
);
const members = await listMemberRepository.find({ where: { listId } });
@@ -159,7 +160,7 @@ export class MessageCampaignAudienceService {
const personRepository = this.workspaceOrmManager.getRepository(
PersonWorkspaceEntity,
- { intersectionOf: { userWorkspaceRoleId: roleId } },
+ buildEmailingRolePermissionConfig(roleId),
);
const people = await personRepository.find({
diff --git a/packages/twenty-server/src/modules/emailing/services/message-campaign-draft.service.ts b/packages/twenty-server/src/modules/emailing/services/message-campaign-draft.service.ts
index 2d90812924f..e02bf5cf56a 100644
--- a/packages/twenty-server/src/modules/emailing/services/message-campaign-draft.service.ts
+++ b/packages/twenty-server/src/modules/emailing/services/message-campaign-draft.service.ts
@@ -21,6 +21,7 @@ import { CampaignVariableService } from 'src/modules/emailing/services/campaign-
import { MessageCampaignWorkspaceEntity } from 'src/modules/emailing/standard-objects/message-campaign.workspace-entity';
import { collectCampaignVariableNames } from 'src/modules/emailing/utils/collect-campaign-variable-names.util';
import { collectCampaignVariableNamesFromString } from 'src/modules/emailing/utils/collect-campaign-variable-names-from-string.util';
+import { buildEmailingRolePermissionConfig } from 'src/modules/emailing/utils/build-emailing-role-permission-config.util';
export type SaveDraftCampaignArgs = {
workspaceId: string;
@@ -53,9 +54,10 @@ export class MessageCampaignDraftService {
entity: Type<T>,
roleId: string,
) {
- return this.workspaceOrmManager.getRepository(entity, {
- intersectionOf: { userWorkspaceRoleId: roleId },
- });
+ return this.workspaceOrmManager.getRepository(
+ entity,
+ buildEmailingRolePermissionConfig(roleId),
+ );
}
async saveDraft({
diff --git a/packages/twenty-server/src/modules/emailing/services/message-campaign-lifecycle.service.ts b/packages/twenty-server/src/modules/emailing/services/message-campaign-lifecycle.service.ts
index da86b113e9b..a53b593a8e9 100644
--- a/packages/twenty-server/src/modules/emailing/services/message-campaign-lifecycle.service.ts
+++ b/packages/twenty-server/src/modules/emailing/services/message-campaign-lifecycle.service.ts
@@ -20,6 +20,7 @@ import { MessageCampaignWorkspaceEntity } from 'src/modules/emailing/standard-ob
import { computeCampaignTerminalStatus } from 'src/modules/emailing/utils/compute-campaign-terminal-status.util';
import { MessageCampaignStatus } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
+import { buildEmailingRolePermissionConfig } from 'src/modules/emailing/utils/build-emailing-role-permission-config.util';
type CampaignStatusTransition = {
workspaceId: string;
@@ -68,7 +69,7 @@ export class MessageCampaignLifecycleService {
const campaignRepository = this.workspaceOrmManager.getRepository(
MessageCampaignWorkspaceEntity,
isDefined(roleId)
- ? { intersectionOf: { userWorkspaceRoleId: roleId } }
+ ? buildEmailingRolePermissionConfig(roleId)
: { shouldBypassPermissionChecks: true },
);
diff --git a/packages/twenty-server/src/modules/emailing/services/message-campaign.service.ts b/packages/twenty-server/src/modules/emailing/services/message-campaign.service.ts
index 1361bfb510a..0171c6a36ea 100644
--- a/packages/twenty-server/src/modules/emailing/services/message-campaign.service.ts
+++ b/packages/twenty-server/src/modules/emailing/services/message-campaign.service.ts
@@ -39,6 +39,7 @@ import { collectCampaignVariableNamesFromTemplates } from 'src/modules/emailing/
import { renderCampaignEmail } from 'src/modules/emailing/utils/render-campaign-email.util';
import { sendableCampaignSchema } from 'src/modules/emailing/zod-schemas/sendable-campaign.zod-schema';
import { getDomainFromEmail } from 'src/utils/get-domain-from-email';
+import { buildEmailingRolePermissionConfig } from 'src/modules/emailing/utils/build-emailing-role-permission-config.util';
type SendableCampaign = z.infer<typeof sendableCampaignSchema>;
@@ -337,7 +338,7 @@ export class MessageCampaignService {
}): Promise<SendableCampaign> {
const campaignRepository = this.workspaceOrmManager.getRepository(
MessageCampaignWorkspaceEntity,
- { intersectionOf: { userWorkspaceRoleId: roleId } },
+ buildEmailingRolePermissionConfig(roleId),
);
const campaign = await campaignRepository.findOne({
diff --git a/packages/twenty-server/src/modules/emailing/services/message-list-duplication.service.ts b/packages/twenty-server/src/modules/emailing/services/message-list-duplication.service.ts
index 3f208efd246..34c8f40dca9 100644
--- a/packages/twenty-server/src/modules/emailing/services/message-list-duplication.service.ts
+++ b/packages/twenty-server/src/modules/emailing/services/message-list-duplication.service.ts
@@ -22,6 +22,7 @@ import {
} from 'src/modules/emailing/exceptions/message-list.exception';
import { type MessageListMemberWorkspaceEntity } from 'src/modules/emailing/standard-objects/message-list-member.workspace-entity';
import { type MessageListWorkspaceEntity } from 'src/modules/emailing/standard-objects/message-list.workspace-entity';
+import { buildEmailingRolePermissionConfig } from 'src/modules/emailing/utils/build-emailing-role-permission-config.util';
const DUPLICATED_OBJECT_UNIVERSAL_IDENTIFIERS = [
STANDARD_OBJECTS.messageList.universalIdentifier,
@@ -126,12 +127,12 @@ export class MessageListDuplicationService {
const messageListRepository =
transactionScope.getRepository<MessageListWorkspaceEntity>(
'messageList',
- { intersectionOf: { userWorkspaceRoleId: roleId } },
+ buildEmailingRolePermissionConfig(roleId),
);
const messageListMemberRepository =
transactionScope.getRepository<MessageListMemberWorkspaceEntity>(
'messageListMember',
- { intersectionOf: { userWorkspaceRoleId: roleId } },
+ buildEmailingRolePermissionConfig(roleId),
);
const originalMessageList = await messageListRepository.findOne({
diff --git a/packages/twenty-server/src/modules/emailing/utils/build-emailing-role-permission-config.util.ts b/packages/twenty-server/src/modules/emailing/utils/build-emailing-role-permission-config.util.ts
new file mode 100644
index 00000000000..e57c0c8a107
--- /dev/null
+++ b/packages/twenty-server/src/modules/emailing/utils/build-emailing-role-permission-config.util.ts
@@ -0,0 +1,19 @@
+import { isUserAuthContext } from 'src/engine/core-modules/auth/guards/is-user-auth-context.guard';
+import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
+import { getWorkspaceContext } from 'src/engine/twenty-orm/storage/orm-workspace-context.storage';
+import { buildUserRoleIdsBySource } from 'src/engine/twenty-orm/utils/build-user-role-ids-by-source.util';
+
+export const buildEmailingRolePermissionConfig = (
+ userRoleId: string,
+): RolePermissionConfig => {
+ const { authContext } = getWorkspaceContext();
+
+ return {
+ intersectionOf: buildUserRoleIdsBySource({
+ userRoleId,
+ application: isUserAuthContext(authContext)
+ ? authContext.application
+ : undefined,
+ }),
+ };
+};