Skip to content

The open alternative to Salesforce, designed for AI.

Keep the role permission config on the workspace repository (#27942)

Paul Rastoind2768fc40dd9
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 061a39d3053..12dd9ba0670 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,7 +26,6 @@ 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<
@@ -204,9 +203,12 @@ export class WorkspaceDataSource {
const flatObjectMetadata =
this.getFlatObjectMetadataOrThrow(objectMetadataId);
+ const repositoryRolePermissionConfig: RolePermissionConfig =
+ rolePermissionConfig ?? { intersectionOf: {} };
+
const { objectRecordsPermissions, shouldBypassPermissionChecks } =
resolveObjectRecordsPermissions({
- rolePermissionConfig,
+ rolePermissionConfig: repositoryRolePermissionConfig,
objectPermissionsByRoleId: this.objectPermissionsByRoleId,
});
@@ -217,9 +219,7 @@ export class WorkspaceDataSource {
authContext: this.authContext,
executor,
objectRecordsPermissions,
- roleIds: isDefined(rolePermissionConfig)
- ? getRoleIdsFromRolePermissionConfig(rolePermissionConfig)
- : [],
+ rolePermissionConfig: repositoryRolePermissionConfig,
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 75fdcc395b5..921aa4ba39d 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,7 +129,7 @@ const buildRepository = ({
restrictedFields: {},
},
},
- roleIds: [ROLE_ID],
+ rolePermissionConfig: { intersectionOf: { apiKeyRoleId: 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 b84805cdc26..ffae572e671 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
@@ -68,6 +68,8 @@ import { isOwningApplicationAuthContext } from 'src/engine/twenty-orm/utils/is-o
import { resolvePrincipalIdsFromAuthContext } from 'src/engine/twenty-orm/utils/resolve-principal-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 { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
+import { getRoleIdsFromRolePermissionConfig } from 'src/engine/twenty-orm/utils/get-role-ids-from-role-permission-config.util';
import { resolveRowLevelPermissionRecordFilter } from 'src/engine/twenty-orm/utils/resolve-row-level-permission-record-filter.util';
import { validateRLSPredicatesForRecords } from 'src/engine/twenty-orm/utils/validate-rls-predicates-for-records.util';
import { getActiveValidationRules } from 'src/engine/twenty-orm/utils/get-active-validation-rules.util';
@@ -141,7 +143,7 @@ type WorkspaceRepositoryOptions<TEntity extends ObjectLiteral> = {
authContext: WorkspaceAuthContext;
executor: QueryExecutor;
objectRecordsPermissions: ObjectsPermissions;
- roleIds: string[];
+ rolePermissionConfig: RolePermissionConfig;
shouldBypassPermissionChecks: boolean;
// Suppresses database events and their snapshot SELECT, for bulk system writes only: webhooks, workflow triggers
// and timeline activities will NOT fire
@@ -1070,7 +1072,7 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
objectMetadata: this.options.flatObjectMetadata,
internalContext: this.options.internalContext,
authContext: this.options.authContext,
- roleIds: this.options.roleIds,
+ rolePermissionConfig: this.options.rolePermissionConfig,
shouldBypassPermissionChecks: this.options.shouldBypassPermissionChecks,
});
@@ -2486,7 +2488,9 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
objectsPermissions: this.options.objectRecordsPermissions,
principalIds: resolvePrincipalIdsFromAuthContext(roleMaps),
canAccessAllRecords: canRolesAccessAllRecords({
- roleIds: this.options.roleIds,
+ roleIds: getRoleIdsFromRolePermissionConfig(
+ this.options.rolePermissionConfig,
+ ),
roleIdsWithAllRecordsAccess:
this.options.internalContext.roleIdsWithAllRecordsAccess,
}),
@@ -2499,7 +2503,7 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
resolveRowLevelPermissionRecordFilter({
internalContext: this.options.internalContext,
authContext: this.options.authContext,
- roleIds: this.options.roleIds,
+ rolePermissionConfig: this.options.rolePermissionConfig,
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 90c4622c3a4..aff3894bb21 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
@@ -7,17 +7,19 @@ import { isUserAuthContext } from 'src/engine/core-modules/auth/guards/is-user-a
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 { type WorkspaceInternalContext } from 'src/engine/twenty-orm/interfaces/workspace-internal-context.interface';
+import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
import { buildRowLevelPermissionRecordFilter } from 'src/engine/twenty-orm/utils/build-row-level-permission-record-filter.util';
+import { getRoleIdsFromRolePermissionConfig } from 'src/engine/twenty-orm/utils/get-role-ids-from-role-permission-config.util';
export const resolveRowLevelPermissionRecordFilter = ({
internalContext,
authContext,
- roleIds,
+ rolePermissionConfig,
objectMetadata,
}: {
internalContext: WorkspaceInternalContext;
authContext: WorkspaceAuthContext;
- roleIds: string[];
+ rolePermissionConfig: RolePermissionConfig;
objectMetadata: FlatObjectMetadata;
}): RecordGqlOperationFilter | null => {
const recordFilter = buildRowLevelPermissionRecordFilter({
@@ -27,7 +29,7 @@ export const resolveRowLevelPermissionRecordFilter = ({
internalContext.flatRowLevelPermissionPredicateGroupMaps,
flatFieldMetadataMaps: internalContext.flatFieldMetadataMaps,
objectMetadata,
- roleIds,
+ roleIds: getRoleIdsFromRolePermissionConfig(rolePermissionConfig),
workspaceMember: isUserAuthContext(authContext)
? authContext.workspaceMember
: undefined,
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 030d2525a0c..dc9ed7db7e1 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
@@ -9,6 +9,7 @@ import { type WorkspaceInternalContext } from 'src/engine/twenty-orm/interfaces/
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 { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
import {
TwentyOrmException,
TwentyOrmExceptionCode,
@@ -21,7 +22,7 @@ type ValidateRLSPredicatesForRecordsArgs<T extends ObjectLiteral> = {
objectMetadata: FlatObjectMetadata;
internalContext: WorkspaceInternalContext;
authContext: WorkspaceAuthContext;
- roleIds: string[];
+ rolePermissionConfig: RolePermissionConfig;
shouldBypassPermissionChecks: boolean;
};
@@ -30,7 +31,7 @@ export const validateRLSPredicatesForRecords = <T extends ObjectLiteral>({
objectMetadata,
internalContext,
authContext,
- roleIds,
+ rolePermissionConfig,
shouldBypassPermissionChecks,
}: ValidateRLSPredicatesForRecordsArgs<T>): void => {
if (shouldBypassPermissionChecks || isSystemAuthContext(authContext)) {
@@ -40,7 +41,7 @@ export const validateRLSPredicatesForRecords = <T extends ObjectLiteral>({
const recordFilter = resolveRowLevelPermissionRecordFilter({
internalContext,
authContext,
- roleIds,
+ rolePermissionConfig,
objectMetadata,
});