Skip to content

The open alternative to Salesforce, designed for AI.

Name permissions principals by role: main, limiting and app (#29452)

Charles Bochetec97ae52dfa6
diff --git a/packages/twenty-server/src/engine/api/common/common-select-fields/common-select-fields-builder.ts b/packages/twenty-server/src/engine/api/common/common-select-fields/common-select-fields-builder.ts
index c74488fa69e..d0f1d4e7635 100644
--- a/packages/twenty-server/src/engine/api/common/common-select-fields/common-select-fields-builder.ts
+++ b/packages/twenty-server/src/engine/api/common/common-select-fields/common-select-fields-builder.ts
@@ -18,7 +18,7 @@ import { findManyFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metada
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 { RecordAccessPolicyService } from 'src/engine/permissions/combine/services/record-access-policy.service';
-import { type PermissionsPrincipal } from 'src/engine/permissions/principal/types/permissions-principal.type';
+import { type PermissionsPrincipalsContext } from 'src/engine/permissions/principal/types/permissions-principals-context.type';
@Injectable()
export class CommonSelectFieldsBuilder {
@@ -28,33 +28,20 @@ export class CommonSelectFieldsBuilder {
// Relations to objects the ORM would refuse are left out, so they cannot fail the whole query
async findReadableObjectMetadataIds({
- principal,
- objectsPermissions,
+ principals,
flatObjectMetadataMaps,
}: {
- principal: PermissionsPrincipal | undefined;
- objectsPermissions: ObjectsPermissions;
+ principals: PermissionsPrincipalsContext;
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
}): Promise<Set<string>> {
const flatObjectMetadatas = Object.values(
flatObjectMetadataMaps.byUniversalIdentifier,
).filter(isDefined);
- if (!isDefined(principal)) {
- return new Set(
- flatObjectMetadatas
- .filter(
- (flatObjectMetadata) =>
- objectsPermissions[flatObjectMetadata.id]?.canReadObjectRecords,
- )
- .map((flatObjectMetadata) => flatObjectMetadata.id),
- );
- }
-
const readableFlags = await Promise.all(
flatObjectMetadatas.map((flatObjectMetadata) =>
this.recordAccessPolicyService.hasAccessToSomeRecords({
- principal,
+ principals,
flatObjectMetadata,
operationType: 'select',
}),
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 783cb518a07..aa25551d0fa 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
@@ -40,7 +40,7 @@ import { WorkspaceCacheStorageService } from 'src/engine/workspace-cache-storage
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
import { isApplicationAuthContext } from 'src/engine/core-modules/auth/guards/is-application-auth-context.guard';
import { type RoleIdsBySource } from 'src/engine/permissions/principal/types/role-permission-config.type';
-import { buildPermissionsPrincipal } from 'src/engine/permissions/principal/utils/build-permissions-principal.util';
+import { getPermissionsPrincipalsFromAuthContext } from 'src/engine/permissions/principal/utils/get-permissions-principals-from-auth-context.util';
import { getObjectsPermissionsFromRolePermissionConfig } from 'src/engine/permissions/role/utils/get-objects-permissions-from-role-permission-config.util';
export interface PageInfo {
@@ -141,19 +141,21 @@ export abstract class RestApiBaseHandler {
);
const rolePermissionConfig = { intersectionOf };
+ const principals = getPermissionsPrincipalsFromAuthContext(authContext);
+
+ if (!isDefined(principals)) {
+ throw new PermissionsException(
+ PermissionsExceptionMessage.PERMISSION_DENIED,
+ PermissionsExceptionCode.PERMISSION_DENIED,
+ );
+ }
return {
- principal: buildPermissionsPrincipal({
- workspaceId: authContext.workspace.id,
- rolePermissionConfig,
- workspaceMemberId: isUserAuthContext(authContext)
- ? authContext.workspaceMemberId
- : undefined,
- flatApplicationMaps,
- }),
+ principals,
objectsPermissions: getObjectsPermissionsFromRolePermissionConfig({
rolesPermissions,
rolePermissionConfig,
+ principals,
flatObjectMetadataMaps,
flatFieldMetadataMaps,
flatApplicationMaps,
@@ -174,15 +176,14 @@ export abstract class RestApiBaseHandler {
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
}): Promise<CommonSelectedFields> {
- const { principal, objectsPermissions } =
+ const { principals, objectsPermissions } =
await this.getPermissionsContext(authContext);
const { selectedFields } = this.commonSelectFieldsBuilder.buildFromDepth({
objectsPermissions,
readableObjectMetadataIds:
await this.findRelationReadableObjectMetadataIds({
- principal,
- objectsPermissions,
+ principals,
flatObjectMetadataMaps,
depth,
}),
@@ -212,15 +213,14 @@ export abstract class RestApiBaseHandler {
}): Promise<{
selectedFields: CommonSelectedFields;
}> {
- const { principal, objectsPermissions } =
+ const { principals, objectsPermissions } =
await this.getPermissionsContext(authContext);
return this.commonSelectFieldsBuilder.buildFromDepth({
objectsPermissions,
readableObjectMetadataIds:
await this.findRelationReadableObjectMetadataIds({
- principal,
- objectsPermissions,
+ principals,
flatObjectMetadataMaps,
depth,
}),
@@ -234,8 +234,7 @@ export abstract class RestApiBaseHandler {
}
private async findRelationReadableObjectMetadataIds({
- principal,
- objectsPermissions,
+ principals,
flatObjectMetadataMaps,
depth,
}: Parameters<
@@ -248,8 +247,7 @@ export abstract class RestApiBaseHandler {
}
return this.commonSelectFieldsBuilder.findReadableObjectMetadataIds({
- principal,
- objectsPermissions,
+ principals,
flatObjectMetadataMaps,
});
}
diff --git a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/triggers/database-event/call-database-event-trigger-jobs.job.ts b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/triggers/database-event/call-database-event-trigger-jobs.job.ts
index 339da5d8bd7..586ef5c3709 100644
--- a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/triggers/database-event/call-database-event-trigger-jobs.job.ts
+++ b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/triggers/database-event/call-database-event-trigger-jobs.job.ts
@@ -101,6 +101,7 @@ export class CallDatabaseEventTriggerJobsJob {
}
const admittedEvents = await resolveEventsReadableByRole({
+ applicationId,
roleId: application.defaultRoleId,
workspaceEventBatch,
eventRecordAccessGate,
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 4dcdc07ad8d..967134bdc83 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
@@ -18,13 +18,17 @@ import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/
import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { buildObjectIdByNameMaps } from 'src/engine/metadata-modules/flat-object-metadata/utils/build-object-id-by-name-maps.util';
-import { type PermissionsPrincipal } from 'src/engine/permissions/principal/types/permissions-principal.type';
-import { buildPermissionsPrincipal } from 'src/engine/permissions/principal/utils/build-permissions-principal.util';
+import { type PermissionsPrincipalsContext } from 'src/engine/permissions/principal/types/permissions-principals-context.type';
+import { getPermissionsPrincipalsFromAuthContext } from 'src/engine/permissions/principal/utils/get-permissions-principals-from-auth-context.util';
import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.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';
+import {
+ PermissionsException,
+ PermissionsExceptionCode,
+ PermissionsExceptionMessage,
+} from 'src/engine/permissions/permissions.exception';
export type CommonApiContext = {
queryRunnerContext: CommonBaseQueryRunnerContext;
@@ -33,7 +37,7 @@ export type CommonApiContext = {
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
objectsPermissions: ObjectsPermissions;
- principal: PermissionsPrincipal | undefined;
+ principals: PermissionsPrincipalsContext;
};
@Injectable()
@@ -97,10 +101,12 @@ export class CommonApiContextBuilderService {
);
}
- const { objectsPermissions, principal } = await this.getPermissionsContext({
- authContext,
- rolePermissionConfig,
- });
+ const { objectsPermissions, principals } = await this.getPermissionsContext(
+ {
+ authContext,
+ rolePermissionConfig,
+ },
+ );
const restrictedFields =
objectsPermissions[flatObjectMetadata.id]?.restrictedFields ?? {};
@@ -129,7 +135,7 @@ export class CommonApiContextBuilderService {
flatObjectMetadataMaps,
flatFieldMetadataMaps,
objectsPermissions,
- principal,
+ principals,
};
}
@@ -141,7 +147,7 @@ export class CommonApiContextBuilderService {
rolePermissionConfig?: RolePermissionConfig;
}): Promise<{
objectsPermissions: ObjectsPermissions;
- principal: PermissionsPrincipal | undefined;
+ principals: PermissionsPrincipalsContext;
}> {
const {
rolesPermissions,
@@ -180,22 +186,25 @@ export class CommonApiContextBuilderService {
);
}
+ const principals = getPermissionsPrincipalsFromAuthContext(authContext);
+
+ if (!isDefined(principals)) {
+ throw new PermissionsException(
+ PermissionsExceptionMessage.PERMISSION_DENIED,
+ PermissionsExceptionCode.PERMISSION_DENIED,
+ );
+ }
+
return {
objectsPermissions: getObjectsPermissionsFromRolePermissionConfig({
rolesPermissions,
rolePermissionConfig: resolvedRolePermissionConfig,
+ principals,
flatObjectMetadataMaps,
flatFieldMetadataMaps,
flatApplicationMaps,
}),
- principal: buildPermissionsPrincipal({
- workspaceId: authContext.workspace.id,
- rolePermissionConfig: resolvedRolePermissionConfig,
- workspaceMemberId: isUserAuthContext(authContext)
- ? authContext.workspaceMemberId
- : undefined,
- flatApplicationMaps,
- }),
+ principals,
};
}
}
diff --git a/packages/twenty-server/src/engine/core-modules/record-crud/services/find-records.service.ts b/packages/twenty-server/src/engine/core-modules/record-crud/services/find-records.service.ts
index d5c9bc9abf2..f704e479683 100644
--- a/packages/twenty-server/src/engine/core-modules/record-crud/services/find-records.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/record-crud/services/find-records.service.ts
@@ -60,7 +60,7 @@ export class FindRecordsService {
flatObjectMetadataMaps,
flatFieldMetadataMaps,
objectsPermissions,
- principal,
+ principals,
} = await this.commonApiContextBuilder.build({
authContext,
objectName,
@@ -90,7 +90,7 @@ export class FindRecordsService {
objectsPermissions,
readableObjectMetadataIds:
await this.commonSelectFieldsBuilder.findReadableObjectMetadataIds(
- { principal, objectsPermissions, flatObjectMetadataMaps },
+ { principals, flatObjectMetadataMaps },
),
depth: 1,
onlyUseLabelIdentifierFieldsInRelations: true,
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 d73d4e43301..cd0582c5f70 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
@@ -32,7 +32,8 @@ import { getDatabaseCrudToolFlatObjects } from 'src/engine/metadata-modules/ai/a
import { type FlatObjectPermission } from 'src/engine/metadata-modules/flat-object-permission/types/flat-object-permission.type';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
import { RecordAccessPolicyService } from 'src/engine/permissions/combine/services/record-access-policy.service';
-import { buildPermissionsPrincipal } from 'src/engine/permissions/principal/utils/build-permissions-principal.util';
+import { buildDeprecatedPermissionsPrincipalsFromConfig } from 'src/engine/permissions/principal/utils/build-deprecated-permissions-principals-from-config.util';
+import { getPermissionsPrincipalsFromAuthContext } from 'src/engine/permissions/principal/utils/get-permissions-principals-from-auth-context.util';
import { type OperationType } from 'src/engine/permissions/role/utils/validate-operation-is-permitted-or-throw.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';
@@ -40,7 +41,6 @@ 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 {
@@ -91,28 +91,28 @@ export class DatabaseToolProvider implements ToolProvider {
},
);
+ const principals =
+ (isDefined(context.authContext)
+ ? getPermissionsPrincipalsFromAuthContext(context.authContext)
+ : undefined) ??
+ buildDeprecatedPermissionsPrincipalsFromConfig({
+ workspaceId: context.workspaceId,
+ rolePermissionConfig: context.rolePermissionConfig,
+ });
+
const objectPermissions = getObjectsPermissionsFromRolePermissionConfig({
rolesPermissions,
rolePermissionConfig: context.rolePermissionConfig,
+ principals,
flatObjectMetadataMaps,
flatFieldMetadataMaps,
flatApplicationMaps,
});
- if (Object.keys(objectPermissions).length === 0) {
+ if (Object.keys(objectPermissions).length === 0 || !isDefined(principals)) {
return descriptors;
}
- const principal = buildPermissionsPrincipal({
- workspaceId: context.workspaceId,
- rolePermissionConfig: context.rolePermissionConfig,
- workspaceMemberId:
- isDefined(context.authContext) && isUserAuthContext(context.authContext)
- ? context.authContext.workspaceMemberId
- : undefined,
- flatApplicationMaps,
- });
-
const { explicitObjectGrantsRoleId } = context;
const requireExplicitObjectGrants = isDefined(explicitObjectGrantsRoleId);
@@ -178,12 +178,11 @@ export class DatabaseToolProvider implements ToolProvider {
!requireExplicitObjectGrants ||
(explicitPermission?.[objectPermission] ?? false);
const hasAccessToSomeRecords = async (operationType: OperationType) =>
- !isDefined(principal) ||
- (await this.recordAccessPolicyService.hasAccessToSomeRecords({
- principal,
+ this.recordAccessPolicyService.hasAccessToSomeRecords({
+ principals,
flatObjectMetadata: flatObject,
operationType,
- }));
+ });
const canCreateRecords =
permission.canUpdateObjectRecords &&
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 5b075fcce5e..5e096b9bea2 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,7 +22,6 @@ 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 {
@@ -84,13 +83,11 @@ export class CallAgentDatabaseEventTriggersJob {
}
const admittedRecordIds =
- await eventRecordAccessGate.resolveAdmittedRecordIds(
- buildPermissionsPrincipal({
- workspaceId: workspaceEventBatch.workspaceId,
- roleId: agentRoleId,
- applicationId: undefined,
- }),
- );
+ await eventRecordAccessGate.resolveAdmittedRecordIds({
+ workspaceId: workspaceEventBatch.workspaceId,
+ mainPrincipal: { agentId: flatAgent.id },
+ applicationPrincipal: { isCustomApp: true },
+ });
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 fada3f2dc1f..458d2c8d321 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
@@ -325,14 +325,14 @@ export class AgentChatSharingService {
const admittedMemberIds = new Set(
(
await Promise.all(
- [...roleIdByMemberId.entries()].map(async ([memberId, roleId]) => {
+ [...roleIdByMemberId.keys()].map(async (memberId) => {
const grants = await Promise.all(
AGENT_CHAT_REPLY_OPERATION_TYPES.map((operationType) =>
this.recordAccessPolicyService.hasAccessToRecords({
- principal: {
+ principals: {
workspaceId,
- roleIds: [roleId],
- workspaceMemberId: memberId,
+ mainPrincipal: { workspaceMemberId: memberId },
+ applicationPrincipal: { isCustomApp: true },
},
flatObjectMetadata: threadFlatObjectMetadata,
recordIds: [threadId],
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 4e7053dc818..f81582420b2 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,7 +20,6 @@ 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;
@@ -94,13 +93,11 @@ export class CallWebhookJobsJob {
const admittedRecordIds =
admittedRecordIdsByRoleId.get(webhookRoleId) ??
- eventRecordAccessGate.resolveAdmittedRecordIds(
- buildPermissionsPrincipal({
- workspaceId: workspaceEventBatch.workspaceId,
- roleId: webhookRoleId,
- applicationId: undefined,
- }),
- );
+ eventRecordAccessGate.resolveAdmittedRecordIds({
+ workspaceId: workspaceEventBatch.workspaceId,
+ mainPrincipal: { webhookId: webhook.id },
+ applicationPrincipal: { isCustomApp: true },
+ });
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 65713e870a8..1cd43b427a8 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
@@ -15,7 +15,9 @@ import {
type PermissionsMetadataMaps,
type PermissionsObjectAccessRequest,
} from 'src/engine/permissions/combine/types/row-access-policy.type';
-import { type PermissionsPrincipal } from 'src/engine/permissions/principal/types/permissions-principal.type';
+import { type PermissionsPrincipalsContext } from 'src/engine/permissions/principal/types/permissions-principals-context.type';
+import { type PermissionsPrincipalsWithRolesContext } from 'src/engine/permissions/principal/types/permissions-principals-with-roles-context.type';
+import { resolvePermissionsPrincipalsWithRoles } from 'src/engine/permissions/principal/utils/resolve-permissions-principals-with-roles.util';
import { getPermissionsPrincipalShareKeys } from 'src/engine/permissions/principal/utils/get-permissions-principal-share-keys.util';
import { resolvePermissionsShareGrant } from 'src/engine/permissions/record-share/utils/resolve-permissions-share-grant.util';
import { isObjectOperationDeniedToPrincipal } from 'src/engine/permissions/role/utils/is-object-operation-denied-to-principal.util';
@@ -32,15 +34,27 @@ import { resolveEventRecordSnapshots } from 'src/engine/permissions/combine/util
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';
+type PrincipalsAccessRequest = Omit<
+ PermissionsObjectAccessRequest,
+ 'principal' | 'metadataMaps'
+> & { principals: PermissionsPrincipalsContext };
+
+const EMPTY_WORKSPACE_MEMBER_MAPS = { byId: {}, userWorkspaceIdByUserId: {} };
+
@Injectable()
export class RecordAccessPolicyService {
+ private readonly principalsWithRolesByPrincipals = new WeakMap<
+ PermissionsPrincipalsContext,
+ Promise<PermissionsPrincipalsWithRolesContext | undefined>
+ >();
+
private readonly metadataMapsByPrincipal = new WeakMap<
- PermissionsPrincipal,
+ PermissionsPrincipalsWithRolesContext,
Promise<PermissionsMetadataMaps>
>();
private readonly sharedAccessLevelsByPrincipal = new WeakMap<
- PermissionsPrincipal,
+ PermissionsPrincipalsWithRolesContext,
Promise<Map<string, RecordShareAccessLevel[]>>
>();
@@ -53,10 +67,16 @@ export class RecordAccessPolicyService {
// Shares only count once a row exists, so an object reached by nothing stays out of reach
async hasAccessToSomeRecords({
- principal,
+ principals,
flatObjectMetadata,
operationType,
- }: Omit<PermissionsObjectAccessRequest, 'metadataMaps'>): Promise<boolean> {
+ }: PrincipalsAccessRequest): Promise<boolean> {
+ const principal = await this.findPrincipalsWithRoles(principals);
+
+ if (!isDefined(principal)) {
+ return false;
+ }
+
const request = {
principal,
metadataMaps: await this.findPrincipalMetadataMaps(principal),
@@ -92,13 +112,13 @@ export class RecordAccessPolicyService {
}
async hasAccessToRecords({
- principal,
+ principals,
flatObjectMetadata,
operationType,
recordIds,
hypotheticalRecordShareAccessLevel,
transactionScope,
- }: Omit<PermissionsObjectAccessRequest, 'metadataMaps'> & {
+ }: PrincipalsAccessRequest & {
recordIds: string[];
hypotheticalRecordShareAccessLevel?: RecordShareAccessLevel;
transactionScope?: WorkspaceTransactionScope;
@@ -106,10 +126,12 @@ export class RecordAccessPolicyService {
const uniqueRecordIds = [
...new Set(recordIds.map((recordId) => recordId.toLowerCase())),
];
+ const principal = await this.findPrincipalsWithRoles(principals);
- if (uniqueRecordIds.length === 0) {
+ if (uniqueRecordIds.length === 0 || !isDefined(principal)) {
return false;
}
+
const findAdmittedRecordIds = (repository: WorkspaceRepository) =>
repository.findPrincipalAdmittedRecordIds({
principal,
@@ -252,8 +274,14 @@ export class RecordAccessPolicyService {
let metadataMaps: Promise<PermissionsMetadataMaps> | undefined;
return {
- resolveAdmittedRecordIds: async (principal) =>
- findPermissionsAdmittedRecordIds({
+ resolveAdmittedRecordIds: async (principals) => {
+ const principal = await this.findPrincipalsWithRoles(principals);
+
+ if (!isDefined(principal)) {
+ return new Set<string>();
+ }
+
+ return findPermissionsAdmittedRecordIds({
principal,
metadataMaps: await (metadataMaps ??=
this.loadPermissionsMetadataMaps(workspaceId)),
@@ -265,7 +293,8 @@ export class RecordAccessPolicyService {
fetchRecordShares,
findPrivateRecordStates,
},
- }),
+ });
+ },
};
}
@@ -299,8 +328,66 @@ export class RecordAccessPolicyService {
);
}
+ private findPrincipalsWithRoles(
+ principals: PermissionsPrincipalsContext,
+ ): Promise<PermissionsPrincipalsWithRolesContext | undefined> {
+ const cachedPrincipalsWithRoles =
+ this.principalsWithRolesByPrincipals.get(principals);
+
+ if (isDefined(cachedPrincipalsWithRoles)) {
+ return cachedPrincipalsWithRoles;
+ }
+
+ const principalsWithRoles = this.resolvePrincipalsWithRoles(principals);
+
+ this.principalsWithRolesByPrincipals.set(principals, principalsWithRoles);
+
+ return principalsWithRoles;
+ }
+
+ private async resolvePrincipalsWithRoles(
+ principals: PermissionsPrincipalsContext,
+ ): Promise<PermissionsPrincipalsWithRolesContext | undefined> {
+ const { mainPrincipal, workspaceId } = principals;
+ const {
+ userWorkspaceRoleMap,
+ apiKeyRoleMap,
+ flatRoleTargetByAgentIdMaps,
+ flatApplicationMaps,
+ } = await this.workspaceCacheService.getOrRecompute(workspaceId, [
+ 'userWorkspaceRoleMap',
+ 'apiKeyRoleMap',
+ 'flatRoleTargetByAgentIdMaps',
+ 'flatApplicationMaps',
+ ]);
+ const { flatWorkspaceMemberMaps } =
+ 'workspaceMemberId' in mainPrincipal
+ ? await this.workspaceCacheService.getOrRecompute(workspaceId, [
+ 'flatWorkspaceMemberMaps',
+ ])
+ : { flatWorkspaceMemberMaps: EMPTY_WORKSPACE_MEMBER_MAPS };
+ const { flatRoleTargetMaps } =
+ 'webhookId' in mainPrincipal
+ ? await this.workspaceCacheService.getOrRecompute(workspaceId, [
+ 'flatRoleTargetMaps',
+ ])
+ : { flatRoleTargetMaps: undefined };
+
+ return resolvePermissionsPrincipalsWithRoles({
+ principalsContext: principals,
+ roleMaps: {
+ flatWorkspaceMemberMaps,
+ userWorkspaceRoleMap,
+ apiKeyRoleMap,
+ flatRoleTargetByAgentIdMaps,
+ flatApplicationMaps,
+ flatRoleTargetMaps,
+ },
+ });
+ }
+
private findPrincipalMetadataMaps(
- principal: PermissionsPrincipal,
+ principal: PermissionsPrincipalsWithRolesContext,
): Promise<PermissionsMetadataMaps> {
const cachedMetadataMaps = this.metadataMapsByPrincipal.get(principal);
@@ -318,7 +405,7 @@ export class RecordAccessPolicyService {
}
private findSharedAccessLevelsByObjectMetadataId(
- principal: PermissionsPrincipal,
+ principal: PermissionsPrincipalsWithRolesContext,
): Promise<Map<string, RecordShareAccessLevel[]>> {
const cachedSharedAccessLevels =
this.sharedAccessLevelsByPrincipal.get(principal);
diff --git a/packages/twenty-server/src/engine/permissions/combine/types/event-record-access-gate.type.ts b/packages/twenty-server/src/engine/permissions/combine/types/event-record-access-gate.type.ts
index 8bb048d9f7b..04644f1e710 100644
--- a/packages/twenty-server/src/engine/permissions/combine/types/event-record-access-gate.type.ts
+++ b/packages/twenty-server/src/engine/permissions/combine/types/event-record-access-gate.type.ts
@@ -1,9 +1,9 @@
/* @license Enterprise */
-import { type PermissionsPrincipal } from 'src/engine/permissions/principal/types/permissions-principal.type';
+import { type PermissionsPrincipalsContext } from 'src/engine/permissions/principal/types/permissions-principals-context.type';
export type EventRecordAccessGate = {
resolveAdmittedRecordIds: (
- principal: PermissionsPrincipal,
+ principals: PermissionsPrincipalsContext,
) => Promise<Set<string>>;
};
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 bbed5faeec5..2a1699a80a6 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
@@ -13,7 +13,7 @@ import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object
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 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 PermissionsPrincipalsWithRolesContext } from 'src/engine/permissions/principal/types/permissions-principals-with-roles-context.type';
import { type PrivateRecordState } from 'src/engine/permissions/private-record/types/private-record-state.type';
import { type RecordShareGrant } from 'src/engine/permissions/record-share/types/record-share-grant.type';
import { type OperationType } from 'src/engine/permissions/role/utils/validate-operation-is-permitted-or-throw.util';
@@ -32,7 +32,7 @@ export type PermissionsMetadataMaps = {
};
export type PermissionsRowAccessRequest = {
- principal: PermissionsPrincipal;
+ principal: PermissionsPrincipalsWithRolesContext;
metadataMaps: PermissionsMetadataMaps;
flatObjectMetadata: FlatObjectMetadata;
operationType: OperationType;
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 f052aaf657e..371cf6dcd0c 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
@@ -19,7 +19,7 @@ import {
type SqlCondition,
} from 'src/engine/permissions/combine/types/row-access-policy.type';
import { buildPermissionsCondition } from 'src/engine/permissions/combine/utils/build-permissions-condition.util';
-import { type PermissionsPrincipal } from 'src/engine/permissions/principal/types/permissions-principal.type';
+import { type PermissionsPrincipalsWithRolesContext } from 'src/engine/permissions/principal/types/permissions-principals-with-roles-context.type';
import { renderRowLevelPermissionFilterToSql } from 'src/engine/permissions/rls/utils/render-row-level-permission-filter-to-sql.util';
import { resolveRowLevelPermissionRecordFilter } from 'src/engine/permissions/rls/utils/resolve-row-level-permission-record-filter.util';
@@ -123,21 +123,28 @@ const buildConditionOutcome = (
return { kind: 'gated', condition };
};
-const readEverything: PermissionsPrincipal = {
+const readEverything: PermissionsPrincipalsWithRolesContext = {
workspaceId: 'workspace-id',
- roleIds: [FULL_ACCESS_ROLE_ID],
- workspaceMemberId: 'member-1',
+ mainPrincipal: { roleId: FULL_ACCESS_ROLE_ID, workspaceMemberId: 'member-1' },
+ applicationPrincipal: { isCustomApp: true },
};
-const owningApplication: PermissionsPrincipal = {
+const owningApplication: PermissionsPrincipalsWithRolesContext = {
workspaceId: 'workspace-id',
- roleIds: [APPLICATION_ROLE_ID],
- applicationId: APPLICATION_ID,
+ mainPrincipal: { roleId: APPLICATION_ROLE_ID, applicationId: APPLICATION_ID },
+ applicationPrincipal: {
+ roleId: APPLICATION_ROLE_ID,
+ applicationId: APPLICATION_ID,
+ },
};
-const withoutObjectPermission: PermissionsPrincipal = {
+const withoutObjectPermission: PermissionsPrincipalsWithRolesContext = {
...readEverything,
- roleIds: [ROLE_WITHOUT_PERMISSION_ID],
+ mainPrincipal: {
+ roleId: ROLE_WITHOUT_PERMISSION_ID,
+ workspaceMemberId: 'member-1',
+ },
+ applicationPrincipal: { isCustomApp: true },
};
const build = ({
@@ -145,7 +152,7 @@ const build = ({
flatObjectMetadata,
policyMetadataMaps = metadataMaps,
}: {
- principal: PermissionsPrincipal;
+ principal: PermissionsPrincipalsWithRolesContext;
flatObjectMetadata: FlatObjectMetadata;
policyMetadataMaps?: typeof metadataMaps;
}) =>
@@ -162,7 +169,7 @@ const gatedSql = ({
flatObjectMetadata,
policyMetadataMaps = metadataMaps,
}: {
- principal: PermissionsPrincipal;
+ principal: PermissionsPrincipalsWithRolesContext;
flatObjectMetadata: FlatObjectMetadata;
policyMetadataMaps?: typeof metadataMaps;
}): string => {
@@ -280,7 +287,7 @@ describe('buildPermissionsCondition', () => {
describe('with a record shared beyond the role', () => {
const company = buildObject({ id: 'company' });
const buildForCompany = (
- principal: PermissionsPrincipal,
+ principal: PermissionsPrincipalsWithRolesContext,
operationType: 'select' | 'update' | 'delete' = 'select',
) =>
buildConditionOutcome({
@@ -290,9 +297,11 @@ describe('buildPermissionsCondition', () => {
flatObjectMetadata: company,
operationType,
});
- const withoutCompanyPermission: PermissionsPrincipal = {
+ const withoutCompanyPermission: PermissionsPrincipalsWithRolesContext = {
...readEverything,
- roleIds: ['role-2', 'role-3'],
+ limitingPrincipal: { roleId: 'role-2', agentId: 'agent-1' },
+ mainPrincipal: { roleId: 'role-3', workspaceMemberId: 'member-1' },
+ applicationPrincipal: { isCustomApp: true },
};
it('narrows a principal without object permission to the records named for them', () => {
@@ -341,15 +350,6 @@ describe('buildPermissionsCondition', () => {
});
});
- it('denies a principal named nowhere', () => {
- expect(
- buildForCompany({
- workspaceId: 'workspace-id',
- roleIds: [],
- }),
- ).toEqual({ kind: 'denied' });
- });
-
it('lets a named grant bypass the row filter of the role', () => {
(resolveRowLevelPermissionRecordFilter as jest.Mock).mockReturnValue(
NOTE_FILTER,
@@ -567,7 +567,9 @@ describe('buildPermissionsCondition', () => {
flatEntityMaps: emptyFlatFieldMetadataMaps,
}),
};
- const buildForCreator = (principal: PermissionsPrincipal) =>
+ const buildForCreator = (
+ principal: PermissionsPrincipalsWithRolesContext,
+ ) =>
buildConditionOutcome({
principal,
metadataMaps: creatorMetadataMaps,
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 baf794d2a64..a1245eef2ff 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
@@ -18,7 +18,7 @@ import {
type RowAccessRecord,
} from 'src/engine/permissions/combine/types/row-access-policy.type';
import { findPermissionsAdmittedRecordIds } from 'src/engine/permissions/combine/utils/find-permissions-admitted-record-ids.util';
-import { type PermissionsPrincipal } from 'src/engine/permissions/principal/types/permissions-principal.type';
+import { type PermissionsPrincipalsWithRolesContext } from 'src/engine/permissions/principal/types/permissions-principals-with-roles-context.type';
import { resolveRowLevelPermissionRecordFilter } from 'src/engine/permissions/rls/utils/resolve-row-level-permission-record-filter.util';
import { type PrivateRecordState } from 'src/engine/permissions/private-record/types/private-record-state.type';
import { type RecordShareGrant } from 'src/engine/permissions/record-share/types/record-share-grant.type';
@@ -99,19 +99,22 @@ const fullAccess = {
rowLevelPermissionPredicateGroups: [],
};
-const rolePrincipal: PermissionsPrincipal = {
+const rolePrincipal: PermissionsPrincipalsWithRolesContext = {
workspaceId: 'workspace-id',
- roleIds: [MEMBER_ROLE_ID],
+ mainPrincipal: { roleId: MEMBER_ROLE_ID, isDeprecatedRoleOnly: true },
+ applicationPrincipal: { isCustomApp: true },
};
-const memberPrincipal: PermissionsPrincipal = {
+const memberPrincipal: PermissionsPrincipalsWithRolesContext = {
...rolePrincipal,
- workspaceMemberId: MEMBER_ID,
+ mainPrincipal: { roleId: MEMBER_ROLE_ID, workspaceMemberId: MEMBER_ID },
+ applicationPrincipal: { isCustomApp: true },
};
-const deniedPrincipal: PermissionsPrincipal = {
+const deniedPrincipal: PermissionsPrincipalsWithRolesContext = {
...memberPrincipal,
- roleIds: ['missing-role'],
+ mainPrincipal: { roleId: 'missing-role', workspaceMemberId: MEMBER_ID },
+ applicationPrincipal: { isCustomApp: true },
};
const filterByStatus = (status: string) =>
@@ -134,7 +137,7 @@ const findAdmitted = ({
featureFlagKeys = [FeatureFlagKey.IS_PRIVATE_RECORD_ENABLED],
context = buildContext(),
}: {
- principal: PermissionsPrincipal;
+ principal: PermissionsPrincipalsWithRolesContext;
featureFlagKeys?: FeatureFlagKey[];
context?: RowAccessEvaluationContext;
}) =>
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 f900dfdda81..8ed2cf8ff2b 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
@@ -1,10 +1,12 @@
/* @license Enterprise */
import { type ObjectPermissions } from 'twenty-shared/types';
+import { isDefined } from 'twenty-shared/utils';
import { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/constant/create-empty-flat-entity-maps.constant';
import { COMPANY_FLAT_OBJECT_MOCK } from 'src/engine/metadata-modules/flat-object-metadata/__mocks__/company-flat-object.mock';
import { type PermissionsObjectAccessRequest } from 'src/engine/permissions/combine/types/row-access-policy.type';
+import { type PermissionsPrincipalsWithRolesContext } from 'src/engine/permissions/principal/types/permissions-principals-with-roles-context.type';
import { hasAccessToAllRecords } from 'src/engine/permissions/combine/utils/has-access-to-all-records.util';
import { resolveRowLevelPermissionRecordFilter } from 'src/engine/permissions/rls/utils/resolve-row-level-permission-record-filter.util';
import { type OperationType } from 'src/engine/permissions/role/utils/validate-operation-is-permitted-or-throw.util';
@@ -38,6 +40,26 @@ const readOnlyPermissions: ObjectPermissions = {
rowLevelPermissionPredicateGroups: [],
};
+const buildPrincipal = (
+ roleId: string,
+): PermissionsPrincipalsWithRolesContext => {
+ const applicationId = APPLICATION_ID_BY_ROLE_ID[roleId];
+
+ if (!isDefined(applicationId)) {
+ return {
+ workspaceId: 'workspace-id',
+ mainPrincipal: { roleId, workspaceMemberId: 'member-1' },
+ applicationPrincipal: { isCustomApp: true },
+ };
+ }
+
+ return {
+ workspaceId: 'workspace-id',
+ mainPrincipal: { roleId, applicationId },
+ applicationPrincipal: { roleId, applicationId },
+ };
+};
+
const hasAccess = ({
roleId = READ_ONLY_ROLE_ID,
operationType = 'select',
@@ -48,11 +70,7 @@ const hasAccess = ({
disabledObjectPermissionActions?: typeof flatObjectMetadata.disabledObjectPermissionActions;
}) => {
const request: PermissionsObjectAccessRequest = {
- principal: {
- workspaceId: 'workspace-id',
- roleIds: [roleId],
- applicationId: APPLICATION_ID_BY_ROLE_ID[roleId],
- },
+ principal: buildPrincipal(roleId),
metadataMaps: {
flatFieldMetadataMaps: createEmptyFlatEntityMaps(),
flatObjectMetadataMaps: createEmptyFlatEntityMaps(),
diff --git a/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/resolve-events-readable-by-role.util.spec.ts b/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/resolve-events-readable-by-role.util.spec.ts
index ba8da7d5349..2db35064a3a 100644
--- a/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/resolve-events-readable-by-role.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/resolve-events-readable-by-role.util.spec.ts
@@ -72,6 +72,7 @@ const updateEvent: ObjectRecordUpdateEvent = {
const resolveForApplication = (applicationId: string) =>
resolveEventsReadableByRole({
+ applicationId,
roleId: ROLE_ID,
workspaceEventBatch: {
name: 'invoice.updated',
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 48d39c1ab8e..43e85658e7c 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
@@ -10,7 +10,7 @@ import { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-enti
import { COMPANY_FLAT_OBJECT_MOCK } from 'src/engine/metadata-modules/flat-object-metadata/__mocks__/company-flat-object.mock';
import { type PermissionsRowAccessRequest } from 'src/engine/permissions/combine/types/row-access-policy.type';
import { resolvePermissionsRowAccessOutcome } from 'src/engine/permissions/combine/utils/resolve-permissions-row-access-outcome.util';
-import { type PermissionsPrincipal } from 'src/engine/permissions/principal/types/permissions-principal.type';
+import { type PermissionsPrincipalsWithRolesContext } from 'src/engine/permissions/principal/types/permissions-principals-with-roles-context.type';
import { type OperationType } from 'src/engine/permissions/role/utils/validate-operation-is-permitted-or-throw.util';
const APPLICATION_ID = 'application-id';
@@ -33,15 +33,19 @@ const readOnlyPermissions: ObjectPermissions = {
rowLevelPermissionPredicateGroups: [],
};
-const readOnlyPrincipal: PermissionsPrincipal = {
+const readOnlyPrincipal: PermissionsPrincipalsWithRolesContext = {
workspaceId: 'workspace-id',
- roleIds: [READ_ONLY_ROLE_ID],
+ mainPrincipal: { roleId: READ_ONLY_ROLE_ID, isDeprecatedRoleOnly: true },
+ applicationPrincipal: { isCustomApp: true },
};
-const owningApplicationPrincipal: PermissionsPrincipal = {
+const owningApplicationPrincipal: PermissionsPrincipalsWithRolesContext = {
workspaceId: 'workspace-id',
- roleIds: [APPLICATION_ROLE_ID],
- applicationId: APPLICATION_ID,
+ mainPrincipal: { roleId: APPLICATION_ROLE_ID, applicationId: APPLICATION_ID },
+ applicationPrincipal: {
+ roleId: APPLICATION_ROLE_ID,
+ applicationId: APPLICATION_ID,
+ },
};
const resolveOutcome = ({
@@ -51,7 +55,7 @@ const resolveOutcome = ({
disabledObjectPermissionActions = [],
hypotheticalRecordShareAccessLevel,
}: {
- principal?: PermissionsPrincipal;
+ principal?: PermissionsPrincipalsWithRolesContext;
operationType?: OperationType;
featureFlagKeys?: FeatureFlagKey[];
disabledObjectPermissionActions?: typeof flatObjectMetadata.disabledObjectPermissionActions;
@@ -102,7 +106,8 @@ describe('resolvePermissionsRowAccessOutcome', () => {
resolveOutcome({
principal: {
...readOnlyPrincipal,
- roleIds: ['missing-role'],
+ mainPrincipal: { roleId: 'missing-role', isDeprecatedRoleOnly: true },
+ applicationPrincipal: { isCustomApp: true },
},
}),
).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 c99c387ebcf..74bd96e8d08 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
@@ -7,17 +7,18 @@ import { isUpdateOfHiddenFieldsOnly } from 'src/engine/permissions/masking/utils
import { omitRestrictedFieldsFromEvent } from 'src/engine/permissions/masking/utils/omit-restricted-fields-from-event.util';
import { getPermissionsPrincipalObjectsPermissions } from 'src/engine/permissions/role/utils/get-permissions-principal-objects-permissions.util';
import { type WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/workspace-event-batch.type';
-import { 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';
+import { type PermissionsPrincipalsWithRolesContext } from 'src/engine/permissions/principal/types/permissions-principals-with-roles-context.type';
export const resolveEventsReadableByRole = async <
TEvent extends ObjectRecordEvent,
>({
+ applicationId,
roleId,
workspaceEventBatch,
eventRecordAccessGate,
metadataMaps,
}: {
+ applicationId: string;
roleId: string | null;
workspaceEventBatch: WorkspaceEventBatch<TEvent>;
eventRecordAccessGate: EventRecordAccessGate;
@@ -27,20 +28,21 @@ export const resolveEventsReadableByRole = async <
return [];
}
- const principal = buildPermissionsPrincipal({
+ const principal: PermissionsPrincipalsWithRolesContext = {
workspaceId: workspaceEventBatch.workspaceId,
- roleId,
- applicationId: resolvePermissionsPrincipalActingApplicationId({
- intersectionOf: { applicationRoleId: roleId },
- flatApplicationMaps: metadataMaps.flatApplicationMaps,
- }),
- });
+ mainPrincipal: { roleId, applicationId },
+ applicationPrincipal: { roleId, applicationId },
+ };
const objectsPermissions = getPermissionsPrincipalObjectsPermissions({
principal,
metadataMaps,
});
const admittedRecordIds =
- await eventRecordAccessGate.resolveAdmittedRecordIds(principal);
+ await eventRecordAccessGate.resolveAdmittedRecordIds({
+ workspaceId: workspaceEventBatch.workspaceId,
+ mainPrincipal: { applicationId },
+ applicationPrincipal: { applicationId },
+ });
return workspaceEventBatch.events
.filter((event) => admittedRecordIds.has(event.recordId))
diff --git a/packages/twenty-server/src/engine/permissions/permissions.service.ts b/packages/twenty-server/src/engine/permissions/permissions.service.ts
index 23446551dd8..a6468f55026 100644
--- a/packages/twenty-server/src/engine/permissions/permissions.service.ts
+++ b/packages/twenty-server/src/engine/permissions/permissions.service.ts
@@ -85,7 +85,10 @@ export class PermissionsService {
return {
permissionFlags,
objectsPermissions: computeObjectsPermissionsForRoles({
- roleIds: [flatRole.id],
+ principal: {
+ mainPrincipal: { roleId: flatRole.id, isDeprecatedRoleOnly: true },
+ applicationPrincipal: { isCustomApp: true },
+ },
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
deleted file mode 100644
index bf86461f1d9..00000000000
--- a/packages/twenty-server/src/engine/permissions/principal/types/permissions-principal.type.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/* @license Enterprise */
-
-export type PermissionsPrincipal = {
- workspaceId: string;
- roleIds: string[];
- workspaceMemberId?: string;
- applicationId?: string;
-};
diff --git a/packages/twenty-server/src/engine/permissions/principal/types/permissions-principals-context.type.ts b/packages/twenty-server/src/engine/permissions/principal/types/permissions-principals-context.type.ts
new file mode 100644
index 00000000000..dfa4ef807cf
--- /dev/null
+++ b/packages/twenty-server/src/engine/permissions/principal/types/permissions-principals-context.type.ts
@@ -0,0 +1,31 @@
+/* @license Enterprise */
+
+// TODO(@charlesBochet): drop isDeprecatedRoleOnly once every caller names the principal holding the role
+export type PermissionsDeprecatedRoleOnlyPrincipal = {
+ roleId: string;
+ isDeprecatedRoleOnly: true;
+};
+
+export type PermissionsMainPrincipal =
+ | { workspaceMemberId: string }
+ | { apiKeyId: string }
+ | { agentId: string }
+ | { webhookId: string }
+ | { applicationId: string }
+ | PermissionsDeprecatedRoleOnlyPrincipal;
+
+export type PermissionsLimitingPrincipal =
+ | { agentId: string }
+ | PermissionsDeprecatedRoleOnlyPrincipal;
+
+export type PermissionsApplicationPrincipal =
+ | { applicationId: string }
+ | { isCustomApp: true }
+ | PermissionsDeprecatedRoleOnlyPrincipal;
+
+export type PermissionsPrincipalsContext = {
+ workspaceId: string;
+ mainPrincipal: PermissionsMainPrincipal;
+ limitingPrincipal?: PermissionsLimitingPrincipal;
+ applicationPrincipal: PermissionsApplicationPrincipal;
+};
diff --git a/packages/twenty-server/src/engine/permissions/principal/types/permissions-principals-with-roles-context.type.ts b/packages/twenty-server/src/engine/permissions/principal/types/permissions-principals-with-roles-context.type.ts
new file mode 100644
index 00000000000..47a1ea651da
--- /dev/null
+++ b/packages/twenty-server/src/engine/permissions/principal/types/permissions-principals-with-roles-context.type.ts
@@ -0,0 +1,27 @@
+/* @license Enterprise */
+
+import { type PermissionsDeprecatedRoleOnlyPrincipal } from 'src/engine/permissions/principal/types/permissions-principals-context.type';
+
+export type PermissionsMainPrincipalWithRole =
+ | { roleId: string; workspaceMemberId: string }
+ | { roleId: string; apiKeyId: string }
+ | { roleId: string; agentId: string }
+ | { roleId: string; webhookId: string }
+ | { roleId: string; applicationId: string }
+ | PermissionsDeprecatedRoleOnlyPrincipal;
+
+export type PermissionsLimitingPrincipalWithRole =
+ | { roleId: string; agentId: string }
+ | PermissionsDeprecatedRoleOnlyPrincipal;
+
+export type PermissionsApplicationPrincipalWithRole =
+ | { roleId: string; applicationId: string }
+ | { isCustomApp: true }
+ | PermissionsDeprecatedRoleOnlyPrincipal;
+
+export type PermissionsPrincipalsWithRolesContext = {
+ workspaceId: string;
+ mainPrincipal: PermissionsMainPrincipalWithRole;
+ limitingPrincipal?: PermissionsLimitingPrincipalWithRole;
+ applicationPrincipal: PermissionsApplicationPrincipalWithRole;
+};
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/build-permissions-principal-roles.util.spec.ts b/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/build-permissions-principal-roles.util.spec.ts
new file mode 100644
index 00000000000..2da556260f0
--- /dev/null
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/build-permissions-principal-roles.util.spec.ts
@@ -0,0 +1,129 @@
+import { type PermissionsPrincipalsContext } from 'src/engine/permissions/principal/types/permissions-principals-context.type';
+import { buildPermissionsPrincipalRoles } from 'src/engine/permissions/principal/utils/build-permissions-principal-roles.util';
+
+const MEMBER_ID = 'member-1';
+const AGENT_ID = 'agent-1';
+const APPLICATION_ID = 'application-1';
+const USER_ROLE_ID = 'user-role';
+const AGENT_ROLE_ID = 'agent-role';
+const APPLICATION_ROLE_ID = 'application-role';
+
+const MEMBER_PRINCIPALS: PermissionsPrincipalsContext = {
+ workspaceId: 'workspace-1',
+ mainPrincipal: { workspaceMemberId: MEMBER_ID },
+ limitingPrincipal: { agentId: AGENT_ID },
+ applicationPrincipal: { applicationId: APPLICATION_ID },
+};
+
+describe('buildPermissionsPrincipalRoles', () => {
+ it('places the member, agent and application in their slots', () => {
+ expect(
+ buildPermissionsPrincipalRoles({
+ roleIdsBySource: {
+ userWorkspaceRoleId: USER_ROLE_ID,
+ agentRoleId: AGENT_ROLE_ID,
+ applicationRoleId: APPLICATION_ROLE_ID,
+ },
+ principalsContext: MEMBER_PRINCIPALS,
+ }),
+ ).toEqual({
+ mainPrincipal: { roleId: USER_ROLE_ID, workspaceMemberId: MEMBER_ID },
+ limitingPrincipal: { roleId: AGENT_ROLE_ID, agentId: AGENT_ID },
+ applicationPrincipal: {
+ roleId: APPLICATION_ROLE_ID,
+ applicationId: APPLICATION_ID,
+ },
+ });
+ });
+
+ it('uses the custom app when no application takes part', () => {
+ expect(
+ buildPermissionsPrincipalRoles({
+ roleIdsBySource: { apiKeyRoleId: 'api-key-role' },
+ principalsContext: {
+ workspaceId: 'workspace-1',
+ mainPrincipal: { apiKeyId: 'api-key-1' },
+ applicationPrincipal: { isCustomApp: true },
+ },
+ }),
+ ).toEqual({
+ mainPrincipal: { roleId: 'api-key-role', apiKeyId: 'api-key-1' },
+ limitingPrincipal: undefined,
+ applicationPrincipal: { isCustomApp: true },
+ });
+ });
+
+ it('puts an application acting alone in main and app', () => {
+ expect(
+ buildPermissionsPrincipalRoles({
+ roleIdsBySource: { applicationRoleId: APPLICATION_ROLE_ID },
+ principalsContext: {
+ workspaceId: 'workspace-1',
+ mainPrincipal: { applicationId: APPLICATION_ID },
+ applicationPrincipal: { applicationId: APPLICATION_ID },
+ },
+ }),
+ ).toEqual({
+ mainPrincipal: {
+ roleId: APPLICATION_ROLE_ID,
+ applicationId: APPLICATION_ID,
+ },
+ limitingPrincipal: undefined,
+ applicationPrincipal: {
+ roleId: APPLICATION_ROLE_ID,
+ applicationId: APPLICATION_ID,
+ },
+ });
+ });
+
+ it('treats an agent or application without a role as the custom app', () => {
+ expect(
+ buildPermissionsPrincipalRoles({
+ roleIdsBySource: {
+ userWorkspaceRoleId: USER_ROLE_ID,
+ agentRoleId: null,
+ applicationRoleId: null,
+ },
+ principalsContext: MEMBER_PRINCIPALS,
+ }),
+ ).toEqual({
+ mainPrincipal: { roleId: USER_ROLE_ID, workspaceMemberId: MEMBER_ID },
+ limitingPrincipal: undefined,
+ applicationPrincipal: { isCustomApp: true },
+ });
+ });
+
+ it('denies a member without a role', () => {
+ expect(
+ buildPermissionsPrincipalRoles({
+ roleIdsBySource: { userWorkspaceRoleId: null },
+ principalsContext: MEMBER_PRINCIPALS,
+ }),
+ ).toBeUndefined();
+ });
+
+ it('denies when a source cannot be placed', () => {
+ expect(
+ buildPermissionsPrincipalRoles({
+ roleIdsBySource: {
+ userWorkspaceRoleId: USER_ROLE_ID,
+ apiKeyRoleId: 'api-key-role',
+ },
+ principalsContext: MEMBER_PRINCIPALS,
+ }),
+ ).toBeUndefined();
+ });
+
+ it('marks roles without a known principal as deprecated role-only', () => {
+ expect(
+ buildPermissionsPrincipalRoles({
+ roleIdsBySource: { agentRoleId: AGENT_ROLE_ID },
+ principalsContext: undefined,
+ }),
+ ).toEqual({
+ mainPrincipal: { roleId: AGENT_ROLE_ID, isDeprecatedRoleOnly: true },
+ limitingPrincipal: undefined,
+ applicationPrincipal: { isCustomApp: true },
+ });
+ });
+});
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/get-permissions-principal-acting-application-id.util.spec.ts b/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/get-permissions-principal-acting-application-id.util.spec.ts
new file mode 100644
index 00000000000..52b42a9867c
--- /dev/null
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/get-permissions-principal-acting-application-id.util.spec.ts
@@ -0,0 +1,113 @@
+import { type ApplicationDefaultRoleMaps } from 'src/engine/permissions/principal/types/application-default-role-maps.type';
+import { getPermissionsPrincipalActingApplicationId } from 'src/engine/permissions/principal/utils/get-permissions-principal-acting-application-id.util';
+
+const APPLICATION_ID = 'application-1';
+const APPLICATION_ROLE_ID = 'application-role';
+
+const flatApplicationMaps: ApplicationDefaultRoleMaps = {
+ byId: {
+ [APPLICATION_ID]: {
+ id: APPLICATION_ID,
+ defaultRoleId: APPLICATION_ROLE_ID,
+ deletedAt: null,
+ },
+ },
+};
+
+describe('getPermissionsPrincipalActingApplicationId', () => {
+ it('returns the application a member acts through', () => {
+ expect(
+ getPermissionsPrincipalActingApplicationId({
+ principal: {
+ mainPrincipal: { roleId: 'user-role', workspaceMemberId: 'member-1' },
+ applicationPrincipal: {
+ roleId: APPLICATION_ROLE_ID,
+ applicationId: APPLICATION_ID,
+ },
+ },
+ flatApplicationMaps,
+ }),
+ ).toBe(APPLICATION_ID);
+ });
+
+ it('returns the application acting alone', () => {
+ expect(
+ getPermissionsPrincipalActingApplicationId({
+ principal: {
+ mainPrincipal: {
+ roleId: APPLICATION_ROLE_ID,
+ applicationId: APPLICATION_ID,
+ },
+ applicationPrincipal: {
+ roleId: APPLICATION_ROLE_ID,
+ applicationId: APPLICATION_ID,
+ },
+ },
+ flatApplicationMaps,
+ }),
+ ).toBe(APPLICATION_ID);
+ });
+
+ it('looks up the application of a deprecated role-only app', () => {
+ expect(
+ getPermissionsPrincipalActingApplicationId({
+ principal: {
+ mainPrincipal: { roleId: 'user-role', isDeprecatedRoleOnly: true },
+ applicationPrincipal: {
+ roleId: APPLICATION_ROLE_ID,
+ isDeprecatedRoleOnly: true,
+ },
+ },
+ flatApplicationMaps,
+ }),
+ ).toBe(APPLICATION_ID);
+ });
+
+ it('keeps the owning application of a role-only application config', () => {
+ expect(
+ getPermissionsPrincipalActingApplicationId({
+ principal: {
+ mainPrincipal: {
+ roleId: APPLICATION_ROLE_ID,
+ isDeprecatedRoleOnly: true,
+ },
+ applicationPrincipal: {
+ roleId: APPLICATION_ROLE_ID,
+ isDeprecatedRoleOnly: true,
+ },
+ },
+ flatApplicationMaps,
+ }),
+ ).toBe(APPLICATION_ID);
+ });
+
+ it('ignores an app role the member also holds', () => {
+ expect(
+ getPermissionsPrincipalActingApplicationId({
+ principal: {
+ mainPrincipal: {
+ roleId: APPLICATION_ROLE_ID,
+ workspaceMemberId: 'member-1',
+ },
+ applicationPrincipal: {
+ roleId: APPLICATION_ROLE_ID,
+ applicationId: APPLICATION_ID,
+ },
+ },
+ flatApplicationMaps,
+ }),
+ ).toBeUndefined();
+ });
+
+ it('ignores the custom app', () => {
+ expect(
+ getPermissionsPrincipalActingApplicationId({
+ principal: {
+ mainPrincipal: { roleId: 'user-role', workspaceMemberId: 'member-1' },
+ applicationPrincipal: { isCustomApp: true },
+ },
+ flatApplicationMaps,
+ }),
+ ).toBeUndefined();
+ });
+});
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/get-permissions-principal-role-ids.util.spec.ts b/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/get-permissions-principal-role-ids.util.spec.ts
new file mode 100644
index 00000000000..58b3d425a22
--- /dev/null
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/get-permissions-principal-role-ids.util.spec.ts
@@ -0,0 +1,25 @@
+import { getPermissionsPrincipalRoleIds } from 'src/engine/permissions/principal/utils/get-permissions-principal-role-ids.util';
+
+describe('getPermissionsPrincipalRoleIds', () => {
+ it('lists the limiting role first and drops duplicates', () => {
+ expect(
+ getPermissionsPrincipalRoleIds({
+ mainPrincipal: { roleId: 'user-role', workspaceMemberId: 'member-1' },
+ limitingPrincipal: { roleId: 'agent-role', agentId: 'agent-1' },
+ applicationPrincipal: {
+ roleId: 'user-role',
+ applicationId: 'application-1',
+ },
+ }),
+ ).toEqual(['agent-role', 'user-role']);
+ });
+
+ it('leaves the custom app out of the intersection', () => {
+ expect(
+ getPermissionsPrincipalRoleIds({
+ mainPrincipal: { roleId: 'user-role', workspaceMemberId: 'member-1' },
+ applicationPrincipal: { isCustomApp: true },
+ }),
+ ).toEqual(['user-role']);
+ });
+});
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/build-deprecated-permissions-principals-from-config.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/build-deprecated-permissions-principals-from-config.util.ts
new file mode 100644
index 00000000000..3d7f83fb1a5
--- /dev/null
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/build-deprecated-permissions-principals-from-config.util.ts
@@ -0,0 +1,44 @@
+/* @license Enterprise */
+
+import { isDefined } from 'twenty-shared/utils';
+
+import { type PermissionsPrincipalsContext } from 'src/engine/permissions/principal/types/permissions-principals-context.type';
+import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
+import { buildPermissionsPrincipalRoles } from 'src/engine/permissions/principal/utils/build-permissions-principal-roles.util';
+
+// TODO(@charlesBochet): drop once callers without an acting principal pass one instead of bare role ids
+export const buildDeprecatedPermissionsPrincipalsFromConfig = ({
+ workspaceId,
+ rolePermissionConfig,
+}: {
+ workspaceId: string;
+ rolePermissionConfig: RolePermissionConfig;
+}): PermissionsPrincipalsContext | undefined => {
+ if (!('intersectionOf' in rolePermissionConfig)) {
+ return undefined;
+ }
+
+ const principalRoles = buildPermissionsPrincipalRoles({
+ roleIdsBySource: rolePermissionConfig.intersectionOf,
+ principalsContext: undefined,
+ });
+
+ if (!isDefined(principalRoles)) {
+ return undefined;
+ }
+
+ const { mainPrincipal, limitingPrincipal, applicationPrincipal } =
+ principalRoles;
+
+ return {
+ workspaceId,
+ mainPrincipal: { roleId: mainPrincipal.roleId, isDeprecatedRoleOnly: true },
+ limitingPrincipal: isDefined(limitingPrincipal)
+ ? { roleId: limitingPrincipal.roleId, isDeprecatedRoleOnly: true }
+ : undefined,
+ applicationPrincipal:
+ 'roleId' in applicationPrincipal
+ ? { roleId: applicationPrincipal.roleId, isDeprecatedRoleOnly: true }
+ : { isCustomApp: true },
+ };
+};
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/build-permissions-principal-roles.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/build-permissions-principal-roles.util.ts
new file mode 100644
index 00000000000..139edfe9a61
--- /dev/null
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/build-permissions-principal-roles.util.ts
@@ -0,0 +1,160 @@
+/* @license Enterprise */
+
+import { isDefined } from 'twenty-shared/utils';
+
+import {
+ type PermissionsMainPrincipal,
+ type PermissionsPrincipalsContext,
+} from 'src/engine/permissions/principal/types/permissions-principals-context.type';
+import {
+ type PermissionsApplicationPrincipalWithRole,
+ type PermissionsLimitingPrincipalWithRole,
+ type PermissionsMainPrincipalWithRole,
+ type PermissionsPrincipalsWithRolesContext,
+} from 'src/engine/permissions/principal/types/permissions-principals-with-roles-context.type';
+import { type RoleIdsBySource } from 'src/engine/permissions/principal/types/role-permission-config.type';
+
+const FALLBACK_MAIN_ROLE_ID_KEYS: (keyof RoleIdsBySource)[] = [
+ 'userWorkspaceRoleId',
+ 'apiKeyRoleId',
+ 'webhookRoleId',
+ 'applicationRoleId',
+ 'agentRoleId',
+];
+
+const getMainRoleIdKey = ({
+ mainPrincipal,
+ roleIdsBySource,
+}: {
+ mainPrincipal: PermissionsMainPrincipal | undefined;
+ roleIdsBySource: RoleIdsBySource;
+}): keyof RoleIdsBySource | undefined => {
+ if (!isDefined(mainPrincipal) || 'isDeprecatedRoleOnly' in mainPrincipal) {
+ return FALLBACK_MAIN_ROLE_ID_KEYS.find(
+ (roleIdKey) => roleIdsBySource[roleIdKey] !== undefined,
+ );
+ }
+
+ if ('workspaceMemberId' in mainPrincipal) {
+ return 'userWorkspaceRoleId';
+ }
+
+ if ('apiKeyId' in mainPrincipal) {
+ return 'apiKeyRoleId';
+ }
+
+ if ('agentId' in mainPrincipal) {
+ return 'agentRoleId';
+ }
+
+ if ('applicationId' in mainPrincipal) {
+ return 'applicationRoleId';
+ }
+
+ return 'webhookRoleId';
+};
+
+// TODO(@charlesBochet): an agent or application always needs a role; until then one without counts as the custom app
+const buildLimitingPrincipal = ({
+ agentRoleId,
+ agentId,
+}: {
+ agentRoleId: string | null | undefined;
+ agentId: string | undefined;
+}): PermissionsLimitingPrincipalWithRole | undefined => {
+ if (!isDefined(agentRoleId)) {
+ return undefined;
+ }
+
+ return isDefined(agentId)
+ ? { roleId: agentRoleId, agentId }
+ : { roleId: agentRoleId, isDeprecatedRoleOnly: true };
+};
+
+const buildApplicationPrincipal = ({
+ applicationRoleId,
+ applicationId,
+}: {
+ applicationRoleId: string | null | undefined;
+ applicationId: string | undefined;
+}): PermissionsApplicationPrincipalWithRole => {
+ if (!isDefined(applicationRoleId)) {
+ return { isCustomApp: true };
+ }
+
+ return isDefined(applicationId)
+ ? { roleId: applicationRoleId, applicationId }
+ : { roleId: applicationRoleId, isDeprecatedRoleOnly: true };
+};
+
+const getIdentifiedMainPrincipal = (
+ principalsContext: PermissionsPrincipalsContext | undefined,
+) => {
+ const mainPrincipal = principalsContext?.mainPrincipal;
+
+ return isDefined(mainPrincipal) && !('isDeprecatedRoleOnly' in mainPrincipal)
+ ? mainPrincipal
+ : undefined;
+};
+
+export const buildPermissionsPrincipalRoles = ({
+ roleIdsBySource,
+ principalsContext,
+}: {
+ roleIdsBySource: RoleIdsBySource;
+ principalsContext: PermissionsPrincipalsContext | undefined;
+}): Omit<PermissionsPrincipalsWithRolesContext, 'workspaceId'> | undefined => {
+ const identifiedMainPrincipal = getIdentifiedMainPrincipal(principalsContext);
+ const mainRoleIdKey = getMainRoleIdKey({
+ mainPrincipal: identifiedMainPrincipal,
+ roleIdsBySource,
+ });
+
+ if (!isDefined(mainRoleIdKey)) {
+ return undefined;
+ }
+
+ const hasUnplacedRoleId = Object.entries(roleIdsBySource).some(
+ ([roleIdKey, roleId]) =>
+ roleId !== undefined &&
+ roleIdKey !== mainRoleIdKey &&
+ roleIdKey !== 'agentRoleId' &&
+ roleIdKey !== 'applicationRoleId',
+ );
+ const mainRoleId = roleIdsBySource[mainRoleIdKey];
+
+ if (hasUnplacedRoleId || !isDefined(mainRoleId)) {
+ return undefined;
+ }
+
+ const mainPrincipal: PermissionsMainPrincipalWithRole = isDefined(
+ identifiedMainPrincipal,
+ )
+ ? { ...identifiedMainPrincipal, roleId: mainRoleId }
+ : { roleId: mainRoleId, isDeprecatedRoleOnly: true };
+
+ const limitingPrincipal = principalsContext?.limitingPrincipal;
+ const applicationPrincipal = principalsContext?.applicationPrincipal;
+
+ return {
+ mainPrincipal,
+ limitingPrincipal:
+ mainRoleIdKey === 'agentRoleId'
+ ? undefined
+ : buildLimitingPrincipal({
+ agentRoleId: roleIdsBySource.agentRoleId,
+ agentId:
+ isDefined(limitingPrincipal) && 'agentId' in limitingPrincipal
+ ? limitingPrincipal.agentId
+ : undefined,
+ }),
+ applicationPrincipal: buildApplicationPrincipal({
+ applicationRoleId: roleIdsBySource.applicationRoleId,
+ applicationId:
+ isDefined(applicationPrincipal) &&
+ 'applicationId' in applicationPrincipal
+ ? applicationPrincipal.applicationId
+ : undefined,
+ }),
+ };
+};
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
deleted file mode 100644
index 16111b224c6..00000000000
--- a/packages/twenty-server/src/engine/permissions/principal/utils/build-permissions-principal.util.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-/* @license Enterprise */
-
-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;
-};
-
-type BuildConfigPermissionsPrincipalArgs = {
- workspaceId: string;
- rolePermissionConfig: RolePermissionConfig;
- 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,
- roleIds: getRoleIdsToIntersect(intersectionOf) ?? [],
- workspaceMemberId,
- applicationId: resolvePermissionsPrincipalActingApplicationId({
- intersectionOf,
- flatApplicationMaps: args.flatApplicationMaps,
- }),
- };
-}
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/build-permissions-principals-context.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/build-permissions-principals-context.util.ts
new file mode 100644
index 00000000000..9d0cb47b9d2
--- /dev/null
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/build-permissions-principals-context.util.ts
@@ -0,0 +1,65 @@
+/* @license Enterprise */
+
+import { isDefined } from 'twenty-shared/utils';
+
+import {
+ type PermissionsMainPrincipal,
+ type PermissionsPrincipalsContext,
+} from 'src/engine/permissions/principal/types/permissions-principals-context.type';
+
+const buildMainPrincipal = ({
+ workspaceMemberId,
+ apiKeyId,
+ applicationId,
+}: {
+ workspaceMemberId: string | undefined;
+ apiKeyId: string | undefined;
+ applicationId: string | undefined;
+}): PermissionsMainPrincipal | undefined => {
+ if (isDefined(workspaceMemberId)) {
+ return { workspaceMemberId };
+ }
+
+ if (isDefined(apiKeyId)) {
+ return { apiKeyId };
+ }
+
+ if (isDefined(applicationId)) {
+ return { applicationId };
+ }
+
+ return undefined;
+};
+
+export const buildPermissionsPrincipalsContext = ({
+ workspaceId,
+ workspaceMemberId,
+ apiKeyId,
+ applicationId,
+ agentId,
+}: {
+ workspaceId: string;
+ workspaceMemberId: string | undefined;
+ apiKeyId: string | undefined;
+ applicationId: string | undefined;
+ agentId: string | undefined;
+}): PermissionsPrincipalsContext | undefined => {
+ const mainPrincipal = buildMainPrincipal({
+ workspaceMemberId,
+ apiKeyId,
+ applicationId,
+ });
+
+ if (!isDefined(mainPrincipal)) {
+ return undefined;
+ }
+
+ return {
+ workspaceId,
+ mainPrincipal,
+ limitingPrincipal: isDefined(agentId) ? { agentId } : undefined,
+ applicationPrincipal: isDefined(applicationId)
+ ? { applicationId }
+ : { isCustomApp: true },
+ };
+};
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/build-permissions-principals-with-roles-from-config.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/build-permissions-principals-with-roles-from-config.util.ts
new file mode 100644
index 00000000000..3fd753ffbc1
--- /dev/null
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/build-permissions-principals-with-roles-from-config.util.ts
@@ -0,0 +1,34 @@
+/* @license Enterprise */
+
+import { isDefined } from 'twenty-shared/utils';
+
+import { type PermissionsPrincipalsContext } from 'src/engine/permissions/principal/types/permissions-principals-context.type';
+import { type PermissionsPrincipalsWithRolesContext } from 'src/engine/permissions/principal/types/permissions-principals-with-roles-context.type';
+import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
+import { buildPermissionsPrincipalRoles } from 'src/engine/permissions/principal/utils/build-permissions-principal-roles.util';
+
+// TODO(@charlesBochet): drop once repositories resolve roles from the principals instead of a RolePermissionConfig
+export const buildPermissionsPrincipalsWithRolesFromConfig = ({
+ workspaceId,
+ rolePermissionConfig,
+ principalsContext,
+}: {
+ workspaceId: string;
+ rolePermissionConfig: RolePermissionConfig;
+ principalsContext: PermissionsPrincipalsContext | undefined;
+}): PermissionsPrincipalsWithRolesContext | undefined => {
+ if (!('intersectionOf' in rolePermissionConfig)) {
+ return undefined;
+ }
+
+ const principalRoles = buildPermissionsPrincipalRoles({
+ roleIdsBySource: rolePermissionConfig.intersectionOf,
+ principalsContext,
+ });
+
+ if (!isDefined(principalRoles)) {
+ return undefined;
+ }
+
+ return { workspaceId, ...principalRoles };
+};
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principal-acting-application-id.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principal-acting-application-id.util.ts
new file mode 100644
index 00000000000..e901a226135
--- /dev/null
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principal-acting-application-id.util.ts
@@ -0,0 +1,43 @@
+/* @license Enterprise */
+
+import { isDefined } from 'twenty-shared/utils';
+
+import { type ApplicationDefaultRoleMaps } from 'src/engine/permissions/principal/types/application-default-role-maps.type';
+import { type PermissionsPrincipalsWithRolesContext } from 'src/engine/permissions/principal/types/permissions-principals-with-roles-context.type';
+
+// TODO(@charlesBochet): members hold Admin, the Standard app's default role (#28667); simplify once they no longer do
+export const getPermissionsPrincipalActingApplicationId = ({
+ principal,
+ flatApplicationMaps,
+}: {
+ principal: Pick<
+ PermissionsPrincipalsWithRolesContext,
+ 'mainPrincipal' | 'limitingPrincipal' | 'applicationPrincipal'
+ >;
+ flatApplicationMaps: ApplicationDefaultRoleMaps;
+}): string | undefined => {
+ const { mainPrincipal, limitingPrincipal, applicationPrincipal } = principal;
+
+ if ('applicationId' in mainPrincipal) {
+ return mainPrincipal.applicationId;
+ }
+
+ if (
+ !('roleId' in applicationPrincipal) ||
+ ('workspaceMemberId' in mainPrincipal &&
+ applicationPrincipal.roleId === mainPrincipal.roleId) ||
+ applicationPrincipal.roleId === limitingPrincipal?.roleId
+ ) {
+ return undefined;
+ }
+
+ if ('applicationId' in applicationPrincipal) {
+ return applicationPrincipal.applicationId;
+ }
+
+ return Object.values(flatApplicationMaps.byId).find(
+ (flatApplication) =>
+ flatApplication?.defaultRoleId === applicationPrincipal.roleId &&
+ !isDefined(flatApplication.deletedAt),
+ )?.id;
+};
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
new file mode 100644
index 00000000000..cf5e339245d
--- /dev/null
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principal-role-ids.util.ts
@@ -0,0 +1,22 @@
+/* @license Enterprise */
+
+import { isDefined } from 'twenty-shared/utils';
+
+import { type PermissionsPrincipalsWithRolesContext } from 'src/engine/permissions/principal/types/permissions-principals-with-roles-context.type';
+
+export const getPermissionsPrincipalRoleIds = (
+ principal: Pick<
+ PermissionsPrincipalsWithRolesContext,
+ 'mainPrincipal' | 'limitingPrincipal' | 'applicationPrincipal'
+ >,
+): string[] => [
+ ...new Set(
+ [
+ principal.limitingPrincipal?.roleId,
+ principal.mainPrincipal.roleId,
+ 'roleId' in principal.applicationPrincipal
+ ? principal.applicationPrincipal.roleId
+ : undefined,
+ ].filter(isDefined),
+ ),
+];
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 a5d0652ca21..e7beb3e9fbc 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
@@ -2,12 +2,17 @@
import { isDefined } from 'twenty-shared/utils';
-import { type PermissionsPrincipal } from 'src/engine/permissions/principal/types/permissions-principal.type';
+import { type PermissionsPrincipalsWithRolesContext } from 'src/engine/permissions/principal/types/permissions-principals-with-roles-context.type';
+import { getPermissionsPrincipalRoleIds } from 'src/engine/permissions/principal/utils/get-permissions-principal-role-ids.util';
+import { getPermissionsPrincipalWorkspaceMemberId } from 'src/engine/permissions/principal/utils/get-permissions-principal-workspace-member-id.util';
export const getPermissionsPrincipalShareKeys = (
- principal: PermissionsPrincipal,
+ principal: PermissionsPrincipalsWithRolesContext,
): string[] => [
...new Set(
- [principal.workspaceMemberId, ...principal.roleIds].filter(isDefined),
+ [
+ getPermissionsPrincipalWorkspaceMemberId(principal),
+ ...getPermissionsPrincipalRoleIds(principal),
+ ].filter(isDefined),
),
];
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principal-workspace-member-id.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principal-workspace-member-id.util.ts
new file mode 100644
index 00000000000..42b7488305f
--- /dev/null
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principal-workspace-member-id.util.ts
@@ -0,0 +1,10 @@
+/* @license Enterprise */
+
+import { type PermissionsPrincipalsWithRolesContext } from 'src/engine/permissions/principal/types/permissions-principals-with-roles-context.type';
+
+export const getPermissionsPrincipalWorkspaceMemberId = (
+ principal: Pick<PermissionsPrincipalsWithRolesContext, 'mainPrincipal'>,
+): string | undefined =>
+ 'workspaceMemberId' in principal.mainPrincipal
+ ? principal.mainPrincipal.workspaceMemberId
+ : undefined;
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principals-from-auth-context.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principals-from-auth-context.util.ts
new file mode 100644
index 00000000000..6ee99bb2b62
--- /dev/null
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principals-from-auth-context.util.ts
@@ -0,0 +1,45 @@
+/* @license Enterprise */
+
+import { isApiKeyAuthContext } from 'src/engine/core-modules/auth/guards/is-api-key-auth-context.guard';
+import { isApplicationAuthContext } from 'src/engine/core-modules/auth/guards/is-application-auth-context.guard';
+import { isUserAuthContext } from 'src/engine/core-modules/auth/guards/is-user-auth-context.guard';
+import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
+import { type PermissionsPrincipalsContext } from 'src/engine/permissions/principal/types/permissions-principals-context.type';
+import { buildPermissionsPrincipalsContext } from 'src/engine/permissions/principal/utils/build-permissions-principals-context.util';
+
+// TODO(@charlesBochet): agent runs do not always carry their agent yet, so their row-level checks can miss its role
+export const getPermissionsPrincipalsFromAuthContext = (
+ authContext: WorkspaceAuthContext,
+): PermissionsPrincipalsContext | undefined => {
+ if (isUserAuthContext(authContext)) {
+ return buildPermissionsPrincipalsContext({
+ workspaceId: authContext.workspace.id,
+ workspaceMemberId: authContext.workspaceMemberId,
+ apiKeyId: undefined,
+ applicationId: authContext.application?.id,
+ agentId: authContext.agentId,
+ });
+ }
+
+ if (isApiKeyAuthContext(authContext)) {
+ return buildPermissionsPrincipalsContext({
+ workspaceId: authContext.workspace.id,
+ workspaceMemberId: undefined,
+ apiKeyId: authContext.apiKey.id,
+ applicationId: undefined,
+ agentId: undefined,
+ });
+ }
+
+ if (isApplicationAuthContext(authContext)) {
+ return buildPermissionsPrincipalsContext({
+ workspaceId: authContext.workspace.id,
+ workspaceMemberId: undefined,
+ apiKeyId: undefined,
+ applicationId: authContext.application.id,
+ agentId: authContext.agentId,
+ });
+ }
+
+ return undefined;
+};
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 3db6657faf1..1d7ca604922 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,14 +3,29 @@
import { isDefined } from 'twenty-shared/utils';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
-import { type PermissionsPrincipal } from 'src/engine/permissions/principal/types/permissions-principal.type';
+import { type ApplicationDefaultRoleMaps } from 'src/engine/permissions/principal/types/application-default-role-maps.type';
+import { type PermissionsPrincipalsWithRolesContext } from 'src/engine/permissions/principal/types/permissions-principals-with-roles-context.type';
+import { getPermissionsPrincipalActingApplicationId } from 'src/engine/permissions/principal/utils/get-permissions-principal-acting-application-id.util';
export const isPermissionsPrincipalOwningObject = ({
principal,
flatObjectMetadata,
+ flatApplicationMaps,
}: {
- principal: Pick<PermissionsPrincipal, 'applicationId'>;
+ principal: Pick<
+ PermissionsPrincipalsWithRolesContext,
+ 'mainPrincipal' | 'limitingPrincipal' | 'applicationPrincipal'
+ >;
flatObjectMetadata: Pick<FlatObjectMetadata, 'applicationId'>;
-}): boolean =>
- isDefined(principal.applicationId) &&
- principal.applicationId === flatObjectMetadata.applicationId;
+ flatApplicationMaps: ApplicationDefaultRoleMaps;
+}): boolean => {
+ const actingApplicationId = getPermissionsPrincipalActingApplicationId({
+ principal,
+ flatApplicationMaps,
+ });
+
+ return (
+ isDefined(actingApplicationId) &&
+ actingApplicationId === flatObjectMetadata.applicationId
+ );
+};
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/resolve-permissions-principal-acting-application-id.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/resolve-permissions-principal-acting-application-id.util.ts
deleted file mode 100644
index b8c09aefd07..00000000000
--- a/packages/twenty-server/src/engine/permissions/principal/utils/resolve-permissions-principal-acting-application-id.util.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/* @license Enterprise */
-
-import { isDefined } from 'twenty-shared/utils';
-
-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 { isDenyingRoleIdsBySource } from 'src/engine/permissions/principal/utils/is-denying-role-ids-by-source.util';
-
-// TODO(@charlesBochet): members hold Admin, the Standard app's default role (#28667); simplify once they no longer do
-export const resolvePermissionsPrincipalActingApplicationId = ({
- intersectionOf,
- flatApplicationMaps,
-}: {
- intersectionOf: RoleIdsBySource;
- flatApplicationMaps: ApplicationDefaultRoleMaps;
-}): string | undefined => {
- const { applicationRoleId, ...nonApplicationRoleIdsBySource } =
- intersectionOf;
-
- if (
- !isDefined(applicationRoleId) ||
- isDenyingRoleIdsBySource(intersectionOf) ||
- Object.values(nonApplicationRoleIdsBySource).includes(applicationRoleId)
- ) {
- return undefined;
- }
-
- return Object.values(flatApplicationMaps.byId).find(
- (flatApplication) =>
- flatApplication?.defaultRoleId === applicationRoleId &&
- !isDefined(flatApplication.deletedAt),
- )?.id;
-};
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/resolve-permissions-principals-with-roles.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/resolve-permissions-principals-with-roles.util.ts
new file mode 100644
index 00000000000..5f4cbc9d465
--- /dev/null
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/resolve-permissions-principals-with-roles.util.ts
@@ -0,0 +1,199 @@
+/* @license Enterprise */
+
+import { isDefined } from 'twenty-shared/utils';
+
+import { findFlatRoleTargetFromForeignKey } from 'src/engine/metadata-modules/flat-role-target/utils/find-flat-role-target-from-foreign-key.util';
+import {
+ type PermissionsApplicationPrincipal,
+ type PermissionsLimitingPrincipal,
+ type PermissionsMainPrincipal,
+ type PermissionsPrincipalsContext,
+} from 'src/engine/permissions/principal/types/permissions-principals-context.type';
+import {
+ type PermissionsApplicationPrincipalWithRole,
+ type PermissionsLimitingPrincipalWithRole,
+ type PermissionsMainPrincipalWithRole,
+ type PermissionsPrincipalsWithRolesContext,
+} from 'src/engine/permissions/principal/types/permissions-principals-with-roles-context.type';
+import { resolveApplicationRoleId } from 'src/engine/permissions/principal/utils/resolve-application-role-id.util';
+import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';
+import { type FlatWorkspaceMember } from 'src/engine/core-modules/user/types/flat-workspace-member.type';
+import { type FlatWorkspaceMemberMaps } from 'src/engine/core-modules/user/types/flat-workspace-member-maps.type';
+import { type FlatRoleTarget } from 'src/engine/metadata-modules/flat-role-target/types/flat-role-target.type';
+import { type AllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-maps.type';
+import { type UserWorkspaceRoleMap } from 'src/engine/metadata-modules/role-target/types/user-workspace-role-map.type';
+
+type PermissionsPrincipalRoleMaps = {
+ flatWorkspaceMemberMaps: {
+ byId: Partial<Record<string, Pick<FlatWorkspaceMember, 'userId'>>>;
+ userWorkspaceIdByUserId: FlatWorkspaceMemberMaps['userWorkspaceIdByUserId'];
+ };
+ userWorkspaceRoleMap: UserWorkspaceRoleMap;
+ apiKeyRoleMap: Record<string, string>;
+ flatRoleTargetByAgentIdMaps: Partial<
+ Record<string, Pick<FlatRoleTarget, 'roleId'>>
+ >;
+ flatApplicationMaps: {
+ byId: Partial<
+ Record<
+ string,
+ Pick<
+ FlatApplication,
+ 'id' | 'defaultRoleId' | 'sourceType' | 'deletedAt'
+ >
+ >
+ >;
+ };
+ flatRoleTargetMaps?: AllFlatEntityMaps['flatRoleTargetMaps'];
+};
+
+const findMainPrincipalRoleId = ({
+ mainPrincipal,
+ roleMaps,
+}: {
+ mainPrincipal: PermissionsMainPrincipal;
+ roleMaps: PermissionsPrincipalRoleMaps;
+}): string | undefined => {
+ if ('isDeprecatedRoleOnly' in mainPrincipal) {
+ return mainPrincipal.roleId;
+ }
+
+ if ('workspaceMemberId' in mainPrincipal) {
+ const userId =
+ roleMaps.flatWorkspaceMemberMaps.byId[mainPrincipal.workspaceMemberId]
+ ?.userId;
+ const userWorkspaceId = isDefined(userId)
+ ? roleMaps.flatWorkspaceMemberMaps.userWorkspaceIdByUserId[userId]
+ : undefined;
+
+ return isDefined(userWorkspaceId)
+ ? roleMaps.userWorkspaceRoleMap[userWorkspaceId]
+ : undefined;
+ }
+
+ if ('apiKeyId' in mainPrincipal) {
+ return roleMaps.apiKeyRoleMap[mainPrincipal.apiKeyId];
+ }
+
+ if ('agentId' in mainPrincipal) {
+ return roleMaps.flatRoleTargetByAgentIdMaps[mainPrincipal.agentId]?.roleId;
+ }
+
+ if ('applicationId' in mainPrincipal) {
+ const flatApplication =
+ roleMaps.flatApplicationMaps.byId[mainPrincipal.applicationId];
+
+ return isDefined(flatApplication) && !isDefined(flatApplication.deletedAt)
+ ? (flatApplication.defaultRoleId ?? undefined)
+ : undefined;
+ }
+
+ if (!isDefined(roleMaps.flatRoleTargetMaps)) {
+ return undefined;
+ }
+
+ return findFlatRoleTargetFromForeignKey({
+ flatRoleTargetMaps: roleMaps.flatRoleTargetMaps,
+ targetMetadataForeignKey: 'webhookId',
+ targetId: mainPrincipal.webhookId,
+ })?.roleId;
+};
+
+// TODO(@charlesBochet): an agent or application always needs a role; until then one without counts as the custom app
+const resolveLimitingPrincipal = ({
+ limitingPrincipal,
+ roleMaps,
+}: {
+ limitingPrincipal: PermissionsLimitingPrincipal | undefined;
+ roleMaps: PermissionsPrincipalRoleMaps;
+}): PermissionsLimitingPrincipalWithRole | undefined => {
+ if (
+ !isDefined(limitingPrincipal) ||
+ 'isDeprecatedRoleOnly' in limitingPrincipal
+ ) {
+ return limitingPrincipal;
+ }
+
+ const roleId =
+ roleMaps.flatRoleTargetByAgentIdMaps[limitingPrincipal.agentId]?.roleId;
+
+ return isDefined(roleId)
+ ? { roleId, agentId: limitingPrincipal.agentId }
+ : undefined;
+};
+
+const resolveApplicationPrincipal = ({
+ applicationPrincipal,
+ mainPrincipal,
+ roleMaps,
+}: {
+ applicationPrincipal: PermissionsApplicationPrincipal;
+ mainPrincipal: PermissionsMainPrincipalWithRole;
+ roleMaps: PermissionsPrincipalRoleMaps;
+}): PermissionsApplicationPrincipalWithRole | undefined => {
+ if (!('applicationId' in applicationPrincipal)) {
+ return applicationPrincipal;
+ }
+
+ const flatApplication =
+ roleMaps.flatApplicationMaps.byId[applicationPrincipal.applicationId];
+
+ if (!isDefined(flatApplication) || isDefined(flatApplication.deletedAt)) {
+ return undefined;
+ }
+
+ const { applicationRoleId } = resolveApplicationRoleId({
+ application: flatApplication,
+ userRoleId:
+ 'workspaceMemberId' in mainPrincipal ? mainPrincipal.roleId : undefined,
+ });
+
+ return isDefined(applicationRoleId)
+ ? {
+ roleId: applicationRoleId,
+ applicationId: applicationPrincipal.applicationId,
+ }
+ : { isCustomApp: true };
+};
+
+export const resolvePermissionsPrincipalsWithRoles = ({
+ principalsContext,
+ roleMaps,
+}: {
+ principalsContext: PermissionsPrincipalsContext;
+ roleMaps: PermissionsPrincipalRoleMaps;
+}): PermissionsPrincipalsWithRolesContext | undefined => {
+ const mainRoleId = findMainPrincipalRoleId({
+ mainPrincipal: principalsContext.mainPrincipal,
+ roleMaps,
+ });
+
+ if (!isDefined(mainRoleId)) {
+ return undefined;
+ }
+
+ const mainPrincipal: PermissionsMainPrincipalWithRole = {
+ ...principalsContext.mainPrincipal,
+ roleId: mainRoleId,
+ };
+
+ const applicationPrincipal = resolveApplicationPrincipal({
+ applicationPrincipal: principalsContext.applicationPrincipal,
+ mainPrincipal,
+ roleMaps,
+ });
+
+ if (!isDefined(applicationPrincipal)) {
+ return undefined;
+ }
+
+ return {
+ workspaceId: principalsContext.workspaceId,
+ mainPrincipal,
+ limitingPrincipal: resolveLimitingPrincipal({
+ limitingPrincipal: principalsContext.limitingPrincipal,
+ roleMaps,
+ }),
+ applicationPrincipal,
+ };
+};
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 e250d80e75a..1feb32e7223 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
@@ -2,6 +2,7 @@
import { type PermissionsRowAccessRequest } from 'src/engine/permissions/combine/types/row-access-policy.type';
import { hasCreatedByField } from 'src/engine/permissions/private-record/utils/has-created-by-field.util';
+import { getPermissionsPrincipalWorkspaceMemberId } from 'src/engine/permissions/principal/utils/get-permissions-principal-workspace-member-id.util';
import { isRecordPrivacyApplicable } from 'src/engine/permissions/private-record/utils/is-record-privacy-applicable.util';
export const resolvePermissionsCreatorWorkspaceMemberId = (
@@ -12,5 +13,5 @@ export const resolvePermissionsCreatorWorkspaceMemberId = (
flatObjectMetadata: request.flatObjectMetadata,
flatFieldMetadataMaps: request.metadataMaps.flatFieldMetadataMaps,
})
- ? request.principal.workspaceMemberId
+ ? getPermissionsPrincipalWorkspaceMemberId(request.principal)
: 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 f479b94b7ad..26977b34aff 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
@@ -7,7 +7,7 @@ import { RecordSharePrincipalType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { RecordAccessPolicyService } from 'src/engine/permissions/combine/services/record-access-policy.service';
-import { type PermissionsPrincipal } from 'src/engine/permissions/principal/types/permissions-principal.type';
+import { type PermissionsPrincipalsWithRolesContext } from 'src/engine/permissions/principal/types/permissions-principals-with-roles-context.type';
import { isRolePermittingOperation } from 'src/engine/permissions/role/utils/is-role-permitting-operation.util';
import {
RecordShareException,
@@ -124,9 +124,10 @@ export class RecordSharePrincipalService {
continue;
}
- const rolePrincipal: PermissionsPrincipal = {
+ const rolePrincipal: PermissionsPrincipalsWithRolesContext = {
workspaceId,
- roleIds: [roleId],
+ mainPrincipal: { roleId, isDeprecatedRoleOnly: true },
+ applicationPrincipal: { isCustomApp: true },
};
if (
@@ -153,9 +154,10 @@ export class RecordSharePrincipalService {
}
const hasGrant = await this.recordAccessPolicyService.hasAccessToRecords({
- principal: {
- ...rolePrincipal,
- workspaceMemberId: principal.principalId,
+ principals: {
+ workspaceId,
+ mainPrincipal: { workspaceMemberId: principal.principalId },
+ applicationPrincipal: { isCustomApp: true },
},
flatObjectMetadata,
operationType: 'select',
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 cd04f00e4f7..d7ba1da8748 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
@@ -5,7 +5,9 @@ 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 { type PermissionsPrincipalsWithRolesContext } from 'src/engine/permissions/principal/types/permissions-principals-with-roles-context.type';
+import { getPermissionsPrincipalRoleIds } from 'src/engine/permissions/principal/utils/get-permissions-principal-role-ids.util';
+import { getPermissionsPrincipalWorkspaceMemberId } from 'src/engine/permissions/principal/utils/get-permissions-principal-workspace-member-id.util';
import { buildRowLevelPermissionRecordFilter } from 'src/engine/permissions/rls/utils/build-row-level-permission-record-filter.util';
export const resolveRowLevelPermissionRecordFilter = ({
@@ -13,11 +15,12 @@ export const resolveRowLevelPermissionRecordFilter = ({
metadataMaps,
flatObjectMetadata,
}: {
- principal: PermissionsPrincipal;
+ principal: PermissionsPrincipalsWithRolesContext;
metadataMaps: PermissionsMetadataMaps;
flatObjectMetadata: FlatObjectMetadata;
}): RecordGqlOperationFilter | null => {
- const { roleIds, workspaceMemberId } = principal;
+ const roleIds = getPermissionsPrincipalRoleIds(principal);
+ const workspaceMemberId = getPermissionsPrincipalWorkspaceMemberId(principal);
if (roleIds.length === 0) {
return null;
diff --git a/packages/twenty-server/src/engine/permissions/rls/utils/validate-rls-predicates-for-records.util.ts b/packages/twenty-server/src/engine/permissions/rls/utils/validate-rls-predicates-for-records.util.ts
index e544e116599..211f74d790a 100644
--- a/packages/twenty-server/src/engine/permissions/rls/utils/validate-rls-predicates-for-records.util.ts
+++ b/packages/twenty-server/src/engine/permissions/rls/utils/validate-rls-predicates-for-records.util.ts
@@ -6,7 +6,7 @@ import { type ObjectLiteral } from 'typeorm';
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 { type PermissionsPrincipalsWithRolesContext } from 'src/engine/permissions/principal/types/permissions-principals-with-roles-context.type';
import {
TwentyOrmException,
TwentyOrmExceptionCode,
@@ -17,7 +17,7 @@ import { resolveRowLevelPermissionRecordFilter } from 'src/engine/permissions/rl
type ValidateRLSPredicatesForRecordsArgs<T extends ObjectLiteral> = {
records: T[];
objectMetadata: FlatObjectMetadata;
- principal: PermissionsPrincipal;
+ principal: PermissionsPrincipalsWithRolesContext;
metadataMaps: PermissionsMetadataMaps;
};
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 7b74894bafc..f77c8eaf132 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
@@ -14,6 +14,7 @@ import { getFlatFieldMetadataMock } from 'src/engine/metadata-modules/flat-field
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';
+import { type PermissionsPrincipalsContext } from 'src/engine/permissions/principal/types/permissions-principals-context.type';
const OBJECT_ID = 'object-1';
@@ -58,6 +59,7 @@ describe('getObjectsPermissionsFromRolePermissionConfig', () => {
it('should resolve a single role unchanged', () => {
expect(
getObjectsPermissionsFromRolePermissionConfig({
+ principals: undefined,
rolesPermissions,
flatObjectMetadataMaps: EMPTY_FLAT_OBJECT_METADATA_MAPS,
flatFieldMetadataMaps: EMPTY_FLAT_FIELD_METADATA_MAPS,
@@ -72,6 +74,7 @@ describe('getObjectsPermissionsFromRolePermissionConfig', () => {
it('should resolve a role held by several sources as that role alone', () => {
expect(
getObjectsPermissionsFromRolePermissionConfig({
+ principals: undefined,
rolesPermissions,
flatObjectMetadataMaps: EMPTY_FLAT_OBJECT_METADATA_MAPS,
flatFieldMetadataMaps: EMPTY_FLAT_FIELD_METADATA_MAPS,
@@ -89,6 +92,7 @@ describe('getObjectsPermissionsFromRolePermissionConfig', () => {
it('should intersect every role when several are provided', () => {
expect(
getObjectsPermissionsFromRolePermissionConfig({
+ principals: undefined,
rolesPermissions,
flatObjectMetadataMaps: EMPTY_FLAT_OBJECT_METADATA_MAPS,
flatFieldMetadataMaps: EMPTY_FLAT_FIELD_METADATA_MAPS,
@@ -106,6 +110,7 @@ describe('getObjectsPermissionsFromRolePermissionConfig', () => {
it('should not grant a permission that only one of the roles allows', () => {
expect(
getObjectsPermissionsFromRolePermissionConfig({
+ principals: undefined,
rolesPermissions,
flatObjectMetadataMaps: EMPTY_FLAT_OBJECT_METADATA_MAPS,
flatFieldMetadataMaps: EMPTY_FLAT_FIELD_METADATA_MAPS,
@@ -123,6 +128,7 @@ describe('getObjectsPermissionsFromRolePermissionConfig', () => {
it('should deny when one of the intersected roles is missing from the cache', () => {
expect(
getObjectsPermissionsFromRolePermissionConfig({
+ principals: undefined,
rolesPermissions,
flatObjectMetadataMaps: EMPTY_FLAT_OBJECT_METADATA_MAPS,
flatFieldMetadataMaps: EMPTY_FLAT_FIELD_METADATA_MAPS,
@@ -140,6 +146,7 @@ describe('getObjectsPermissionsFromRolePermissionConfig', () => {
it('should return empty permissions when bypassing checks', () => {
expect(
getObjectsPermissionsFromRolePermissionConfig({
+ principals: undefined,
rolesPermissions,
flatObjectMetadataMaps: EMPTY_FLAT_OBJECT_METADATA_MAPS,
flatFieldMetadataMaps: EMPTY_FLAT_FIELD_METADATA_MAPS,
@@ -152,6 +159,7 @@ describe('getObjectsPermissionsFromRolePermissionConfig', () => {
it('should return empty permissions when the role is missing from the cache', () => {
expect(
getObjectsPermissionsFromRolePermissionConfig({
+ principals: undefined,
rolesPermissions,
flatObjectMetadataMaps: EMPTY_FLAT_OBJECT_METADATA_MAPS,
flatFieldMetadataMaps: EMPTY_FLAT_FIELD_METADATA_MAPS,
@@ -163,17 +171,22 @@ describe('getObjectsPermissionsFromRolePermissionConfig', () => {
).toEqual({});
});
- it('should deny when an actor takes part without a role', () => {
+ it('should deny when the main principal has no role', () => {
expect(
getObjectsPermissionsFromRolePermissionConfig({
+ principals: {
+ workspaceId: 'workspace-1',
+ mainPrincipal: { workspaceMemberId: 'member-id' },
+ applicationPrincipal: { isCustomApp: true },
+ },
rolesPermissions,
flatObjectMetadataMaps: EMPTY_FLAT_OBJECT_METADATA_MAPS,
flatFieldMetadataMaps: EMPTY_FLAT_FIELD_METADATA_MAPS,
flatApplicationMaps: EMPTY_APPLICATION_DEFAULT_ROLE_MAPS,
rolePermissionConfig: {
intersectionOf: {
- agentRoleId: null,
- userWorkspaceRoleId: 'agent-role-id',
+ agentRoleId: 'agent-role-id',
+ userWorkspaceRoleId: null,
},
},
}),
@@ -183,6 +196,7 @@ describe('getObjectsPermissionsFromRolePermissionConfig', () => {
it('should deny when no actor restricts the call', () => {
expect(
getObjectsPermissionsFromRolePermissionConfig({
+ principals: undefined,
rolesPermissions,
flatObjectMetadataMaps: EMPTY_FLAT_OBJECT_METADATA_MAPS,
flatFieldMetadataMaps: EMPTY_FLAT_FIELD_METADATA_MAPS,
@@ -257,26 +271,47 @@ const disabledActionRolesPermissions = Object.fromEntries(
describe('getObjectsPermissionsFromRolePermissionConfig disabled actions', () => {
it.each<{
actor: string;
+ principals: PermissionsPrincipalsContext;
intersectionOf: RoleIdsBySource;
canDestroy: boolean;
}>([
{
actor: 'the owning application',
+ principals: {
+ workspaceId: 'workspace-1',
+ mainPrincipal: { applicationId: 'owning-application-id' },
+ applicationPrincipal: { applicationId: 'owning-application-id' },
+ },
intersectionOf: { applicationRoleId: 'owning-application-role-id' },
canDestroy: true,
},
{
actor: 'another application',
+ principals: {
+ workspaceId: 'workspace-1',
+ mainPrincipal: { applicationId: 'other-application-id' },
+ applicationPrincipal: { applicationId: 'other-application-id' },
+ },
intersectionOf: { applicationRoleId: 'other-application-role-id' },
canDestroy: false,
},
{
actor: 'a user',
+ principals: {
+ workspaceId: 'workspace-1',
+ mainPrincipal: { workspaceMemberId: 'member-id' },
+ applicationPrincipal: { isCustomApp: true },
+ },
intersectionOf: { userWorkspaceRoleId: 'user-role-id' },
canDestroy: false,
},
{
actor: 'a user through the owning application',
+ principals: {
+ workspaceId: 'workspace-1',
+ mainPrincipal: { workspaceMemberId: 'member-id' },
+ applicationPrincipal: { applicationId: 'owning-application-id' },
+ },
intersectionOf: {
userWorkspaceRoleId: 'user-role-id',
applicationRoleId: 'owning-application-role-id',
@@ -285,21 +320,41 @@ describe('getObjectsPermissionsFromRolePermissionConfig disabled actions', () =>
},
{
actor: "a user holding the owning application's default role",
+ principals: {
+ workspaceId: 'workspace-1',
+ mainPrincipal: { workspaceMemberId: 'member-id' },
+ applicationPrincipal: { isCustomApp: true },
+ },
intersectionOf: { userWorkspaceRoleId: 'owning-application-role-id' },
canDestroy: false,
},
{
actor: "an API key holding the owning application's default role",
+ principals: {
+ workspaceId: 'workspace-1',
+ mainPrincipal: { apiKeyId: 'api-key-id' },
+ applicationPrincipal: { isCustomApp: true },
+ },
intersectionOf: { apiKeyRoleId: 'owning-application-role-id' },
canDestroy: false,
},
{
actor: "an agent holding the owning application's default role",
+ principals: {
+ workspaceId: 'workspace-1',
+ mainPrincipal: { agentId: 'agent-id' },
+ applicationPrincipal: { isCustomApp: true },
+ },
intersectionOf: { agentRoleId: 'owning-application-role-id' },
canDestroy: false,
},
{
actor: 'the owning application with a user holding its default role',
+ principals: {
+ workspaceId: 'workspace-1',
+ mainPrincipal: { workspaceMemberId: 'member-id' },
+ applicationPrincipal: { applicationId: 'owning-application-id' },
+ },
intersectionOf: {
userWorkspaceRoleId: 'owning-application-role-id',
applicationRoleId: 'owning-application-role-id',
@@ -308,9 +363,10 @@ describe('getObjectsPermissionsFromRolePermissionConfig disabled actions', () =>
},
])(
'disabled actions allowed for $actor: $canDestroy',
- ({ intersectionOf, canDestroy }) => {
+ ({ principals, intersectionOf, canDestroy }) => {
const invoicePermissions = getObjectsPermissionsFromRolePermissionConfig({
rolePermissionConfig: { intersectionOf },
+ principals,
rolesPermissions: disabledActionRolesPermissions,
flatObjectMetadataMaps,
flatFieldMetadataMaps,
@@ -387,6 +443,7 @@ describe('getObjectsPermissionsFromRolePermissionConfig disabled actions', () =>
}
const objectsPermissions = getObjectsPermissionsFromRolePermissionConfig({
+ principals: undefined,
rolePermissionConfig: {
intersectionOf: { userWorkspaceRoleId: 'user-role-id' },
},
diff --git a/packages/twenty-server/src/engine/permissions/role/utils/compute-objects-permissions-for-roles.util.ts b/packages/twenty-server/src/engine/permissions/role/utils/compute-objects-permissions-for-roles.util.ts
index c21278a9c95..993e73a782d 100644
--- a/packages/twenty-server/src/engine/permissions/role/utils/compute-objects-permissions-for-roles.util.ts
+++ b/packages/twenty-server/src/engine/permissions/role/utils/compute-objects-permissions-for-roles.util.ts
@@ -10,29 +10,41 @@ 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 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 PermissionsPrincipalsWithRolesContext } from 'src/engine/permissions/principal/types/permissions-principals-with-roles-context.type';
+import { getPermissionsPrincipalActingApplicationId } from 'src/engine/permissions/principal/utils/get-permissions-principal-acting-application-id.util';
+import { getPermissionsPrincipalRoleIds } from 'src/engine/permissions/principal/utils/get-permissions-principal-role-ids.util';
import { computePermissionIntersection } from 'src/engine/permissions/role/utils/compute-permission-intersection.util';
import { restrictObjectsPermissionsToDisabledActions } from 'src/engine/permissions/role/utils/restrict-objects-permissions-to-disabled-actions.util';
export const computeObjectsPermissionsForRoles = ({
- roleIds,
- applicationId,
+ principal,
rolesPermissions,
flatObjectMetadataMaps,
flatFieldMetadataMaps,
flatApplicationMaps,
-}: Pick<PermissionsPrincipal, 'roleIds' | 'applicationId'> & {
+}: {
+ principal: Pick<
+ PermissionsPrincipalsWithRolesContext,
+ 'mainPrincipal' | 'limitingPrincipal' | 'applicationPrincipal'
+ >;
rolesPermissions: ObjectsPermissionsByRoleId;
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
flatApplicationMaps: ApplicationDefaultRoleMaps;
}): ObjectsPermissions => {
+ const roleIds = getPermissionsPrincipalRoleIds(principal);
+
if (!isNonEmptyArray(roleIds)) {
return {};
}
- const actingApplicationRoleId = isDefined(applicationId)
- ? flatApplicationMaps.byId[applicationId]?.defaultRoleId
+ const actingApplicationId = getPermissionsPrincipalActingApplicationId({
+ principal,
+ flatApplicationMaps,
+ });
+
+ const actingApplicationRoleId = isDefined(actingApplicationId)
+ ? flatApplicationMaps.byId[actingApplicationId]?.defaultRoleId
: undefined;
const permissionsPerRole = roleIds.map((roleId) => {
@@ -44,7 +56,9 @@ export const computeObjectsPermissionsForRoles = ({
flatObjectMetadataMaps,
flatFieldMetadataMaps,
actingApplicationId:
- roleId === actingApplicationRoleId ? applicationId : undefined,
+ roleId === actingApplicationRoleId
+ ? actingApplicationId
+ : 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 c85bfa9ac06..96e1a2f9ca4 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
@@ -2,6 +2,7 @@ import {
type ObjectsPermissions,
type ObjectsPermissionsByRoleId,
} from 'twenty-shared/types';
+import { isDefined } from 'twenty-shared/utils';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
@@ -9,18 +10,20 @@ import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object
import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
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';
+import { buildPermissionsPrincipalRoles } from 'src/engine/permissions/principal/utils/build-permissions-principal-roles.util';
+import { type PermissionsPrincipalsContext } from 'src/engine/permissions/principal/types/permissions-principals-context.type';
export const getObjectsPermissionsFromRolePermissionConfig = ({
rolesPermissions,
rolePermissionConfig,
+ principals,
flatObjectMetadataMaps,
flatFieldMetadataMaps,
flatApplicationMaps,
}: {
rolesPermissions: ObjectsPermissionsByRoleId;
rolePermissionConfig: RolePermissionConfig;
+ principals: PermissionsPrincipalsContext | undefined;
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
flatApplicationMaps: ApplicationDefaultRoleMaps;
@@ -29,14 +32,17 @@ export const getObjectsPermissionsFromRolePermissionConfig = ({
return {};
}
- const { intersectionOf } = rolePermissionConfig;
+ const principalRoles = buildPermissionsPrincipalRoles({
+ roleIdsBySource: rolePermissionConfig.intersectionOf,
+ principalsContext: principals,
+ });
+
+ if (!isDefined(principalRoles)) {
+ return {};
+ }
return computeObjectsPermissionsForRoles({
- roleIds: getRoleIdsToIntersect(intersectionOf) ?? [],
- applicationId: resolvePermissionsPrincipalActingApplicationId({
- intersectionOf,
- flatApplicationMaps,
- }),
+ principal: principalRoles,
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 406eb22fb43..52fd85da769 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
@@ -4,11 +4,11 @@ import { type ObjectsPermissions } from 'twenty-shared/types';
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 { type PermissionsPrincipalsWithRolesContext } from 'src/engine/permissions/principal/types/permissions-principals-with-roles-context.type';
import { computeObjectsPermissionsForRoles } from 'src/engine/permissions/role/utils/compute-objects-permissions-for-roles.util';
const objectsPermissionsByMetadataMapsByPrincipal = new WeakMap<
- PermissionsPrincipal,
+ PermissionsPrincipalsWithRolesContext,
WeakMap<PermissionsMetadataMaps, ObjectsPermissions>
>();
@@ -16,7 +16,7 @@ export const getPermissionsPrincipalObjectsPermissions = ({
principal,
metadataMaps,
}: {
- principal: PermissionsPrincipal;
+ principal: PermissionsPrincipalsWithRolesContext;
metadataMaps: PermissionsMetadataMaps;
}): ObjectsPermissions => {
const objectsPermissionsByMetadataMaps =
@@ -36,8 +36,7 @@ export const getPermissionsPrincipalObjectsPermissions = ({
}
const objectsPermissions = computeObjectsPermissionsForRoles({
- roleIds: principal.roleIds,
- applicationId: principal.applicationId,
+ principal,
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 f9b635e08c0..bc5cc3d113d 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,9 +6,10 @@ import { isObjectOperationDisabled } from 'src/engine/permissions/role/utils/is-
export const isObjectOperationDisabledToPrincipal = ({
principal,
+ metadataMaps,
flatObjectMetadata,
operationType,
-}: Omit<PermissionsObjectAccessRequest, 'metadataMaps'>): boolean =>
+}: PermissionsObjectAccessRequest): boolean =>
isObjectOperationDisabled({
objectMetadata: flatObjectMetadata,
operationType,
@@ -16,4 +17,5 @@ export const isObjectOperationDisabledToPrincipal = ({
!isPermissionsPrincipalOwningObject({
principal,
flatObjectMetadata,
+ flatApplicationMaps: metadataMaps.flatApplicationMaps,
});
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 f6788dea074..46dbe35d58f 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
@@ -10,15 +10,18 @@ import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object
import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.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 { type PermissionsPrincipalsContext } from 'src/engine/permissions/principal/types/permissions-principals-context.type';
export const resolveObjectRecordsPermissions = ({
rolePermissionConfig,
+ principals,
objectPermissionsByRoleId,
flatObjectMetadataMaps,
flatFieldMetadataMaps,
flatApplicationMaps,
}: {
rolePermissionConfig?: RolePermissionConfig;
+ principals: PermissionsPrincipalsContext | undefined;
objectPermissionsByRoleId: ObjectsPermissionsByRoleId;
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
@@ -45,6 +48,7 @@ export const resolveObjectRecordsPermissions = ({
return {
objectRecordsPermissions: getObjectsPermissionsFromRolePermissionConfig({
rolePermissionConfig,
+ principals,
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 83377523d87..c4a0006acde 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
@@ -47,13 +47,13 @@ import { computePermissionIntersection } from 'src/engine/permissions/role/utils
import { isRecordMatchingRLSRowLevelPermissionPredicate } from 'src/engine/permissions/rls/utils/is-record-matching-rls-row-level-permission-predicate.util';
import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
-import { type PermissionsPrincipal } from 'src/engine/permissions/principal/types/permissions-principal.type';
+import { type PermissionsPrincipalsContext } from 'src/engine/permissions/principal/types/permissions-principals-context.type';
import { buildUserRoleIdsBySource } from 'src/engine/permissions/principal/utils/build-user-role-ids-by-source.util';
import { getRoleIdsToIntersect } from 'src/engine/permissions/principal/utils/get-role-ids-to-intersect.util';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/workspace-event-batch.type';
import { parseEventNameOrThrow } from 'src/engine/workspace-event-emitter/utils/parse-event-name';
-import { buildPermissionsPrincipal } from 'src/engine/permissions/principal/utils/build-permissions-principal.util';
+import { buildPermissionsPrincipalsContext } from 'src/engine/permissions/principal/utils/build-permissions-principals-context.util';
type StreamPermissionsContext = {
flatRowLevelPermissionPredicateMaps: FlatRowLevelPermissionPredicateMaps;
@@ -206,14 +206,20 @@ export class ObjectRecordEventPublisher {
}),
};
- const principal: PermissionsPrincipal = buildPermissionsPrincipal({
+ const principals = buildPermissionsPrincipalsContext({
workspaceId: workspaceEventBatch.workspaceId,
- rolePermissionConfig,
workspaceMemberId: subscriberAuthContext.workspaceMemberId,
- flatApplicationMaps: permissionsContext.flatApplicationMaps,
- }) ?? { workspaceId: workspaceEventBatch.workspaceId, roleIds: [] };
+ apiKeyId: subscriberAuthContext.apiKeyId,
+ applicationId: subscriberAuthContext.applicationId,
+ agentId: undefined,
+ });
+
+ if (!isDefined(principals)) {
+ return;
+ }
+
const admittedRecordIds =
- await eventRecordAccessGate.resolveAdmittedRecordIds(principal);
+ await eventRecordAccessGate.resolveAdmittedRecordIds(principals);
if (admittedRecordIds.size === 0) {
return;
@@ -278,7 +284,7 @@ export class ObjectRecordEventPublisher {
streamData,
workspaceId: workspaceEventBatch.workspaceId,
rolePermissionConfig,
- principal,
+ principals,
objectsPermissions,
});
} catch (error) {
@@ -309,7 +315,7 @@ export class ObjectRecordEventPublisher {
events,
workspaceId,
rolePermissionConfig,
- principal,
+ principals,
objectsPermissions,
}: {
streamData: EventStreamData;
@@ -317,7 +323,7 @@ export class ObjectRecordEventPublisher {
events: ObjectRecordEvent[];
workspaceId: string;
rolePermissionConfig: RolePermissionConfig;
- principal: PermissionsPrincipal;
+ principals: PermissionsPrincipalsContext;
objectsPermissions: ObjectsPermissions;
}) {
const { flatFieldMetadataMaps, flatObjectMetadataMaps } =
@@ -351,8 +357,7 @@ export class ObjectRecordEventPublisher {
const { selectedFields } = this.commonSelectFieldsBuilder.buildFromDepth({
readableObjectMetadataIds:
await this.commonSelectFieldsBuilder.findReadableObjectMetadataIds({
- principal: { ...principal, workspaceMemberId: undefined },
- objectsPermissions,
+ principals,
flatObjectMetadataMaps,
}),
depth: 1,
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 679a0a9631f..4ef75ba8844 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
@@ -29,6 +29,7 @@ import { WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace-
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 { resolveObjectRecordsPermissions } from 'src/engine/permissions/role/utils/resolve-object-records-permissions.util';
+import { getPermissionsPrincipalsFromAuthContext } from 'src/engine/permissions/principal/utils/get-permissions-principals-from-auth-context.util';
const tableShapeCache = new WeakMap<
FlatEntityMaps<OrmFlatFieldMetadata>,
@@ -211,6 +212,7 @@ export class WorkspaceDataSource {
const { objectRecordsPermissions, shouldBypassPermissionChecks } =
resolveObjectRecordsPermissions({
rolePermissionConfig: repositoryRolePermissionConfig,
+ principals: getPermissionsPrincipalsFromAuthContext(this.authContext),
objectPermissionsByRoleId: this.objectPermissionsByRoleId,
flatObjectMetadataMaps: this.internalContext.flatObjectMetadataMaps,
flatFieldMetadataMaps: this.internalContext.flatFieldMetadataMaps,
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 835aa31f275..559dce4c251 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
@@ -112,7 +112,11 @@ const buildRepository = ({
flatRowLevelPermissionPredicateMaps: EMPTY_FLAT_ENTITY_MAPS,
flatRowLevelPermissionPredicateGroupMaps: EMPTY_FLAT_ENTITY_MAPS,
},
- authContext: { type: 'apiKey', apiKey: { id: API_KEY_ID } },
+ authContext: {
+ type: 'apiKey',
+ apiKey: { id: API_KEY_ID },
+ workspace: { id: 'workspace-id' },
+ },
executor: {
execute: async (statement: CompiledStatement) => {
executedStatements.push(statement);
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 4c6cd7c5ddc..4e2afa0eeea 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
@@ -20,7 +20,6 @@ import { DatabaseEventAction } from 'src/engine/api/graphql/graphql-query-runner
import { type PrivateRecordState } from 'src/engine/permissions/private-record/types/private-record-state.type';
import { findPrivateRecordStates } from 'src/engine/permissions/private-record/utils/find-private-record-states.util';
import { isPrivateRecordEnabled } from 'src/engine/permissions/private-record/utils/is-private-record-enabled.util';
-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 { isRecordStockTrackedObject } from 'src/engine/core-modules/usage-limit/utils/is-record-stock-tracked-object.util';
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
@@ -55,7 +54,7 @@ import {
getUpdateEventRecords,
mergeRecordsWithUpdateValues,
} from 'src/engine/twenty-orm/utils/merge-records-with-update-values.util';
-import { type PermissionsPrincipal } from 'src/engine/permissions/principal/types/permissions-principal.type';
+import { type PermissionsPrincipalsWithRolesContext } from 'src/engine/permissions/principal/types/permissions-principals-with-roles-context.type';
import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
import { resolveRowLevelPermissionRecordFilter } from 'src/engine/permissions/rls/utils/resolve-row-level-permission-record-filter.util';
import { validateRLSPredicatesForRecords } from 'src/engine/permissions/rls/utils/validate-rls-predicates-for-records.util';
@@ -109,7 +108,8 @@ 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';
+import { getPermissionsPrincipalsFromAuthContext } from 'src/engine/permissions/principal/utils/get-permissions-principals-from-auth-context.util';
+import { buildPermissionsPrincipalsWithRolesFromConfig } from 'src/engine/permissions/principal/utils/build-permissions-principals-with-roles-from-config.util';
const ALWAYS_FALSE_CONDITION = '1=0';
const MUTATION_EVENT_ACTIONS_BY_KIND: Record<
@@ -161,7 +161,7 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
private _filesFieldSync?: FilesFieldSync;
- private permissionsPrincipal?: PermissionsPrincipal;
+ private permissionsPrincipal?: PermissionsPrincipalsWithRolesContext;
private permissionsMetadataMaps?: PermissionsMetadataMaps;
@@ -1064,7 +1064,7 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
validateRLSPredicatesForRecords({
records: this.formatResult<ObjectRecord[]>(formattedRecords),
objectMetadata: this.options.flatObjectMetadata,
- principal: this.resolvePermissionsPrincipal(),
+ principal: this.resolvePermissionsPrincipalOrThrow(),
metadataMaps: this.resolvePermissionsMetadataMaps(),
});
}
@@ -1747,7 +1747,7 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
return;
}
- const principal = this.resolvePermissionsPrincipal();
+ const principal = this.resolvePermissionsPrincipalOrThrow();
const metadataMaps = this.resolvePermissionsMetadataMaps();
if (
@@ -2061,7 +2061,7 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
}
return buildPermissionsCondition({
- principal: this.resolvePermissionsPrincipal(),
+ principal: this.resolvePermissionsPrincipalOrThrow(),
metadataMaps: this.resolvePermissionsMetadataMaps(),
recordShareTableExpression: this.getRecordShareTableExpression(),
flatObjectMetadata,
@@ -2183,7 +2183,7 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
operationType,
hypotheticalRecordShareAccessLevel,
}: {
- principal: PermissionsPrincipal;
+ principal: PermissionsPrincipalsWithRolesContext;
recordIds: string[];
operationType: OperationType;
hypotheticalRecordShareAccessLevel?: RecordShareAccessLevel;
@@ -2255,7 +2255,7 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
if (
!this.isOperationDisabled({ operationType, flatObjectMetadata }) &&
isObjectOperationDeniedToPrincipal({
- principal: this.resolvePermissionsPrincipal(),
+ principal: this.resolvePermissionsPrincipalOrThrow(),
metadataMaps: this.resolvePermissionsMetadataMaps(),
flatObjectMetadata,
operationType,
@@ -2284,24 +2284,32 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
}
return isObjectOperationDisabledToPrincipal({
- principal: this.resolvePermissionsPrincipal(),
+ principal: this.resolvePermissionsPrincipalOrThrow(),
+ metadataMaps: this.resolvePermissionsMetadataMaps(),
flatObjectMetadata,
operationType,
});
}
- private resolvePermissionsPrincipal(): PermissionsPrincipal {
- return (this.permissionsPrincipal ??= buildPermissionsPrincipal({
- workspaceId: this.options.internalContext.workspaceId,
- 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: [],
- });
+ private resolvePermissionsPrincipalOrThrow(): PermissionsPrincipalsWithRolesContext {
+ this.permissionsPrincipal ??= buildPermissionsPrincipalsWithRolesFromConfig(
+ {
+ workspaceId: this.options.internalContext.workspaceId,
+ rolePermissionConfig: this.options.rolePermissionConfig,
+ principalsContext: getPermissionsPrincipalsFromAuthContext(
+ this.options.authContext,
+ ),
+ },
+ );
+
+ if (!isDefined(this.permissionsPrincipal)) {
+ throw new PermissionsException(
+ PermissionsExceptionMessage.PERMISSION_DENIED,
+ PermissionsExceptionCode.PERMISSION_DENIED,
+ );
+ }
+
+ return this.permissionsPrincipal;
}
private resolvePermissionsMetadataMaps(): PermissionsMetadataMaps {
diff --git a/packages/twenty-server/src/modules/call-recording/services/call-recording.service.ts b/packages/twenty-server/src/modules/call-recording/services/call-recording.service.ts
index aa9c5c35565..765276a6484 100644
--- a/packages/twenty-server/src/modules/call-recording/services/call-recording.service.ts
+++ b/packages/twenty-server/src/modules/call-recording/services/call-recording.service.ts
@@ -12,6 +12,7 @@ import {
} from 'src/engine/permissions/permissions.exception';
import { CallRecordingStatus } from 'src/modules/call-recording/common/enums/call-recording-status.enum';
import { type CallRecordingWorkspaceEntity } from 'src/modules/call-recording/standard-objects/call-recording.workspace-entity';
+import { getPermissionsPrincipalsFromAuthContext } from 'src/engine/permissions/principal/utils/get-permissions-principals-from-auth-context.util';
const NON_TERMINAL_CALL_RECORDING_STATUSES: CallRecordingStatus[] = [
CallRecordingStatus.SCHEDULED,
@@ -47,6 +48,9 @@ export class CallRecordingService {
const { objectRecordsPermissions, shouldBypassPermissionChecks } =
resolveObjectRecordsPermissions({
rolePermissionConfig,
+ principals: getPermissionsPrincipalsFromAuthContext(
+ workspaceContext.authContext,
+ ),
objectPermissionsByRoleId: workspaceContext.permissionsPerRoleId,
flatObjectMetadataMaps: workspaceContext.flatObjectMetadataMaps,
flatFieldMetadataMaps: workspaceContext.flatFieldMetadataMaps,
diff --git a/packages/twenty-server/src/modules/dashboard/services/dashboard-duplication.service.ts b/packages/twenty-server/src/modules/dashboard/services/dashboard-duplication.service.ts
index 675fb1580d9..ebb0da8f898 100644
--- a/packages/twenty-server/src/modules/dashboard/services/dashboard-duplication.service.ts
+++ b/packages/twenty-server/src/modules/dashboard/services/dashboard-duplication.service.ts
@@ -30,6 +30,7 @@ import {
generateDashboardExceptionMessage,
} from 'src/modules/dashboard/exceptions/dashboard.exception';
import { DashboardWorkspaceEntity } from 'src/modules/dashboard/standard-objects/dashboard.workspace-entity';
+import { getPermissionsPrincipalsFromAuthContext } from 'src/engine/permissions/principal/utils/get-permissions-principals-from-auth-context.util';
// A role-scoped read validates every selected column, so reading the whole row would refuse over fields never copied
const DUPLICATION_SOURCE_COLUMNS: (keyof DashboardWorkspaceEntity)[] = [
@@ -162,6 +163,9 @@ export class DashboardDuplicationService {
const { objectRecordsPermissions, shouldBypassPermissionChecks } =
resolveObjectRecordsPermissions({
rolePermissionConfig,
+ principals: getPermissionsPrincipalsFromAuthContext(
+ workspaceContext.authContext,
+ ),
objectPermissionsByRoleId: workspaceContext.permissionsPerRoleId,
flatObjectMetadataMaps: workspaceContext.flatObjectMetadataMaps,
flatFieldMetadataMaps: workspaceContext.flatFieldMetadataMaps,
diff --git a/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/listeners/workflow-database-event-trigger.listener.ts b/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/listeners/workflow-database-event-trigger.listener.ts
index cb5fdebf4c1..bd3789f0ae6 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/listeners/workflow-database-event-trigger.listener.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/listeners/workflow-database-event-trigger.listener.ts
@@ -506,6 +506,7 @@ export class WorkflowDatabaseEventTriggerListener {
);
return resolveEventsReadableByRole({
+ applicationId,
roleId:
findActiveFlatApplicationById(flatApplicationMaps, applicationId)
?.defaultRoleId ?? null,
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 47d34a242ec..c895342e44f 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
@@ -985,9 +985,7 @@ describe('Conversations through the record API', () => {
await getAppProviderByClassName<WorkspaceCacheService>(
'WorkspaceCacheService',
).getOrRecompute(SEED_APPLE_WORKSPACE_ID, ['userWorkspaceRoleMap']);
- const roleId = userWorkspaceRoleMap[userWorkspaceId];
-
- if (!isDefined(roleId)) {
+ if (!isDefined(userWorkspaceRoleMap[userWorkspaceId])) {
throw new Error(`Seeded role of ${userWorkspaceId} is missing`);
}
@@ -998,8 +996,8 @@ describe('Conversations through the record API', () => {
.buildEventRecordAccessGate(batch)
.resolveAdmittedRecordIds({
workspaceId: SEED_APPLE_WORKSPACE_ID,
- roleIds: [roleId],
- workspaceMemberId: workspaceMemberId,
+ mainPrincipal: { workspaceMemberId },
+ applicationPrincipal: { isCustomApp: true },
});
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 16f31729fed..f000da0fc2c 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
@@ -15,7 +15,6 @@ import { makeGraphqlApiRequest } from 'test/integration/graphql/utils/make-graph
import { restoreManyOperationFactory } from 'test/integration/graphql/utils/restore-many-operation-factory.util';
import { searchFactory } from 'test/integration/graphql/utils/search-factory.util';
import { updateManyOperationFactory } from 'test/integration/graphql/utils/update-many-operation-factory.util';
-import { findOneRoleByLabel } from 'test/integration/metadata/suites/role/utils/find-one-role-by-label.util';
import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';
import { updateFeatureFlag } from 'test/integration/metadata/suites/utils/update-feature-flag.util';
import { makeRestApiRequest } from 'test/integration/rest/utils/make-rest-api-request.util';
@@ -281,7 +280,6 @@ describe('A restricted record on an object open by default', () => {
});
it('should leave it out of the events delivered to others', async () => {
- const memberRole = await findOneRoleByLabel({ label: 'Member' });
const { flatObjectMetadataMaps } =
await getAppProviderByClassName<WorkspaceCacheService>(
'WorkspaceCacheService',
@@ -310,8 +308,10 @@ describe('A restricted record on an object open by default', () => {
})
.resolveAdmittedRecordIds({
workspaceId: workspaceId,
- roleIds: [memberRole.id],
- workspaceMemberId: WORKSPACE_MEMBER_DATA_SEED_IDS.JONY,
+ mainPrincipal: {
+ workspaceMemberId: WORKSPACE_MEMBER_DATA_SEED_IDS.JONY,
+ },
+ applicationPrincipal: { isCustomApp: true },
});
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 df98c083db1..3c98722a918 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
@@ -34,6 +34,7 @@ import { type WorkspaceCacheService } from 'src/engine/workspace-cache/services/
import { type RecordShareStorageService } from 'src/engine/permissions/record-share/services/record-share-storage.service';
import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
import { WORKSPACE_MEMBER_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/data/constants/workspace-member-data-seeds.constant';
+import { type PermissionsPrincipalsContext } from 'src/engine/permissions/principal/types/permissions-principals-context.type';
const OBJECT_NAME = 'beyondRoleRecord';
const OBJECT_PLURAL = 'beyondRoleRecords';
@@ -254,15 +255,17 @@ describe('Records shared beyond the role that can access their object', () => {
throw new Error('The object under test is not cached');
}
- const buildJonyPrincipal = () => ({
+ const buildJonyPrincipal = (): PermissionsPrincipalsContext => ({
workspaceId,
- roleIds: [memberRoleId],
- workspaceMemberId: WORKSPACE_MEMBER_DATA_SEED_IDS.JONY,
+ mainPrincipal: {
+ workspaceMemberId: WORKSPACE_MEMBER_DATA_SEED_IDS.JONY,
+ },
+ applicationPrincipal: { isCustomApp: true },
});
expect(
await recordAccessPolicyService.hasAccessToSomeRecords({
- principal: buildJonyPrincipal(),
+ principals: buildJonyPrincipal(),
flatObjectMetadata,
operationType: 'select',
}),
@@ -270,25 +273,25 @@ describe('Records shared beyond the role that can access their object', () => {
await setShare({ principal: JONY });
- const principal = buildJonyPrincipal();
+ const principals = buildJonyPrincipal();
expect(
await recordAccessPolicyService.hasAccessToSomeRecords({
- principal,
+ principals,
flatObjectMetadata,
operationType: 'select',
}),
).toBe(true);
expect(
await recordAccessPolicyService.hasAccessToSomeRecords({
- principal,
+ principals,
flatObjectMetadata,
operationType: 'update',
}),
).toBe(false);
expect(
await recordAccessPolicyService.hasAccessToRecords({
- principal,
+ principals,
flatObjectMetadata,
operationType: 'select',
recordIds: [SHARED_RECORD_ID],
@@ -296,7 +299,7 @@ describe('Records shared beyond the role that can access their object', () => {
).toBe(true);
expect(
await recordAccessPolicyService.hasAccessToRecords({
- principal,
+ principals,
flatObjectMetadata,
operationType: 'select',
recordIds: [SHARED_RECORD_ID, OTHER_RECORD_ID],
@@ -520,8 +523,10 @@ describe('Records shared beyond the role that can access their object', () => {
})
.resolveAdmittedRecordIds({
workspaceId: workspaceId,
- roleIds: [memberRoleId],
- workspaceMemberId: WORKSPACE_MEMBER_DATA_SEED_IDS.JONY,
+ mainPrincipal: {
+ workspaceMemberId: WORKSPACE_MEMBER_DATA_SEED_IDS.JONY,
+ },
+ applicationPrincipal: { isCustomApp: true },
});
};
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 ae8b3185ef8..0ae312a6445 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
@@ -11,7 +11,7 @@ import { getAppProviderByClassName } from 'test/integration/utils/get-app-provid
import { findFlatEntityByUniversalIdentifier } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-universal-identifier.util';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { type RecordAccessPolicyService } from 'src/engine/permissions/combine/services/record-access-policy.service';
-import { type PermissionsPrincipal } from 'src/engine/permissions/principal/types/permissions-principal.type';
+import { type PermissionsPrincipalsContext } from 'src/engine/permissions/principal/types/permissions-principals-context.type';
import { type OperationType } from 'src/engine/permissions/role/utils/validate-operation-is-permitted-or-throw.util';
import { type WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
@@ -19,12 +19,13 @@ import { STANDARD_ROLE } from 'src/engine/workspace-manager/twenty-standard-appl
describe('RecordAccessPolicyService', () => {
const recordId = randomUUID();
- let adminPrincipal: PermissionsPrincipal;
+ let adminPrincipal: PermissionsPrincipalsContext;
let personFlatObjectMetadata: FlatObjectMetadata;
let recordAccessPolicyService: RecordAccessPolicyService;
- const missingRolePrincipal: PermissionsPrincipal = {
+ const missingRolePrincipal: PermissionsPrincipalsContext = {
workspaceId: SEED_APPLE_WORKSPACE_ID,
- roleIds: [randomUUID()],
+ mainPrincipal: { roleId: randomUUID(), isDeprecatedRoleOnly: true },
+ applicationPrincipal: { isCustomApp: true },
};
// Other suites wipe every person, so the record under test is created here
@@ -70,7 +71,8 @@ describe('RecordAccessPolicyService', () => {
adminPrincipal = {
workspaceId: SEED_APPLE_WORKSPACE_ID,
- roleIds: [adminRoleId],
+ mainPrincipal: { roleId: adminRoleId, isDeprecatedRoleOnly: true },
+ applicationPrincipal: { isCustomApp: true },
};
});
@@ -89,12 +91,12 @@ describe('RecordAccessPolicyService', () => {
recordIds,
operationType = 'select',
}: {
- principal: PermissionsPrincipal;
+ principal: PermissionsPrincipalsContext;
recordIds: string[];
operationType?: OperationType;
}): Promise<boolean> =>
recordAccessPolicyService.hasAccessToRecords({
- principal,
+ principals: principal,
flatObjectMetadata: personFlatObjectMetadata,
operationType,
recordIds,
@@ -140,7 +142,7 @@ describe('RecordAccessPolicyService', () => {
it('follows the role when it permits the operation', async () => {
expect(
await recordAccessPolicyService.hasAccessToSomeRecords({
- principal: adminPrincipal,
+ principals: adminPrincipal,
flatObjectMetadata: personFlatObjectMetadata,
operationType: 'select',
}),
@@ -150,7 +152,7 @@ describe('RecordAccessPolicyService', () => {
it('denies a principal with no role and no share on the object', async () => {
expect(
await recordAccessPolicyService.hasAccessToSomeRecords({
- principal: missingRolePrincipal,
+ principals: missingRolePrincipal,
flatObjectMetadata: personFlatObjectMetadata,
operationType: 'select',
}),