Skip to content

The open alternative to Salesforce, designed for AI.

Derive repository permissions from the auth context (#29483)

Charles Bochet1ad67b37e9dd
diff --git a/packages/twenty-server/src/database/commands/agent-history/__tests__/agent-history-migration.postgres.spec.ts b/packages/twenty-server/src/database/commands/agent-history/__tests__/agent-history-migration.postgres.spec.ts
index 8c52126cbd7..8ba36e9b973 100644
--- a/packages/twenty-server/src/database/commands/agent-history/__tests__/agent-history-migration.postgres.spec.ts
+++ b/packages/twenty-server/src/database/commands/agent-history/__tests__/agent-history-migration.postgres.spec.ts
@@ -148,6 +148,10 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);
),
getRepository:
workspaceDataSource.getRepository.bind(workspaceDataSource),
+ getRepositoryWithoutPermissionChecks:
+ workspaceDataSource.getRepositoryWithoutPermissionChecks.bind(
+ workspaceDataSource,
+ ),
runInWorkspaceTransaction:
workspaceDataSource.transaction.bind(workspaceDataSource),
};
@@ -264,7 +268,6 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);
}),
} as never,
{} as never,
- {} as never,
);
beforeAll(async () => {
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-21/1-21-workspace-command-1775500008000-migrate-ai-agent-text-to-json-response-format.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-21/1-21-workspace-command-1775500008000-migrate-ai-agent-text-to-json-response-format.command.ts
index 802183f22ab..c0859e3d945 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-21/1-21-workspace-command-1775500008000-migrate-ai-agent-text-to-json-response-format.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-21/1-21-workspace-command-1775500008000-migrate-ai-agent-text-to-json-response-format.command.ts
@@ -164,10 +164,8 @@ export class MigrateAiAgentTextToJsonResponseFormatCommand extends ProvisionedWo
agentIds: string[],
): Promise<void> {
const workflowVersionRepository =
- this.workspaceOrmManager.getRepository<WorkflowVersionWorkspaceEntity>(
- 'workflowVersion',
- { shouldBypassPermissionChecks: true },
- );
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkflowVersionWorkspaceEntity>(
+ 'workflowVersion');
const allVersions = await workflowVersionRepository.find();
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-21/1-21-workspace-command-1775500012000-migrate-messaging-infrastructure-to-metadata.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-21/1-21-workspace-command-1775500012000-migrate-messaging-infrastructure-to-metadata.command.ts
index a2cba85bbde..18e38d8bf90 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-21/1-21-workspace-command-1775500012000-migrate-messaging-infrastructure-to-metadata.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-21/1-21-workspace-command-1775500012000-migrate-messaging-infrastructure-to-metadata.command.ts
@@ -365,9 +365,7 @@ export class MigrateMessagingInfrastructureToMetadataCommand extends Provisioned
workspaceId: string,
): Promise<Map<string, string>> {
const workspaceMemberRepository =
- this.workspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>('workspaceMember',
- { shouldBypassPermissionChecks: true },
- );
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkspaceMemberWorkspaceEntity>('workspaceMember');
const workspaceMembers = await workspaceMemberRepository.find();
const userWorkspaces = await this.userWorkspaceRepository.find({
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-15/2-15-workspace-command-1800000001000-migrate-manual-trigger-variables-to-payload.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-15/2-15-workspace-command-1800000001000-migrate-manual-trigger-variables-to-payload.command.ts
index 409fe7ee6d4..5408c3a5b2c 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-15/2-15-workspace-command-1800000001000-migrate-manual-trigger-variables-to-payload.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-15/2-15-workspace-command-1800000001000-migrate-manual-trigger-variables-to-payload.command.ts
@@ -57,9 +57,7 @@ export class MigrateManualTriggerVariablesToPayloadCommand extends ProvisionedWo
}
const workflowVersionRepository =
- this.workspaceOrmManager.getRepository<WorkflowVersionWorkspaceEntity>('workflowVersion',
- { shouldBypassPermissionChecks: true },
- );
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkflowVersionWorkspaceEntity>('workflowVersion');
const allVersions = await workflowVersionRepository.find();
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-20/2-20-workspace-command-1783526282685-backfill-workflow-version-to-core.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-20/2-20-workspace-command-1783526282685-backfill-workflow-version-to-core.command.ts
index cb676293073..ffabd638482 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-20/2-20-workspace-command-1783526282685-backfill-workflow-version-to-core.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-20/2-20-workspace-command-1783526282685-backfill-workflow-version-to-core.command.ts
@@ -36,9 +36,7 @@ export class BackfillWorkflowVersionToCoreCommand extends ProvisionedWorkspaceCo
await this.workspaceOrmManager.executeInWorkspaceContext(
async () => {
const workflowVersionRepository =
- this.workspaceOrmManager.getRepository<WorkflowVersionWorkspaceEntity>('workflowVersion',
- { shouldBypassPermissionChecks: true },
- );
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkflowVersionWorkspaceEntity>('workflowVersion');
return workflowVersionRepository.find();
},
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-22/2-22-workspace-command-1783960128000-migrate-person-avatar-url-to-avatar-file.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-22/2-22-workspace-command-1783960128000-migrate-person-avatar-url-to-avatar-file.command.ts
index c7f53add1db..155519bf4bc 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-22/2-22-workspace-command-1783960128000-migrate-person-avatar-url-to-avatar-file.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-22/2-22-workspace-command-1783960128000-migrate-person-avatar-url-to-avatar-file.command.ts
@@ -91,9 +91,7 @@ export class MigratePersonAvatarUrlToAvatarFileCommand extends ProvisionedWorksp
}
const personRepository =
- this.workspaceOrmManager.getRepository<PersonWorkspaceEntity>('person',
- { shouldBypassPermissionChecks: true },
- );
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<PersonWorkspaceEntity>('person');
let candidateCount = 0;
let migratedCount = 0;
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-22/2-22-workspace-command-1784193207000-backfill-workflow-version-core-links.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-22/2-22-workspace-command-1784193207000-backfill-workflow-version-core-links.command.ts
index 8bf316fe605..1b427838a64 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-22/2-22-workspace-command-1784193207000-backfill-workflow-version-core-links.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-22/2-22-workspace-command-1784193207000-backfill-workflow-version-core-links.command.ts
@@ -53,9 +53,7 @@ export class BackfillWorkflowVersionCoreLinksCommand extends ProvisionedWorkspac
await this.workspaceOrmManager.executeInWorkspaceContext(
async () => {
const workflowVersionRepository =
- this.workspaceOrmManager.getRepository<WorkflowVersionWorkspaceEntity>('workflowVersion',
- { shouldBypassPermissionChecks: true },
- );
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkflowVersionWorkspaceEntity>('workflowVersion');
return workflowVersionRepository.find();
},
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-23/2-23-workspace-command-1784286707000-backfill-workflow-core-links.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-23/2-23-workspace-command-1784286707000-backfill-workflow-core-links.command.ts
index 872c92c1586..3d47560511e 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-23/2-23-workspace-command-1784286707000-backfill-workflow-core-links.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-23/2-23-workspace-command-1784286707000-backfill-workflow-core-links.command.ts
@@ -51,9 +51,7 @@ export class BackfillWorkflowCoreLinksCommand extends ProvisionedWorkspaceComman
await this.workspaceOrmManager.executeInWorkspaceContext(
async () => {
const workflowRepository =
- this.workspaceOrmManager.getRepository<WorkflowWorkspaceEntity>('workflow',
- { shouldBypassPermissionChecks: true },
- );
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkflowWorkspaceEntity>('workflow');
return workflowRepository.find();
},
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-28/2-28-workspace-command-1785600000000-repair-orphan-core-workflow-versions.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-28/2-28-workspace-command-1785600000000-repair-orphan-core-workflow-versions.command.ts
index a5351d0e3e6..473277a8af3 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-28/2-28-workspace-command-1785600000000-repair-orphan-core-workflow-versions.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-28/2-28-workspace-command-1785600000000-repair-orphan-core-workflow-versions.command.ts
@@ -50,9 +50,7 @@ export class RepairOrphanCoreWorkflowVersionsCommand extends ProvisionedWorkspac
await this.workspaceOrmManager.executeInWorkspaceContext(
async () => {
const workflowVersionRepository =
- this.workspaceOrmManager.getRepository<WorkflowVersionWorkspaceEntity>('workflowVersion',
- { shouldBypassPermissionChecks: true },
- );
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkflowVersionWorkspaceEntity>('workflowVersion');
return workflowVersionRepository.count();
},
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-28/__tests__/2-28-workspace-command-1785600000000-repair-orphan-core-workflow-versions.command.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-28/__tests__/2-28-workspace-command-1785600000000-repair-orphan-core-workflow-versions.command.spec.ts
index 23d45a175eb..3d11b13543d 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-28/__tests__/2-28-workspace-command-1785600000000-repair-orphan-core-workflow-versions.command.spec.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-28/__tests__/2-28-workspace-command-1785600000000-repair-orphan-core-workflow-versions.command.spec.ts
@@ -68,7 +68,7 @@ const setup = ({
const workspaceOrmManager = {
executeInWorkspaceContext: (fn: () => Promise<unknown>) => fn(),
- getRepository: () => ({ count }),
+ getRepositoryWithoutPermissionChecks: () => ({ count }),
} as unknown as WorkspaceOrmManager;
const recompute = jest.fn();
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-36/2-36-workspace-command-1787700000000-rewrite-is-not-null-workflow-filter-operands.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-36/2-36-workspace-command-1787700000000-rewrite-is-not-null-workflow-filter-operands.command.ts
index f65c7f65150..53f7e573e62 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-36/2-36-workspace-command-1787700000000-rewrite-is-not-null-workflow-filter-operands.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-36/2-36-workspace-command-1787700000000-rewrite-is-not-null-workflow-filter-operands.command.ts
@@ -74,10 +74,8 @@ export class RewriteIsNotNullWorkflowFilterOperandsCommand extends ProvisionedWo
}
const workflowVersionRepository =
- await this.workspaceOrmManager.getRepository<WorkflowVersionWorkspaceEntity>(
- 'workflowVersion',
- { shouldBypassPermissionChecks: true },
- );
+ await this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkflowVersionWorkspaceEntity>(
+ 'workflowVersion');
const allVersions = await workflowVersionRepository.find();
@@ -131,10 +129,8 @@ export class RewriteIsNotNullWorkflowFilterOperandsCommand extends ProvisionedWo
}
const automatedTriggerRepository =
- await this.workspaceOrmManager.getRepository<WorkflowAutomatedTriggerWorkspaceEntity>(
- 'workflowAutomatedTrigger',
- { shouldBypassPermissionChecks: true },
- );
+ await this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkflowAutomatedTriggerWorkspaceEntity>(
+ 'workflowAutomatedTrigger');
const allTriggers = await automatedTriggerRepository.find();
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-40/2-40-workspace-command-1788960408162-backfill-core-workflow-id-on-workflow-versions.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-40/2-40-workspace-command-1788960408162-backfill-core-workflow-id-on-workflow-versions.command.ts
index f241a7dfacf..36e28e8252f 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-40/2-40-workspace-command-1788960408162-backfill-core-workflow-id-on-workflow-versions.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-40/2-40-workspace-command-1788960408162-backfill-core-workflow-id-on-workflow-versions.command.ts
@@ -37,10 +37,8 @@ export class BackfillCoreWorkflowIdOnWorkflowVersionsCommand extends Provisioned
try {
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const workflowRepository =
- this.workspaceOrmManager.getRepository<WorkflowWorkspaceEntity>(
- 'workflow',
- { shouldBypassPermissionChecks: true },
- );
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkflowWorkspaceEntity>(
+ 'workflow');
return workflowRepository.count();
}, buildSystemAuthContext(workspaceId));
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-40/__tests__/2-40-workspace-command-1788960408162-backfill-core-workflow-id-on-workflow-versions.command.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-40/__tests__/2-40-workspace-command-1788960408162-backfill-core-workflow-id-on-workflow-versions.command.spec.ts
index d096bd5ff6c..5e15986e89c 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-40/__tests__/2-40-workspace-command-1788960408162-backfill-core-workflow-id-on-workflow-versions.command.spec.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-40/__tests__/2-40-workspace-command-1788960408162-backfill-core-workflow-id-on-workflow-versions.command.spec.ts
@@ -57,7 +57,7 @@ const setup = ({
const workspaceOrmManager = {
executeInWorkspaceContext: (fn: () => Promise<unknown>) => fn(),
- getRepository: () => ({ count }),
+ getRepositoryWithoutPermissionChecks: () => ({ count }),
} as unknown as WorkspaceOrmManager;
const command = new BackfillCoreWorkflowIdOnWorkflowVersionsCommand(
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/2-41-workspace-command-1789482628000-normalize-workflow-record-crud-rich-text-fields.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/2-41-workspace-command-1789482628000-normalize-workflow-record-crud-rich-text-fields.command.ts
index 686f35fac6e..ce0cdc3a5c3 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/2-41-workspace-command-1789482628000-normalize-workflow-record-crud-rich-text-fields.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/2-41-workspace-command-1789482628000-normalize-workflow-record-crud-rich-text-fields.command.ts
@@ -78,10 +78,8 @@ export class NormalizeWorkflowRecordCrudRichTextFieldsCommand extends Provisione
}
const workflowVersionRepository =
- await this.workspaceOrmManager.getRepository<WorkflowVersionWorkspaceEntity>(
- 'workflowVersion',
- { shouldBypassPermissionChecks: true },
- );
+ await this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkflowVersionWorkspaceEntity>(
+ 'workflowVersion');
const allVersions = await workflowVersionRepository.find();
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/2-44-workspace-command-1790772993322-record-pending-form-conversations.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/2-44-workspace-command-1790772993322-record-pending-form-conversations.command.ts
index 89506c27a0a..5a81a61ecac 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/2-44-workspace-command-1790772993322-record-pending-form-conversations.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/2-44-workspace-command-1790772993322-record-pending-form-conversations.command.ts
@@ -95,9 +95,7 @@ export class RecordPendingFormConversationsCommand extends ProvisionedWorkspaceC
isDryRun: boolean;
}): Promise<number> {
const getRepository = <TEntity extends object>(objectName: string) =>
- this.workspaceOrmManager.getRepository<TEntity>(objectName, {
- shouldBypassPermissionChecks: true,
- });
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<TEntity>(objectName);
const workflowRunRepository =
getRepository<WorkflowRunWorkspaceEntity>('workflowRun');
const threadRepository = getRepository<
diff --git a/packages/twenty-server/src/engine/api/common/common-nested-relations-processor/process-nested-relations.helper.ts b/packages/twenty-server/src/engine/api/common/common-nested-relations-processor/process-nested-relations.helper.ts
index 2cc8a250710..7a9d1e86edd 100644
--- a/packages/twenty-server/src/engine/api/common/common-nested-relations-processor/process-nested-relations.helper.ts
+++ b/packages/twenty-server/src/engine/api/common/common-nested-relations-processor/process-nested-relations.helper.ts
@@ -32,7 +32,6 @@ import {
type FieldMapsForObject,
} from 'src/engine/metadata-modules/flat-field-metadata/utils/build-field-maps-from-flat-object-metadata.util';
import { FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
-import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
import { type WorkspaceSelectQueryBuilder } from 'src/engine/twenty-orm/query-builder/workspace-select-query-builder';
import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace-repository';
@@ -54,7 +53,6 @@ type ProcessNestedRelationsArgs<T extends ObjectRecord = ObjectRecord> = {
limit: number;
authContext: WorkspaceAuthContext;
useReplica?: boolean;
- rolePermissionConfig?: RolePermissionConfig;
repository?: WorkspaceRepository;
// oxlint-disable-next-line typescript/no-explicit-any
selectedFields: Record<string, any>;
@@ -87,7 +85,6 @@ export class ProcessNestedRelationsHelper {
limit,
authContext,
useReplica = false,
- rolePermissionConfig,
repository,
selectedFields,
}: ProcessNestedRelationsArgs<T>,
@@ -107,7 +104,6 @@ export class ProcessNestedRelationsHelper {
limit,
authContext,
useReplica,
- rolePermissionConfig,
repository,
relationQueryLimiter,
selectedFields:
@@ -132,7 +128,6 @@ export class ProcessNestedRelationsHelper {
limit,
authContext,
useReplica,
- rolePermissionConfig,
repository,
relationQueryLimiter,
selectedFields,
@@ -149,7 +144,6 @@ export class ProcessNestedRelationsHelper {
limit: number;
authContext: WorkspaceAuthContext;
useReplica: boolean;
- rolePermissionConfig?: RolePermissionConfig;
repository?: WorkspaceRepository;
relationQueryLimiter: ConcurrencyLimiter;
selectedFields: Record<string, unknown>;
@@ -203,7 +197,6 @@ export class ProcessNestedRelationsHelper {
? repository.getRepositoryForObjectMetadataId(targetObjectMetadata.id)
: this.workspaceOrmManager.getRepository(
targetObjectMetadata.nameSingular,
- rolePermissionConfig,
{ useReplica },
);
@@ -332,7 +325,6 @@ export class ProcessNestedRelationsHelper {
limit,
authContext,
useReplica,
- rolePermissionConfig,
repository,
selectedFields,
},
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-base-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-base-query-runner.service.ts
index 6b8b885ecf6..68e841e1589 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-base-query-runner.service.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-base-query-runner.service.ts
@@ -72,7 +72,6 @@ import { RelationNestedQueries } from 'src/engine/twenty-orm/field-operations/re
import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace-repository';
import { type MutationKind } from 'src/engine/twenty-orm/sql/utils/build-mutation-statement.util';
import { getWorkspaceContext } from 'src/engine/twenty-orm/storage/orm-workspace-context.storage';
-import { resolveRolePermissionConfig } from 'src/engine/permissions/principal/utils/resolve-role-permission-config.util';
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
import { addTimelineActivityObjectColumnsToSelect } from 'src/modules/timeline/utils/add-timeline-activity-object-columns-to-select.util';
@@ -373,38 +372,18 @@ export abstract class CommonBaseQueryRunnerService<
): Promise<Omit<CommonExtendedQueryRunnerContext, 'commonQueryParser'>> {
const context = getWorkspaceContext();
- const rolePermissionConfig =
- queryRunnerContext.rolePermissionConfig ??
- resolveRolePermissionConfig({
- authContext: context.authContext,
- userWorkspaceRoleMap: context.userWorkspaceRoleMap,
- apiKeyRoleMap: context.apiKeyRoleMap,
- flatRoleTargetByAgentIdMaps: context.flatRoleTargetByAgentIdMaps,
- });
-
- if (!rolePermissionConfig) {
- throw new CommonQueryRunnerException(
- 'Invalid auth context',
- CommonQueryRunnerExceptionCode.INVALID_AUTH_CONTEXT,
- { userFriendlyMessage: STANDARD_ERROR_MESSAGE },
- );
- }
-
const repository = isDefined(queryRunnerContext.transactionScope)
? queryRunnerContext.transactionScope.getRepository<ObjectRecord>(
queryRunnerContext.flatObjectMetadata.nameSingular,
- rolePermissionConfig,
)
: this.workspaceOrmManager.getRepository<ObjectRecord>(
queryRunnerContext.flatObjectMetadata.nameSingular,
- rolePermissionConfig,
{ useReplica: this.isReadOnly },
);
return {
...queryRunnerContext,
authContext: context.authContext,
- rolePermissionConfig,
repository,
featureFlagsMap: context.featureFlagsMap,
};
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-create-many-query-runner/common-create-many-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-create-many-query-runner/common-create-many-query-runner.service.ts
index 10b6f38c72c..cbe4f603a38 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-create-many-query-runner/common-create-many-query-runner.service.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-create-many-query-runner/common-create-many-query-runner.service.ts
@@ -52,7 +52,6 @@ import { type ShareWithInput } from 'src/engine/permissions/record-share/types/s
import { resolveObjectSharing } from 'src/engine/permissions/record-share/utils/resolve-object-sharing.util';
import { resolveCreatedRecordSharingOrThrow } from 'src/engine/permissions/record-share/utils/resolve-created-record-sharing-or-throw.util';
import { WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace-repository';
-import { RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
import { containsNestedRelationCreate } from 'src/engine/twenty-orm/utils/contains-nested-relation-create.util';
import { getNestedRelationFieldNames } from 'src/engine/twenty-orm/utils/get-nested-relation-field-names.util';
@@ -108,7 +107,6 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSer
transactionScope,
repository: transactionScope.getRepository(
queryRunnerContext.flatObjectMetadata.nameSingular,
- queryRunnerContext.rolePermissionConfig,
),
}),
);
@@ -127,7 +125,6 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSer
const {
repository,
authContext,
- rolePermissionConfig,
flatObjectMetadata,
flatObjectMetadataMaps,
flatFieldMetadataMaps,
@@ -161,9 +158,8 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSer
repository:
objectSharing.isPrivateByDefault &&
isDefined(queryRunnerContext.transactionScope)
- ? queryRunnerContext.transactionScope.getRepository(
+ ? queryRunnerContext.transactionScope.getRepositoryWithoutPermissionChecks(
flatObjectMetadata.nameSingular,
- { shouldBypassPermissionChecks: true },
)
: repository,
selectedFieldsResult: args.selectedFieldsResult,
@@ -176,7 +172,6 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSer
flatObjectMetadataMaps,
flatFieldMetadataMaps,
authContext,
- rolePermissionConfig,
repository,
nestedRelationsReadPathOptions: this.getNestedRelationsReadPathOptions(),
});
@@ -191,7 +186,6 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSer
flatObjectMetadataMaps,
flatFieldMetadataMaps,
authContext,
- rolePermissionConfig,
repository,
nestedRelationsReadPathOptions,
}: {
@@ -201,7 +195,6 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSer
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
authContext: WorkspaceAuthContext;
- rolePermissionConfig?: RolePermissionConfig;
repository: WorkspaceRepository<ObjectRecord>;
nestedRelationsReadPathOptions: NestedRelationsReadPathOptions;
}): Promise<void> {
@@ -220,7 +213,6 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSer
>,
limit: QUERY_MAX_RECORDS,
authContext,
- rolePermissionConfig,
repository,
selectedFields: args.selectedFieldsResult.select,
...nestedRelationsReadPathOptions,
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-delete-many-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-delete-many-query-runner.service.ts
index aa7b92dc060..0592e5ffbea 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-delete-many-query-runner.service.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-delete-many-query-runner.service.ts
@@ -40,7 +40,6 @@ export class CommonDeleteManyQueryRunnerService extends CommonBaseQueryRunnerSer
): Promise<ObjectRecord[]> {
const {
authContext,
- rolePermissionConfig,
flatObjectMetadataMaps,
flatFieldMetadataMaps,
flatObjectMetadata,
@@ -73,7 +72,6 @@ export class CommonDeleteManyQueryRunnerService extends CommonBaseQueryRunnerSer
>,
limit: QUERY_MAX_RECORDS_FROM_RELATION,
authContext,
- rolePermissionConfig,
selectedFields: args.selectedFieldsResult.select,
...this.getNestedRelationsReadPathOptions(),
});
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-destroy-many-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-destroy-many-query-runner.service.ts
index 0b2071b6c84..928fbad39da 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-destroy-many-query-runner.service.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-destroy-many-query-runner.service.ts
@@ -40,7 +40,6 @@ export class CommonDestroyManyQueryRunnerService extends CommonBaseQueryRunnerSe
): Promise<ObjectRecord[]> {
const {
authContext,
- rolePermissionConfig,
flatObjectMetadataMaps,
flatFieldMetadataMaps,
flatObjectMetadata,
@@ -73,7 +72,6 @@ export class CommonDestroyManyQueryRunnerService extends CommonBaseQueryRunnerSe
>,
limit: QUERY_MAX_RECORDS_FROM_RELATION,
authContext,
- rolePermissionConfig,
selectedFields: args.selectedFieldsResult.select,
...this.getNestedRelationsReadPathOptions(),
});
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-duplicates-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-duplicates-query-runner.service.ts
index 7ba7cb8adad..f62bad4db19 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-duplicates-query-runner.service.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-duplicates-query-runner.service.ts
@@ -53,7 +53,6 @@ export class CommonFindDuplicatesQueryRunnerService extends CommonBaseQueryRunne
flatFieldMetadataMaps,
commonQueryParser,
authContext,
- rolePermissionConfig,
} = queryRunnerContext;
const readRepository = this.getReadRepository(queryRunnerContext);
@@ -178,7 +177,6 @@ export class CommonFindDuplicatesQueryRunnerService extends CommonBaseQueryRunne
>,
limit: QUERY_MAX_RECORDS_FROM_RELATION,
authContext,
- rolePermissionConfig,
selectedFields: args.selectedFieldsResult.select,
...this.getNestedRelationsReadPathOptions(),
});
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-many-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-many-query-runner.service.ts
index 1d95637801b..2e4b44b8fe7 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-many-query-runner.service.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-many-query-runner.service.ts
@@ -66,7 +66,6 @@ export class CommonFindManyQueryRunnerService extends CommonBaseQueryRunnerServi
): Promise<CommonFindManyOutput> {
const {
authContext,
- rolePermissionConfig,
flatObjectMetadata,
flatObjectMetadataMaps,
flatFieldMetadataMaps,
@@ -246,7 +245,6 @@ export class CommonFindManyQueryRunnerService extends CommonBaseQueryRunnerServi
aggregate: args.selectedFieldsResult.aggregate,
limit: QUERY_MAX_RECORDS_FROM_RELATION,
authContext,
- rolePermissionConfig,
selectedFields: args.selectedFieldsResult.select,
...this.getNestedRelationsReadPathOptions(),
});
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-one-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-one-query-runner.service.ts
index 7520c77cdda..7429591d70d 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-one-query-runner.service.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-one-query-runner.service.ts
@@ -41,7 +41,6 @@ export class CommonFindOneQueryRunnerService extends CommonBaseQueryRunnerServic
): Promise<ObjectRecord> {
const {
authContext,
- rolePermissionConfig,
flatObjectMetadataMaps,
flatFieldMetadataMaps,
flatObjectMetadata,
@@ -103,7 +102,6 @@ export class CommonFindOneQueryRunnerService extends CommonBaseQueryRunnerServic
>,
limit: QUERY_MAX_RECORDS_FROM_RELATION,
authContext,
- rolePermissionConfig,
selectedFields: args.selectedFieldsResult.select,
...this.getNestedRelationsReadPathOptions(),
});
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-merge-many-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-merge-many-query-runner.service.ts
index 45f68018541..2fe6ccab401 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-merge-many-query-runner.service.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-merge-many-query-runner.service.ts
@@ -51,7 +51,6 @@ import { isMorphOrRelationFlatFieldMetadata } from 'src/engine/metadata-modules/
import { type FlatIndexMetadata } from 'src/engine/metadata-modules/flat-index-metadata/types/flat-index-metadata.type';
import { FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { assertMutationNotOnRemoteObject } from 'src/engine/metadata-modules/object-metadata/utils/assert-mutation-not-on-remote-object.util';
-import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
import { type WorkspaceTransactionScope } from 'src/engine/twenty-orm/types/workspace-transaction-scope.type';
import { resolveEffectiveFlatEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity-property.util';
@@ -166,7 +165,6 @@ export class CommonMergeManyQueryRunnerService extends CommonBaseQueryRunnerServ
>,
limit: QUERY_MAX_RECORDS_FROM_RELATION,
authContext: context.authContext,
- rolePermissionConfig: context.rolePermissionConfig,
selectedFields: args.selectedFieldsResult.select,
...this.getNestedRelationsReadPathOptions(),
});
@@ -242,18 +240,12 @@ export class CommonMergeManyQueryRunnerService extends CommonBaseQueryRunnerServ
.filter(([, fieldMetadataId]) => unreadableFieldIds.has(fieldMetadataId))
.map(([recordKey]) => recordKey);
- const bypassPermissionConfig = {
- shouldBypassPermissionChecks: true,
- } as const;
-
const unrestrictedRepository = isDefined(transactionScope)
- ? transactionScope.getRepository<ObjectRecord>(
+ ? transactionScope.getRepositoryWithoutPermissionChecks<ObjectRecord>(
flatObjectMetadata.nameSingular,
- bypassPermissionConfig,
)
- : this.workspaceOrmManager.getRepository<ObjectRecord>(
+ : this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<ObjectRecord>(
flatObjectMetadata.nameSingular,
- bypassPermissionConfig,
);
const fullRecords = await unrestrictedRepository.find({
@@ -472,7 +464,6 @@ export class CommonMergeManyQueryRunnerService extends CommonBaseQueryRunnerServ
relationField,
flatFieldMetadataMaps,
flatIndexMaps,
- rolePermissionConfig,
idsToDelete,
priorityRecordId,
}: {
@@ -483,17 +474,13 @@ export class CommonMergeManyQueryRunnerService extends CommonBaseQueryRunnerServ
};
flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
flatIndexMaps: FlatEntityMaps<FlatIndexMetadata>;
- rolePermissionConfig: RolePermissionConfig;
idsToDelete: string[];
priorityRecordId: string;
}): Promise<void> {
const { joinColumnName } = relationField;
const alias = relationField.objectMetadata.nameSingular;
- const relatedRepository = transactionScope.getRepository(
- alias,
- rolePermissionConfig,
- );
+ const relatedRepository = transactionScope.getRepository(alias);
const duplicateKeyColumnGroups =
computeDuplicateKeyColumnGroupsForJoinColumn({
@@ -573,7 +560,6 @@ export class CommonMergeManyQueryRunnerService extends CommonBaseQueryRunnerServ
flatObjectMetadataMaps,
flatFieldMetadataMaps,
flatIndexMaps,
- rolePermissionConfig,
} = queryRunnerContext;
if (!isDefined(flatIndexMaps)) {
@@ -610,16 +596,12 @@ export class CommonMergeManyQueryRunnerService extends CommonBaseQueryRunnerServ
relationField,
flatFieldMetadataMaps,
flatIndexMaps,
- rolePermissionConfig,
idsToDelete,
priorityRecordId,
});
}
- const objectRepository = transactionScope.getRepository(
- alias,
- rolePermissionConfig,
- );
+ const objectRepository = transactionScope.getRepository(alias);
const deletedRecords = await objectRepository.runMutation({
selectQueryBuilder: objectRepository
@@ -684,7 +666,6 @@ export class CommonMergeManyQueryRunnerService extends CommonBaseQueryRunnerServ
flatFieldMetadataMaps,
flatObjectMetadata,
authContext,
- rolePermissionConfig,
} = queryRunnerContext;
if (args.selectedFieldsResult.relations) {
@@ -699,7 +680,6 @@ export class CommonMergeManyQueryRunnerService extends CommonBaseQueryRunnerServ
>,
limit: QUERY_MAX_RECORDS_FROM_RELATION,
authContext,
- rolePermissionConfig,
selectedFields: args.selectedFieldsResult.select,
...this.getNestedRelationsReadPathOptions(),
});
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-restore-many-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-restore-many-query-runner.service.ts
index e09f6355967..1b2ae18349d 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-restore-many-query-runner.service.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-restore-many-query-runner.service.ts
@@ -40,7 +40,6 @@ export class CommonRestoreManyQueryRunnerService extends CommonBaseQueryRunnerSe
): Promise<ObjectRecord[]> {
const {
authContext,
- rolePermissionConfig,
flatObjectMetadataMaps,
flatFieldMetadataMaps,
flatObjectMetadata,
@@ -73,7 +72,6 @@ export class CommonRestoreManyQueryRunnerService extends CommonBaseQueryRunnerSe
>,
limit: QUERY_MAX_RECORDS_FROM_RELATION,
authContext,
- rolePermissionConfig,
selectedFields: args.selectedFieldsResult.select,
...this.getNestedRelationsReadPathOptions(),
});
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-update-many-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-update-many-query-runner.service.ts
index 3159d6d0ce7..efec7a79063 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-update-many-query-runner.service.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-update-many-query-runner.service.ts
@@ -40,7 +40,6 @@ export class CommonUpdateManyQueryRunnerService extends CommonBaseQueryRunnerSer
): Promise<ObjectRecord[]> {
const {
authContext,
- rolePermissionConfig,
flatObjectMetadataMaps,
flatFieldMetadataMaps,
flatObjectMetadata,
@@ -74,7 +73,6 @@ export class CommonUpdateManyQueryRunnerService extends CommonBaseQueryRunnerSer
>,
limit: QUERY_MAX_RECORDS_FROM_RELATION,
authContext,
- rolePermissionConfig,
selectedFields: args.selectedFieldsResult.select,
...this.getNestedRelationsReadPathOptions(),
});
diff --git a/packages/twenty-server/src/engine/api/common/types/common-base-query-runner-context.type.ts b/packages/twenty-server/src/engine/api/common/types/common-base-query-runner-context.type.ts
index fac95e2d111..8c518e931e5 100644
--- a/packages/twenty-server/src/engine/api/common/types/common-base-query-runner-context.type.ts
+++ b/packages/twenty-server/src/engine/api/common/types/common-base-query-runner-context.type.ts
@@ -3,7 +3,6 @@ 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 FlatIndexMetadata } from 'src/engine/metadata-modules/flat-index-metadata/types/flat-index-metadata.type';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
-import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
import { type WorkspaceTransactionScope } from 'src/engine/twenty-orm/types/workspace-transaction-scope.type';
export type CommonBaseQueryRunnerContext = {
@@ -13,7 +12,6 @@ export type CommonBaseQueryRunnerContext = {
flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
flatIndexMaps?: FlatEntityMaps<FlatIndexMetadata>;
objectIdByNameSingular: Record<string, string>;
- rolePermissionConfig?: RolePermissionConfig;
transactionScope?: WorkspaceTransactionScope;
nestedOperationDepth?: number;
nestedCreateRecordsCounter?: { count: number };
diff --git a/packages/twenty-server/src/engine/api/common/types/common-extended-query-runner-context.type.ts b/packages/twenty-server/src/engine/api/common/types/common-extended-query-runner-context.type.ts
index cb7b2c4fd92..cff59a5418a 100644
--- a/packages/twenty-server/src/engine/api/common/types/common-extended-query-runner-context.type.ts
+++ b/packages/twenty-server/src/engine/api/common/types/common-extended-query-runner-context.type.ts
@@ -4,14 +4,12 @@ import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/wo
import { type CommonBaseQueryRunnerContext } from 'src/engine/api/common/types/common-base-query-runner-context.type';
import { type GraphqlQueryParser } from 'src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query.parser';
import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace-repository';
-import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
export type CommonExtendedQueryRunnerContext = Omit<
CommonBaseQueryRunnerContext,
'authContext'
> & {
authContext: WorkspaceAuthContext;
- rolePermissionConfig: RolePermissionConfig;
repository: WorkspaceRepository<ObjectRecord>;
commonQueryParser: GraphqlQueryParser;
featureFlagsMap: Record<FeatureFlagKey, boolean>;
diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/group-by/services/group-by-with-records.service.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/group-by/services/group-by-with-records.service.ts
index cf929749240..51db4048522 100644
--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/group-by/services/group-by-with-records.service.ts
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/group-by/services/group-by-with-records.service.ts
@@ -76,7 +76,6 @@ export class GroupByWithRecordsService {
const {
authContext,
- rolePermissionConfig,
flatObjectMetadata,
flatObjectMetadataMaps,
flatFieldMetadataMaps,
@@ -124,7 +123,6 @@ export class GroupByWithRecordsService {
aggregate: selectedFieldsResult.aggregate,
limit: RELATIONS_PER_RECORD_LIMIT,
authContext,
- rolePermissionConfig,
selectedFields: selectedFieldsResult.select,
...nestedRelationsReadPathOptions,
});
diff --git a/packages/twenty-server/src/engine/api/mcp/services/mcp-instruction-builder.service.ts b/packages/twenty-server/src/engine/api/mcp/services/mcp-instruction-builder.service.ts
index 544ff0153bb..b6aad57a9db 100644
--- a/packages/twenty-server/src/engine/api/mcp/services/mcp-instruction-builder.service.ts
+++ b/packages/twenty-server/src/engine/api/mcp/services/mcp-instruction-builder.service.ts
@@ -3,13 +3,13 @@ import { Injectable } from '@nestjs/common';
import { ToolCategory } from 'twenty-shared/ai';
import { camelToSnakeCase } from 'twenty-shared/utils';
+import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { MCP_EXCLUDED_TOOL_NAMES } from 'src/engine/api/mcp/constants/mcp-excluded-tool-names.constant';
import { buildMcpServerInstructions } from 'src/engine/api/mcp/utils/build-mcp-server-instructions.util';
import { ToolRegistryService } from 'src/engine/core-modules/tool-provider/services/tool-registry.service';
import { getDatabaseCrudToolFlatObjects } from 'src/engine/metadata-modules/ai/ai-agent/utils/get-database-crud-tool-flat-objects.util';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
import { SkillService } from 'src/engine/metadata-modules/skill/skill.service';
-import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
@Injectable()
export class McpInstructionBuilderService {
@@ -21,11 +21,11 @@ export class McpInstructionBuilderService {
async buildInstructions({
workspaceId,
- rolePermissionConfig,
+ authContext,
isDirectMode,
}: {
workspaceId: string;
- rolePermissionConfig: RolePermissionConfig;
+ authContext: WorkspaceAuthContext;
isDirectMode: boolean;
}): Promise<string> {
const [{ flatObjectMetadataMaps }, allSkills, actionToolCatalog] =
@@ -36,7 +36,7 @@ export class McpInstructionBuilderService {
}),
this.skillService.findAllFlatSkills(workspaceId),
this.toolRegistry.buildToolIndex(workspaceId, {
- rolePermissionConfig,
+ authContext,
categories: [ToolCategory.ACTION],
}),
]);
diff --git a/packages/twenty-server/src/engine/api/mcp/services/mcp-protocol.service.ts b/packages/twenty-server/src/engine/api/mcp/services/mcp-protocol.service.ts
index 703fd4dbc43..eb61e671858 100644
--- a/packages/twenty-server/src/engine/api/mcp/services/mcp-protocol.service.ts
+++ b/packages/twenty-server/src/engine/api/mcp/services/mcp-protocol.service.ts
@@ -40,7 +40,6 @@ import { getMcpRegistryToolAnnotations } from 'src/engine/api/mcp/utils/get-mcp-
import { isMcpMethod } from 'src/engine/api/mcp/utils/is-mcp-method.util';
import { parseMcpToolCallParams } from 'src/engine/api/mcp/utils/parse-mcp-tool-call-params.util';
import { wrapJsonRpcResponse } from 'src/engine/api/mcp/utils/wrap-jsonrpc-response.util';
-import { ApiKeyRoleService } from 'src/engine/core-modules/api-key/services/api-key-role.service';
import { type FlatApiKey } from 'src/engine/core-modules/api-key/types/flat-api-key.type';
import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
@@ -65,15 +64,8 @@ import {
LOAD_SKILL_TOOL_NAME,
} from 'src/engine/core-modules/tool-provider/tools/load-skill.tool';
import { type FlatWorkspace } from 'src/engine/core-modules/workspace/types/flat-workspace.type';
-import {
- type RoleIdsBySource,
- type RolePermissionConfig,
-} from 'src/engine/permissions/principal/types/role-permission-config.type';
-import { buildAgentRoleIdsBySource } from 'src/engine/permissions/principal/utils/build-agent-role-ids-by-source.util';
-import { buildUserRoleIdsBySource } from 'src/engine/permissions/principal/utils/build-user-role-ids-by-source.util';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
import { SkillService } from 'src/engine/metadata-modules/skill/skill.service';
-import { UserRoleService } from 'src/engine/permissions/role-assignment/user-role.service';
import { handleException } from 'src/engine/utils/global-exception-handler.util';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
@@ -102,9 +94,7 @@ const annotatePreloadedMcpTools = (toolSet: ToolSet): McpToolSet =>
export class McpProtocolService {
constructor(
private readonly toolRegistry: ToolRegistryService,
- private readonly userRoleService: UserRoleService,
private readonly mcpToolExecutorService: McpToolExecutorService,
- private readonly apiKeyRoleService: ApiKeyRoleService,
private readonly skillService: SkillService,
private readonly mcpInstructionBuilderService: McpInstructionBuilderService,
private readonly flatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,
@@ -115,18 +105,10 @@ export class McpProtocolService {
private async handleInitialize(
context: McpCoreQueryContext,
): Promise<McpInitializeResult> {
- const { rolePermissionConfig } = await this.resolveCallerRoles({
- workspaceId: context.workspace.id,
- userWorkspaceId: context.userWorkspaceId,
- apiKey: context.apiKey,
- application: context.application,
- agentId: context.agentId,
- });
-
const instructions =
await this.mcpInstructionBuilderService.buildInstructions({
workspaceId: context.workspace.id,
- rolePermissionConfig,
+ authContext: context.authContext,
isDirectMode: context.isDirectMode,
});
@@ -142,94 +124,6 @@ export class McpProtocolService {
};
}
- async resolveCallerRoles({
- workspaceId,
- userWorkspaceId,
- apiKey,
- application,
- agentId,
- }: {
- workspaceId: string;
- userWorkspaceId?: string;
- apiKey?: FlatApiKey;
- application?: FlatApplication;
- agentId?: string;
- }): Promise<{ rolePermissionConfig: RolePermissionConfig }> {
- if (isDefined(apiKey)) {
- const apiKeyRoleId = await this.apiKeyRoleService.getRoleIdForApiKeyId(
- apiKey.id,
- workspaceId,
- );
-
- return {
- rolePermissionConfig: { intersectionOf: { apiKeyRoleId } },
- };
- }
-
- const agentRoleIdsBySource = await this.resolveAgentRoleIdsBySource({
- workspaceId,
- agentId,
- });
-
- if (!userWorkspaceId && isDefined(application)) {
- if (!isDefined(application.defaultRoleId)) {
- throw new McpException(
- 'Application has no role',
- McpExceptionCode.FORBIDDEN,
- );
- }
-
- return {
- rolePermissionConfig: {
- intersectionOf: {
- applicationRoleId: application.defaultRoleId,
- ...agentRoleIdsBySource,
- },
- },
- };
- }
-
- if (!userWorkspaceId) {
- throw new McpException(
- 'User workspace ID missing',
- McpExceptionCode.FORBIDDEN,
- );
- }
-
- const userRoleId = await this.userRoleService.getRoleIdForUserWorkspace({
- workspaceId,
- userWorkspaceId,
- });
-
- return {
- rolePermissionConfig: {
- intersectionOf: {
- ...buildUserRoleIdsBySource({ userRoleId, application }),
- ...agentRoleIdsBySource,
- },
- },
- };
- }
-
- private async resolveAgentRoleIdsBySource({
- workspaceId,
- agentId,
- }: {
- workspaceId: string;
- agentId: string | undefined;
- }): Promise<Pick<RoleIdsBySource, 'agentRoleId'>> {
- if (!isDefined(agentId)) {
- return {};
- }
-
- const { flatRoleTargetByAgentIdMaps } =
- await this.workspaceCacheService.getOrRecompute(workspaceId, [
- 'flatRoleTargetByAgentIdMaps',
- ]);
-
- return buildAgentRoleIdsBySource({ agentId, flatRoleTargetByAgentIdMaps });
- }
-
private async buildActorContext(
workspaceId: string,
userId?: string,
@@ -276,7 +170,6 @@ export class McpProtocolService {
private async buildMcpToolSet(
workspace: FlatWorkspace,
- rolePermissionConfig: RolePermissionConfig,
options?: {
authContext?: WorkspaceAuthContext;
userId?: string;
@@ -294,7 +187,6 @@ export class McpProtocolService {
const toolContext: ToolProviderContext = {
workspaceId: workspace.id,
- rolePermissionConfig,
authContext: options?.authContext,
application: options?.application,
userId: options?.userId,
@@ -312,7 +204,6 @@ export class McpProtocolService {
...annotatePreloadedMcpTools(preloadedTools),
[GET_TOOL_CATALOG_TOOL_NAME]: {
...createGetToolCatalogTool(this.toolRegistry, workspace.id, {
- rolePermissionConfig,
userId: options?.userId,
userWorkspaceId: options?.userWorkspaceId,
excludeTools: MCP_EXCLUDED_TOOL_NAMES,
@@ -506,18 +397,10 @@ export class McpProtocolService {
}
private async resolveMcpToolSet(context: McpCoreQueryContext) {
- const { rolePermissionConfig } = await this.resolveCallerRoles({
- workspaceId: context.workspace.id,
- userWorkspaceId: context.userWorkspaceId,
- apiKey: context.apiKey,
- application: context.application,
- agentId: context.agentId,
- });
-
return Sentry.startSpan(
{ name: 'mcp build tool set', op: 'mcp.tools', onlyIfParent: true },
() =>
- this.buildMcpToolSet(context.workspace, rolePermissionConfig, {
+ this.buildMcpToolSet(context.workspace, {
authContext: context.authContext,
application: context.application,
userId: context.userId,
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 aa25551d0fa..acbe74d950b 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
@@ -14,9 +14,6 @@ import { REST_API_DEFAULT_MAX_FIELDS } from 'src/engine/api/rest/input-request-p
import { parseCorePath } from 'src/engine/api/rest/input-request-parsers/path-parser-utils/parse-core-path.utils';
import { AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
import { ActorFromAuthContextService } from 'src/engine/core-modules/actor/services/actor-from-auth-context.service';
-import { ApiKeyRoleService } from 'src/engine/core-modules/api-key/services/api-key-role.service';
-import { isApiKeyAuthContext } from 'src/engine/core-modules/auth/guards/is-api-key-auth-context.guard';
-import { isUserAuthContext } from 'src/engine/core-modules/auth/guards/is-user-auth-context.guard';
import { getWorkspaceAuthContext } from 'src/engine/core-modules/auth/storage/workspace-auth-context.storage';
import { AccessTokenService } from 'src/engine/core-modules/auth/token/services/access-token.service';
import { WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
@@ -35,13 +32,10 @@ import {
PermissionsExceptionCode,
PermissionsExceptionMessage,
} from 'src/engine/permissions/permissions.exception';
-import { UserRoleService } from 'src/engine/permissions/role-assignment/user-role.service';
import { WorkspaceCacheStorageService } from 'src/engine/workspace-cache-storage/workspace-cache-storage.service';
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 { RecordAccessPolicyService } from 'src/engine/permissions/combine/services/record-access-policy.service';
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 {
hasNextPage?: boolean;
@@ -62,18 +56,16 @@ export abstract class RestApiBaseHandler {
@Inject()
protected readonly workspaceCacheService: WorkspaceCacheService;
@Inject()
+ protected readonly recordAccessPolicyService: RecordAccessPolicyService;
+ @Inject()
protected readonly actorFromAuthContextService: ActorFromAuthContextService;
@Inject()
protected readonly workspaceCacheStorageService: WorkspaceCacheStorageService;
@Inject()
protected readonly workspaceManyOrAllFlatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService;
@Inject()
- protected readonly apiKeyRoleService: ApiKeyRoleService;
- @Inject()
protected readonly commonSelectFieldsBuilder: CommonSelectFieldsBuilder;
@Inject()
- protected readonly userRoleService: UserRoleService;
- @Inject()
protected readonly accessTokenService: AccessTokenService;
@Inject()
protected readonly workspaceDomainsService: WorkspaceDomainsService;
@@ -87,60 +79,6 @@ export abstract class RestApiBaseHandler {
>;
private getPermissionsContext = async (authContext: WorkspaceAuthContext) => {
- let intersectionOf: RoleIdsBySource;
-
- if (isApiKeyAuthContext(authContext)) {
- intersectionOf = {
- apiKeyRoleId: await this.apiKeyRoleService.getRoleIdForApiKeyId(
- authContext.apiKey.id,
- authContext.workspace.id,
- ),
- };
- } else if (isUserAuthContext(authContext)) {
- const userWorkspaceRoleId =
- await this.userRoleService.getRoleIdForUserWorkspace({
- userWorkspaceId: authContext.userWorkspaceId,
- workspaceId: authContext.workspace.id,
- });
-
- if (!isDefined(userWorkspaceRoleId)) {
- throw new PermissionsException(
- PermissionsExceptionMessage.NO_ROLE_FOUND_FOR_USER_WORKSPACE,
- PermissionsExceptionCode.NO_ROLE_FOUND_FOR_USER_WORKSPACE,
- );
- }
-
- intersectionOf = { userWorkspaceRoleId };
- } else if (
- isApplicationAuthContext(authContext) &&
- isDefined(authContext.application.defaultRoleId)
- ) {
- intersectionOf = {
- applicationRoleId: authContext.application.defaultRoleId,
- };
- } else {
- throw new PermissionsException(
- 'Authentication context is invalid',
- PermissionsExceptionCode.NO_AUTHENTICATION_CONTEXT,
- );
- }
-
- const {
- rolesPermissions,
- flatObjectMetadataMaps,
- flatFieldMetadataMaps,
- flatApplicationMaps,
- } = await this.workspaceCacheService.getOrRecompute(
- authContext.workspace.id,
- [
- 'rolesPermissions',
- 'flatObjectMetadataMaps',
- 'flatFieldMetadataMaps',
- 'flatApplicationMaps',
- ],
- );
-
- const rolePermissionConfig = { intersectionOf };
const principals = getPermissionsPrincipalsFromAuthContext(authContext);
if (!isDefined(principals)) {
@@ -152,14 +90,10 @@ export abstract class RestApiBaseHandler {
return {
principals,
- objectsPermissions: getObjectsPermissionsFromRolePermissionConfig({
- rolesPermissions,
- rolePermissionConfig,
- principals,
- flatObjectMetadataMaps,
- flatFieldMetadataMaps,
- flatApplicationMaps,
- }),
+ objectsPermissions:
+ await this.recordAccessPolicyService.getObjectsPermissionsOrThrow(
+ principals,
+ ),
};
};
diff --git a/packages/twenty-server/src/engine/api/rest/core/rest-api-core.module.ts b/packages/twenty-server/src/engine/api/rest/core/rest-api-core.module.ts
index c90f98b1052..1f5cc1ec26c 100644
--- a/packages/twenty-server/src/engine/api/rest/core/rest-api-core.module.ts
+++ b/packages/twenty-server/src/engine/api/rest/core/rest-api-core.module.ts
@@ -1,3 +1,4 @@
+import { RecordShareModule } from 'src/engine/permissions/record-share/record-share.module';
import { Module } from '@nestjs/common';
import { CoreCommonApiModule } from 'src/engine/api/common/core-common-api.module';
@@ -59,6 +60,7 @@ const restApiCoreResolvers = [
CoreCommonApiModule,
WorkspaceDomainsModule,
WorkspaceCacheModule,
+ RecordShareModule,
],
controllers: [RestApiCoreController],
providers: [RestApiCoreService, ...restApiCoreResolvers],
diff --git a/packages/twenty-server/src/engine/core-modules/approved-access-domain/approved-access-domain.resolver.ts b/packages/twenty-server/src/engine/core-modules/approved-access-domain/approved-access-domain.resolver.ts
index c2da77e2639..de847ad80aa 100644
--- a/packages/twenty-server/src/engine/core-modules/approved-access-domain/approved-access-domain.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/approved-access-domain/approved-access-domain.resolver.ts
@@ -74,9 +74,8 @@ export class ApprovedAccessDomainResolver {
const workspaceMember =
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const workspaceMemberRepository =
- this.workspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkspaceMemberWorkspaceEntity>(
'workspaceMember',
- { shouldBypassPermissionChecks: true },
);
return workspaceMemberRepository.findOneOrFail({
diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/create-connected-account.service.ts b/packages/twenty-server/src/engine/core-modules/auth/services/create-connected-account.service.ts
index 044fb4bf496..d237c4310af 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/services/create-connected-account.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/services/create-connected-account.service.ts
@@ -9,9 +9,7 @@ import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user
import { ConnectedAccountEntity } from 'src/engine/metadata-modules/connected-account/entities/connected-account.entity';
import { ConnectedAccountTokenEncryptionService } from 'src/engine/metadata-modules/connected-account/services/connected-account-token-encryption.service';
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
-import { getWorkspaceContext } from 'src/engine/twenty-orm/storage/orm-workspace-context.storage';
import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
-import { resolveRolePermissionConfig } from 'src/engine/permissions/principal/utils/resolve-role-permission-config.util';
import { type WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
export type CreateConnectedAccountInput = {
@@ -52,19 +50,9 @@ export class CreateConnectedAccountService {
const authContext = buildSystemAuthContext(workspaceId);
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const workspaceContext = getWorkspaceContext();
- const rolePermissionConfig = resolveRolePermissionConfig({
- authContext,
- userWorkspaceRoleMap: workspaceContext.userWorkspaceRoleMap,
- apiKeyRoleMap: workspaceContext.apiKeyRoleMap,
- flatRoleTargetByAgentIdMaps:
- workspaceContext.flatRoleTargetByAgentIdMaps,
- });
-
const workspaceMemberRepo =
- this.workspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkspaceMemberWorkspaceEntity>(
'workspaceMember',
- rolePermissionConfig ?? undefined,
);
const member = await workspaceMemberRepo.findOne({
diff --git a/packages/twenty-server/src/engine/core-modules/auth/token/services/access-token.service.ts b/packages/twenty-server/src/engine/core-modules/auth/token/services/access-token.service.ts
index 446ea91ed7d..475dc663907 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/token/services/access-token.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/token/services/access-token.service.ts
@@ -83,9 +83,8 @@ export class AccessTokenService {
workspaceMemberId =
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const workspaceMemberRepository =
- this.workspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkspaceMemberWorkspaceEntity>(
'workspaceMember',
- { shouldBypassPermissionChecks: true },
);
const workspaceMember = await workspaceMemberRepository.findOne({
diff --git a/packages/twenty-server/src/engine/core-modules/auth/types/workspace-auth-context.type.ts b/packages/twenty-server/src/engine/core-modules/auth/types/workspace-auth-context.type.ts
index 5bb806b0889..26c285141d3 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/types/workspace-auth-context.type.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/types/workspace-auth-context.type.ts
@@ -1,5 +1,6 @@
import { type ActingAgent } from 'src/engine/core-modules/auth/types/acting-agent.type';
import { type RawAuthContext } from 'src/engine/core-modules/auth/types/raw-auth-context.type';
+import { type PermissionScope } from 'src/engine/permissions/principal/types/permission-scope.type';
export type WorkspaceAuthContextType =
| 'system'
@@ -16,6 +17,10 @@ interface BaseWorkspaceAuthContext {
export interface ApiKeyWorkspaceAuthContext extends BaseWorkspaceAuthContext {
type: 'apiKey';
apiKey: NonNullable<RawAuthContext['apiKey']>;
+ // Set when the key runs an agent: the agent and its application narrow the key's roles
+ application?: NonNullable<RawAuthContext['application']>;
+ agentId?: string;
+ permissionScope?: PermissionScope;
}
export interface UserWorkspaceAuthContext extends BaseWorkspaceAuthContext {
@@ -27,6 +32,8 @@ export interface UserWorkspaceAuthContext extends BaseWorkspaceAuthContext {
application?: NonNullable<RawAuthContext['application']>;
viaApplication?: NonNullable<RawAuthContext['application']>;
agentId?: string;
+ // Set when an AI run narrows the caller to an inline scope
+ permissionScope?: PermissionScope;
}
export interface ApplicationWorkspaceAuthContext extends BaseWorkspaceAuthContext {
@@ -36,6 +43,7 @@ export interface ApplicationWorkspaceAuthContext extends BaseWorkspaceAuthContex
actingAgent?: ActingAgent;
// The agent named in the token only narrows its roles; unlike actingAgent, writes are not attributed to it
agentId?: string;
+ permissionScope?: PermissionScope;
}
export interface SystemWorkspaceAuthContext extends BaseWorkspaceAuthContext {
diff --git a/packages/twenty-server/src/engine/core-modules/billing/app-billing/application-recurring-charge.service.ts b/packages/twenty-server/src/engine/core-modules/billing/app-billing/application-recurring-charge.service.ts
index d918c2d5bb1..b9509069ca1 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/app-billing/application-recurring-charge.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/app-billing/application-recurring-charge.service.ts
@@ -130,9 +130,8 @@ export class ApplicationRecurringChargeService {
return this.workspaceOrmManager.executeInWorkspaceContext(
async () => {
const workspaceMemberRepository =
- this.workspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkspaceMemberWorkspaceEntity>(
'workspaceMember',
- { shouldBypassPermissionChecks: true },
);
return workspaceMemberRepository.count();
diff --git a/packages/twenty-server/src/engine/core-modules/billing/jobs/update-subscription-quantity.job.ts b/packages/twenty-server/src/engine/core-modules/billing/jobs/update-subscription-quantity.job.ts
index 342780f4c5c..56bc0dd76cb 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/jobs/update-subscription-quantity.job.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/jobs/update-subscription-quantity.job.ts
@@ -29,9 +29,8 @@ export class UpdateSubscriptionQuantityJob {
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const workspaceMemberRepository =
- this.workspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkspaceMemberWorkspaceEntity>(
'workspaceMember',
- { shouldBypassPermissionChecks: true },
);
const workspaceMembersCount = await workspaceMemberRepository.count();
diff --git a/packages/twenty-server/src/engine/core-modules/billing/services/billing-subscription-update.service.ts b/packages/twenty-server/src/engine/core-modules/billing/services/billing-subscription-update.service.ts
index 99dbea44ec8..f33c7083ed2 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/services/billing-subscription-update.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/services/billing-subscription-update.service.ts
@@ -376,9 +376,8 @@ export class BillingSubscriptionUpdateService {
return await this.workspaceOrmManager.executeInWorkspaceContext(
async () => {
const workspaceMemberRepository =
- this.workspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkspaceMemberWorkspaceEntity>(
'workspaceMember',
- { shouldBypassPermissionChecks: true },
);
return await workspaceMemberRepository.count();
diff --git a/packages/twenty-server/src/engine/core-modules/calendar/timeline-calendar-event.service.ts b/packages/twenty-server/src/engine/core-modules/calendar/timeline-calendar-event.service.ts
index aceb0ca68b2..b159018272c 100644
--- a/packages/twenty-server/src/engine/core-modules/calendar/timeline-calendar-event.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/calendar/timeline-calendar-event.service.ts
@@ -65,9 +65,8 @@ export class TimelineCalendarEventService {
// System auth context resolves no role, so participant relations would be denied; channel-level redaction below gates access.
// TODO: run under the caller's role once unreadable person degrades to redaction https://github.com/twentyhq/core-team-issues/issues/2777
const calendarEventRepository =
- this.workspaceOrmManager.getRepository<CalendarEventWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<CalendarEventWorkspaceEntity>(
'calendarEvent',
- { shouldBypassPermissionChecks: true },
);
const where = isDefined(targetFilter)
@@ -277,9 +276,8 @@ export class TimelineCalendarEventService {
}
const calendarEventRepository =
- this.workspaceOrmManager.getRepository<CalendarEventWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<CalendarEventWorkspaceEntity>(
'calendarEvent',
- { shouldBypassPermissionChecks: true },
);
const queryBuilder = calendarEventRepository
@@ -402,9 +400,8 @@ export class TimelineCalendarEventService {
}
const calendarEventRepository =
- this.workspaceOrmManager.getRepository<CalendarEventWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<CalendarEventWorkspaceEntity>(
'calendarEvent',
- { shouldBypassPermissionChecks: true },
);
const [events] = await calendarEventRepository.findAndCount({
@@ -421,9 +418,8 @@ export class TimelineCalendarEventService {
});
const callRecordingRepository =
- this.workspaceOrmManager.getRepository<CallRecordingWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<CallRecordingWorkspaceEntity>(
'callRecording',
- { shouldBypassPermissionChecks: true },
);
const callRecordings = await callRecordingRepository.find({
diff --git a/packages/twenty-server/src/engine/core-modules/emailing-domain/services/emailing-domain.service.ts b/packages/twenty-server/src/engine/core-modules/emailing-domain/services/emailing-domain.service.ts
index a6ae4359174..c0038870d4d 100644
--- a/packages/twenty-server/src/engine/core-modules/emailing-domain/services/emailing-domain.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/emailing-domain/services/emailing-domain.service.ts
@@ -170,9 +170,7 @@ export class EmailingDomainService {
const isCampaignSending =
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const hasSendingCampaign = await this.workspaceOrmManager
- .getRepository(MessageCampaignWorkspaceEntity, {
- shouldBypassPermissionChecks: true,
- })
+ .getRepositoryWithoutPermissionChecks(MessageCampaignWorkspaceEntity)
.exists({ where: { status: MessageCampaignStatus.SENDING } });
if (hasSendingCampaign) {
@@ -180,9 +178,7 @@ export class EmailingDomainService {
}
return this.workspaceOrmManager
- .getRepository(CampaignDeliveryWorkspaceEntity, {
- shouldBypassPermissionChecks: true,
- })
+ .getRepositoryWithoutPermissionChecks(CampaignDeliveryWorkspaceEntity)
.exists({
where: {
state: In([
diff --git a/packages/twenty-server/src/engine/core-modules/messaging/services/timeline-messaging.service.ts b/packages/twenty-server/src/engine/core-modules/messaging/services/timeline-messaging.service.ts
index d86d2d841c1..ac6a4b9091f 100644
--- a/packages/twenty-server/src/engine/core-modules/messaging/services/timeline-messaging.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/messaging/services/timeline-messaging.service.ts
@@ -56,9 +56,8 @@ export class TimelineMessagingService {
return this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const messageThreadRepository =
- this.workspaceOrmManager.getRepository<MessageThreadWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<MessageThreadWorkspaceEntity>(
'messageThread',
- { shouldBypassPermissionChecks: true },
);
const totalQueryBuilder = messageThreadRepository
@@ -127,9 +126,8 @@ export class TimelineMessagingService {
return this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const messageThreadRepository =
- this.workspaceOrmManager.getRepository<MessageThreadWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<MessageThreadWorkspaceEntity>(
'messageThread',
- { shouldBypassPermissionChecks: true },
);
const queryBuilder = messageThreadRepository
@@ -262,9 +260,8 @@ export class TimelineMessagingService {
}
const messageThreadRepository =
- this.workspaceOrmManager.getRepository<MessageThreadWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<MessageThreadWorkspaceEntity>(
'messageThread',
- { shouldBypassPermissionChecks: true },
);
const messageThreads = await messageThreadRepository.find({
@@ -318,9 +315,8 @@ export class TimelineMessagingService {
return this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const messageParticipantRepository =
- this.workspaceOrmManager.getRepository<MessageParticipantWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<MessageParticipantWorkspaceEntity>(
'messageParticipant',
- { shouldBypassPermissionChecks: true },
);
const threadParticipants = await messageParticipantRepository
@@ -431,9 +427,8 @@ export class TimelineMessagingService {
}> {
return this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const messageThreadRepository =
- this.workspaceOrmManager.getRepository<MessageThreadWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<MessageThreadWorkspaceEntity>(
'messageThread',
- { shouldBypassPermissionChecks: true },
);
const threadChannelRows = await messageThreadRepository
diff --git a/packages/twenty-server/src/engine/core-modules/pending-wake-up/services/pending-wake-up-resolver.service.ts b/packages/twenty-server/src/engine/core-modules/pending-wake-up/services/pending-wake-up-resolver.service.ts
index 0ddf78d3b50..49838c5eb15 100644
--- a/packages/twenty-server/src/engine/core-modules/pending-wake-up/services/pending-wake-up-resolver.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/pending-wake-up/services/pending-wake-up-resolver.service.ts
@@ -121,7 +121,7 @@ export class PendingWakeUpResolverService {
? { id: { eq: event.recordId }, deletedAt: { is: 'NOT_NULL' } }
: { id: { eq: event.recordId } },
limit: 1,
- ...readPermissions,
+ authContext: readPermissions.authContext,
shouldBuildEffectiveSelectFields: false,
});
diff --git a/packages/twenty-server/src/engine/core-modules/pending-wake-up/types/pending-wake-up-owner-handler.type.ts b/packages/twenty-server/src/engine/core-modules/pending-wake-up/types/pending-wake-up-owner-handler.type.ts
index ca68dc375fe..7ab85134ba0 100644
--- a/packages/twenty-server/src/engine/core-modules/pending-wake-up/types/pending-wake-up-owner-handler.type.ts
+++ b/packages/twenty-server/src/engine/core-modules/pending-wake-up/types/pending-wake-up-owner-handler.type.ts
@@ -3,7 +3,6 @@ import { type QueueJobOptions } from 'src/engine/core-modules/message-queue/driv
import { type PendingWakeUpEntity } from 'src/engine/core-modules/pending-wake-up/entities/pending-wake-up.entity';
import { type PendingWakeUpOutcome } from 'src/engine/core-modules/pending-wake-up/types/pending-wake-up-outcome.type';
import { type PendingWakeUpOwnerState } from 'src/engine/core-modules/pending-wake-up/types/pending-wake-up-owner-state.type';
-import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
export type PendingWakeUpOwnerHandler<TOwner = unknown> = {
buildResumeJobOptions?(
@@ -18,10 +17,7 @@ export type PendingWakeUpOwnerHandler<TOwner = unknown> = {
getReadPermissions(input: {
wakeUp: PendingWakeUpEntity;
owner: TOwner;
- }): Promise<{
- authContext: WorkspaceAuthContext;
- rolePermissionConfig: RolePermissionConfig;
- } | null>;
+ }): Promise<{ authContext: WorkspaceAuthContext } | null>;
// the handler claims the wake-up once it takes the outcome, so the outcome is taken once
resolve(input: {
diff --git a/packages/twenty-server/src/engine/core-modules/record-crud/record-crud.module.ts b/packages/twenty-server/src/engine/core-modules/record-crud/record-crud.module.ts
index dd5e1948635..1d74599c6e8 100644
--- a/packages/twenty-server/src/engine/core-modules/record-crud/record-crud.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/record-crud/record-crud.module.ts
@@ -1,3 +1,4 @@
+import { RecordShareModule } from 'src/engine/permissions/record-share/record-share.module';
import { Module } from '@nestjs/common';
import { CoreCommonApiModule } from 'src/engine/api/common/core-common-api.module';
@@ -25,6 +26,7 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache
WorkspaceCacheModule,
UserRoleModule,
ApiKeyModule,
+ RecordShareModule,
],
providers: [
CommonApiContextBuilderService,
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 967134bdc83..f85648fddc5 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
@@ -20,10 +20,7 @@ import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object
import { buildObjectIdByNameMaps } from 'src/engine/metadata-modules/flat-object-metadata/utils/build-object-id-by-name-maps.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 { RecordAccessPolicyService } from 'src/engine/permissions/combine/services/record-access-policy.service';
import {
PermissionsException,
PermissionsExceptionCode,
@@ -44,17 +41,15 @@ export type CommonApiContext = {
export class CommonApiContextBuilderService {
constructor(
private readonly workspaceManyOrAllFlatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,
- private readonly workspaceCacheService: WorkspaceCacheService,
+ private readonly recordAccessPolicyService: RecordAccessPolicyService,
) {}
async build({
authContext,
objectName,
- rolePermissionConfig,
}: {
authContext: WorkspaceAuthContext;
objectName: string;
- rolePermissionConfig?: RolePermissionConfig;
}): Promise<CommonApiContext> {
const workspaceId = authContext.workspace.id;
@@ -101,12 +96,8 @@ export class CommonApiContextBuilderService {
);
}
- const { objectsPermissions, principals } = await this.getPermissionsContext(
- {
- authContext,
- rolePermissionConfig,
- },
- );
+ const { objectsPermissions, principals } =
+ await this.getPermissionsContext(authContext);
const restrictedFields =
objectsPermissions[flatObjectMetadata.id]?.restrictedFields ?? {};
@@ -128,7 +119,6 @@ export class CommonApiContextBuilderService {
flatFieldMetadataMaps,
flatIndexMaps,
objectIdByNameSingular: idByNameSingular,
- rolePermissionConfig,
},
selectedFields,
flatObjectMetadata,
@@ -139,53 +129,12 @@ export class CommonApiContextBuilderService {
};
}
- private async getPermissionsContext({
- authContext,
- rolePermissionConfig,
- }: {
- authContext: WorkspaceAuthContext;
- rolePermissionConfig?: RolePermissionConfig;
- }): Promise<{
+ private async getPermissionsContext(
+ authContext: WorkspaceAuthContext,
+ ): Promise<{
objectsPermissions: ObjectsPermissions;
principals: PermissionsPrincipalsContext;
}> {
- const {
- rolesPermissions,
- flatObjectMetadataMaps,
- flatFieldMetadataMaps,
- flatApplicationMaps,
- userWorkspaceRoleMap,
- apiKeyRoleMap,
- flatRoleTargetByAgentIdMaps,
- } = await this.workspaceCacheService.getOrRecompute(
- authContext.workspace.id,
- [
- 'rolesPermissions',
- 'flatObjectMetadataMaps',
- 'flatFieldMetadataMaps',
- 'flatApplicationMaps',
- 'userWorkspaceRoleMap',
- 'apiKeyRoleMap',
- 'flatRoleTargetByAgentIdMaps',
- ],
- );
-
- const resolvedRolePermissionConfig =
- rolePermissionConfig ??
- resolveRolePermissionConfig({
- authContext,
- userWorkspaceRoleMap,
- apiKeyRoleMap,
- flatRoleTargetByAgentIdMaps,
- });
-
- if (!isDefined(resolvedRolePermissionConfig)) {
- throw new RecordCrudException(
- 'No role found for this auth context',
- RecordCrudExceptionCode.INVALID_REQUEST,
- );
- }
-
const principals = getPermissionsPrincipalsFromAuthContext(authContext);
if (!isDefined(principals)) {
@@ -196,14 +145,10 @@ export class CommonApiContextBuilderService {
}
return {
- objectsPermissions: getObjectsPermissionsFromRolePermissionConfig({
- rolesPermissions,
- rolePermissionConfig: resolvedRolePermissionConfig,
- principals,
- flatObjectMetadataMaps,
- flatFieldMetadataMaps,
- flatApplicationMaps,
- }),
+ objectsPermissions:
+ await this.recordAccessPolicyService.getObjectsPermissionsOrThrow(
+ principals,
+ ),
principals,
};
}
diff --git a/packages/twenty-server/src/engine/core-modules/record-crud/services/create-many-records.service.ts b/packages/twenty-server/src/engine/core-modules/record-crud/services/create-many-records.service.ts
index 03f0436c608..74178e23f8b 100644
--- a/packages/twenty-server/src/engine/core-modules/record-crud/services/create-many-records.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/record-crud/services/create-many-records.service.ts
@@ -24,13 +24,7 @@ export class CreateManyRecordsService {
) {}
async execute(params: CreateManyRecordsParams): Promise<ToolOutput> {
- const {
- objectName,
- objectRecords,
- authContext,
- rolePermissionConfig,
- shareWith,
- } = params;
+ const { objectName, objectRecords, authContext, shareWith } = params;
try {
const {
@@ -41,7 +35,6 @@ export class CreateManyRecordsService {
} = await this.commonApiContextBuilder.build({
authContext,
objectName,
- rolePermissionConfig,
});
if (
diff --git a/packages/twenty-server/src/engine/core-modules/record-crud/services/create-record.service.ts b/packages/twenty-server/src/engine/core-modules/record-crud/services/create-record.service.ts
index 376b357e95c..e5a5400062b 100644
--- a/packages/twenty-server/src/engine/core-modules/record-crud/services/create-record.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/record-crud/services/create-record.service.ts
@@ -24,13 +24,7 @@ export class CreateRecordService {
) {}
async execute(params: CreateRecordParams): Promise<ToolOutput> {
- const {
- objectName,
- objectRecord,
- authContext,
- rolePermissionConfig,
- shareWith,
- } = params;
+ const { objectName, objectRecord, authContext, shareWith } = params;
try {
const {
@@ -41,7 +35,6 @@ export class CreateRecordService {
} = await this.commonApiContextBuilder.build({
authContext,
objectName,
- rolePermissionConfig,
});
if (
diff --git a/packages/twenty-server/src/engine/core-modules/record-crud/services/delete-many-records.service.ts b/packages/twenty-server/src/engine/core-modules/record-crud/services/delete-many-records.service.ts
index c0e342d01f4..8ada344db0c 100644
--- a/packages/twenty-server/src/engine/core-modules/record-crud/services/delete-many-records.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/record-crud/services/delete-many-records.service.ts
@@ -23,7 +23,7 @@ export class DeleteManyRecordsService {
) {}
async execute(params: DeleteManyRecordsParams): Promise<ToolOutput> {
- const { objectName, filter, authContext, rolePermissionConfig } = params;
+ const { objectName, filter, authContext } = params;
if (!isDefined(filter) || isRecordFilterEmpty(filter)) {
return {
@@ -39,7 +39,6 @@ export class DeleteManyRecordsService {
await this.commonApiContextBuilder.build({
authContext,
objectName,
- rolePermissionConfig,
});
if (
diff --git a/packages/twenty-server/src/engine/core-modules/record-crud/services/delete-record.service.ts b/packages/twenty-server/src/engine/core-modules/record-crud/services/delete-record.service.ts
index b8a3d7ecee2..b6eea807b6d 100644
--- a/packages/twenty-server/src/engine/core-modules/record-crud/services/delete-record.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/record-crud/services/delete-record.service.ts
@@ -24,13 +24,7 @@ export class DeleteRecordService {
) {}
async execute(params: DeleteRecordParams): Promise<ToolOutput> {
- const {
- objectName,
- objectRecordId,
- authContext,
- rolePermissionConfig,
- soft = true,
- } = params;
+ const { objectName, objectRecordId, authContext, soft = true } = params;
if (!isDefined(objectRecordId) || !isValidUuid(objectRecordId)) {
return {
@@ -45,7 +39,6 @@ export class DeleteRecordService {
await this.commonApiContextBuilder.build({
authContext,
objectName,
- rolePermissionConfig,
});
if (
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 f704e479683..bcc7a47061f 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
@@ -39,7 +39,6 @@ export class FindRecordsService {
limit,
offset = 0,
authContext,
- rolePermissionConfig,
select,
shouldBuildEffectiveSelectFields,
} = params;
@@ -64,7 +63,6 @@ export class FindRecordsService {
} = await this.commonApiContextBuilder.build({
authContext,
objectName,
- rolePermissionConfig,
});
const { effectiveSelectedFields, warnings } =
diff --git a/packages/twenty-server/src/engine/core-modules/record-crud/services/group-by-records.service.ts b/packages/twenty-server/src/engine/core-modules/record-crud/services/group-by-records.service.ts
index ddeb4ed633e..ec3f27e8434 100644
--- a/packages/twenty-server/src/engine/core-modules/record-crud/services/group-by-records.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/record-crud/services/group-by-records.service.ts
@@ -42,7 +42,6 @@ export class GroupByRecordsService {
orderBy = 'DESC',
filter,
authContext,
- rolePermissionConfig,
} = params;
try {
@@ -54,7 +53,6 @@ export class GroupByRecordsService {
} = await this.commonApiContextBuilder.build({
authContext,
objectName,
- rolePermissionConfig,
});
const availableAggregations =
diff --git a/packages/twenty-server/src/engine/core-modules/record-crud/services/merge-many-records.service.ts b/packages/twenty-server/src/engine/core-modules/record-crud/services/merge-many-records.service.ts
index a0f33ed7fbf..082f00fee81 100644
--- a/packages/twenty-server/src/engine/core-modules/record-crud/services/merge-many-records.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/record-crud/services/merge-many-records.service.ts
@@ -22,14 +22,8 @@ export class MergeManyRecordsService {
) {}
async execute(params: MergeManyRecordsParams): Promise<ToolOutput> {
- const {
- objectName,
- ids,
- conflictPriorityIndex,
- dryRun,
- authContext,
- rolePermissionConfig,
- } = params;
+ const { objectName, ids, conflictPriorityIndex, dryRun, authContext } =
+ params;
try {
const {
@@ -40,7 +34,6 @@ export class MergeManyRecordsService {
} = await this.commonApiContextBuilder.build({
authContext,
objectName,
- rolePermissionConfig,
});
if (
diff --git a/packages/twenty-server/src/engine/core-modules/record-crud/services/update-many-records.service.ts b/packages/twenty-server/src/engine/core-modules/record-crud/services/update-many-records.service.ts
index 342ccd0e9ec..8362464acf5 100644
--- a/packages/twenty-server/src/engine/core-modules/record-crud/services/update-many-records.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/record-crud/services/update-many-records.service.ts
@@ -25,8 +25,7 @@ export class UpdateManyRecordsService {
) {}
async execute(params: UpdateManyRecordsParams): Promise<ToolOutput> {
- const { objectName, filter, data, authContext, rolePermissionConfig } =
- params;
+ const { objectName, filter, data, authContext } = params;
if (!isDefined(filter) || isRecordFilterEmpty(filter)) {
return {
@@ -46,7 +45,6 @@ export class UpdateManyRecordsService {
} = await this.commonApiContextBuilder.build({
authContext,
objectName,
- rolePermissionConfig,
});
if (
diff --git a/packages/twenty-server/src/engine/core-modules/record-crud/services/update-record.service.ts b/packages/twenty-server/src/engine/core-modules/record-crud/services/update-record.service.ts
index 0f8d3d8ed7a..af074733eb4 100644
--- a/packages/twenty-server/src/engine/core-modules/record-crud/services/update-record.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/record-crud/services/update-record.service.ts
@@ -31,7 +31,6 @@ export class UpdateRecordService {
objectRecord,
fieldsToUpdate,
authContext,
- rolePermissionConfig,
} = params;
if (!isDefined(objectRecordId) || !isValidUuid(objectRecordId)) {
@@ -51,7 +50,6 @@ export class UpdateRecordService {
} = await this.commonApiContextBuilder.build({
authContext,
objectName,
- rolePermissionConfig,
});
const fieldsToUpdateArray = fieldsToUpdate ?? Object.keys(objectRecord);
diff --git a/packages/twenty-server/src/engine/core-modules/record-crud/services/upsert-many-records.service.ts b/packages/twenty-server/src/engine/core-modules/record-crud/services/upsert-many-records.service.ts
index 3a7c1dae161..3f7b01ff234 100644
--- a/packages/twenty-server/src/engine/core-modules/record-crud/services/upsert-many-records.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/record-crud/services/upsert-many-records.service.ts
@@ -25,8 +25,7 @@ export class UpsertManyRecordsService {
) {}
async execute(params: UpsertManyRecordsParams): Promise<ToolOutput> {
- const { objectName, objectRecords, authContext, rolePermissionConfig } =
- params;
+ const { objectName, objectRecords, authContext } = params;
try {
const {
@@ -37,7 +36,6 @@ export class UpsertManyRecordsService {
} = await this.commonApiContextBuilder.build({
authContext,
objectName,
- rolePermissionConfig,
});
if (
diff --git a/packages/twenty-server/src/engine/core-modules/record-crud/services/upsert-record.service.ts b/packages/twenty-server/src/engine/core-modules/record-crud/services/upsert-record.service.ts
index 0c19ef9e71f..632653da875 100644
--- a/packages/twenty-server/src/engine/core-modules/record-crud/services/upsert-record.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/record-crud/services/upsert-record.service.ts
@@ -22,15 +22,13 @@ export class UpsertRecordService {
) {}
async execute(params: UpsertRecordParams): Promise<ToolOutput> {
- const { objectName, objectRecord, authContext, rolePermissionConfig } =
- params;
+ const { objectName, objectRecord, authContext } = params;
try {
const { queryRunnerContext, selectedFields, flatObjectMetadata } =
await this.commonApiContextBuilder.build({
authContext,
objectName,
- rolePermissionConfig,
});
if (
diff --git a/packages/twenty-server/src/engine/core-modules/record-crud/types/create-many-records-params.type.ts b/packages/twenty-server/src/engine/core-modules/record-crud/types/create-many-records-params.type.ts
index 5d6384ff1ab..00b136c75c7 100644
--- a/packages/twenty-server/src/engine/core-modules/record-crud/types/create-many-records-params.type.ts
+++ b/packages/twenty-server/src/engine/core-modules/record-crud/types/create-many-records-params.type.ts
@@ -3,13 +3,11 @@ import { type ActorMetadata } from 'twenty-shared/types';
import { type ShareWithInput } from 'src/engine/permissions/record-share/types/share-with-input.type';
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { type ObjectRecordProperties } from 'src/engine/core-modules/record-crud/types/object-record-properties.type';
-import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
export type CreateManyRecordsParams = {
objectName: string;
objectRecords: ObjectRecordProperties[];
authContext: WorkspaceAuthContext;
- rolePermissionConfig?: RolePermissionConfig;
createdBy?: ActorMetadata;
slimResponse?: boolean;
shareWith?: ShareWithInput[];
diff --git a/packages/twenty-server/src/engine/core-modules/record-crud/types/delete-many-records-params.type.ts b/packages/twenty-server/src/engine/core-modules/record-crud/types/delete-many-records-params.type.ts
index 4756480966e..240bd121350 100644
--- a/packages/twenty-server/src/engine/core-modules/record-crud/types/delete-many-records-params.type.ts
+++ b/packages/twenty-server/src/engine/core-modules/record-crud/types/delete-many-records-params.type.ts
@@ -1,11 +1,9 @@
import { type ObjectRecordFilter } from 'src/engine/api/graphql/workspace-query-builder/interfaces/object-record.interface';
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
-import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
export type DeleteManyRecordsParams = {
objectName: string;
filter: Partial<ObjectRecordFilter>;
authContext: WorkspaceAuthContext;
- rolePermissionConfig?: RolePermissionConfig;
};
diff --git a/packages/twenty-server/src/engine/core-modules/record-crud/types/record-crud-execution-context.type.ts b/packages/twenty-server/src/engine/core-modules/record-crud/types/record-crud-execution-context.type.ts
index 8d336eb82ad..5b3bb5429e3 100644
--- a/packages/twenty-server/src/engine/core-modules/record-crud/types/record-crud-execution-context.type.ts
+++ b/packages/twenty-server/src/engine/core-modules/record-crud/types/record-crud-execution-context.type.ts
@@ -1,8 +1,6 @@
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
-import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
export type RecordCrudExecutionContext = {
authContext: WorkspaceAuthContext;
- rolePermissionConfig?: RolePermissionConfig;
slimResponse?: boolean;
};
diff --git a/packages/twenty-server/src/engine/core-modules/record-crud/types/update-many-records-params.type.ts b/packages/twenty-server/src/engine/core-modules/record-crud/types/update-many-records-params.type.ts
index a7fd526ed58..326f3028ede 100644
--- a/packages/twenty-server/src/engine/core-modules/record-crud/types/update-many-records-params.type.ts
+++ b/packages/twenty-server/src/engine/core-modules/record-crud/types/update-many-records-params.type.ts
@@ -2,13 +2,11 @@ import { type ObjectRecordFilter } from 'src/engine/api/graphql/workspace-query-
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { type ObjectRecordProperties } from 'src/engine/core-modules/record-crud/types/object-record-properties.type';
-import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
export type UpdateManyRecordsParams = {
objectName: string;
filter: Partial<ObjectRecordFilter>;
data: ObjectRecordProperties;
authContext: WorkspaceAuthContext;
- rolePermissionConfig?: RolePermissionConfig;
slimResponse?: boolean;
};
diff --git a/packages/twenty-server/src/engine/core-modules/record-crud/types/upsert-many-records-params.type.ts b/packages/twenty-server/src/engine/core-modules/record-crud/types/upsert-many-records-params.type.ts
index b0fb2b8bc3d..5b055a80fd7 100644
--- a/packages/twenty-server/src/engine/core-modules/record-crud/types/upsert-many-records-params.type.ts
+++ b/packages/twenty-server/src/engine/core-modules/record-crud/types/upsert-many-records-params.type.ts
@@ -2,13 +2,11 @@ import { type ActorMetadata } from 'twenty-shared/types';
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { type ObjectRecordProperties } from 'src/engine/core-modules/record-crud/types/object-record-properties.type';
-import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
export type UpsertManyRecordsParams = {
objectName: string;
objectRecords: ObjectRecordProperties[];
authContext: WorkspaceAuthContext;
- rolePermissionConfig?: RolePermissionConfig;
createdBy?: ActorMetadata;
slimResponse?: boolean;
};
diff --git a/packages/twenty-server/src/engine/core-modules/record-position/services/record-position.service.ts b/packages/twenty-server/src/engine/core-modules/record-position/services/record-position.service.ts
index 25c2306449c..7800d473b00 100644
--- a/packages/twenty-server/src/engine/core-modules/record-position/services/record-position.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/record-position/services/record-position.service.ts
@@ -161,12 +161,10 @@ export class RecordPositionService {
const authContext = buildSystemAuthContext(workspaceId);
return this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const repository = this.workspaceOrmManager.getRepository(
- objectMetadata.nameSingular,
- {
- shouldBypassPermissionChecks: true,
- },
- );
+ const repository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ objectMetadata.nameSingular,
+ );
const record = await repository.findOneBy({
position: positionValue,
@@ -185,12 +183,10 @@ export class RecordPositionService {
const authContext = buildSystemAuthContext(workspaceId);
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const repository = this.workspaceOrmManager.getRepository(
- objectMetadata.nameSingular,
- {
- shouldBypassPermissionChecks: true,
- },
- );
+ const repository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ objectMetadata.nameSingular,
+ );
await repository.update(recordId, {
position: positionValue,
@@ -206,12 +202,10 @@ export class RecordPositionService {
const result = await this.workspaceOrmManager.executeInWorkspaceContext(
async () => {
- const repository = this.workspaceOrmManager.getRepository(
- objectMetadata.nameSingular,
- {
- shouldBypassPermissionChecks: true,
- },
- );
+ const repository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ objectMetadata.nameSingular,
+ );
return await repository.minimum('position');
},
@@ -229,12 +223,10 @@ export class RecordPositionService {
const result = await this.workspaceOrmManager.executeInWorkspaceContext(
async () => {
- const repository = this.workspaceOrmManager.getRepository(
- objectMetadata.nameSingular,
- {
- shouldBypassPermissionChecks: true,
- },
- );
+ const repository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ objectMetadata.nameSingular,
+ );
return await repository.maximum('position');
},
diff --git a/packages/twenty-server/src/engine/core-modules/related-person-ids/services/related-person-ids.service.ts b/packages/twenty-server/src/engine/core-modules/related-person-ids/services/related-person-ids.service.ts
index e3808f057d4..3ea0c8a9133 100644
--- a/packages/twenty-server/src/engine/core-modules/related-person-ids/services/related-person-ids.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/related-person-ids/services/related-person-ids.service.ts
@@ -83,9 +83,8 @@ export class RelatedPersonIdsService {
}
const repository =
- this.workspaceOrmManager.getRepository<RelationWalkRecord>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<RelationWalkRecord>(
hop.queryObjectNameSingular,
- { shouldBypassPermissionChecks: true },
);
if (hop.direction === RelationType.MANY_TO_ONE) {
diff --git a/packages/twenty-server/src/engine/core-modules/search/services/search.service.ts b/packages/twenty-server/src/engine/core-modules/search/services/search.service.ts
index 3d4370aabfc..2ccc7e84642 100644
--- a/packages/twenty-server/src/engine/core-modules/search/services/search.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/search/services/search.service.ts
@@ -54,9 +54,6 @@ import { SEARCH_VECTOR_FIELD } from 'src/engine/metadata-modules/search-field-me
import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-entity-property.util';
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace-repository';
-import { getWorkspaceContext } from 'src/engine/twenty-orm/storage/orm-workspace-context.storage';
-import { resolveRolePermissionConfig } from 'src/engine/permissions/principal/utils/resolve-role-permission-config.util';
-import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
import { ApplicationTranslationCatalogService } from 'src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service';
import { resolveEffectiveFlatEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity-property.util';
@@ -112,20 +109,9 @@ export class SearchService {
objectMetadataItemChunk.map(async (flatObjectMetadata) => {
return this.workspaceOrmManager.executeInWorkspaceContext(
async () => {
- const context = getWorkspaceContext();
- const rolePermissionConfig =
- resolveRolePermissionConfig({
- authContext: context.authContext,
- userWorkspaceRoleMap: context.userWorkspaceRoleMap,
- apiKeyRoleMap: context.apiKeyRoleMap,
- flatRoleTargetByAgentIdMaps:
- context.flatRoleTargetByAgentIdMaps,
- }) ?? undefined;
-
const repository =
this.workspaceOrmManager.getRepository<ObjectRecord>(
flatObjectMetadata.nameSingular,
- rolePermissionConfig,
{ useReplica: true },
);
@@ -133,7 +119,6 @@ export class SearchService {
objectMetadataItem: flatObjectMetadata,
records: await this.buildSearchQueryAndGetRecordsWithFallback({
entityManager: repository,
- rolePermissionConfig,
flatObjectMetadata,
flatFieldMetadataMaps,
searchInput,
@@ -211,7 +196,6 @@ export class SearchService {
Entity extends ObjectLiteral,
>({
entityManager,
- rolePermissionConfig,
flatObjectMetadata,
flatFieldMetadataMaps,
searchInput,
@@ -222,7 +206,6 @@ export class SearchService {
after,
}: {
entityManager: WorkspaceRepository<Entity>;
- rolePermissionConfig?: RolePermissionConfig;
flatObjectMetadata: FlatObjectMetadata;
flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
searchInput: string;
@@ -253,7 +236,6 @@ export class SearchService {
const fallbackResults = await this.buildIlikeFallbackQuery({
entityManager,
- rolePermissionConfig,
flatObjectMetadata,
flatFieldMetadataMaps,
searchInput,
@@ -382,7 +364,6 @@ export class SearchService {
private async buildIlikeFallbackQuery<Entity extends ObjectLiteral>({
entityManager,
- rolePermissionConfig,
flatObjectMetadata,
flatFieldMetadataMaps,
searchInput,
@@ -390,7 +371,6 @@ export class SearchService {
filter,
}: {
entityManager: WorkspaceRepository<Entity>;
- rolePermissionConfig?: RolePermissionConfig;
flatObjectMetadata: FlatObjectMetadata;
flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
searchInput: string;
@@ -411,7 +391,6 @@ export class SearchService {
const repository = transactionScope.getRepository<Entity>(
flatObjectMetadata.nameSingular,
- rolePermissionConfig,
);
const queryBuilder = repository.createQueryBuilder(
diff --git a/packages/twenty-server/src/engine/core-modules/short-link/services/short-link.service.ts b/packages/twenty-server/src/engine/core-modules/short-link/services/short-link.service.ts
index 7d2478e9b1d..b293c275960 100644
--- a/packages/twenty-server/src/engine/core-modules/short-link/services/short-link.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/short-link/services/short-link.service.ts
@@ -24,11 +24,11 @@ export class ShortLinkService {
const linkHashes = links.map(hashShortLink);
return this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const repository = this.workspaceOrmManager.getRepository(
- ShortLinkWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- { shouldSkipEventEmission: true },
- );
+ const repository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ ShortLinkWorkspaceEntity,
+ { shouldSkipEventEmission: true },
+ );
await repository.insert(
links.map((link, index) => ({
@@ -61,9 +61,7 @@ export class ShortLinkService {
return this.workspaceOrmManager.executeInWorkspaceContext(
() =>
this.workspaceOrmManager
- .getRepository(ShortLinkWorkspaceEntity, {
- shouldBypassPermissionChecks: true,
- })
+ .getRepositoryWithoutPermissionChecks(ShortLinkWorkspaceEntity)
.findOne({ where: { id: shortLinkId } }),
buildSystemAuthContext(workspaceId),
);
diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/interfaces/tool-provider-context.type.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/interfaces/tool-provider-context.type.ts
index 18b42e69556..9455fbbd03f 100644
--- a/packages/twenty-server/src/engine/core-modules/tool-provider/interfaces/tool-provider-context.type.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/interfaces/tool-provider-context.type.ts
@@ -5,13 +5,11 @@ import { type FlatApplication } from 'src/engine/core-modules/application/types/
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { type ExplicitObjectGrants } from 'src/engine/core-modules/tool-provider/interfaces/explicit-object-grants.type';
import { type CodeExecutionStreamEmitter } from 'src/engine/core-modules/tool-provider/interfaces/code-execution-stream-emitter.type';
-import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
export type ToolProviderContext = {
resolveExecutionContext?: () => Promise<ToolProviderContext>;
workspaceId: string;
approvedToolName?: string;
- rolePermissionConfig: RolePermissionConfig;
authContext?: WorkspaceAuthContext;
application?: FlatApplication;
actorContext?: ActorMetadata;
diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/action-tool.provider.spec.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/action-tool.provider.spec.ts
index 0dfcd397049..40232b9a23a 100644
--- a/packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/action-tool.provider.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/action-tool.provider.spec.ts
@@ -27,7 +27,6 @@ const USER_AUTH_CONTEXT = {
const CONTEXT: ToolProviderContext = {
workspaceId: WORKSPACE_ID,
- rolePermissionConfig: { intersectionOf: { userWorkspaceRoleId: 'role-id' } },
authContext: USER_AUTH_CONTEXT,
userId: 'user-id',
userWorkspaceId: 'user-workspace-id',
@@ -66,7 +65,7 @@ const buildProvider = ({
shareRecordTool,
{ isEnabled: () => false } as unknown as CodeInterpreterService,
{
- checkRolesPermissions: jest.fn().mockResolvedValue(false),
+ hasPermissionFlag: jest.fn().mockResolvedValue(false),
} as unknown as PermissionsService,
{
translateMessage: ({ messageId }: { messageId: string }) => messageId,
diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/database-tool.provider.spec.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/database-tool.provider.spec.ts
index 58b3d2731c3..305650f28e1 100644
--- a/packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/database-tool.provider.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/database-tool.provider.spec.ts
@@ -1,3 +1,4 @@
+import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { type ObjectPermissions } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
@@ -14,10 +15,7 @@ import { getFlatObjectMetadataMock } from 'src/engine/metadata-modules/flat-obje
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 OperationType } from 'src/engine/permissions/role/utils/validate-operation-is-permitted-or-throw.util';
-import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
-import { type WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
-const roleId = 'role-id';
const workspaceId = 'workspace-id';
const allObjectPermissions: ObjectPermissions = {
@@ -44,7 +42,6 @@ const createFlatObject = (
type GenerateDescriptorsTestOptions = {
explicitObjectGrants?: ExplicitObjectGrants;
composedObjectPermissions?: Partial<ObjectPermissions>;
- rolePermissionConfig?: RolePermissionConfig;
sharedOperationTypes?: OperationType[];
};
@@ -91,15 +88,6 @@ describe('DatabaseToolProvider', () => {
]),
);
- const workspaceCacheService = {
- getOrRecompute: jest.fn().mockResolvedValue({
- rolesPermissions: {
- [roleId]: composedObjectPermissionsByObjectId,
- },
- flatApplicationMaps: { byId: {}, idByUniversalIdentifier: {} },
- }),
- } as unknown as WorkspaceCacheService;
-
const flatEntityMapsCacheService = {
getOrRecomputeManyOrAllFlatEntityMaps: jest.fn().mockResolvedValue({
flatObjectMetadataMaps,
@@ -134,6 +122,9 @@ describe('DatabaseToolProvider', () => {
...options?.composedObjectPermissions,
};
const recordAccessPolicyService = {
+ findObjectsPermissions: jest
+ .fn()
+ .mockResolvedValue(composedObjectPermissionsByObjectId),
hasAccessToSomeRecords: jest.fn(
async ({ operationType }: { operationType: OperationType }) => {
const objectPermission =
@@ -148,7 +139,6 @@ describe('DatabaseToolProvider', () => {
} as unknown as RecordAccessPolicyService;
const provider = new DatabaseToolProvider(
- workspaceCacheService,
recordAccessPolicyService,
flatEntityMapsCacheService,
i18nService,
@@ -158,9 +148,11 @@ describe('DatabaseToolProvider', () => {
return (await provider.generateDescriptors(
{
workspaceId,
- rolePermissionConfig: options?.rolePermissionConfig ?? {
- intersectionOf: { agentRoleId: roleId },
- },
+ authContext: {
+ type: 'apiKey',
+ workspace: { id: workspaceId },
+ apiKey: { id: 'api-key-id' },
+ } as WorkspaceAuthContext,
explicitObjectGrants: options?.explicitObjectGrants,
},
{ includeSchemas: false },
diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/logic-function-tool.provider.spec.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/logic-function-tool.provider.spec.ts
index 1e0314a7e7b..d93ec31194d 100644
--- a/packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/logic-function-tool.provider.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/logic-function-tool.provider.spec.ts
@@ -10,7 +10,6 @@ import { type FlatFrontComponent } from 'src/engine/metadata-modules/flat-front-
import { type FlatLogicFunction } from 'src/engine/metadata-modules/logic-function/types/flat-logic-function.type';
const workspaceId = 'workspace-id';
-const roleId = 'role-id';
const FRONT_COMPONENT_UNIVERSAL_IDENTIFIER = 'invoice-preview-component';
const FRONT_COMPONENT_ID = 'front-component-id';
@@ -68,7 +67,6 @@ const generateDescriptors = async (
return (await provider.generateDescriptors(
{
workspaceId,
- rolePermissionConfig: { intersectionOf: { userWorkspaceRoleId: roleId } },
authContext,
application,
},
diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/providers/action-tool.provider.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/providers/action-tool.provider.ts
index 59cb7e0dafd..b8d4e102c57 100644
--- a/packages/twenty-server/src/engine/core-modules/tool-provider/providers/action-tool.provider.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/providers/action-tool.provider.ts
@@ -91,12 +91,10 @@ export class ActionToolProvider implements ToolProvider {
const includeSchemas = options?.includeSchemas ?? true;
const descriptors: (ToolIndexEntry | ToolDescriptor)[] = [];
- const hasHttpPermission =
- await this.permissionsService.checkRolesPermissions(
- context.rolePermissionConfig,
- context.workspaceId,
- PermissionFlagType.HTTP_REQUEST_TOOL,
- );
+ const hasHttpPermission = await this.permissionsService.hasPermissionFlag({
+ authContext: context.authContext,
+ setting: PermissionFlagType.HTTP_REQUEST_TOOL,
+ });
if (hasHttpPermission) {
descriptors.push(
@@ -109,12 +107,10 @@ export class ActionToolProvider implements ToolProvider {
);
}
- const hasEmailPermission =
- await this.permissionsService.checkRolesPermissions(
- context.rolePermissionConfig,
- context.workspaceId,
- PermissionFlagType.SEND_EMAIL_TOOL,
- );
+ const hasEmailPermission = await this.permissionsService.hasPermissionFlag({
+ authContext: context.authContext,
+ setting: PermissionFlagType.SEND_EMAIL_TOOL,
+ });
if (hasEmailPermission) {
descriptors.push(
@@ -146,11 +142,10 @@ export class ActionToolProvider implements ToolProvider {
}
const hasCreateCalendarEventPermission =
- await this.permissionsService.checkRolesPermissions(
- context.rolePermissionConfig,
- context.workspaceId,
- PermissionFlagType.CREATE_CALENDAR_EVENT_TOOL,
- );
+ await this.permissionsService.hasPermissionFlag({
+ authContext: context.authContext,
+ setting: PermissionFlagType.CREATE_CALENDAR_EVENT_TOOL,
+ });
if (hasCreateCalendarEventPermission) {
descriptors.push(
@@ -164,11 +159,10 @@ export class ActionToolProvider implements ToolProvider {
}
const hasUploadFilePermission =
- await this.permissionsService.checkRolesPermissions(
- context.rolePermissionConfig,
- context.workspaceId,
- PermissionFlagType.UPLOAD_FILE,
- );
+ await this.permissionsService.hasPermissionFlag({
+ authContext: context.authContext,
+ setting: PermissionFlagType.UPLOAD_FILE,
+ });
if (hasUploadFilePermission) {
descriptors.push(
@@ -236,11 +230,10 @@ export class ActionToolProvider implements ToolProvider {
const hasCodeInterpreterPermission =
this.codeInterpreterService.isEnabled() &&
- (await this.permissionsService.checkRolesPermissions(
- context.rolePermissionConfig,
- context.workspaceId,
- PermissionFlagType.CODE_INTERPRETER_TOOL,
- ));
+ (await this.permissionsService.hasPermissionFlag({
+ authContext: context.authContext,
+ setting: PermissionFlagType.CODE_INTERPRETER_TOOL,
+ }));
if (hasCodeInterpreterPermission) {
descriptors.push(
@@ -275,7 +268,6 @@ export class ActionToolProvider implements ToolProvider {
userWorkspaceId: context.userWorkspaceId,
agentId: context.agentId,
threadId: context.threadId,
- rolePermissionConfig: context.rolePermissionConfig,
authContext: context.authContext,
onCodeExecutionUpdate: context.onCodeExecutionUpdate,
});
diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/providers/dashboard-tool.provider.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/providers/dashboard-tool.provider.ts
index df9d9e1104a..731df84771b 100644
--- a/packages/twenty-server/src/engine/core-modules/tool-provider/providers/dashboard-tool.provider.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/providers/dashboard-tool.provider.ts
@@ -1,3 +1,4 @@
+import { isDefined } from 'twenty-shared/utils';
import { Inject, Injectable, Optional } from '@nestjs/common';
import { type ToolSet } from 'ai';
@@ -37,11 +38,10 @@ export class DashboardToolProvider implements ToolProvider {
return false;
}
- return this.permissionsService.checkRolesPermissions(
- context.rolePermissionConfig,
- context.workspaceId,
- PermissionFlagType.LAYOUTS,
- );
+ return this.permissionsService.hasPermissionFlag({
+ authContext: context.authContext,
+ setting: PermissionFlagType.LAYOUTS,
+ });
}
async generateDescriptors(
@@ -90,13 +90,13 @@ export class DashboardToolProvider implements ToolProvider {
private async buildToolSet(
context: ToolProviderContext,
): Promise<ToolSet | null> {
- if (!this.dashboardToolService) {
+ if (!this.dashboardToolService || !isDefined(context.authContext)) {
return null;
}
return this.dashboardToolService.generateDashboardTools(
context.workspaceId,
- context.rolePermissionConfig,
+ context.authContext,
);
}
}
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 04adec4b86b..8ed0a260463 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
@@ -36,11 +36,8 @@ import { buildExplicitObjectPermissionByObjectId } from 'src/engine/core-modules
import { getDatabaseCrudToolFlatObjects } from 'src/engine/metadata-modules/ai/ai-agent/utils/get-database-crud-tool-flat-objects.util';
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 { 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';
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';
@@ -51,7 +48,6 @@ export class DatabaseToolProvider implements ToolProvider {
readonly category = ToolCategory.DATABASE_CRUD;
constructor(
- private readonly workspaceCacheService: WorkspaceCacheService,
private readonly recordAccessPolicyService: RecordAccessPolicyService,
private readonly flatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,
private readonly i18nService: I18nService,
@@ -81,11 +77,6 @@ export class DatabaseToolProvider implements ToolProvider {
const toolNames = options?.toolNames;
const descriptors: (ToolIndexEntry | ToolDescriptor)[] = [];
- const { rolesPermissions, flatApplicationMaps } =
- await this.workspaceCacheService.getOrRecompute(context.workspaceId, [
- 'rolesPermissions',
- 'flatApplicationMaps',
- ]);
const { flatObjectMetadataMaps, flatFieldMetadataMaps } =
await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
{
@@ -94,25 +85,18 @@ 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,
- });
+ const principals = isDefined(context.authContext)
+ ? getPermissionsPrincipalsFromAuthContext(context.authContext)
+ : undefined;
+ const objectPermissions = isDefined(principals)
+ ? await this.recordAccessPolicyService.findObjectsPermissions(principals)
+ : undefined;
- if (Object.keys(objectPermissions).length === 0 || !isDefined(principals)) {
+ if (
+ !isDefined(principals) ||
+ !isDefined(objectPermissions) ||
+ Object.keys(objectPermissions).length === 0
+ ) {
return descriptors;
}
diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/providers/workflow-tool.provider.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/providers/workflow-tool.provider.ts
index 67f73d9c62f..46f760d74eb 100644
--- a/packages/twenty-server/src/engine/core-modules/tool-provider/providers/workflow-tool.provider.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/providers/workflow-tool.provider.ts
@@ -1,3 +1,4 @@
+import { isDefined } from 'twenty-shared/utils';
import { Inject, Injectable, Optional } from '@nestjs/common';
import { type ToolSet } from 'ai';
@@ -46,11 +47,10 @@ export class WorkflowToolProvider implements ToolProvider {
return false;
}
- return this.permissionsService.checkRolesPermissions(
- context.rolePermissionConfig,
- context.workspaceId,
- PermissionFlagType.WORKFLOWS,
- );
+ return this.permissionsService.hasPermissionFlag({
+ authContext: context.authContext,
+ setting: PermissionFlagType.WORKFLOWS,
+ });
}
async generateDescriptors(
@@ -99,13 +99,13 @@ export class WorkflowToolProvider implements ToolProvider {
private async buildToolSet(
context: ToolProviderContext,
): Promise<ToolSet | null> {
- if (!this.workflowToolService) {
+ if (!this.workflowToolService || !isDefined(context.authContext)) {
return null;
}
return this.workflowToolService.generateWorkflowTools({
workspaceId: context.workspaceId,
- rolePermissionConfig: context.rolePermissionConfig,
+ authContext: context.authContext,
userWorkspaceId: context.userWorkspaceId,
});
}
diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/resolvers/tool-index.resolver.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/resolvers/tool-index.resolver.ts
index 9aa446ffa4c..dd72f8f74cf 100644
--- a/packages/twenty-server/src/engine/core-modules/tool-provider/resolvers/tool-index.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/resolvers/tool-index.resolver.ts
@@ -17,9 +17,6 @@ import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorat
import { RequestLocale } from 'src/engine/decorators/locale/request-locale.decorator';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
-import { UserRoleService } from 'src/engine/permissions/role-assignment/user-role.service';
-import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
-import { buildUserRoleIdsBySource } from 'src/engine/permissions/principal/utils/build-user-role-ids-by-source.util';
@ObjectType('ToolIndexEntry')
export class ToolIndexEntryDTO {
@@ -66,10 +63,7 @@ export class ToolIndexEntryDTO {
}),
)
export class ToolIndexResolver {
- constructor(
- private readonly toolRegistryService: ToolRegistryService,
- private readonly userRoleService: UserRoleService,
- ) {}
+ constructor(private readonly toolRegistryService: ToolRegistryService) {}
@Query(() => [ToolIndexEntryDTO])
@UseGuards(NoPermissionGuard)
@@ -81,14 +75,7 @@ export class ToolIndexResolver {
application: FlatApplication | undefined,
@RequestLocale() locale: keyof typeof APP_LOCALES | undefined,
): Promise<ToolIndexEntryDTO[]> {
- const { rolePermissionConfig } = await this.resolveCallerRoles({
- userWorkspaceId,
- workspaceId: workspace.id,
- application,
- });
-
return this.toolRegistryService.buildToolIndex(workspace.id, {
- rolePermissionConfig,
userId: user?.id,
userWorkspaceId,
locale,
@@ -108,17 +95,10 @@ export class ToolIndexResolver {
@AuthApplication({ allowUndefined: true })
application: FlatApplication | undefined,
): Promise<object | null> {
- const { rolePermissionConfig } = await this.resolveCallerRoles({
- userWorkspaceId,
- workspaceId: workspace.id,
- application,
- });
-
const schemas = await this.toolRegistryService.resolveSchemas({
toolNames: [toolName],
context: {
workspaceId: workspace.id,
- rolePermissionConfig,
userId: user?.id,
userWorkspaceId,
authContext: getWorkspaceAuthContext(),
@@ -128,28 +108,4 @@ export class ToolIndexResolver {
return schemas.get(toolName) ?? null;
}
-
- private async resolveCallerRoles({
- userWorkspaceId,
- workspaceId,
- application,
- }: {
- userWorkspaceId: string;
- workspaceId: string;
- application: FlatApplication | undefined;
- }): Promise<{ rolePermissionConfig: RolePermissionConfig }> {
- const userRoleId = await this.userRoleService.getRoleIdForUserWorkspace({
- userWorkspaceId,
- workspaceId,
- });
-
- return {
- rolePermissionConfig: {
- intersectionOf: buildUserRoleIdsBySource({
- userRoleId,
- application,
- }),
- },
- };
- }
}
diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/services/__tests__/defined-tool-registry.service.spec.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/services/__tests__/defined-tool-registry.service.spec.ts
index 3ca24dda893..c17609f6d49 100644
--- a/packages/twenty-server/src/engine/core-modules/tool-provider/services/__tests__/defined-tool-registry.service.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/services/__tests__/defined-tool-registry.service.spec.ts
@@ -19,9 +19,6 @@ const webhookId = '2b3c4d5e-6f7a-4b8c-9d0e-1f2a3b4c5d6e';
const context: ToolProviderContext = {
workspaceId: 'workspace-id',
- rolePermissionConfig: {
- intersectionOf: { userWorkspaceRoleId: 'member-role-id' },
- },
};
const renameWebhookInputSchema = z.object({ id: z.uuid() });
@@ -124,7 +121,7 @@ const buildDefinedToolRegistryService = ({
tools.map((tool) => ({ instance: tool, metatype: tool.constructor })),
} as unknown as DiscoveryService,
{
- checkRolesPermissions: jest.fn().mockResolvedValue(isGranted),
+ hasPermissionFlag: jest.fn().mockResolvedValue(isGranted),
} as unknown as PermissionsService,
featureFlagService as unknown as FeatureFlagService,
);
diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/services/__tests__/tool-registry.service.spec.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/services/__tests__/tool-registry.service.spec.ts
index ad43a284ba5..ae0066101a1 100644
--- a/packages/twenty-server/src/engine/core-modules/tool-provider/services/__tests__/tool-registry.service.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/services/__tests__/tool-registry.service.spec.ts
@@ -41,16 +41,10 @@ describe('ToolRegistryService', () => {
buildToolRegistryService();
const resolvedContext: ToolProviderContext = {
workspaceId,
- rolePermissionConfig: {
- intersectionOf: { userWorkspaceRoleId: 'member-role-id' },
- },
};
await toolRegistryService.getCatalog({
workspaceId,
- rolePermissionConfig: {
- intersectionOf: { userWorkspaceRoleId: 'member-role-id' },
- },
explicitObjectGrants: { canReadAllObjectRecords: true },
resolveExecutionContext: async () => resolvedContext,
});
diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/services/defined-tool-registry.service.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/services/defined-tool-registry.service.ts
index 18607be5293..48b01916d70 100644
--- a/packages/twenty-server/src/engine/core-modules/tool-provider/services/defined-tool-registry.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/services/defined-tool-registry.service.ts
@@ -175,11 +175,10 @@ export class DefinedToolRegistryService implements OnModuleInit {
return cachedGrant;
}
- const grant = this.permissionsService.checkRolesPermissions(
- context.rolePermissionConfig,
- context.workspaceId,
- permissionFlag,
- );
+ const grant = this.permissionsService.hasPermissionFlag({
+ authContext: context.authContext,
+ setting: permissionFlag,
+ });
grantedByPermissionFlag.set(permissionFlag, grant);
diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/services/tool-executor.service.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/services/tool-executor.service.ts
index 22816c921da..b3c37023ca3 100644
--- a/packages/twenty-server/src/engine/core-modules/tool-provider/services/tool-executor.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/services/tool-executor.service.ts
@@ -144,7 +144,6 @@ export class ToolExecutorService {
select: select as string[],
shouldBuildEffectiveSelectFields: true,
authContext,
- rolePermissionConfig: context.rolePermissionConfig,
});
}
@@ -158,7 +157,6 @@ export class ToolExecutorService {
select: select as string[],
shouldBuildEffectiveSelectFields: isDefined(select),
authContext,
- rolePermissionConfig: context.rolePermissionConfig,
});
}
@@ -174,7 +172,6 @@ export class ToolExecutorService {
objectName: ref.objectNameSingular,
objectRecord: records[0],
authContext,
- rolePermissionConfig: context.rolePermissionConfig,
createdBy: context.actorContext,
slimResponse: true,
});
@@ -194,7 +191,6 @@ export class ToolExecutorService {
objectName: ref.objectNameSingular,
objectRecords: records,
authContext,
- rolePermissionConfig: context.rolePermissionConfig,
createdBy: context.actorContext,
slimResponse: true,
});
@@ -220,7 +216,6 @@ export class ToolExecutorService {
objectRecordId: id as string,
objectRecord: records[0],
authContext,
- rolePermissionConfig: context.rolePermissionConfig,
slimResponse: true,
});
@@ -233,7 +228,6 @@ export class ToolExecutorService {
filter: args.filter as Record<string, unknown>,
data: args.data as Record<string, unknown>,
authContext,
- rolePermissionConfig: context.rolePermissionConfig,
slimResponse: true,
});
@@ -249,7 +243,6 @@ export class ToolExecutorService {
objectName: ref.objectNameSingular,
objectRecords: records,
authContext,
- rolePermissionConfig: context.rolePermissionConfig,
createdBy: context.actorContext,
slimResponse: true,
});
@@ -262,7 +255,6 @@ export class ToolExecutorService {
objectName: ref.objectNameSingular,
objectRecordId: args.id as string,
authContext,
- rolePermissionConfig: context.rolePermissionConfig,
soft: true,
});
@@ -271,7 +263,6 @@ export class ToolExecutorService {
objectName: ref.objectNameSingular,
filter: args.filter as Record<string, unknown>,
authContext,
- rolePermissionConfig: context.rolePermissionConfig,
});
case 'merge_many':
@@ -281,7 +272,6 @@ export class ToolExecutorService {
conflictPriorityIndex: args.conflictPriorityIndex as number,
dryRun: args.dryRun as boolean | undefined,
authContext,
- rolePermissionConfig: context.rolePermissionConfig,
});
case 'group_by': {
@@ -305,7 +295,6 @@ export class ToolExecutorService {
orderBy: groupByOrderBy as 'ASC' | 'DESC' | undefined,
filter: groupByFilter,
authContext,
- rolePermissionConfig: context.rolePermissionConfig,
});
}
}
diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/services/tool-registry.service.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/services/tool-registry.service.ts
index 7fae24ef6e8..4c9ac6614cb 100644
--- a/packages/twenty-server/src/engine/core-modules/tool-provider/services/tool-registry.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/services/tool-registry.service.ts
@@ -28,7 +28,6 @@ import { buildToolExecutionFailure } from 'src/engine/core-modules/tool-provider
import { findSimilarToolNames } from 'src/engine/core-modules/tool-provider/utils/find-similar-tool-names.util';
import { ToolOutputSpillService } from 'src/engine/core-modules/tool/services/tool-output-spill.service';
import { type ToolOutput } from 'src/engine/core-modules/tool/types/tool-output.type';
-import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
@Injectable()
export class ToolRegistryService {
@@ -199,7 +198,6 @@ export class ToolRegistryService {
userId?: string;
userWorkspaceId?: string;
locale?: keyof typeof APP_LOCALES;
- rolePermissionConfig: RolePermissionConfig;
categories?: ToolCategory[];
excludeTools?: Set<string>;
authContext?: WorkspaceAuthContext;
@@ -208,7 +206,6 @@ export class ToolRegistryService {
): Promise<ToolIndexEntry[]> {
const context = this.buildContextFromToolContext({
workspaceId,
- rolePermissionConfig: options.rolePermissionConfig,
userId: options.userId,
userWorkspaceId: options.userWorkspaceId,
locale: options.locale,
@@ -546,7 +543,6 @@ export class ToolRegistryService {
: undefined,
workspaceId: context.workspaceId,
approvedToolName: context.approvedToolName,
- rolePermissionConfig: context.rolePermissionConfig,
authContext: context.authContext,
application: context.application,
actorContext: context.actorContext,
diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/tools/get-tool-catalog.tool.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/tools/get-tool-catalog.tool.ts
index eb0b745a450..b3dfb57fa4e 100644
--- a/packages/twenty-server/src/engine/core-modules/tool-provider/tools/get-tool-catalog.tool.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/tools/get-tool-catalog.tool.ts
@@ -6,7 +6,6 @@ import { type FlatApplication } from 'src/engine/core-modules/application/types/
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { type ToolRegistryService } from 'src/engine/core-modules/tool-provider/services/tool-registry.service';
import { type ToolIndexEntry } from 'src/engine/core-modules/tool-provider/types/tool-index-entry.type';
-import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
export const GET_TOOL_CATALOG_TOOL_NAME = 'get_tool_catalog';
@@ -34,7 +33,6 @@ export const createGetToolCatalogTool = (
toolRegistry: ToolRegistryService,
workspaceId: string,
options: {
- rolePermissionConfig: RolePermissionConfig;
userId?: string;
userWorkspaceId?: string;
excludeTools?: Set<string>;
diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/types/tool-context.type.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/types/tool-context.type.ts
index abb81b65685..52ad1f48c35 100644
--- a/packages/twenty-server/src/engine/core-modules/tool-provider/types/tool-context.type.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/types/tool-context.type.ts
@@ -5,13 +5,11 @@ import { type CodeExecutionStreamEmitter } from 'src/engine/core-modules/tool-pr
import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
-import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
export type ToolContext = {
resolveExecutionContext?: () => Promise<ToolContext>;
workspaceId: string;
approvedToolName?: string;
- rolePermissionConfig: RolePermissionConfig;
authContext?: WorkspaceAuthContext;
application?: FlatApplication;
actorContext?: ActorMetadata;
diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/utils/__tests__/build-required-tool-auth-context.util.spec.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/utils/__tests__/build-required-tool-auth-context.util.spec.ts
index 26bf037b05b..52dce3c04b3 100644
--- a/packages/twenty-server/src/engine/core-modules/tool-provider/utils/__tests__/build-required-tool-auth-context.util.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/utils/__tests__/build-required-tool-auth-context.util.spec.ts
@@ -14,7 +14,6 @@ describe('buildRequiredToolAuthContext', () => {
overrides?: Partial<ToolProviderContext>,
): ToolProviderContext => ({
workspaceId,
- rolePermissionConfig: { intersectionOf: { userWorkspaceRoleId: 'role-1' } },
...overrides,
});
@@ -89,6 +88,15 @@ describe('buildRequiredToolAuthContext', () => {
expect(authContext).toMatchObject({ type: 'user', application });
});
+ it('should keep the agent the run is limited to', async () => {
+ const authContext = await buildRequiredToolAuthContext({
+ context: buildContext({ userId, userWorkspaceId, agentId: 'agent-id' }),
+ ...buildDependencies(),
+ });
+
+ expect(authContext).toMatchObject({ type: 'user', agentId: 'agent-id' });
+ });
+
it('should throw without a resolvable identity', async () => {
await expect(
buildRequiredToolAuthContext({
diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/utils/__tests__/with-resolved-tool-auth-context.util.spec.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/utils/__tests__/with-resolved-tool-auth-context.util.spec.ts
index 469a9d4fc1c..ebeb7c83879 100644
--- a/packages/twenty-server/src/engine/core-modules/tool-provider/utils/__tests__/with-resolved-tool-auth-context.util.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/utils/__tests__/with-resolved-tool-auth-context.util.spec.ts
@@ -16,7 +16,6 @@ describe('withResolvedToolAuthContext', () => {
overrides?: Partial<ToolProviderContext>,
): ToolProviderContext => ({
workspaceId,
- rolePermissionConfig: { intersectionOf: { userWorkspaceRoleId: 'role-1' } },
...overrides,
});
diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/utils/build-required-tool-auth-context.util.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/utils/build-required-tool-auth-context.util.ts
index 4a945bd8ecd..e7390d5ca26 100644
--- a/packages/twenty-server/src/engine/core-modules/tool-provider/utils/build-required-tool-auth-context.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/utils/build-required-tool-auth-context.util.ts
@@ -72,5 +72,6 @@ export const buildRequiredToolAuthContext = async ({
workspaceMemberId,
workspaceMember,
application: context.application,
+ agentId: context.agentId,
});
};
diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/utils/with-resolved-tool-auth-context.util.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/utils/with-resolved-tool-auth-context.util.ts
index 9fb6a4471b1..5e7f18bd606 100644
--- a/packages/twenty-server/src/engine/core-modules/tool-provider/utils/with-resolved-tool-auth-context.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/utils/with-resolved-tool-auth-context.util.ts
@@ -1,10 +1,33 @@
import { isDefined } from 'twenty-shared/utils';
import { withWorkspaceAuthContext } from 'src/engine/core-modules/auth/storage/workspace-auth-context.storage';
+import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { type ToolProviderContext } from 'src/engine/core-modules/tool-provider/interfaces/tool-provider-context.type';
import { type ToolAuthContextDependencies } from 'src/engine/core-modules/tool-provider/types/tool-auth-context-dependencies.type';
import { buildRequiredToolAuthContext } from 'src/engine/core-modules/tool-provider/utils/build-required-tool-auth-context.util';
+const resolveToolAuthContext = async ({
+ context,
+ userRepository,
+ workspaceCacheService,
+}: { context: ToolProviderContext } & ToolAuthContextDependencies): Promise<
+ WorkspaceAuthContext | undefined
+> => {
+ if (isDefined(context.authContext)) {
+ return context.authContext;
+ }
+
+ if (!isDefined(context.userId) || !isDefined(context.userWorkspaceId)) {
+ return undefined;
+ }
+
+ return buildRequiredToolAuthContext({
+ context,
+ userRepository,
+ workspaceCacheService,
+ });
+};
+
// Queue workers get no async-local auth context from WorkspaceAuthContextMiddleware, so establish one around the dispatch.
export const withResolvedToolAuthContext = async <T>(
{
@@ -14,15 +37,11 @@ export const withResolvedToolAuthContext = async <T>(
}: { context: ToolProviderContext } & ToolAuthContextDependencies,
dispatch: (contextWithAuth: ToolProviderContext) => Promise<T>,
): Promise<T> => {
- const authContext =
- context.authContext ??
- (isDefined(context.userId) && isDefined(context.userWorkspaceId)
- ? await buildRequiredToolAuthContext({
- context,
- userRepository,
- workspaceCacheService,
- })
- : undefined);
+ const authContext = await resolveToolAuthContext({
+ context,
+ userRepository,
+ workspaceCacheService,
+ });
if (!isDefined(authContext)) {
return dispatch(context);
diff --git a/packages/twenty-server/src/engine/core-modules/tool/tools/email-tool/email-composer.service.ts b/packages/twenty-server/src/engine/core-modules/tool/tools/email-tool/email-composer.service.ts
index aaef268a0cd..c7e58f67f3e 100644
--- a/packages/twenty-server/src/engine/core-modules/tool/tools/email-tool/email-composer.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool/tools/email-tool/email-composer.service.ts
@@ -316,9 +316,8 @@ export class EmailComposerService {
return this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const messageRepository =
- this.workspaceOrmManager.getRepository<MessageWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<MessageWorkspaceEntity>(
'message',
- { shouldBypassPermissionChecks: true },
);
const parentMessage = await messageRepository.findOne({
@@ -334,9 +333,8 @@ export class EmailComposerService {
}
const associationRepository =
- this.workspaceOrmManager.getRepository<MessageChannelMessageAssociationWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<MessageChannelMessageAssociationWorkspaceEntity>(
'messageChannelMessageAssociation',
- { shouldBypassPermissionChecks: true },
);
const [association, ancestorMessages] = await Promise.all([
diff --git a/packages/twenty-server/src/engine/core-modules/tool/types/tool-execution-context.type.ts b/packages/twenty-server/src/engine/core-modules/tool/types/tool-execution-context.type.ts
index 3874cde1936..3cfde79c796 100644
--- a/packages/twenty-server/src/engine/core-modules/tool/types/tool-execution-context.type.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool/types/tool-execution-context.type.ts
@@ -1,6 +1,5 @@
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { type CodeExecutionStreamEmitter } from 'src/engine/core-modules/tool-provider/interfaces/code-execution-stream-emitter.type';
-import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
export type ToolExecutionContext = {
workspaceId: string;
@@ -8,7 +7,6 @@ export type ToolExecutionContext = {
userWorkspaceId?: string;
agentId?: string;
threadId?: string;
- rolePermissionConfig?: RolePermissionConfig;
authContext?: WorkspaceAuthContext;
onCodeExecutionUpdate?: CodeExecutionStreamEmitter;
};
diff --git a/packages/twenty-server/src/engine/core-modules/user-workspace/services/user-workspace-auth-context.service.ts b/packages/twenty-server/src/engine/core-modules/user-workspace/services/user-workspace-auth-context.service.ts
index f7cb1a7ef82..e08ad4184f0 100644
--- a/packages/twenty-server/src/engine/core-modules/user-workspace/services/user-workspace-auth-context.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/user-workspace/services/user-workspace-auth-context.service.ts
@@ -1,3 +1,4 @@
+import { isOAuthOnlyApplication } from 'src/engine/core-modules/application/utils/is-oauth-only-application.util';
import { workspaceAuthContextStorage } from 'src/engine/core-modules/auth/storage/workspace-auth-context.storage';
import { isUserAuthContext } from 'src/engine/core-modules/auth/guards/is-user-auth-context.guard';
import { isNonEmptyString } from '@sniptt/guards';
@@ -144,7 +145,12 @@ export class UserWorkspaceAuthContextService {
'flatApplicationMaps',
]);
application = flatApplicationMaps.byId[applicationId];
- if (!isDefined(application) || !isDefined(application.defaultRoleId)) {
+ // OAuth-only applications have no role and act with the member's role
+ if (
+ !isDefined(application) ||
+ (!isDefined(application.defaultRoleId) &&
+ !isOAuthOnlyApplication(application))
+ ) {
throw new AuthException(
'Application no longer has access',
AuthExceptionCode.UNAUTHENTICATED,
diff --git a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts
index 9280b4258af..28c36779739 100644
--- a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts
@@ -169,9 +169,8 @@ export class UserWorkspaceService {
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const workspaceMemberRepository =
- this.workspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkspaceMemberWorkspaceEntity>(
'workspaceMember',
- { shouldBypassPermissionChecks: true },
);
const existingWorkspaceMembers = await workspaceMemberRepository.find({
@@ -494,9 +493,8 @@ export class UserWorkspaceService {
return this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const workspaceMemberRepository =
- this.workspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkspaceMemberWorkspaceEntity>(
'workspaceMember',
- { shouldBypassPermissionChecks: true },
);
return workspaceMemberRepository.findOne({
diff --git a/packages/twenty-server/src/engine/core-modules/user/jobs/update-workspace-member-email.job.ts b/packages/twenty-server/src/engine/core-modules/user/jobs/update-workspace-member-email.job.ts
index 38f014258f7..6e9f69ca7ae 100644
--- a/packages/twenty-server/src/engine/core-modules/user/jobs/update-workspace-member-email.job.ts
+++ b/packages/twenty-server/src/engine/core-modules/user/jobs/update-workspace-member-email.job.ts
@@ -37,9 +37,8 @@ export class UpdateWorkspaceMemberEmailJob {
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const workspaceMemberRepository =
- this.workspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkspaceMemberWorkspaceEntity>(
'workspaceMember',
- { shouldBypassPermissionChecks: true },
);
await workspaceMemberRepository.update({ userId }, { userEmail: email });
diff --git a/packages/twenty-server/src/engine/core-modules/user/services/user.service.ts b/packages/twenty-server/src/engine/core-modules/user/services/user.service.ts
index 41b960d3a0c..105cc00ff83 100644
--- a/packages/twenty-server/src/engine/core-modules/user/services/user.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/user/services/user.service.ts
@@ -113,9 +113,8 @@ export class UserService {
return this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const workspaceMemberRepository =
- this.workspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkspaceMemberWorkspaceEntity>(
'workspaceMember',
- { shouldBypassPermissionChecks: true },
);
return await workspaceMemberRepository.findOne({
@@ -142,9 +141,8 @@ export class UserService {
return this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const workspaceMemberRepository =
- this.workspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkspaceMemberWorkspaceEntity>(
'workspaceMember',
- { shouldBypassPermissionChecks: true },
);
return await workspaceMemberRepository.find({
@@ -225,9 +223,8 @@ export class UserService {
return this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const workspaceMemberRepository =
- this.workspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkspaceMemberWorkspaceEntity>(
'workspaceMember',
- { shouldBypassPermissionChecks: true },
);
return await workspaceMemberRepository.find({
@@ -248,9 +245,8 @@ export class UserService {
return this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const workspaceMemberRepository =
- this.workspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkspaceMemberWorkspaceEntity>(
'workspaceMember',
- { shouldBypassPermissionChecks: true },
);
return await workspaceMemberRepository.find({
@@ -336,9 +332,8 @@ export class UserService {
const workspaceMembers =
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const workspaceMemberRepository =
- this.workspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkspaceMemberWorkspaceEntity>(
'workspaceMember',
- { shouldBypassPermissionChecks: true },
);
return workspaceMemberRepository.find();
@@ -414,9 +409,8 @@ export class UserService {
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const workspaceMemberRepository =
- this.workspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkspaceMemberWorkspaceEntity>(
'workspaceMember',
- { shouldBypassPermissionChecks: true },
);
await workspaceMemberRepository.delete({
diff --git a/packages/twenty-server/src/engine/core-modules/user/services/workspace-flat-workspace-member-map-cache.service.ts b/packages/twenty-server/src/engine/core-modules/user/services/workspace-flat-workspace-member-map-cache.service.ts
index 3af23201552..360a27d7cd9 100644
--- a/packages/twenty-server/src/engine/core-modules/user/services/workspace-flat-workspace-member-map-cache.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/user/services/workspace-flat-workspace-member-map-cache.service.ts
@@ -42,9 +42,9 @@ export class WorkspaceFlatWorkspaceMemberMapCacheService extends WorkspaceCacheP
await this.workspaceOrmManager.executeInWorkspaceContext(
() =>
this.workspaceOrmManager
- .getRepository<WorkspaceMemberWorkspaceEntity>('workspaceMember', {
- shouldBypassPermissionChecks: true,
- })
+ .getRepositoryWithoutPermissionChecks<WorkspaceMemberWorkspaceEntity>(
+ 'workspaceMember',
+ )
.find({ withDeleted: true }),
buildSystemAuthContext(workspaceId),
{ lite: true },
diff --git a/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts b/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts
index 3d883d1b443..f69f58a2bbf 100644
--- a/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts
@@ -450,9 +450,8 @@ export class UserResolver {
const workspaceMemberToDelete =
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const workspaceMemberRepository =
- this.workspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkspaceMemberWorkspaceEntity>(
'workspaceMember',
- { shouldBypassPermissionChecks: true },
);
return workspaceMemberRepository.findOne({
@@ -576,11 +575,8 @@ export class UserResolver {
const workspaceMemberRepository =
await this.workspaceOrmManager.executeInWorkspaceContext(async () =>
- this.workspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkspaceMemberWorkspaceEntity>(
'workspaceMember',
- {
- shouldBypassPermissionChecks: true,
- },
),
);
diff --git a/packages/twenty-server/src/engine/core-modules/workflow/resolvers/core-workflow-run.resolver.ts b/packages/twenty-server/src/engine/core-modules/workflow/resolvers/core-workflow-run.resolver.ts
index c28932a9981..f3ded41acaa 100644
--- a/packages/twenty-server/src/engine/core-modules/workflow/resolvers/core-workflow-run.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/workflow/resolvers/core-workflow-run.resolver.ts
@@ -81,9 +81,8 @@ export class CoreWorkflowRunResolver {
const workspaceMember =
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const workspaceMemberRepository =
- this.workspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkspaceMemberWorkspaceEntity>(
'workspaceMember',
- { shouldBypassPermissionChecks: true },
);
return workspaceMemberRepository.findOneOrFail({
diff --git a/packages/twenty-server/src/engine/core-modules/workflow/services/workflow-version-core-sync.service.ts b/packages/twenty-server/src/engine/core-modules/workflow/services/workflow-version-core-sync.service.ts
index 7244d6555d2..42726f0708b 100644
--- a/packages/twenty-server/src/engine/core-modules/workflow/services/workflow-version-core-sync.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/workflow/services/workflow-version-core-sync.service.ts
@@ -337,9 +337,9 @@ export class WorkflowVersionCoreSyncService {
const linkedCoreVersionId =
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const workflowVersion = await this.workspaceOrmManager
- .getRepository<WorkflowVersionWorkspaceEntity>('workflowVersion', {
- shouldBypassPermissionChecks: true,
- })
+ .getRepositoryWithoutPermissionChecks<WorkflowVersionWorkspaceEntity>(
+ 'workflowVersion',
+ )
.findOne({
where: { id: workspaceWorkflowVersionId },
select: { coreWorkflowVersionId: true },
@@ -369,9 +369,9 @@ export class WorkflowVersionCoreSyncService {
): Promise<string | null> {
return this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const workflowVersion = await this.workspaceOrmManager
- .getRepository<WorkflowVersionWorkspaceEntity>('workflowVersion', {
- shouldBypassPermissionChecks: true,
- })
+ .getRepositoryWithoutPermissionChecks<WorkflowVersionWorkspaceEntity>(
+ 'workflowVersion',
+ )
.findOne({ where: { coreWorkflowVersionId }, select: { id: true } });
return workflowVersion?.id ?? null;
@@ -391,9 +391,8 @@ export class WorkflowVersionCoreSyncService {
const workflows = await this.workspaceOrmManager.executeInWorkspaceContext(
async () => {
const workflowRepository =
- this.workspaceOrmManager.getRepository<WorkflowWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkflowWorkspaceEntity>(
'workflow',
- { shouldBypassPermissionChecks: true },
);
return workflowRepository.find({
@@ -455,9 +454,8 @@ export class WorkflowVersionCoreSyncService {
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const workspaceWorkflowVersionRepository =
- this.workspaceOrmManager.getRepository<WorkflowVersionWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkflowVersionWorkspaceEntity>(
'workflowVersion',
- { shouldBypassPermissionChecks: true },
);
for (const [
diff --git a/packages/twenty-server/src/engine/core-modules/workspace-data-export/services/workspace-data-export-part-writer.service.ts b/packages/twenty-server/src/engine/core-modules/workspace-data-export/services/workspace-data-export-part-writer.service.ts
index 00192f9452b..67a0e5438e2 100644
--- a/packages/twenty-server/src/engine/core-modules/workspace-data-export/services/workspace-data-export-part-writer.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/workspace-data-export/services/workspace-data-export-part-writer.service.ts
@@ -134,10 +134,11 @@ export class WorkspaceDataExportPartWriterService {
return this.workspaceOrmManager.executeInWorkspaceContext(
() =>
this.workspaceOrmManager
- .getRepository<ObjectRecord>(
+ .getRepositoryWithoutPermissionChecks<ObjectRecord>(
object.nameSingular,
- { shouldBypassPermissionChecks: true },
- { useReplica: true },
+ {
+ useReplica: true,
+ },
)
.find({
where: isDefined(after) ? { id: MoreThan(after) } : {},
diff --git a/packages/twenty-server/src/engine/core-modules/workspace-invitation/workspace-invitation.resolver.ts b/packages/twenty-server/src/engine/core-modules/workspace-invitation/workspace-invitation.resolver.ts
index 34d4f5c69ec..266aa043ee6 100644
--- a/packages/twenty-server/src/engine/core-modules/workspace-invitation/workspace-invitation.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/workspace-invitation/workspace-invitation.resolver.ts
@@ -111,9 +111,8 @@ export class WorkspaceInvitationResolver {
const workspaceMember =
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const workspaceMemberRepository =
- this.workspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkspaceMemberWorkspaceEntity>(
'workspaceMember',
- { shouldBypassPermissionChecks: true },
);
return workspaceMemberRepository.findOneOrFail({
@@ -184,9 +183,8 @@ export class WorkspaceInvitationResolver {
const workspaceMember =
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const workspaceMemberRepository =
- this.workspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkspaceMemberWorkspaceEntity>(
'workspaceMember',
- { shouldBypassPermissionChecks: true },
);
return workspaceMemberRepository.findOneOrFail({
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/__tests__/agent-run-persona.service.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/__tests__/agent-run-persona.service.spec.ts
index cff673827b2..73ed12ea99c 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/__tests__/agent-run-persona.service.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/__tests__/agent-run-persona.service.spec.ts
@@ -1,3 +1,4 @@
+import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { AgentRunPersonaService } from 'src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run-persona.service';
import { type AgentRunInlineConfig } from 'src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-inline-config.type';
import { AiExceptionCode } from 'src/engine/metadata-modules/ai/ai.exception';
@@ -57,44 +58,45 @@ describe('AgentRunPersonaService', () => {
);
});
-describe('AgentRunPersonaService.resolveRolePermissionConfig', () => {
+describe('AgentRunPersonaService.resolveRunAuthContext', () => {
const service = buildService({});
- const agentRunRoleIds = { applicationRoleId: 'application-role-id' };
+ const authContext = {
+ type: 'apiKey',
+ workspace: { id: WORKSPACE_ID },
+ apiKey: { id: 'api-key-id' },
+ } as WorkspaceAuthContext;
- it("narrows the agent's role to the run's roles", async () => {
+ it("narrows the caller to the run's agent", async () => {
expect(
- await service.resolveRolePermissionConfig({
+ await service.resolveRunAuthContext({
workspaceId: WORKSPACE_ID,
persona: {
+ agentId: 'agent-id',
permissions: {
agentRoleId: 'agent-role-id',
scope: null,
explicitObjectGrants: { objectPermissions: [] },
},
},
- agentRunRoleIds,
+ authContext,
}),
- ).toEqual({
- intersectionOf: {
- applicationRoleId: 'application-role-id',
- agentRoleId: 'agent-role-id',
- },
- });
+ ).toMatchObject({ type: 'apiKey', agentId: 'agent-id' });
});
it('reads nothing for a run handed no data access', async () => {
expect(
- await service.resolveRolePermissionConfig({
+ await service.resolveRunAuthContext({
workspaceId: WORKSPACE_ID,
persona: {
+ agentId: null,
permissions: {
agentRoleId: null,
scope: null,
explicitObjectGrants: null,
},
},
- agentRunRoleIds,
+ authContext,
}),
- ).toBeNull();
+ ).toBeUndefined();
});
});
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/__tests__/agent-run-turn.service.start-turn.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/__tests__/agent-run-turn.service.start-turn.spec.ts
index a397e211903..54f280c5695 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/__tests__/agent-run-turn.service.start-turn.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/__tests__/agent-run-turn.service.start-turn.spec.ts
@@ -36,9 +36,9 @@ const startTurn = async (persona: ResolvedAgentRunPersona) => {
assertAiExecutionAllowed: jest.fn().mockResolvedValue(undefined),
} as never,
{
- resolveRolePermissionConfig: jest
+ resolveRunAuthContext: jest
.fn()
- .mockResolvedValue({ intersectionOf: {} }),
+ .mockResolvedValue({ type: 'application' }),
} as never,
{} as never,
{ findOneBy: jest.fn().mockResolvedValue(null) } as never,
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/__tests__/agent-run.service.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/__tests__/agent-run.service.spec.ts
index 4149fef3198..0506b4f093b 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/__tests__/agent-run.service.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/__tests__/agent-run.service.spec.ts
@@ -67,7 +67,6 @@ const buildService = (overrides: Record<string, unknown>) => {
new AgentRunCallerContextService(
agentActorContextService as never,
{} as never,
- {} as never,
),
{} as never,
applicationLookupService as never,
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-actor-context.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-actor-context.service.ts
index 64e722b5434..ea62eeb8fe7 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-actor-context.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-actor-context.service.ts
@@ -116,9 +116,9 @@ export class AgentActorContextService {
const workspaceMember =
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const workspaceMemberRepository =
- this.workspaceOrmManager.getRepository('workspaceMember', {
- shouldBypassPermissionChecks: true,
- });
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ 'workspaceMember',
+ );
return workspaceMemberRepository.findOne({
where: {
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-caller-conversation.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-caller-conversation.service.ts
index 7c34c0a47f3..5674636de66 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-caller-conversation.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-caller-conversation.service.ts
@@ -31,10 +31,7 @@ type AgentCallerAwaitedToolCall = {
toolName: string;
arguments: Record<string, unknown>;
// the caller's own permissions, the ones the call is resolved and run with
- permissions: Pick<
- ToolContext,
- 'authContext' | 'rolePermissionConfig' | 'application'
- >;
+ permissions: Pick<ToolContext, 'authContext' | 'application'>;
// called before the call is posted, so its answer always finds the caller waiting
waitOnAnswer: (postedCall: {
threadId: string;
@@ -264,7 +261,7 @@ export class AgentCallerConversationService {
awaitedToolCall: {
toolName,
arguments: toolArguments,
- permissions: { authContext, rolePermissionConfig, application },
+ permissions: { authContext, application },
},
summary,
}: {
@@ -275,7 +272,6 @@ export class AgentCallerConversationService {
const toolContext = {
workspaceId,
authContext,
- rolePermissionConfig,
application,
} satisfies ToolContext;
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run-caller-context.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run-caller-context.service.ts
index 81f65b5a348..f9205d7f9ae 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run-caller-context.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run-caller-context.service.ts
@@ -2,7 +2,6 @@ import { Injectable } from '@nestjs/common';
import { isDefined } from 'twenty-shared/utils';
-import { ApiKeyRoleService } from 'src/engine/core-modules/api-key/services/api-key-role.service';
import { ApiKeyService } from 'src/engine/core-modules/api-key/services/api-key.service';
import { fromApiKeyEntityToFlat } from 'src/engine/core-modules/api-key/utils/from-api-key-entity-to-flat.util';
import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';
@@ -15,37 +14,37 @@ import { AgentActorContextService } from 'src/engine/metadata-modules/ai/ai-agen
import { type AgentRunCallerContext } from 'src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-caller-context.type';
import { type AgentRunCallerRef } from 'src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-caller-ref.schema';
import { type AgentRunExecutionContext } from 'src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-execution-context.type';
-import { type AgentRunRoleIds } from 'src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-role-ids.type';
+import { buildAgentRunAuthContext } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/build-agent-run-auth-context.util';
import { buildAgentRunTurnCreatedBy } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/build-agent-run-turn-created-by.util';
import {
AiException,
AiExceptionCode,
} from 'src/engine/metadata-modules/ai/ai.exception';
-import { resolveApplicationRoleId } from 'src/engine/permissions/principal/utils/resolve-application-role-id.util';
@Injectable()
export class AgentRunCallerContextService {
constructor(
private readonly agentActorContextService: AgentActorContextService,
private readonly apiKeyService: ApiKeyService,
- private readonly apiKeyRoleService: ApiKeyRoleService,
) {}
async buildExecutionContext({
workspace,
callerRef,
requestUserWorkspaceId,
+ agentId,
application,
callerApplication,
}: {
workspace: FlatWorkspace;
+ agentId?: string;
callerRef: AgentRunCallerRef;
requestUserWorkspaceId: string | null;
application: FlatApplication | undefined;
// differs from application when an application runs an agent of another one
callerApplication: FlatApplication | undefined;
}): Promise<AgentRunExecutionContext> {
- const { authContext, actorContext, callerRoleIds } =
+ const { authContext: callerAuthContext, actorContext } =
await this.buildCallerContextOrThrow({
workspace,
callerRef,
@@ -53,10 +52,11 @@ export class AgentRunCallerContextService {
? buildApplicationAuthContext({ workspace, application })
: undefined,
});
- const agentRunRoleIds: AgentRunRoleIds = {
- ...callerRoleIds,
- ...resolveApplicationRoleId({ application }),
- };
+ const authContext = buildAgentRunAuthContext({
+ authContext: callerAuthContext,
+ agentId,
+ application,
+ });
return {
authContext,
@@ -69,7 +69,6 @@ export class AgentRunCallerContextService {
userWorkspaceId: isUserAuthContext(authContext)
? authContext.userWorkspaceId
: requestUserWorkspaceId,
- agentRunRoleIds,
conversationViewer: {
workspaceMemberId: isUserAuthContext(authContext)
? authContext.workspaceMemberId
@@ -90,18 +89,14 @@ export class AgentRunCallerContextService {
applicationAuthContext?: ApplicationWorkspaceAuthContext;
}): Promise<AgentRunCallerContext> {
if (isDefined(callerRef.callerWorkspaceMemberId)) {
- const { authContext, actorContext, roleId } =
+ const { authContext, actorContext } =
await this.agentActorContextService.buildRunAsWorkspaceMemberContext({
workspaceMemberId: callerRef.callerWorkspaceMemberId,
workspaceId: workspace.id,
viaApplication: applicationAuthContext?.application,
});
- return {
- authContext,
- actorContext,
- callerRoleIds: { userWorkspaceRoleId: roleId },
- };
+ return { authContext, actorContext };
}
if (isDefined(callerRef.callerApiKeyId)) {
@@ -115,12 +110,6 @@ export class AgentRunCallerContextService {
workspace,
apiKey: fromApiKeyEntityToFlat(apiKey),
}),
- callerRoleIds: {
- apiKeyRoleId: await this.apiKeyRoleService.getRoleIdForApiKeyId(
- apiKey.id,
- workspace.id,
- ),
- },
};
}
@@ -131,6 +120,6 @@ export class AgentRunCallerContextService {
);
}
- return { authContext: applicationAuthContext, callerRoleIds: {} };
+ return { authContext: applicationAuthContext };
}
}
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run-pending-wake-up-handler.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run-pending-wake-up-handler.service.ts
index 1e02cba5061..c27fedbee0f 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run-pending-wake-up-handler.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run-pending-wake-up-handler.service.ts
@@ -50,7 +50,7 @@ export class AgentRunPendingWakeUpHandlerService
wakeUp: PendingWakeUpEntity;
owner: AgentRunSuspension;
}) {
- const [{ authContext, agentRunRoleIds }, persona] = await Promise.all([
+ const [{ authContext }, persona] = await Promise.all([
this.callerHandlerRegistry
.getHandlerOrThrow(caller.type)
.buildExecutionContext({ workspaceId, caller }),
@@ -59,16 +59,14 @@ export class AgentRunPendingWakeUpHandlerService
spec: runSpec,
}),
]);
- const rolePermissionConfig =
- await this.agentRunPersonaService.resolveRolePermissionConfig({
+ const runAuthContext =
+ await this.agentRunPersonaService.resolveRunAuthContext({
workspaceId,
persona,
- agentRunRoleIds,
+ authContext,
});
- return isDefined(rolePermissionConfig)
- ? { authContext, rolePermissionConfig }
- : null;
+ return isDefined(runAuthContext) ? { authContext: runAuthContext } : null;
}
// the run removes its wake-up once it went on, so the conversation waits until then
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run-persona.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run-persona.service.ts
index 7b07ba6fbd1..29083c33312 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run-persona.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run-persona.service.ts
@@ -3,9 +3,10 @@ import { Injectable } from '@nestjs/common';
import { msg } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
-import { type AgentRunRoleIds } from 'src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-role-ids.type';
+import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { type AgentRunPersonaSpec } from 'src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-spec.type';
import { type ResolvedAgentRunPersona } from 'src/engine/metadata-modules/ai/ai-agent-execution/types/resolved-agent-run-persona.type';
+import { buildAgentRunAuthContext } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/build-agent-run-auth-context.util';
import { buildRoleExplicitObjectGrants } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/build-role-explicit-object-grants.util';
import { resolveAgentRunPersonaFromAgent } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/resolve-agent-run-persona-from-agent.util';
import { resolveAgentRunPersonaFromInlineConfig } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/resolve-agent-run-persona-from-inline-config.util';
@@ -18,7 +19,6 @@ import {
import { resolveEffectiveAgent } from 'src/engine/metadata-modules/flat-agent/utils/resolve-effective-agent.util';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
-import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
import { resolveAiRunPermissionScope } from 'src/engine/permissions/role/utils/resolve-ai-run-permission-scope.util';
import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/inject-workspace-scoped-repository.decorator';
import { WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository';
@@ -82,29 +82,32 @@ export class AgentRunPersonaService {
});
}
- // What the run reads and acts with, for its tools as for the records that wake it up. Null when it may read nothing
- async resolveRolePermissionConfig({
+ // What the run reads and acts with, for its tools as for the records that wake it up. Undefined when it may read nothing
+ async resolveRunAuthContext({
workspaceId,
persona: {
- permissions: { agentRoleId, scope, explicitObjectGrants },
+ agentId,
+ permissions: { scope, explicitObjectGrants },
},
- agentRunRoleIds,
+ authContext,
}: {
workspaceId: string;
- persona: Pick<ResolvedAgentRunPersona, 'permissions'>;
- agentRunRoleIds: AgentRunRoleIds | undefined;
- }): Promise<RolePermissionConfig | null> {
- if (!isDefined(explicitObjectGrants)) {
- return null;
+ persona: Pick<ResolvedAgentRunPersona, 'agentId' | 'permissions'>;
+ authContext: WorkspaceAuthContext | undefined;
+ }): Promise<WorkspaceAuthContext | undefined> {
+ if (!isDefined(authContext) || !isDefined(explicitObjectGrants)) {
+ return undefined;
}
- const intersectionOf = {
- ...agentRunRoleIds,
- ...(isDefined(agentRoleId) ? { agentRoleId } : {}),
- };
+ if (!isDefined(agentId) && !isDefined(scope)) {
+ return authContext;
+ }
if (!isDefined(scope)) {
- return { intersectionOf };
+ return buildAgentRunAuthContext({
+ authContext,
+ agentId: agentId ?? undefined,
+ });
}
const { flatObjectMetadataMaps, flatFieldMetadataMaps } =
@@ -115,14 +118,15 @@ export class AgentRunPersonaService {
},
);
- return {
- intersectionOf,
- scope: resolveAiRunPermissionScope({
+ return buildAgentRunAuthContext({
+ authContext,
+ agentId: agentId ?? undefined,
+ permissionScope: resolveAiRunPermissionScope({
scope,
flatObjectMetadataMaps,
flatFieldMetadataMaps,
}),
- };
+ });
}
// like a deleted agent, a deleted application fails the run rather than letting it act for the workspace
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run-turn.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run-turn.service.ts
index d30f05ef546..d3c4eaea390 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run-turn.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run-turn.service.ts
@@ -404,7 +404,7 @@ export class AgentRunTurnService {
private async buildAgentRegistryAccess({
persona,
workspaceId,
- executionContext: { authContext, actorContext, agentRunRoleIds },
+ executionContext: { authContext, actorContext },
additionalExcludedToolNames,
toolLoadingStrategy,
}: Pick<
@@ -415,15 +415,15 @@ export class AgentRunTurnService {
| 'additionalExcludedToolNames'
| 'toolLoadingStrategy'
>): Promise<AgentRegistryAccess> {
- const rolePermissionConfig =
- await this.agentRunPersonaService.resolveRolePermissionConfig({
+ const runAuthContext =
+ await this.agentRunPersonaService.resolveRunAuthContext({
workspaceId,
persona,
- agentRunRoleIds,
+ authContext,
});
if (
- !isDefined(rolePermissionConfig) ||
+ !isDefined(runAuthContext) ||
!isDefined(persona.permissions.explicitObjectGrants)
) {
return { type: 'none' };
@@ -432,10 +432,9 @@ export class AgentRunTurnService {
const toolContext: ToolContext = {
workspaceId,
agentId: persona.agentId ?? undefined,
- authContext,
- application: getAuthContextApplication(authContext),
+ authContext: runAuthContext,
+ application: getAuthContextApplication(runAuthContext),
actorContext,
- rolePermissionConfig,
...(isDefined(authContext) && isUserAuthContext(authContext)
? {
userId: authContext.user.id,
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run.service.ts
index d4e30b1cf8e..84f7f78ec32 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run.service.ts
@@ -555,6 +555,7 @@ export class AgentRunService implements AgentRunCallerHandler, OnModuleInit {
? { callerWorkspaceMemberId: ref.runAsWorkspaceMemberId }
: ref,
requestUserWorkspaceId: ref.requestUserWorkspaceId,
+ agentId: ref.agentId,
application,
callerApplication,
});
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-toolset.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-toolset.service.ts
index 33ef1788367..8d214177e8b 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-toolset.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-toolset.service.ts
@@ -183,7 +183,6 @@ export class AgentToolsetService {
userWorkspaceId,
locale,
excludeTools: new Set(excludedToolNames),
- rolePermissionConfig: toolContext.rolePermissionConfig,
authContext: toolContext.authContext,
application: toolContext.application,
},
@@ -221,7 +220,6 @@ export class AgentToolsetService {
{
userId,
userWorkspaceId,
- rolePermissionConfig: toolContext.rolePermissionConfig,
authContext: toolContext.authContext,
application: toolContext.application,
categories: [...registryAccess.categories],
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-caller-context.type.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-caller-context.type.ts
index 50739b78861..16e448a19c2 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-caller-context.type.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-caller-context.type.ts
@@ -1,10 +1,8 @@
import { type ActorMetadata } from 'twenty-shared/types';
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
-import { type AgentRunRoleIds } from 'src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-role-ids.type';
export type AgentRunCallerContext = {
authContext: WorkspaceAuthContext;
actorContext?: ActorMetadata;
- callerRoleIds?: AgentRunRoleIds;
};
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-execution-context.type.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-execution-context.type.ts
index ee62a2879f5..44d643074d0 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-execution-context.type.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-execution-context.type.ts
@@ -1,7 +1,6 @@
import { type ActorMetadata } from 'twenty-shared/types';
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
-import { type AgentRunRoleIds } from 'src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-role-ids.type';
import { type AgentConversationViewer } from 'src/engine/metadata-modules/ai/ai-history/types/agent-conversation-viewer.type';
// How a run acts, which its caller derives on each segment instead of the engine storing it
@@ -11,7 +10,5 @@ export type AgentRunExecutionContext = {
// who the run's turns are recorded as sent by
turnCreatedBy: ActorMetadata;
userWorkspaceId: string | null;
- // narrows the agent's own role, such as to the application a run belongs to
- agentRunRoleIds?: AgentRunRoleIds;
conversationViewer?: AgentConversationViewer;
};
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-role-ids.type.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-role-ids.type.ts
deleted file mode 100644
index a7c7ad4438f..00000000000
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-role-ids.type.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { type RoleIdsBySource } from 'src/engine/permissions/principal/types/role-permission-config.type';
-
-export type AgentRunRoleIds = Omit<RoleIdsBySource, 'agentRoleId'>;
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/build-agent-run-auth-context.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/build-agent-run-auth-context.util.ts
new file mode 100644
index 00000000000..cb815d43004
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/build-agent-run-auth-context.util.ts
@@ -0,0 +1,44 @@
+import { isDefined } from 'twenty-shared/utils';
+
+import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';
+import {
+ AiException,
+ AiExceptionCode,
+} from 'src/engine/metadata-modules/ai/ai.exception';
+import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
+import { type PermissionScope } from 'src/engine/permissions/principal/types/permission-scope.type';
+
+// A run never exceeds its agent, its scope nor the agent's application, whoever calls it
+export const buildAgentRunAuthContext = ({
+ authContext,
+ agentId,
+ application,
+ permissionScope,
+}: {
+ authContext: WorkspaceAuthContext;
+ agentId?: string;
+ application?: FlatApplication;
+ permissionScope?: PermissionScope;
+}): WorkspaceAuthContext => {
+ const narrowing = {
+ ...(isDefined(agentId) ? { agentId } : {}),
+ ...(isDefined(permissionScope) ? { permissionScope } : {}),
+ };
+
+ switch (authContext.type) {
+ case 'user':
+ case 'apiKey':
+ return {
+ ...authContext,
+ ...narrowing,
+ application: application ?? authContext.application,
+ };
+ case 'application':
+ return { ...authContext, ...narrowing };
+ default:
+ throw new AiException(
+ `An agent cannot run with a ${authContext.type} auth context`,
+ AiExceptionCode.AGENT_EXECUTION_FAILED,
+ );
+ }
+};
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-trigger/services/agent-trigger-runner.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-trigger/services/agent-trigger-runner.service.ts
index e170510d551..ec78aac2df2 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-trigger/services/agent-trigger-runner.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-trigger/services/agent-trigger-runner.service.ts
@@ -13,8 +13,6 @@ import { type AgentRunCallerInput } from 'src/engine/metadata-modules/ai/ai-agen
import { type AgentRunCallerHandler } from 'src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-caller-handler.type';
import { type OwnerWaitingState } from 'src/engine/core-modules/pending-wake-up/types/owner-waiting-state.type';
import { type AgentRunExecutionContext } from 'src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-execution-context.type';
-import { resolveApplicationRoleId } from 'src/engine/permissions/principal/utils/resolve-application-role-id.util';
-import { type AgentRunRoleIds } from 'src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-role-ids.type';
import { buildAgentRunThreadId } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/build-agent-run-thread-id.util';
import { AGENT_TRIGGER_BASE_SYSTEM_PROMPT } from 'src/engine/metadata-modules/ai/ai-agent-trigger/constants/agent-trigger-base-system-prompt.const';
import { type RunAgentTriggerJobData } from 'src/engine/metadata-modules/ai/ai-agent-trigger/types/run-agent-trigger-job-data.type';
@@ -202,11 +200,6 @@ export class AgentTriggerRunnerService
return null;
}
- // the agent never exceeds its application, as in its runAgent runs
- const agentRunRoleIds: AgentRunRoleIds = resolveApplicationRoleId({
- application,
- });
-
const actingAgent = { id: agent.id, label: agent.label };
const createdBy = buildCreatedByFromAgent({
agent: actingAgent,
@@ -217,11 +210,10 @@ export class AgentTriggerRunnerService
agent,
trigger,
executionContext: {
- authContext: { ...authContext, actingAgent },
+ authContext: { ...authContext, agentId: agent.id, actingAgent },
actorContext: createdBy,
turnCreatedBy: createdBy,
userWorkspaceId: null,
- agentRunRoleIds,
},
};
}
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/tools/__tests__/agent-tools.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/tools/__tests__/agent-tools.spec.ts
index 6d093b002de..b5dcf32a24f 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/tools/__tests__/agent-tools.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/tools/__tests__/agent-tools.spec.ts
@@ -50,9 +50,6 @@ const otherApplication = {
const context: ToolProviderContext = {
workspaceId,
- rolePermissionConfig: {
- intersectionOf: { userWorkspaceRoleId: 'caller-role-id' },
- },
userWorkspaceId: 'caller-user-workspace-id',
actorContext: {
source: FieldActorSource.MANUAL,
@@ -94,7 +91,7 @@ const buildAgentTools = (options?: {
}),
};
const permissionsService = {
- checkRolesPermissions: jest
+ hasPermissionFlag: jest
.fn()
.mockResolvedValue(options?.hasAiSettingsPermission ?? true),
};
@@ -182,12 +179,11 @@ describe('Agent tools', () => {
const { listToolNames, permissionsService } = buildAgentTools();
await expect(listToolNames()).resolves.toHaveLength(4);
- expect(permissionsService.checkRolesPermissions).toHaveBeenCalledTimes(1);
- expect(permissionsService.checkRolesPermissions).toHaveBeenCalledWith(
- context.rolePermissionConfig,
- workspaceId,
- PermissionFlagType.AI_SETTINGS,
- );
+ expect(permissionsService.hasPermissionFlag).toHaveBeenCalledTimes(1);
+ expect(permissionsService.hasPermissionFlag).toHaveBeenCalledWith({
+ authContext: context.authContext,
+ setting: PermissionFlagType.AI_SETTINGS,
+ });
});
it('is not available without the AI settings permission', async () => {
@@ -216,7 +212,7 @@ describe('Agent tools', () => {
success: false,
message: 'Tool "list_agents" is not available',
});
- expect(permissionsService.checkRolesPermissions).not.toHaveBeenCalled();
+ expect(permissionsService.hasPermissionFlag).not.toHaveBeenCalled();
expect(agentService.findManyAgents).not.toHaveBeenCalled();
});
});
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-actor.service.resolve-message.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-actor.service.resolve-message.spec.ts
index 6e6cf694ee4..249ec1f43c1 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-actor.service.resolve-message.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-actor.service.resolve-message.spec.ts
@@ -45,7 +45,6 @@ const buildService = (
{} as never,
{ resolveWorkspaceMember } as never,
{} as never,
- {} as never,
);
return { service, resolveWorkspaceMember };
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-actor.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-actor.service.ts
index 5a6e4721992..ec4886a37ea 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-actor.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-actor.service.ts
@@ -15,9 +15,6 @@ import { AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/a
import { AgentChatThreadService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread.service';
import { UserWorkspaceAuthContextService } from 'src/engine/core-modules/user-workspace/services/user-workspace-auth-context.service';
import { PermissionsService } from 'src/engine/permissions/permissions.service';
-import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
-import { resolveRolePermissionConfig } from 'src/engine/permissions/principal/utils/resolve-role-permission-config.util';
-import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { type AgentChatSender } from 'src/engine/metadata-modules/ai/ai-chat/types/agent-chat-sender.type';
import {
@@ -35,7 +32,6 @@ export class AgentChatActorService {
private readonly threadService: AgentChatThreadService,
private readonly userAuthContextService: UserWorkspaceAuthContextService,
private readonly permissionsService: PermissionsService,
- private readonly workspaceCacheService: WorkspaceCacheService,
) {}
async resolveMessage({
@@ -151,41 +147,20 @@ export class AgentChatActorService {
AiExceptionCode.THREAD_NOT_FOUND,
);
}
- const rolePermissions = await this.resolveRolePermissions({
- workspaceId,
- authContext,
- });
- if (!isDefined(rolePermissions)) {
+ if (!(await this.hasRole(authContext))) {
throw new AiException(
'Chat execution is not permitted',
AiExceptionCode.THREAD_NOT_FOUND,
);
}
- return { authContext, ...rolePermissions };
+ return { authContext };
}
- // the permissions a member acts with in the chat, also used to run the calls they approve
- async resolveRolePermissions({
- workspaceId,
- authContext,
- }: {
- workspaceId: string;
- authContext: WorkspaceAuthContext;
- }): Promise<{ rolePermissionConfig: RolePermissionConfig } | undefined> {
- const { userWorkspaceRoleMap } =
- await this.workspaceCacheService.getOrRecompute(workspaceId, [
- 'userWorkspaceRoleMap',
- ]);
- const rolePermissionConfig = resolveRolePermissionConfig({
- authContext,
- userWorkspaceRoleMap,
- apiKeyRoleMap: {},
- flatRoleTargetByAgentIdMaps: {},
- });
+ // a member with no role left cannot act in the chat nor run the calls they approve
+ async hasRole(authContext: WorkspaceAuthContext): Promise<boolean> {
+ const roleIds = await this.permissionsService.getRoleIds(authContext);
- return isDefined(rolePermissionConfig)
- ? { rolePermissionConfig }
- : undefined;
+ return roleIds.length > 0;
}
// resolved from the application context of the turn that made the call
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-channel-threads.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-channel-threads.service.ts
index 060755d5b5f..5d255e96fe7 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-channel-threads.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-channel-threads.service.ts
@@ -214,9 +214,7 @@ export class AgentChatChannelThreadsService {
return this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const repository =
- this.workspaceOrmManager.getRepositoryWithContextPermissions(
- 'agentChatThread',
- );
+ this.workspaceOrmManager.getRepository('agentChatThread');
const readableThreadQueryBuilder = repository
.createQueryBuilder('readableThread')
.select('"readableThread"."id"', 'id')
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-direct-message-identity.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-direct-message-identity.service.ts
index 8e394a387b3..a4703a80e19 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-direct-message-identity.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-direct-message-identity.service.ts
@@ -77,9 +77,8 @@ export class AgentChatDirectMessageIdentityService {
this.workspaceOrmManager.runInWorkspaceTransaction(
async (transactionScope) => {
const { identifiers } = await transactionScope
- .getRepository<AgentChatThreadWorkspaceEntity>(
+ .getRepositoryWithoutPermissionChecks<AgentChatThreadWorkspaceEntity>(
'agentChatThread',
- { shouldBypassPermissionChecks: true },
{ shouldSkipEventEmission: true },
)
.insert(
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 dadd250809c..623e1eb79e1 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
@@ -196,9 +196,7 @@ export class AgentChatSharingService {
// batches that stay well under PostgreSQL's parameter limit
return this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const repository =
- this.workspaceOrmManager.getRepositoryWithContextPermissions(
- 'agentChatThread',
- );
+ this.workspaceOrmManager.getRepository('agentChatThread');
const readableThreadIds: string[] = [];
for (const threadIdBatch of chunk(
@@ -469,7 +467,7 @@ export class AgentChatSharingService {
return this.workspaceOrmManager.executeInWorkspaceContext(
() =>
this.workspaceOrmManager
- .getRepositoryWithContextPermissions('agentChatThread')
+ .getRepository('agentChatThread')
.validateWriteIsPermitted({
operationType: 'insert',
columnsToReturn: ['id'],
@@ -689,7 +687,7 @@ export class AgentChatSharingService {
operationType: OperationType,
): Promise<void> {
const allowedIds = await this.workspaceOrmManager
- .getRepositoryWithContextPermissions('agentChatThread')
+ .getRepository('agentChatThread')
.findRecordIdsAllowedForOperation({
recordIds: [threadId],
operationType,
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread-participant.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread-participant.service.ts
index 0f2275e4c90..ad7e088765f 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread-participant.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread-participant.service.ts
@@ -594,9 +594,7 @@ export class AgentChatThreadParticipantService {
const [summary] = await this.workspaceOrmManager
.executeInWorkspaceContext(() => {
const repository =
- this.workspaceOrmManager.getRepositoryWithContextPermissions(
- 'agentChatThread',
- );
+ this.workspaceOrmManager.getRepository('agentChatThread');
const readableThreads = repository
.createQueryBuilder('thread')
.select([])
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread-target.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread-target.service.ts
index da9cbc27525..96f722ff9cc 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread-target.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread-target.service.ts
@@ -87,7 +87,7 @@ export class AgentChatThreadTargetService {
}
private getThreadTargetRepository() {
- return this.workspaceOrmManager.getRepositoryWithContextPermissions(
+ return this.workspaceOrmManager.getRepository(
AGENT_CHAT_THREAD_TARGET_OBJECT_METADATA_NAME,
);
}
@@ -97,7 +97,7 @@ export class AgentChatThreadTargetService {
recordId,
}: RecordReference): Promise<void> {
const record = await this.workspaceOrmManager
- .getRepositoryWithContextPermissions(objectNameSingular)
+ .getRepository(objectNameSingular)
.findOne({ where: { id: recordId }, select: { id: true } })
.catch((error: unknown) => {
if (
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-inbox-proposal.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-inbox-proposal.service.ts
index 9a3a7b9c98d..5877033c108 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-inbox-proposal.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-inbox-proposal.service.ts
@@ -11,17 +11,12 @@ import { type ProposedToolCallResolution } from 'src/engine/metadata-modules/ai/
import { isEmailToolName } from 'src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/is-email-tool-name.util';
import { resolveEmailToolCallProposal } from 'src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/resolve-email-tool-call-proposal.util';
import { resolveProposedToolCall } from 'src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/resolve-proposed-tool-call.util';
-import { resolveRolePermissionConfig } from 'src/engine/permissions/principal/utils/resolve-role-permission-config.util';
-import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
// An app proposes only calls it could run itself, checked with its own role; once
// approved, the call runs with the member's access. An email needs none of the app's tools.
@Injectable()
export class AgentInboxProposalService {
- constructor(
- private readonly toolRegistryService: ToolRegistryService,
- private readonly workspaceCacheService: WorkspaceCacheService,
- ) {}
+ constructor(private readonly toolRegistryService: ToolRegistryService) {}
async resolveApplicationProposal({
workspaceId,
@@ -37,23 +32,7 @@ export class AgentInboxProposalService {
}
const authContext = workspaceAuthContextStorage.getStore();
- const { userWorkspaceRoleMap } =
- await this.workspaceCacheService.getOrRecompute(workspaceId, [
- 'userWorkspaceRoleMap',
- ]);
- const rolePermissionConfig = isDefined(authContext)
- ? resolveRolePermissionConfig({
- authContext,
- userWorkspaceRoleMap,
- apiKeyRoleMap: {},
- flatRoleTargetByAgentIdMaps: {},
- })
- : null;
-
- if (
- !isDefined(rolePermissionConfig) ||
- !isDefined(application.defaultRoleId)
- ) {
+ if (!isDefined(authContext) || !isDefined(application.defaultRoleId)) {
return {
error: `The application needs a default role to propose "${input.toolName}".`,
};
@@ -61,7 +40,6 @@ export class AgentInboxProposalService {
const toolContext: ToolContext = {
workspaceId,
- rolePermissionConfig,
authContext,
application,
};
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/system-prompt-builder.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/system-prompt-builder.service.ts
index 9063d029918..ed467b869fb 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/system-prompt-builder.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/system-prompt-builder.service.ts
@@ -1,3 +1,4 @@
+import { getWorkspaceAuthContext } from 'src/engine/core-modules/auth/storage/workspace-auth-context.storage';
import { Injectable } from '@nestjs/common';
import { FeatureFlagKey } from 'twenty-shared/types';
@@ -35,7 +36,7 @@ export class SystemPromptBuilderService {
userWorkspaceId: string,
workspaceInstructions?: string,
): Promise<SystemPromptPreview> {
- const { roleId, userId, userContext } =
+ const { userId, userContext } =
await this.agentActorContextService.buildUserAndAgentActorContext(
userWorkspaceId,
workspaceId,
@@ -44,9 +45,7 @@ export class SystemPromptBuilderService {
const [toolCatalog, skillCatalog, canAttachConversationToRecords] =
await Promise.all([
this.toolRegistry.buildToolIndex(workspaceId, {
- rolePermissionConfig: {
- intersectionOf: { userWorkspaceRoleId: roleId },
- },
+ authContext: getWorkspaceAuthContext(),
userId,
userWorkspaceId,
excludeTools: AI_CHAT_EXCLUDED_TOOL_NAMES,
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/workspace-setup-chat.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/workspace-setup-chat.service.ts
index 58abb1f86eb..6531b5a4df7 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/workspace-setup-chat.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/workspace-setup-chat.service.ts
@@ -274,9 +274,9 @@ export class WorkspaceSetupChatService {
const workspaceMember =
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const workspaceMemberRepository =
- this.workspaceOrmManager.getRepository('workspaceMember', {
- shouldBypassPermissionChecks: true,
- });
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ 'workspaceMember',
+ );
return workspaceMemberRepository.findOne({ where: { userId } });
}, buildSystemAuthContext(workspaceId));
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-front-component/ai-front-component.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-front-component/ai-front-component.service.ts
index 07688a93a8b..1d51958efa1 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-front-component/ai-front-component.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-front-component/ai-front-component.service.ts
@@ -198,11 +198,7 @@ export class AiFrontComponentService {
draftInput: FrontComponentDraftInput;
context: Pick<
ToolProviderContext,
- | 'workspaceId'
- | 'userWorkspaceId'
- | 'threadId'
- | 'authContext'
- | 'rolePermissionConfig'
+ 'workspaceId' | 'userWorkspaceId' | 'threadId' | 'authContext'
>;
}) {
const { userWorkspaceId, threadId } = context;
@@ -236,7 +232,6 @@ export class AiFrontComponentService {
const objectNamePlural = await this.getQueryObjectNamePluralOrThrow({
query: input.query,
authContext: context.authContext,
- rolePermissionConfig: context.rolePermissionConfig,
});
validateFrontComponentSampleRecordsOrThrow({
sampleRecords: input.sampleRecords,
@@ -414,7 +409,6 @@ export class AiFrontComponentService {
| 'authContext'
| 'approvedToolName'
| 'threadId'
- | 'rolePermissionConfig'
>;
}) {
const { workspaceId, userWorkspaceId, authContext } = context;
@@ -508,7 +502,6 @@ export class AiFrontComponentService {
await this.getQueryObjectNamePluralOrThrow({
query: draft.query,
authContext,
- rolePermissionConfig: context.rolePermissionConfig,
});
await this.saveDraft({
workspaceId,
@@ -598,17 +591,14 @@ export class AiFrontComponentService {
private async getQueryObjectNamePluralOrThrow({
query,
authContext,
- rolePermissionConfig,
}: {
query: FrontComponentQuery;
authContext: WorkspaceAuthContext;
- rolePermissionConfig?: ToolProviderContext['rolePermissionConfig'];
}) {
const { selectedFields, flatObjectMetadata } =
await this.queryContext.build({
authContext,
objectName: query.objectName,
- rolePermissionConfig,
});
for (const fieldName of query.select) {
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-front-component/tools/preview-front-component.tool.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-front-component/tools/preview-front-component.tool.ts
index 2a4efce578a..e2fad560afd 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-front-component/tools/preview-front-component.tool.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-front-component/tools/preview-front-component.tool.ts
@@ -12,11 +12,7 @@ export const createPreviewFrontComponentTool = ({
aiFrontComponentService: Pick<AiFrontComponentService, 'createDraft'>;
context: Pick<
ToolProviderContext,
- | 'workspaceId'
- | 'userWorkspaceId'
- | 'threadId'
- | 'authContext'
- | 'rolePermissionConfig'
+ 'workspaceId' | 'userWorkspaceId' | 'threadId' | 'authContext'
>;
}) =>
tool({
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-front-component/tools/publish-front-component.tool.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-front-component/tools/publish-front-component.tool.ts
index 2fbc783db75..338b16284e5 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-front-component/tools/publish-front-component.tool.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-front-component/tools/publish-front-component.tool.ts
@@ -17,7 +17,6 @@ export const createPublishFrontComponentTool = ({
| 'threadId'
| 'authContext'
| 'approvedToolName'
- | 'rolePermissionConfig'
>;
}) =>
tool({
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-front-component/tools/services/ai-front-component-tool.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-front-component/tools/services/ai-front-component-tool.service.ts
index 66098973d42..5f7661bcd66 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-front-component/tools/services/ai-front-component-tool.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-front-component/tools/services/ai-front-component-tool.service.ts
@@ -35,11 +35,10 @@ export class AiFrontComponentToolService {
FeatureFlagKey.IS_AI_CHAT_COMPONENT_BUILDER_ENABLED,
context.workspaceId,
)) ||
- !(await this.permissionsService.checkRolesPermissions(
- context.rolePermissionConfig,
- context.workspaceId,
- PermissionFlagType.APPLICATIONS,
- ))
+ !(await this.permissionsService.hasPermissionFlag({
+ authContext: context.authContext,
+ setting: PermissionFlagType.APPLICATIONS,
+ }))
) {
return {};
}
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/repositories/__tests__/agent-history-repository.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/repositories/__tests__/agent-history-repository.spec.ts
index 44d05a36a44..36679cf11b3 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/repositories/__tests__/agent-history-repository.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/repositories/__tests__/agent-history-repository.spec.ts
@@ -18,7 +18,9 @@ it('reads native workspace fields and precision from workspace storage', async (
executeInWorkspaceContext: jest
.fn()
.mockImplementation(async (work: () => Promise<unknown>) => work()),
- getRepository: jest.fn().mockReturnValue({ find, count }),
+ getRepositoryWithoutPermissionChecks: jest
+ .fn()
+ .mockReturnValue({ find, count }),
};
const repository = new AgentHistoryRepository<AgentChatThreadWorkspaceEntity>(
'agentChatThread',
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository.ts
index 2d3a2f7803f..8e75171f6d9 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository.ts
@@ -31,7 +31,7 @@ export class AgentHistoryRepository<TRecord extends { id: string }> {
>,
private readonly workspaceOrmManager: Pick<
WorkspaceOrmManager,
- 'executeInWorkspaceContext' | 'getRepository'
+ 'executeInWorkspaceContext' | 'getRepositoryWithoutPermissionChecks'
>,
) {}
@@ -47,10 +47,11 @@ export class AgentHistoryRepository<TRecord extends { id: string }> {
return this.workspaceOrmManager.executeInWorkspaceContext(
() =>
work(
- this.workspaceOrmManager.getRepository<TRecord>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<TRecord>(
this.name,
- { shouldBypassPermissionChecks: true },
- { shouldSkipEventEmission: true },
+ {
+ shouldSkipEventEmission: true,
+ },
),
context,
),
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-history-transaction.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-history-transaction.service.ts
index d7acbbf080b..304fea65e9b 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-history-transaction.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-history-transaction.service.ts
@@ -18,11 +18,9 @@ export class AgentHistoryTransactionService {
this.workspaceOrmManager.runInWorkspaceTransaction(
(transactionScope) => {
const getRepository = (name: AgentHistoryObjectName) =>
- transactionScope.getRepository(
- name,
- { shouldBypassPermissionChecks: true },
- { shouldSkipEventEmission: true },
- );
+ transactionScope.getRepositoryWithoutPermissionChecks(name, {
+ shouldSkipEventEmission: true,
+ });
return work({
executeRawQuery: transactionScope.executeRawQuery,
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/services/tool-call-answer.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/services/tool-call-answer.service.ts
index 5f876cd5e4b..1171dca8a95 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/services/tool-call-answer.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/services/tool-call-answer.service.ts
@@ -511,12 +511,7 @@ export class ToolCallAnswerService {
);
}
- const rolePermissions = await this.actorService.resolveRolePermissions({
- workspaceId,
- authContext,
- });
-
- if (!isDefined(rolePermissions)) {
+ if (!(await this.actorService.hasRole(authContext))) {
throw new AiException(
'Answering requires a role in the workspace',
AiExceptionCode.TOOL_CALL_RESOLUTION_FORBIDDEN,
@@ -531,7 +526,6 @@ export class ToolCallAnswerService {
return {
workspaceId,
- ...rolePermissions,
authContext,
actorContext,
userId,
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-workspace-stats/resolvers/ai-workspace-stats.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-workspace-stats/resolvers/ai-workspace-stats.resolver.ts
index 7607131c7ce..296cdb22a6a 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-workspace-stats/resolvers/ai-workspace-stats.resolver.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-workspace-stats/resolvers/ai-workspace-stats.resolver.ts
@@ -1,3 +1,4 @@
+import { getWorkspaceAuthContext } from 'src/engine/core-modules/auth/storage/workspace-auth-context.storage';
import { UseGuards } from '@nestjs/common';
import { Query } from '@nestjs/graphql';
@@ -5,13 +6,11 @@ import { PermissionFlagType } from 'twenty-shared/constants';
import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
-import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { WorkspaceAiStatsDTO } from 'src/engine/metadata-modules/ai/ai-workspace-stats/dtos/workspace-ai-stats.dto';
import { AiWorkspaceStatsService } from 'src/engine/metadata-modules/ai/ai-workspace-stats/services/ai-workspace-stats.service';
-import { UserRoleService } from 'src/engine/permissions/role-assignment/user-role.service';
@UseGuards(
AuthPrincipalGuard({
@@ -31,21 +30,15 @@ import { UserRoleService } from 'src/engine/permissions/role-assignment/user-rol
export class AiWorkspaceStatsResolver {
constructor(
private readonly aiWorkspaceStatsService: AiWorkspaceStatsService,
- private readonly userRoleService: UserRoleService,
) {}
@Query(() => WorkspaceAiStatsDTO)
async findWorkspaceAiStats(
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
- @AuthUserWorkspaceId() userWorkspaceId: string,
): Promise<WorkspaceAiStatsDTO> {
- // The tool catalog is role-scoped, so resolve the caller's role to count
- // the tools they can actually see.
- const roleId = await this.userRoleService.getRoleIdForUserWorkspace({
- userWorkspaceId,
+ return this.aiWorkspaceStatsService.computeStats(
workspaceId,
- });
-
- return this.aiWorkspaceStatsService.computeStats(workspaceId, roleId);
+ getWorkspaceAuthContext(),
+ );
}
}
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-workspace-stats/services/ai-workspace-stats.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-workspace-stats/services/ai-workspace-stats.service.ts
index 09fdda16b7b..3ae1e0f8e36 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-workspace-stats/services/ai-workspace-stats.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-workspace-stats/services/ai-workspace-stats.service.ts
@@ -1,3 +1,4 @@
+import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { InjectAgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/inject-agent-history-repository.decorator';
import { AgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository';
import { Injectable } from '@nestjs/common';
@@ -20,7 +21,7 @@ export class AiWorkspaceStatsService {
async computeStats(
workspaceId: string,
- userRoleId: string,
+ authContext: WorkspaceAuthContext,
): Promise<WorkspaceAiStatsDTO> {
const [conversationsCount, flatMaps, toolIndex] = await Promise.all([
this.threadRepository.count(workspaceId),
@@ -29,11 +30,7 @@ export class AiWorkspaceStatsService {
flatMapsKeys: ['flatSkillMaps'],
}),
// the full role-scoped catalog, to match the Tools tab
- this.toolRegistryService.buildToolIndex(workspaceId, {
- rolePermissionConfig: {
- intersectionOf: { userWorkspaceRoleId: userRoleId },
- },
- }),
+ this.toolRegistryService.buildToolIndex(workspaceId, { authContext }),
]);
const skillsCount = Object.values(
diff --git a/packages/twenty-server/src/engine/metadata-modules/message-channel/services/__tests__/application-message-send.service.spec.ts b/packages/twenty-server/src/engine/metadata-modules/message-channel/services/__tests__/application-message-send.service.spec.ts
index 2f742070426..6fa16ea740a 100644
--- a/packages/twenty-server/src/engine/metadata-modules/message-channel/services/__tests__/application-message-send.service.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/message-channel/services/__tests__/application-message-send.service.spec.ts
@@ -77,7 +77,7 @@ describe('ApplicationMessageSendService', () => {
{ ingest } as unknown as ApplicationMessageIngestionService,
{
executeInWorkspaceContext: jest.fn((callback) => callback()),
- getRepository: jest.fn((objectName: string) => ({
+ getRepositoryWithoutPermissionChecks: jest.fn((objectName: string) => ({
find: jest.fn().mockResolvedValue(rowsByObjectName[objectName] ?? []),
})),
} as unknown as WorkspaceOrmManager,
diff --git a/packages/twenty-server/src/engine/metadata-modules/message-channel/services/application-message-folders.service.ts b/packages/twenty-server/src/engine/metadata-modules/message-channel/services/application-message-folders.service.ts
index 07d81e12507..f4b7617ffe9 100644
--- a/packages/twenty-server/src/engine/metadata-modules/message-channel/services/application-message-folders.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/message-channel/services/application-message-folders.service.ts
@@ -154,9 +154,8 @@ export class ApplicationMessageFoldersService {
await this.workspaceOrmManager.executeInWorkspaceContext(
async () => {
const messageFolderAssociationRepository =
- this.workspaceOrmManager.getRepository<MessageChannelMessageAssociationMessageFolderWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<MessageChannelMessageAssociationMessageFolderWorkspaceEntity>(
'messageChannelMessageAssociationMessageFolder',
- { shouldBypassPermissionChecks: true },
);
await messageFolderAssociationRepository.delete({
diff --git a/packages/twenty-server/src/engine/metadata-modules/message-channel/services/application-message-ingestion.service.ts b/packages/twenty-server/src/engine/metadata-modules/message-channel/services/application-message-ingestion.service.ts
index ed62736e8eb..085e6c9036d 100644
--- a/packages/twenty-server/src/engine/metadata-modules/message-channel/services/application-message-ingestion.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/message-channel/services/application-message-ingestion.service.ts
@@ -326,10 +326,10 @@ export class ApplicationMessageIngestionService {
return;
}
- const repository = this.workspaceOrmManager.getRepository(
- objectMetadataName,
- { shouldBypassPermissionChecks: true },
- );
+ const repository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ objectMetadataName,
+ );
const found = await repository.find({
where: { id: In([...ids]) },
diff --git a/packages/twenty-server/src/engine/metadata-modules/message-channel/services/application-message-send.service.ts b/packages/twenty-server/src/engine/metadata-modules/message-channel/services/application-message-send.service.ts
index 3be7f4edabf..8af58093758 100644
--- a/packages/twenty-server/src/engine/metadata-modules/message-channel/services/application-message-send.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/message-channel/services/application-message-send.service.ts
@@ -271,9 +271,9 @@ export class ApplicationMessageSendService {
await this.workspaceOrmManager.executeInWorkspaceContext(
async () => {
const threadMessages = await this.workspaceOrmManager
- .getRepository<MessageWorkspaceEntity>('message', {
- shouldBypassPermissionChecks: true,
- })
+ .getRepositoryWithoutPermissionChecks<MessageWorkspaceEntity>(
+ 'message',
+ )
.find({ where: { messageThreadId }, select: { id: true } });
const threadMessageIds = threadMessages.map((message) => message.id);
@@ -283,9 +283,8 @@ export class ApplicationMessageSendService {
}
const associations = await this.workspaceOrmManager
- .getRepository<MessageChannelMessageAssociationWorkspaceEntity>(
+ .getRepositoryWithoutPermissionChecks<MessageChannelMessageAssociationWorkspaceEntity>(
'messageChannelMessageAssociation',
- { shouldBypassPermissionChecks: true },
)
.find({
where: {
@@ -300,9 +299,9 @@ export class ApplicationMessageSendService {
}
const latestMessages = await this.workspaceOrmManager
- .getRepository<MessageWorkspaceEntity>('message', {
- shouldBypassPermissionChecks: true,
- })
+ .getRepositoryWithoutPermissionChecks<MessageWorkspaceEntity>(
+ 'message',
+ )
.find({
where: {
id: In(
@@ -317,9 +316,8 @@ export class ApplicationMessageSendService {
const messageIds = latestMessages.map((message) => message.id);
const participants = await this.workspaceOrmManager
- .getRepository<MessageParticipantWorkspaceEntity>(
+ .getRepositoryWithoutPermissionChecks<MessageParticipantWorkspaceEntity>(
'messageParticipant',
- { shouldBypassPermissionChecks: true },
)
.find({
where: { messageId: In(messageIds) },
@@ -422,7 +420,7 @@ export class ApplicationMessageSendService {
}
const records = await this.workspaceOrmManager
- .getRepository(objectMetadataName, { shouldBypassPermissionChecks: true })
+ .getRepositoryWithoutPermissionChecks(objectMetadataName)
.find({ where: { id: In(definedIds) }, select: { id: true } });
return new Set(records.map((record) => record.id));
diff --git a/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/services/navigation-menu-item-record-identifier.service.ts b/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/services/navigation-menu-item-record-identifier.service.ts
index ffd9b367d62..2463ea548a2 100644
--- a/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/services/navigation-menu-item-record-identifier.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/services/navigation-menu-item-record-identifier.service.ts
@@ -11,10 +11,12 @@ import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadat
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
import { RecordIdentifierDTO } from 'src/engine/metadata-modules/navigation-menu-item/dtos/record-identifier.dto';
import { getMinimalSelectForRecordIdentifier } from 'src/engine/metadata-modules/navigation-menu-item/utils/get-minimal-select-for-record-identifier.util';
+import {
+ PermissionsException,
+ PermissionsExceptionCode,
+} from 'src/engine/permissions/permissions.exception';
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
-import { getWorkspaceContext } from 'src/engine/twenty-orm/storage/orm-workspace-context.storage';
import { formatResult } from 'src/engine/twenty-orm/utils/format-result.util';
-import { resolveRolePermissionConfig } from 'src/engine/permissions/principal/utils/resolve-role-permission-config.util';
import { FileFolder } from 'twenty-shared/types';
@Injectable()
@@ -66,23 +68,11 @@ export class NavigationMenuItemRecordIdentifierService {
workspace: { id: workspaceId },
} as WorkspaceAuthContext);
- const record = await this.workspaceOrmManager.executeInWorkspaceContext(
- async () => {
- const context = getWorkspaceContext();
- const rolePermissionConfig = resolveRolePermissionConfig({
- authContext: context.authContext,
- userWorkspaceRoleMap: context.userWorkspaceRoleMap,
- apiKeyRoleMap: context.apiKeyRoleMap,
- flatRoleTargetByAgentIdMaps: context.flatRoleTargetByAgentIdMaps,
- });
-
- if (!rolePermissionConfig) {
- return null;
- }
-
+ // A caller who cannot read the record sees no identifier rather than an error
+ const record = await this.workspaceOrmManager
+ .executeInWorkspaceContext(async () => {
const repository = this.workspaceOrmManager.getRepository(
objectMetadata.nameSingular,
- rolePermissionConfig,
);
const alias = objectMetadata.nameSingular;
@@ -108,9 +98,17 @@ export class NavigationMenuItemRecordIdentifierService {
flatObjectMetadataMaps,
flatFieldMetadataMaps,
);
- },
- resolvedAuthContext,
- );
+ }, resolvedAuthContext)
+ .catch((error: unknown) => {
+ if (
+ error instanceof PermissionsException &&
+ error.code === PermissionsExceptionCode.PERMISSION_DENIED
+ ) {
+ return null;
+ }
+
+ throw error;
+ });
if (!isDefined(record)) {
return null;
diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout.service.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout.service.ts
index 94523e162a8..599e1c36a17 100644
--- a/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout.service.ts
@@ -562,12 +562,10 @@ export class PageLayoutService {
const authContext = buildSystemAuthContext(workspaceId);
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const dashboardRepository = this.workspaceOrmManager.getRepository(
- 'dashboard',
- {
- shouldBypassPermissionChecks: true,
- },
- );
+ const dashboardRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ 'dashboard',
+ );
const dashboards = await dashboardRepository.find({
where: {
diff --git a/packages/twenty-server/src/engine/metadata-modules/role/tools/__tests__/role-tools.spec.ts b/packages/twenty-server/src/engine/metadata-modules/role/tools/__tests__/role-tools.spec.ts
index 1f70254fe9a..c2991f79898 100644
--- a/packages/twenty-server/src/engine/metadata-modules/role/tools/__tests__/role-tools.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/role/tools/__tests__/role-tools.spec.ts
@@ -1,3 +1,5 @@
+import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
+import { type PermissionsService } from 'src/engine/permissions/permissions.service';
import {
FieldActorSource,
RowLevelPermissionPredicateGroupLogicalOperator,
@@ -31,6 +33,9 @@ const workspaceMemberIdFieldMetadataId = '5e6f7a8b-9c0d-4e1f-8a3b-4c5d6e7f8091';
const predicateGroupId = '6f7a8b9c-0d1e-4f2a-9b4c-5d6e7f8091a2';
const buildServices = () => ({
+ permissionsService: {
+ getRoleIds: jest.fn().mockResolvedValue([callerRoleId]),
+ },
roleService: {
getWorkspaceRoles: jest.fn().mockResolvedValue([]),
createRole: jest.fn(),
@@ -80,10 +85,12 @@ const buildListRolesTool = (services: ReturnType<typeof buildServices>) =>
const context: ToolProviderContext = {
workspaceId,
- rolePermissionConfig: {
- intersectionOf: { userWorkspaceRoleId: callerRoleId },
- },
userWorkspaceId: callerUserWorkspaceId,
+ authContext: {
+ type: 'user',
+ workspace: { id: workspaceId },
+ userWorkspaceId: callerUserWorkspaceId,
+ } as WorkspaceAuthContext,
actorContext: {
source: FieldActorSource.MANUAL,
workspaceMemberId: 'caller-workspace-member-id',
@@ -226,6 +233,7 @@ describe('Role tools', () => {
const output = await new UpdateRoleTool(
services.roleService as unknown as RoleService,
+ services.permissionsService as unknown as PermissionsService,
).execute({
input: {
roleId: otherRoleId,
@@ -243,26 +251,26 @@ describe('Role tools', () => {
},
actingRoleIds: [callerRoleId],
});
+ expect(services.permissionsService.getRoleIds).toHaveBeenCalledWith(
+ context.authContext,
+ );
});
- it('forwards every role of the caller config for lockout protection', async () => {
+ it('forwards every role of the caller for lockout protection', async () => {
const services = buildServices();
services.roleService.updateRole.mockResolvedValue({ id: otherRoleId });
+ services.permissionsService.getRoleIds.mockResolvedValue([
+ callerRoleId,
+ 'application-role-id',
+ ]);
await new UpdateRoleTool(
services.roleService as unknown as RoleService,
+ services.permissionsService as unknown as PermissionsService,
).execute({
input: { roleId: otherRoleId, update: { canUpdateAllSettings: false } },
- context: {
- ...context,
- rolePermissionConfig: {
- intersectionOf: {
- userWorkspaceRoleId: callerRoleId,
- applicationRoleId: 'application-role-id',
- },
- },
- },
+ context,
});
expect(services.roleService.updateRole).toHaveBeenCalledTimes(1);
@@ -273,19 +281,18 @@ describe('Role tools', () => {
);
});
- it('forwards no caller role when the config bypasses permission checks', async () => {
+ it('forwards no caller role for the system', async () => {
const services = buildServices();
services.roleService.updateRole.mockResolvedValue({ id: otherRoleId });
+ services.permissionsService.getRoleIds.mockResolvedValue([]);
await new UpdateRoleTool(
services.roleService as unknown as RoleService,
+ services.permissionsService as unknown as PermissionsService,
).execute({
input: { roleId: otherRoleId, update: { canUpdateAllSettings: false } },
- context: {
- ...context,
- rolePermissionConfig: { shouldBypassPermissionChecks: true },
- },
+ context,
});
expect(services.roleService.updateRole).toHaveBeenCalledTimes(1);
@@ -306,6 +313,7 @@ describe('Role tools', () => {
const output = await new DeleteRoleTool(
services.roleService as unknown as RoleService,
+ services.permissionsService as unknown as PermissionsService,
).execute({ input: { roleId: otherRoleId }, context });
expect(output.success).toBe(true);
diff --git a/packages/twenty-server/src/engine/metadata-modules/role/tools/delete-role.tool.ts b/packages/twenty-server/src/engine/metadata-modules/role/tools/delete-role.tool.ts
index 874b3f28d43..bbb14ad5d1f 100644
--- a/packages/twenty-server/src/engine/metadata-modules/role/tools/delete-role.tool.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/role/tools/delete-role.tool.ts
@@ -7,7 +7,7 @@ import { BaseTool } from 'src/engine/core-modules/tool-provider/interfaces/base-
import { type ToolExecuteArgs } from 'src/engine/core-modules/tool-provider/types/tool-execute-args.type';
import { type ToolOutput } from 'src/engine/core-modules/tool/types/tool-output.type';
import { RoleService } from 'src/engine/metadata-modules/role/role.service';
-import { getRoleIdsFromRolePermissionConfig } from 'src/engine/permissions/principal/utils/get-role-ids-from-role-permission-config.util';
+import { PermissionsService } from 'src/engine/permissions/permissions.service';
const deleteRoleInputSchema = z.object({
roleId: z.uuid().describe('Id of the role to delete'),
@@ -24,18 +24,21 @@ System-managed roles (isEditable=false, like Admin), the workspace default role,
export class DeleteRoleTool extends BaseTool<typeof deleteRoleInputSchema> {
readonly inputSchema = deleteRoleInputSchema;
- constructor(private readonly roleService: RoleService) {
+ constructor(
+ private readonly roleService: RoleService,
+ private readonly permissionsService: PermissionsService,
+ ) {
super();
}
async execute({
input,
- context: { workspaceId, rolePermissionConfig },
+ context: { workspaceId, authContext },
}: ToolExecuteArgs<typeof deleteRoleInputSchema>): Promise<ToolOutput> {
const deletedRole = await this.roleService.deleteRole({
roleId: input.roleId,
workspaceId,
- actingRoleIds: getRoleIdsFromRolePermissionConfig(rolePermissionConfig),
+ actingRoleIds: await this.permissionsService.getRoleIds(authContext),
});
return {
diff --git a/packages/twenty-server/src/engine/metadata-modules/role/tools/role-tools.module.ts b/packages/twenty-server/src/engine/metadata-modules/role/tools/role-tools.module.ts
index 46348cda3c0..38d69f5b1c0 100644
--- a/packages/twenty-server/src/engine/metadata-modules/role/tools/role-tools.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/role/tools/role-tools.module.ts
@@ -11,6 +11,7 @@ import { UpdateRoleTool } from 'src/engine/metadata-modules/role/tools/update-ro
import { UpsertObjectPermissionsTool } from 'src/engine/metadata-modules/role/tools/upsert-object-permissions.tool';
import { UpsertRowLevelPermissionRulesTool } from 'src/engine/metadata-modules/role/tools/upsert-row-level-permission-rules.tool';
import { RowLevelPermissionModule } from 'src/engine/metadata-modules/row-level-permission-predicate/row-level-permission.module';
+import { PermissionsModule } from 'src/engine/permissions/permissions.module';
import { UserRoleModule } from 'src/engine/permissions/role-assignment/user-role.module';
@Module({
@@ -20,6 +21,7 @@ import { UserRoleModule } from 'src/engine/permissions/role-assignment/user-role
ObjectPermissionModule,
RowLevelPermissionModule,
ApplicationModule,
+ PermissionsModule,
],
providers: [
ListRolesTool,
diff --git a/packages/twenty-server/src/engine/metadata-modules/role/tools/update-role.tool.ts b/packages/twenty-server/src/engine/metadata-modules/role/tools/update-role.tool.ts
index 84f9b08faee..68e2391d6fb 100644
--- a/packages/twenty-server/src/engine/metadata-modules/role/tools/update-role.tool.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/role/tools/update-role.tool.ts
@@ -7,9 +7,9 @@ import { BaseTool } from 'src/engine/core-modules/tool-provider/interfaces/base-
import { type ToolExecuteArgs } from 'src/engine/core-modules/tool-provider/types/tool-execute-args.type';
import { type ToolOutput } from 'src/engine/core-modules/tool/types/tool-output.type';
import { RoleService } from 'src/engine/metadata-modules/role/role.service';
+import { PermissionsService } from 'src/engine/permissions/permissions.service';
import { rolePermissionsSchema } from 'src/engine/metadata-modules/role/tools/schemas/role-permissions.schema';
import { toRoleSummary } from 'src/engine/metadata-modules/role/tools/utils/to-role-summary.util';
-import { getRoleIdsFromRolePermissionConfig } from 'src/engine/permissions/principal/utils/get-role-ids-from-role-permission-config.util';
const updateRoleInputSchema = z.object({
roleId: z.uuid().describe('Id of the role to update'),
@@ -33,13 +33,16 @@ System-managed roles (isEditable=false, like Admin) cannot be updated. Updates t
export class UpdateRoleTool extends BaseTool<typeof updateRoleInputSchema> {
readonly inputSchema = updateRoleInputSchema;
- constructor(private readonly roleService: RoleService) {
+ constructor(
+ private readonly roleService: RoleService,
+ private readonly permissionsService: PermissionsService,
+ ) {
super();
}
async execute({
input,
- context: { workspaceId, rolePermissionConfig },
+ context: { workspaceId, authContext },
}: ToolExecuteArgs<typeof updateRoleInputSchema>): Promise<ToolOutput> {
const role = await this.roleService.updateRole({
workspaceId,
@@ -47,7 +50,7 @@ export class UpdateRoleTool extends BaseTool<typeof updateRoleInputSchema> {
id: input.roleId,
update: input.update,
},
- actingRoleIds: getRoleIdsFromRolePermissionConfig(rolePermissionConfig),
+ actingRoleIds: await this.permissionsService.getRoleIds(authContext),
});
return {
diff --git a/packages/twenty-server/src/engine/metadata-modules/view/services/view-query-params.service.ts b/packages/twenty-server/src/engine/metadata-modules/view/services/view-query-params.service.ts
index 315e4e6a57b..0c86ec83d48 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view/services/view-query-params.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view/services/view-query-params.service.ts
@@ -172,9 +172,8 @@ export class ViewQueryParamsService {
try {
const workspaceMemberRepository =
- this.workspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkspaceMemberWorkspaceEntity>(
'workspaceMember',
- { shouldBypassPermissionChecks: true },
);
const workspaceMember = await workspaceMemberRepository.findOne({
diff --git a/packages/twenty-server/src/engine/metadata-modules/view/tools/__tests__/view-tools.spec.ts b/packages/twenty-server/src/engine/metadata-modules/view/tools/__tests__/view-tools.spec.ts
index 7bb1cded550..b7474a835e9 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view/tools/__tests__/view-tools.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view/tools/__tests__/view-tools.spec.ts
@@ -238,7 +238,6 @@ describe('View tools', () => {
const context: ToolProviderContext = {
workspaceId,
userWorkspaceId,
- rolePermissionConfig: { shouldBypassPermissionChecks: true },
actorContext: workspaceMemberId
? {
source: FieldActorSource.MANUAL,
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 05c557e7b7b..696cfb9ab82 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
@@ -4,9 +4,18 @@ import { Injectable } from '@nestjs/common';
import groupBy from 'lodash.groupby';
import { type ObjectRecordEvent } from 'twenty-shared/database-events';
-import { type RecordShareAccessLevel } from 'twenty-shared/types';
+import {
+ type ObjectsPermissions,
+ type RecordShareAccessLevel,
+} from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
+import {
+ PermissionsException,
+ PermissionsExceptionCode,
+ PermissionsExceptionMessage,
+} from 'src/engine/permissions/permissions.exception';
+import { getPermissionsPrincipalObjectsPermissions } from 'src/engine/permissions/role/utils/get-permissions-principal-objects-permissions.util';
import { PrivateRecordStorageService } from 'src/engine/permissions/private-record/services/private-record-storage.service';
import { type PrivateRecordState } from 'src/engine/permissions/private-record/types/private-record-state.type';
import { RecordShareStorageService } from 'src/engine/permissions/record-share/services/record-share-storage.service';
@@ -149,6 +158,37 @@ export class RecordAccessPolicyService {
return uniqueRecordIds.every((recordId) => admittedRecordIds.has(recordId));
}
+ async getObjectsPermissionsOrThrow(
+ principals: PermissionsPrincipalsContext,
+ ): Promise<ObjectsPermissions> {
+ const objectsPermissions = await this.findObjectsPermissions(principals);
+
+ if (!isDefined(objectsPermissions)) {
+ throw new PermissionsException(
+ PermissionsExceptionMessage.PERMISSION_DENIED,
+ PermissionsExceptionCode.PERMISSION_DENIED,
+ );
+ }
+
+ return objectsPermissions;
+ }
+
+ // undefined when the principals hold no role
+ async findObjectsPermissions(
+ principals: PermissionsPrincipalsContext,
+ ): Promise<ObjectsPermissions | undefined> {
+ const principal = await this.findPrincipalsWithRoles(principals);
+
+ if (!isDefined(principal)) {
+ return undefined;
+ }
+
+ return getPermissionsPrincipalObjectsPermissions({
+ principal,
+ metadataMaps: await this.findPrincipalMetadataMaps(principal),
+ });
+ }
+
async loadPermissionsMetadataMaps(
workspaceId: string,
): Promise<PermissionsMetadataMaps> {
@@ -311,18 +351,18 @@ export class RecordAccessPolicyService {
}): Promise<TResult> {
if (isDefined(transactionScope)) {
return work(
- transactionScope.getRepository(objectNameSingular, {
- shouldBypassPermissionChecks: true,
- }),
+ transactionScope.getRepositoryWithoutPermissionChecks(
+ objectNameSingular,
+ ),
);
}
return this.workspaceOrmManager.executeInWorkspaceContext(
() =>
work(
- this.workspaceOrmManager.getRepository(objectNameSingular, {
- shouldBypassPermissionChecks: true,
- }),
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ objectNameSingular,
+ ),
),
buildSystemAuthContext(workspaceId),
);
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 cf9ab7cb00c..a746d19a3f7 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
@@ -168,6 +168,7 @@ describe('resolvePermissionsRowAccessOutcome', () => {
canReadObjectRecords,
},
},
+ permissionFlags: {},
},
});
diff --git a/packages/twenty-server/src/engine/permissions/permissions.service.ts b/packages/twenty-server/src/engine/permissions/permissions.service.ts
index faa14b04438..e79510818d0 100644
--- a/packages/twenty-server/src/engine/permissions/permissions.service.ts
+++ b/packages/twenty-server/src/engine/permissions/permissions.service.ts
@@ -24,13 +24,14 @@ import {
} from 'src/engine/permissions/permissions.exception';
import { type UserWorkspacePermissions } from 'src/engine/permissions/types/user-workspace-permissions.type';
import { type UserWorkspaceRoleMap } from 'src/engine/metadata-modules/role-target/types/user-workspace-role-map.type';
-import {
- type RoleIdsBySource,
- type RolePermissionConfig,
-} from 'src/engine/permissions/principal/types/role-permission-config.type';
-import { buildAgentRoleIdsBySource } from 'src/engine/permissions/principal/utils/build-agent-role-ids-by-source.util';
-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 { isSystemAuthContext } from 'src/engine/core-modules/auth/guards/is-system-auth-context.guard';
+import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
+import { buildPermissionsPrincipalRoleMaps } from 'src/engine/permissions/principal/utils/build-permissions-principal-role-maps.util';
+import { getPermissionsPrincipalRoleIds } from 'src/engine/permissions/principal/utils/get-permissions-principal-role-ids.util';
+import { getPermissionsPrincipalsFromAuthContext } from 'src/engine/permissions/principal/utils/get-permissions-principals-from-auth-context.util';
+import { resolveApplicationRoleId } from 'src/engine/permissions/principal/utils/resolve-application-role-id.util';
+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 { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
@Injectable()
@@ -136,52 +137,59 @@ export class PermissionsService {
'flatRoleTargetByAgentIdMaps',
]);
- const callerRoleIdsBySource =
- await this.resolveCallerRoleIdsBySourceOrThrow({
- workspaceId,
- userWorkspaceId,
- apiKeyId,
- applicationId,
- userWorkspaceRoleMap,
- flatApplicationMaps,
- flatRoleMaps,
- });
+ const callerRoleIds = await this.resolveCallerRoleIdsOrThrow({
+ workspaceId,
+ userWorkspaceId,
+ apiKeyId,
+ applicationId,
+ userWorkspaceRoleMap,
+ flatApplicationMaps,
+ flatRoleMaps,
+ });
return this.isPermissionFlagGrantedToRoles({
- roleIdsBySource: {
- ...callerRoleIdsBySource,
- ...buildAgentRoleIdsBySource({
- agentId,
- flatRoleTargetByAgentIdMaps,
- }),
- },
+ roleIds: isDefined(agentId)
+ ? [...callerRoleIds, flatRoleTargetByAgentIdMaps[agentId]?.roleId]
+ : callerRoleIds,
setting,
flatRoleMaps,
flatRolePermissionFlagMaps,
});
}
- public async checkRolesPermissions(
- rolePermissionConfig: RolePermissionConfig,
- workspaceId: string,
- setting: PermissionFlagType,
- ): Promise<boolean> {
- if ('shouldBypassPermissionChecks' in rolePermissionConfig) {
+ public async hasPermissionFlag({
+ authContext,
+ setting,
+ }: {
+ authContext: WorkspaceAuthContext | undefined;
+ setting: PermissionFlagType;
+ }): Promise<boolean> {
+ if (!isDefined(authContext)) {
+ return false;
+ }
+
+ if (isSystemAuthContext(authContext)) {
return true;
}
+ const principal = await this.findPrincipalWithRoles(authContext);
+
+ if (!isDefined(principal)) {
+ return false;
+ }
+
const { flatRoleMaps, flatRolePermissionFlagMaps } =
- await this.workspaceCacheService.getOrRecompute(workspaceId, [
+ await this.workspaceCacheService.getOrRecompute(principal.workspaceId, [
'flatRoleMaps',
'flatRolePermissionFlagMaps',
]);
- const { scope } = rolePermissionConfig;
+ const { scope } = principal;
return (
(!isDefined(scope) || (scope.permissionFlags[setting] ?? false)) &&
this.isPermissionFlagGrantedToRoles({
- roleIdsBySource: rolePermissionConfig.intersectionOf,
+ roleIds: getPermissionsPrincipalRoleIds(principal),
setting,
flatRoleMaps,
flatRolePermissionFlagMaps,
@@ -189,27 +197,80 @@ export class PermissionsService {
);
}
- // Like the ORM, a role missing from the cache grants nothing
+ // Empty for the system, which acts with no role
+ public async getRoleIds(
+ authContext: WorkspaceAuthContext | undefined,
+ ): Promise<string[]> {
+ if (!isDefined(authContext) || isSystemAuthContext(authContext)) {
+ return [];
+ }
+
+ const principal = await this.findPrincipalWithRoles(authContext);
+
+ return isDefined(principal)
+ ? getPermissionsPrincipalRoleIds(principal)
+ : [];
+ }
+
+ private async findPrincipalWithRoles(
+ authContext: WorkspaceAuthContext,
+ ): Promise<PermissionsPrincipalsWithRolesContext | undefined> {
+ const principals = getPermissionsPrincipalsFromAuthContext(authContext);
+
+ if (!isDefined(principals)) {
+ return undefined;
+ }
+
+ const {
+ userWorkspaceRoleMap,
+ apiKeyRoleMap,
+ flatRoleTargetByAgentIdMaps,
+ flatApplicationMaps,
+ flatWorkspaceMemberMaps,
+ } = await this.workspaceCacheService.getOrRecompute(
+ principals.workspaceId,
+ [
+ 'userWorkspaceRoleMap',
+ 'apiKeyRoleMap',
+ 'flatRoleTargetByAgentIdMaps',
+ 'flatApplicationMaps',
+ 'flatWorkspaceMemberMaps',
+ ],
+ );
+
+ return resolvePermissionsPrincipalsWithRoles({
+ principalsContext: principals,
+ roleMaps: buildPermissionsPrincipalRoleMaps({
+ flatWorkspaceMemberMaps,
+ userWorkspaceRoleMap,
+ apiKeyRoleMap,
+ flatRoleTargetByAgentIdMaps,
+ flatApplicationMaps,
+ }),
+ });
+ }
+
+ // Like the ORM, a role missing from the cache grants nothing, and every role must grant the flag
private isPermissionFlagGrantedToRoles({
- roleIdsBySource,
+ roleIds,
setting,
flatRoleMaps,
flatRolePermissionFlagMaps,
}: {
- roleIdsBySource: RoleIdsBySource;
+ roleIds: (string | undefined)[];
setting: PermissionFlagType;
flatRoleMaps: FlatRoleMaps;
flatRolePermissionFlagMaps: FlatRolePermissionFlagMaps;
}): boolean {
- const roleIds = getRoleIdsToIntersect(roleIdsBySource);
-
return (
- isDefined(roleIds) &&
+ roleIds.length > 0 &&
roleIds.every((roleId) => {
- const flatRole = findFlatEntityByIdInFlatEntityMaps({
- flatEntityId: roleId,
- flatEntityMaps: flatRoleMaps,
- });
+ const flatRole = isDefined(roleId)
+ ? findFlatEntityByIdInFlatEntityMaps({
+ flatEntityId: roleId,
+ flatEntityMaps: flatRoleMaps,
+ })
+ : undefined;
return (
isDefined(flatRole) &&
@@ -223,7 +284,8 @@ export class PermissionsService {
);
}
- private async resolveCallerRoleIdsBySourceOrThrow({
+ // undefined entries are roles a caller should have but does not, which deny
+ private async resolveCallerRoleIdsOrThrow({
workspaceId,
userWorkspaceId,
apiKeyId,
@@ -239,7 +301,7 @@ export class PermissionsService {
userWorkspaceRoleMap: UserWorkspaceRoleMap;
flatApplicationMaps: FlatApplicationCacheMaps;
flatRoleMaps: FlatRoleMaps;
- }): Promise<RoleIdsBySource> {
+ }): Promise<(string | undefined)[]> {
if (isDefined(apiKeyId)) {
const apiKeyRoleId = await this.apiKeyRoleService.getRoleIdForApiKeyId(
apiKeyId,
@@ -261,7 +323,7 @@ export class PermissionsService {
);
}
- return { apiKeyRoleId: apiKeyFlatRole.id };
+ return [apiKeyFlatRole.id];
}
if (isDefined(userWorkspaceId)) {
@@ -272,7 +334,7 @@ export class PermissionsService {
});
if (!isDefined(applicationId)) {
- return { userWorkspaceRoleId: userFlatRole.id };
+ return [userFlatRole.id];
}
const application = this.findActiveApplication({
@@ -288,16 +350,19 @@ export class PermissionsService {
);
}
- return buildUserRoleIdsBySource({
- userRoleId: userFlatRole.id,
- application: {
- defaultRoleId: this.findApplicationRoleIdOrThrow({
- application,
- flatRoleMaps,
- }),
- sourceType: application.sourceType,
- },
- });
+ return [
+ userFlatRole.id,
+ resolveApplicationRoleId({
+ application: {
+ defaultRoleId: this.findApplicationRoleIdOrThrow({
+ application,
+ flatRoleMaps,
+ }),
+ sourceType: application.sourceType,
+ },
+ userRoleId: userFlatRole.id,
+ }),
+ ];
}
if (isDefined(applicationId)) {
@@ -313,12 +378,10 @@ export class PermissionsService {
);
}
- return {
- applicationRoleId: this.findApplicationRoleIdOrThrow({
- application,
- flatRoleMaps,
- }),
- };
+ return [
+ this.findApplicationRoleIdOrThrow({ application, flatRoleMaps }) ??
+ undefined,
+ ];
}
throw new PermissionsException(
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
index 21f76739f3b..498fafbfe44 100644
--- 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
@@ -1,5 +1,7 @@
/* @license Enterprise */
+import { type PermissionScope } from 'src/engine/permissions/principal/types/permission-scope.type';
+
// TODO(@charlesBochet): drop deprecatedRoleOnly once every caller names the principal holding the role
export type PermissionsDeprecatedRoleOnlyPrincipal = {
type: 'deprecatedRoleOnly';
@@ -57,4 +59,6 @@ export type PermissionsPrincipalsContext = {
mainPrincipal: PermissionsMainPrincipal;
limitingPrincipal?: PermissionsLimitingPrincipal;
applicationPrincipal: PermissionsApplicationPrincipal;
+ // narrows what the roles allow, and leaves no reach beyond them
+ scope?: PermissionScope;
};
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
index 9e9383aeb99..ecf46d89d5f 100644
--- 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
@@ -36,5 +36,5 @@ export type PermissionsPrincipalsWithRolesContext = {
limitingPrincipal?: PermissionsLimitingPrincipalWithRole;
applicationPrincipal: PermissionsApplicationPrincipalWithRole;
// narrows what the roles allow, and leaves no reach beyond them
- scope?: Pick<PermissionScope, 'objectsPermissions'>;
+ scope?: PermissionScope;
};
diff --git a/packages/twenty-server/src/engine/permissions/principal/types/role-permission-config.type.ts b/packages/twenty-server/src/engine/permissions/principal/types/role-permission-config.type.ts
deleted file mode 100644
index 8885a55cec4..00000000000
--- a/packages/twenty-server/src/engine/permissions/principal/types/role-permission-config.type.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { type PermissionScope } from 'src/engine/permissions/principal/types/permission-scope.type';
-
-// null: this actor takes part but has no role, so nothing is allowed
-export type RoleIdsBySource = {
- userWorkspaceRoleId?: string | null;
- apiKeyRoleId?: string | null;
- applicationRoleId?: string | null;
- agentRoleId?: string | null;
- webhookRoleId?: string | null;
-};
-
-export type RolePermissionConfig =
- | { shouldBypassPermissionChecks: true }
- | {
- intersectionOf: RoleIdsBySource;
- scope?: PermissionScope;
- };
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
deleted file mode 100644
index 6d9bb40b392..00000000000
--- a/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/build-permissions-principal-roles.util.spec.ts
+++ /dev/null
@@ -1,151 +0,0 @@
-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: { type: 'workspaceMember', workspaceMemberId: MEMBER_ID },
- limitingPrincipal: { type: 'agent', agentId: AGENT_ID },
- applicationPrincipal: { type: 'application', 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: {
- type: 'workspaceMember',
- roleId: USER_ROLE_ID,
- workspaceMemberId: MEMBER_ID,
- },
- limitingPrincipal: {
- type: 'agent',
- roleId: AGENT_ROLE_ID,
- agentId: AGENT_ID,
- },
- applicationPrincipal: {
- type: 'application',
- 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: { type: 'apiKey', apiKeyId: 'api-key-1' },
- applicationPrincipal: { type: 'customApplication' },
- },
- }),
- ).toEqual({
- mainPrincipal: {
- type: 'apiKey',
- roleId: 'api-key-role',
- apiKeyId: 'api-key-1',
- },
- limitingPrincipal: undefined,
- applicationPrincipal: { type: 'customApplication' },
- });
- });
-
- it('puts an application acting alone in main and app', () => {
- expect(
- buildPermissionsPrincipalRoles({
- roleIdsBySource: { applicationRoleId: APPLICATION_ROLE_ID },
- principalsContext: {
- workspaceId: 'workspace-1',
- mainPrincipal: { type: 'application', applicationId: APPLICATION_ID },
- applicationPrincipal: {
- type: 'application',
- applicationId: APPLICATION_ID,
- },
- },
- }),
- ).toEqual({
- mainPrincipal: {
- type: 'application',
- roleId: APPLICATION_ROLE_ID,
- applicationId: APPLICATION_ID,
- },
- limitingPrincipal: undefined,
- applicationPrincipal: {
- type: 'application',
- 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: {
- type: 'workspaceMember',
- roleId: USER_ROLE_ID,
- workspaceMemberId: MEMBER_ID,
- },
- limitingPrincipal: undefined,
- applicationPrincipal: { type: 'customApplication' },
- });
- });
-
- 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: { type: 'deprecatedRoleOnly', roleId: AGENT_ROLE_ID },
- limitingPrincipal: undefined,
- applicationPrincipal: { type: 'customApplication' },
- });
- });
-});
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/get-role-ids-from-role-permission-config.util.spec.ts b/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/get-role-ids-from-role-permission-config.util.spec.ts
deleted file mode 100644
index dda9d23acaa..00000000000
--- a/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/get-role-ids-from-role-permission-config.util.spec.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { getRoleIdsFromRolePermissionConfig } from 'src/engine/permissions/principal/utils/get-role-ids-from-role-permission-config.util';
-
-describe('getRoleIdsFromRolePermissionConfig', () => {
- it('returns the roles to intersect', () => {
- expect(
- getRoleIdsFromRolePermissionConfig({
- intersectionOf: {
- userWorkspaceRoleId: 'member-role-id',
- agentRoleId: 'agent-role-id',
- },
- }),
- ).toEqual(['agent-role-id', 'member-role-id']);
- });
-
- it('returns no role ids for a config that denies', () => {
- expect(
- getRoleIdsFromRolePermissionConfig({
- intersectionOf: {
- userWorkspaceRoleId: 'member-role-id',
- agentRoleId: null,
- },
- }),
- ).toEqual([]);
- });
-
- it('returns no role ids for a bypass config', () => {
- expect(
- getRoleIdsFromRolePermissionConfig({
- shouldBypassPermissionChecks: true,
- }),
- ).toEqual([]);
- });
-});
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/get-role-ids-to-intersect.util.spec.ts b/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/get-role-ids-to-intersect.util.spec.ts
deleted file mode 100644
index a972cf3fc18..00000000000
--- a/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/get-role-ids-to-intersect.util.spec.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-import { getRoleIdsToIntersect } from 'src/engine/permissions/principal/utils/get-role-ids-to-intersect.util';
-
-describe('getRoleIdsToIntersect', () => {
- it('returns the role of a single source', () => {
- expect(getRoleIdsToIntersect({ apiKeyRoleId: 'api-key-role-id' })).toEqual([
- 'api-key-role-id',
- ]);
- });
-
- it('returns every restricting role once, the agent role first', () => {
- expect(
- getRoleIdsToIntersect({
- applicationRoleId: 'application-role-id',
- userWorkspaceRoleId: 'member-role-id',
- agentRoleId: 'agent-role-id',
- }),
- ).toEqual(['agent-role-id', 'member-role-id', 'application-role-id']);
- });
-
- it('returns a role shared by several sources once', () => {
- expect(
- getRoleIdsToIntersect({
- userWorkspaceRoleId: 'shared-role-id',
- applicationRoleId: 'shared-role-id',
- }),
- ).toEqual(['shared-role-id']);
- });
-
- it('ignores a source without a key', () => {
- expect(
- getRoleIdsToIntersect({
- userWorkspaceRoleId: 'member-role-id',
- applicationRoleId: undefined,
- }),
- ).toEqual(['member-role-id']);
- });
-
- it('denies when an actor takes part without a role, whatever the others hold', () => {
- expect(
- getRoleIdsToIntersect({
- agentRoleId: null,
- userWorkspaceRoleId: 'member-role-id',
- applicationRoleId: 'application-role-id',
- }),
- ).toBeNull();
- });
-
- const OTHER_SOURCES_WITH_ROLES = {
- agentRoleId: 'agent-role-id',
- userWorkspaceRoleId: 'member-role-id',
- apiKeyRoleId: 'api-key-role-id',
- applicationRoleId: 'application-role-id',
- } as const;
-
- const buildCombinations = (
- sources: (keyof typeof OTHER_SOURCES_WITH_ROLES)[],
- ): Record<string, string>[] =>
- sources.reduce<Record<string, string>[]>(
- (combinations, source) => [
- ...combinations,
- ...combinations.map((combination) => ({
- ...combination,
- [source]: OTHER_SOURCES_WITH_ROLES[source],
- })),
- ],
- [{}],
- );
-
- it.each(['userWorkspaceRoleId', 'apiKeyRoleId', 'agentRoleId'] as const)(
- 'denies a %s without a role in every combination',
- (sourceWithoutRole) => {
- const otherSources = (
- Object.keys(
- OTHER_SOURCES_WITH_ROLES,
- ) as (keyof typeof OTHER_SOURCES_WITH_ROLES)[]
- ).filter((source) => source !== sourceWithoutRole);
-
- for (const combination of buildCombinations(otherSources)) {
- expect(
- getRoleIdsToIntersect({
- ...combination,
- [sourceWithoutRole]: null,
- }),
- ).toBeNull();
- }
- },
- );
-
- it('denies when no source restricts', () => {
- expect(getRoleIdsToIntersect({})).toBeNull();
- });
-});
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/is-denying-role-ids-by-source.util.spec.ts b/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/is-denying-role-ids-by-source.util.spec.ts
deleted file mode 100644
index 0866781aea6..00000000000
--- a/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/is-denying-role-ids-by-source.util.spec.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { isDenyingRoleIdsBySource } from 'src/engine/permissions/principal/utils/is-denying-role-ids-by-source.util';
-
-describe('isDenyingRoleIdsBySource', () => {
- it('denies when no source restricts', () => {
- expect(isDenyingRoleIdsBySource({})).toBe(true);
- expect(isDenyingRoleIdsBySource({ applicationRoleId: undefined })).toBe(
- true,
- );
- });
-
- it('denies when an actor takes part without a role', () => {
- expect(
- isDenyingRoleIdsBySource({
- userWorkspaceRoleId: 'member-role-id',
- agentRoleId: null,
- }),
- ).toBe(true);
- });
-
- it('allows when every actor that takes part has a role', () => {
- expect(
- isDenyingRoleIdsBySource({
- userWorkspaceRoleId: 'member-role-id',
- applicationRoleId: 'application-role-id',
- }),
- ).toBe(false);
- });
-});
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/resolve-application-role-id.util.spec.ts b/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/resolve-application-role-id.util.spec.ts
index 6ab6ab9bd02..4842b71ec2f 100644
--- a/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/resolve-application-role-id.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/resolve-application-role-id.util.spec.ts
@@ -10,7 +10,7 @@ describe('resolveApplicationRoleId', () => {
resolveApplicationRoleId({
application: { defaultRoleId: 'application-role-id', sourceType },
}),
- ).toEqual({ applicationRoleId: 'application-role-id' });
+ ).toBe('application-role-id');
});
it.each([
@@ -22,7 +22,7 @@ describe('resolveApplicationRoleId', () => {
resolveApplicationRoleId({
application: { defaultRoleId: null, sourceType },
}),
- ).toEqual({ applicationRoleId: null });
+ ).toBeUndefined();
});
it('lends the member role to an OAuth-only application without a role', () => {
@@ -34,25 +34,17 @@ describe('resolveApplicationRoleId', () => {
},
userRoleId: 'user-role-id',
}),
- ).toEqual({ applicationRoleId: 'user-role-id' });
+ ).toBe('user-role-id');
});
- it.each([undefined, null])(
- 'denies an OAuth-only application without a role when no member role backs it (member role: %s)',
- (userRoleId) => {
- expect(
- resolveApplicationRoleId({
- application: {
- defaultRoleId: null,
- sourceType: ApplicationRegistrationSourceType.OAUTH_ONLY,
- },
- userRoleId,
- }),
- ).toEqual({ applicationRoleId: null });
- },
- );
-
- it('adds no restriction without an application', () => {
- expect(resolveApplicationRoleId({ application: undefined })).toEqual({});
+ it('denies an OAuth-only application without a role when no member role backs it', () => {
+ expect(
+ resolveApplicationRoleId({
+ application: {
+ defaultRoleId: null,
+ sourceType: ApplicationRegistrationSourceType.OAUTH_ONLY,
+ },
+ }),
+ ).toBeUndefined();
});
});
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/resolve-role-permission-config.util.spec.ts b/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/resolve-role-permission-config.util.spec.ts
deleted file mode 100644
index a27f16cec5d..00000000000
--- a/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/resolve-role-permission-config.util.spec.ts
+++ /dev/null
@@ -1,235 +0,0 @@
-import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';
-import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
-import { type FlatRoleTargetByAgentIdMaps } from 'src/engine/metadata-modules/flat-agent/types/flat-role-target-by-agent-id-maps.type';
-import { resolveRolePermissionConfig } from 'src/engine/permissions/principal/utils/resolve-role-permission-config.util';
-
-const USER_WORKSPACE_ID = 'user-workspace-1';
-const USER_ROLE_ID = 'user-role-1';
-const APPLICATION_ROLE_ID = 'application-role-1';
-const API_KEY_ID = 'api-key-1';
-const API_KEY_ROLE_ID = 'api-key-role-1';
-const AGENT_ROLE_ID = 'agent-role-1';
-const AGENT_ID = 'agent-1';
-const AGENT_WITHOUT_ROLE_ID = 'agent-without-role';
-
-const buildUserContext = ({
- userWorkspaceId = USER_WORKSPACE_ID,
- application,
-}: {
- userWorkspaceId?: string;
- application?: {
- defaultRoleId: string | null;
- sourceType?: ApplicationRegistrationSourceType;
- };
-} = {}): WorkspaceAuthContext =>
- ({
- type: 'user',
- workspace: { id: 'workspace-1' },
- userWorkspaceId,
- user: { id: 'user-1' },
- workspaceMemberId: 'workspace-member-1',
- workspaceMember: { id: 'workspace-member-1' },
- ...(application ? { application } : {}),
- }) as unknown as WorkspaceAuthContext;
-
-const buildApiKeyContext = (apiKeyId: string): WorkspaceAuthContext =>
- ({
- type: 'apiKey',
- workspace: { id: 'workspace-1' },
- apiKey: { id: apiKeyId },
- }) as unknown as WorkspaceAuthContext;
-
-const buildApplicationContext = (
- defaultRoleId: string | null,
- sourceType?: ApplicationRegistrationSourceType,
-): WorkspaceAuthContext =>
- ({
- type: 'application',
- workspace: { id: 'workspace-1' },
- application: { defaultRoleId, sourceType },
- }) as unknown as WorkspaceAuthContext;
-
-const withAgent = (
- authContext: WorkspaceAuthContext,
- agentId: string,
-): WorkspaceAuthContext =>
- ({ ...authContext, agentId }) as WorkspaceAuthContext;
-
-const resolve = (authContext: WorkspaceAuthContext) =>
- resolveRolePermissionConfig({
- authContext,
- userWorkspaceRoleMap: { [USER_WORKSPACE_ID]: USER_ROLE_ID },
- apiKeyRoleMap: { [API_KEY_ID]: API_KEY_ROLE_ID },
- flatRoleTargetByAgentIdMaps: {
- [AGENT_ID]: { roleId: AGENT_ROLE_ID },
- } as unknown as FlatRoleTargetByAgentIdMaps,
- });
-
-describe('resolveRolePermissionConfig', () => {
- it('bypasses permission checks for a system request', () => {
- expect(
- resolve({
- type: 'system',
- workspace: { id: 'workspace-1' },
- } as unknown as WorkspaceAuthContext),
- ).toEqual({ shouldBypassPermissionChecks: true });
- });
-
- it('restricts a user request to the user role', () => {
- expect(resolve(buildUserContext())).toEqual({
- intersectionOf: { userWorkspaceRoleId: USER_ROLE_ID },
- });
- });
-
- it('bounds the user role by the application acting for the user', () => {
- expect(
- resolve(
- buildUserContext({
- application: { defaultRoleId: APPLICATION_ROLE_ID },
- }),
- ),
- ).toEqual({
- intersectionOf: {
- userWorkspaceRoleId: USER_ROLE_ID,
- applicationRoleId: APPLICATION_ROLE_ID,
- },
- });
- });
-
- it('bounds a user acting through an OAuth-only application without a role by the user role alone', () => {
- expect(
- resolve(
- buildUserContext({
- application: {
- defaultRoleId: null,
- sourceType: ApplicationRegistrationSourceType.OAUTH_ONLY,
- },
- }),
- ),
- ).toEqual({
- intersectionOf: {
- userWorkspaceRoleId: USER_ROLE_ID,
- applicationRoleId: USER_ROLE_ID,
- },
- });
- });
-
- it('allows nothing for a user acting through an installed application without a role', () => {
- expect(
- resolve(
- buildUserContext({
- application: {
- defaultRoleId: null,
- sourceType: ApplicationRegistrationSourceType.NPM,
- },
- }),
- ),
- ).toBeNull();
- });
-
- it('allows nothing for a user without a role, even with an application', () => {
- expect(
- resolve(
- buildUserContext({
- userWorkspaceId: 'unknown-user-workspace',
- application: { defaultRoleId: APPLICATION_ROLE_ID },
- }),
- ),
- ).toBeNull();
- });
-
- it('allows nothing for a user without a role, with an application without a role', () => {
- expect(
- resolve(
- buildUserContext({
- userWorkspaceId: 'unknown-user-workspace',
- application: { defaultRoleId: null },
- }),
- ),
- ).toBeNull();
- });
-
- it('allows nothing for a user without a role acting alone', () => {
- expect(
- resolve(buildUserContext({ userWorkspaceId: 'unknown-user-workspace' })),
- ).toBeNull();
- });
-
- it('restricts an api key request to the api key role', () => {
- expect(resolve(buildApiKeyContext(API_KEY_ID))).toEqual({
- intersectionOf: { apiKeyRoleId: API_KEY_ROLE_ID },
- });
- });
-
- it('allows nothing for an api key without a role', () => {
- expect(resolve(buildApiKeyContext('unknown-api-key'))).toBeNull();
- });
-
- it('restricts an application request to the application role', () => {
- expect(resolve(buildApplicationContext(APPLICATION_ROLE_ID))).toEqual({
- intersectionOf: { applicationRoleId: APPLICATION_ROLE_ID },
- });
- });
-
- it('allows nothing for an application without a role', () => {
- expect(resolve(buildApplicationContext(null))).toBeNull();
- });
-
- it('allows nothing for an OAuth-only application without a role acting alone, even with an agent', () => {
- expect(
- resolve(
- withAgent(
- buildApplicationContext(
- null,
- ApplicationRegistrationSourceType.OAUTH_ONLY,
- ),
- AGENT_ID,
- ),
- ),
- ).toBeNull();
- });
-
- it('narrows a user application token to the role of the agent it carries', () => {
- expect(
- resolve(
- withAgent(
- buildUserContext({
- application: { defaultRoleId: APPLICATION_ROLE_ID },
- }),
- AGENT_ID,
- ),
- ),
- ).toEqual({
- intersectionOf: {
- userWorkspaceRoleId: USER_ROLE_ID,
- applicationRoleId: APPLICATION_ROLE_ID,
- agentRoleId: AGENT_ROLE_ID,
- },
- });
- });
-
- it('narrows an application token to the role of the agent it carries', () => {
- expect(
- resolve(
- withAgent(buildApplicationContext(APPLICATION_ROLE_ID), AGENT_ID),
- ),
- ).toEqual({
- intersectionOf: {
- applicationRoleId: APPLICATION_ROLE_ID,
- agentRoleId: AGENT_ROLE_ID,
- },
- });
- });
-
- it('allows nothing when the agent the token carries has no role', () => {
- expect(
- resolve(withAgent(buildUserContext(), AGENT_WITHOUT_ROLE_ID)),
- ).toBeNull();
- });
-
- it('allows nothing for an application without a role, even with an agent', () => {
- expect(
- resolve(withAgent(buildApplicationContext(null), AGENT_ID)),
- ).toBeNull();
- });
-});
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/build-agent-role-ids-by-source.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/build-agent-role-ids-by-source.util.ts
deleted file mode 100644
index 06d952dda65..00000000000
--- a/packages/twenty-server/src/engine/permissions/principal/utils/build-agent-role-ids-by-source.util.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { isDefined } from 'twenty-shared/utils';
-
-import { type FlatRoleTargetByAgentIdMaps } from 'src/engine/metadata-modules/flat-agent/types/flat-role-target-by-agent-id-maps.type';
-import { type RoleIdsBySource } from 'src/engine/permissions/principal/types/role-permission-config.type';
-
-// An agent without a role, or a deleted one, resolves to null, which denies
-export const buildAgentRoleIdsBySource = ({
- agentId,
- flatRoleTargetByAgentIdMaps,
-}: {
- agentId: string | undefined;
- flatRoleTargetByAgentIdMaps: FlatRoleTargetByAgentIdMaps;
-}): Pick<RoleIdsBySource, 'agentRoleId'> =>
- isDefined(agentId)
- ? { agentRoleId: flatRoleTargetByAgentIdMaps[agentId]?.roleId ?? null }
- : {};
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
deleted file mode 100644
index 9efc736594a..00000000000
--- a/packages/twenty-server/src/engine/permissions/principal/utils/build-deprecated-permissions-principals-from-config.util.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/* @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: { type: 'deprecatedRoleOnly', roleId: mainPrincipal.roleId },
- limitingPrincipal: isDefined(limitingPrincipal)
- ? { type: 'deprecatedRoleOnly', roleId: limitingPrincipal.roleId }
- : undefined,
- applicationPrincipal:
- applicationPrincipal.type === 'customApplication'
- ? applicationPrincipal
- : { type: 'deprecatedRoleOnly', roleId: applicationPrincipal.roleId },
- };
-};
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/build-permissions-principal-role-maps.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/build-permissions-principal-role-maps.util.ts
new file mode 100644
index 00000000000..d46a91f00b5
--- /dev/null
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/build-permissions-principal-role-maps.util.ts
@@ -0,0 +1,26 @@
+/* @license Enterprise */
+
+import { type FlatWorkspaceMemberMaps } from 'src/engine/core-modules/user/types/flat-workspace-member-maps.type';
+import { type PermissionsPrincipalRoleMaps } from 'src/engine/permissions/principal/utils/resolve-permissions-principals-with-roles.util';
+
+const EMPTY_WORKSPACE_MEMBER_MAPS = { byId: {}, userWorkspaceIdByUserId: {} };
+
+export const buildPermissionsPrincipalRoleMaps = ({
+ flatWorkspaceMemberMaps,
+ userWorkspaceRoleMap,
+ apiKeyRoleMap,
+ flatRoleTargetByAgentIdMaps,
+ flatApplicationMaps,
+}: Omit<
+ PermissionsPrincipalRoleMaps,
+ 'flatWorkspaceMemberMaps' | 'flatRoleTargetMaps'
+> & {
+ flatWorkspaceMemberMaps?: FlatWorkspaceMemberMaps;
+}): PermissionsPrincipalRoleMaps => ({
+ flatWorkspaceMemberMaps:
+ flatWorkspaceMemberMaps ?? EMPTY_WORKSPACE_MEMBER_MAPS,
+ userWorkspaceRoleMap,
+ apiKeyRoleMap,
+ flatRoleTargetByAgentIdMaps,
+ flatApplicationMaps,
+});
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
deleted file mode 100644
index a3fa77befb3..00000000000
--- a/packages/twenty-server/src/engine/permissions/principal/utils/build-permissions-principal-roles.util.ts
+++ /dev/null
@@ -1,153 +0,0 @@
-/* @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 => {
- switch (mainPrincipal?.type) {
- case undefined:
- case 'deprecatedRoleOnly':
- return FALLBACK_MAIN_ROLE_ID_KEYS.find(
- (roleIdKey) => roleIdsBySource[roleIdKey] !== undefined,
- );
- case 'workspaceMember':
- return 'userWorkspaceRoleId';
- case 'apiKey':
- return 'apiKeyRoleId';
- case 'agent':
- return 'agentRoleId';
- case 'application':
- return 'applicationRoleId';
- case 'webhook':
- 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)
- ? { type: 'agent', roleId: agentRoleId, agentId }
- : { type: 'deprecatedRoleOnly', roleId: agentRoleId };
-};
-
-const buildApplicationPrincipal = ({
- applicationRoleId,
- applicationId,
-}: {
- applicationRoleId: string | null | undefined;
- applicationId: string | undefined;
-}): PermissionsApplicationPrincipalWithRole => {
- if (!isDefined(applicationRoleId)) {
- return { type: 'customApplication' };
- }
-
- return isDefined(applicationId)
- ? { type: 'application', roleId: applicationRoleId, applicationId }
- : { type: 'deprecatedRoleOnly', roleId: applicationRoleId };
-};
-
-const getIdentifiedMainPrincipal = (
- principalsContext: PermissionsPrincipalsContext | undefined,
-) => {
- const mainPrincipal = principalsContext?.mainPrincipal;
-
- return mainPrincipal?.type === 'deprecatedRoleOnly'
- ? undefined
- : mainPrincipal;
-};
-
-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 }
- : { type: 'deprecatedRoleOnly', roleId: mainRoleId };
-
- const limitingPrincipal = principalsContext?.limitingPrincipal;
- const applicationPrincipal = principalsContext?.applicationPrincipal;
-
- return {
- mainPrincipal,
- limitingPrincipal:
- mainRoleIdKey === 'agentRoleId'
- ? undefined
- : buildLimitingPrincipal({
- agentRoleId: roleIdsBySource.agentRoleId,
- agentId:
- limitingPrincipal?.type === 'agent'
- ? limitingPrincipal.agentId
- : undefined,
- }),
- applicationPrincipal: buildApplicationPrincipal({
- applicationRoleId: roleIdsBySource.applicationRoleId,
- applicationId:
- applicationPrincipal?.type === 'application'
- ? applicationPrincipal.applicationId
- : undefined,
- }),
- };
-};
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
deleted file mode 100644
index 1337449193e..00000000000
--- a/packages/twenty-server/src/engine/permissions/principal/utils/build-permissions-principals-with-roles-from-config.util.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/* @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 { intersectionOf, scope } = rolePermissionConfig;
- const principalRoles = buildPermissionsPrincipalRoles({
- roleIdsBySource: intersectionOf,
- principalsContext,
- });
-
- if (!isDefined(principalRoles)) {
- return undefined;
- }
-
- return {
- workspaceId,
- ...principalRoles,
- ...(isDefined(scope) ? { scope } : {}),
- };
-};
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/build-user-role-ids-by-source.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/build-user-role-ids-by-source.util.ts
deleted file mode 100644
index 2628a7f3ab2..00000000000
--- a/packages/twenty-server/src/engine/permissions/principal/utils/build-user-role-ids-by-source.util.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';
-import { type RoleIdsBySource } from 'src/engine/permissions/principal/types/role-permission-config.type';
-import { resolveApplicationRoleId } from 'src/engine/permissions/principal/utils/resolve-application-role-id.util';
-
-// An application acting for a user is bounded by both the user's role and its own
-export const buildUserRoleIdsBySource = ({
- userRoleId,
- application,
-}: {
- userRoleId: string | null | undefined;
- application:
- | Pick<FlatApplication, 'defaultRoleId' | 'sourceType'>
- | undefined;
-}): RoleIdsBySource => ({
- userWorkspaceRoleId: userRoleId ?? null,
- ...resolveApplicationRoleId({ application, userRoleId }),
-});
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
index 6ee99bb2b62..2303819f555 100644
--- 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
@@ -1,5 +1,7 @@
/* @license Enterprise */
+import { isDefined } from 'twenty-shared/utils';
+
import { isApiKeyAuthContext } from 'src/engine/core-modules/auth/guards/is-api-key-auth-context.guard';
import { isApplicationAuthContext } from 'src/engine/core-modules/auth/guards/is-application-auth-context.guard';
import { isUserAuthContext } from 'src/engine/core-modules/auth/guards/is-user-auth-context.guard';
@@ -7,8 +9,7 @@ import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/wo
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 = (
+const getIdentityPrincipalsFromAuthContext = (
authContext: WorkspaceAuthContext,
): PermissionsPrincipalsContext | undefined => {
if (isUserAuthContext(authContext)) {
@@ -26,8 +27,8 @@ export const getPermissionsPrincipalsFromAuthContext = (
workspaceId: authContext.workspace.id,
workspaceMemberId: undefined,
apiKeyId: authContext.apiKey.id,
- applicationId: undefined,
- agentId: undefined,
+ applicationId: authContext.application?.id,
+ agentId: authContext.agentId,
});
}
@@ -43,3 +44,19 @@ export const getPermissionsPrincipalsFromAuthContext = (
return undefined;
};
+
+export const getPermissionsPrincipalsFromAuthContext = (
+ authContext: WorkspaceAuthContext,
+): PermissionsPrincipalsContext | undefined => {
+ const principalsContext = getIdentityPrincipalsFromAuthContext(authContext);
+
+ if (
+ !isDefined(principalsContext) ||
+ !('permissionScope' in authContext) ||
+ !isDefined(authContext.permissionScope)
+ ) {
+ return principalsContext;
+ }
+
+ return { ...principalsContext, scope: authContext.permissionScope };
+};
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/get-role-ids-from-role-permission-config.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/get-role-ids-from-role-permission-config.util.ts
deleted file mode 100644
index e6fea3b2731..00000000000
--- a/packages/twenty-server/src/engine/permissions/principal/utils/get-role-ids-from-role-permission-config.util.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-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';
-
-// Bypass and deny both yield no role ids: never read an empty list as "no restriction"
-export const getRoleIdsFromRolePermissionConfig = (
- rolePermissionConfig: RolePermissionConfig,
-): string[] =>
- 'shouldBypassPermissionChecks' in rolePermissionConfig
- ? []
- : (getRoleIdsToIntersect(rolePermissionConfig.intersectionOf) ?? []);
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/get-role-ids-to-intersect.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/get-role-ids-to-intersect.util.ts
deleted file mode 100644
index de4c0d03ddc..00000000000
--- a/packages/twenty-server/src/engine/permissions/principal/utils/get-role-ids-to-intersect.util.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { isDefined } from 'twenty-shared/utils';
-
-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';
-
-// Keyed by every source so none can be left out. The key order is the intersection order,
-// which must stay stable because the intersection keeps the first role's row-level predicates
-const ROLE_SOURCES_IN_INTERSECTION_ORDER = Object.keys({
- agentRoleId: true,
- userWorkspaceRoleId: true,
- apiKeyRoleId: true,
- applicationRoleId: true,
- webhookRoleId: true,
-} satisfies Record<keyof RoleIdsBySource, true>) as (keyof RoleIdsBySource)[];
-
-// null when the config allows nothing
-export const getRoleIdsToIntersect = (
- roleIdsBySource: RoleIdsBySource,
-): string[] | null => {
- if (isDenyingRoleIdsBySource(roleIdsBySource)) {
- return null;
- }
-
- return [
- ...new Set(
- ROLE_SOURCES_IN_INTERSECTION_ORDER.map(
- (source) => roleIdsBySource[source],
- ).filter(isDefined),
- ),
- ];
-};
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/is-denying-role-ids-by-source.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/is-denying-role-ids-by-source.util.ts
deleted file mode 100644
index 0cb68b95b64..00000000000
--- a/packages/twenty-server/src/engine/permissions/principal/utils/is-denying-role-ids-by-source.util.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { type RoleIdsBySource } from 'src/engine/permissions/principal/types/role-permission-config.type';
-
-export const isDenyingRoleIdsBySource = (
- roleIdsBySource: RoleIdsBySource,
-): boolean => {
- const roleIds = Object.values(roleIdsBySource).filter(
- (roleId) => roleId !== undefined,
- );
-
- return roleIds.length === 0 || roleIds.includes(null);
-};
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/resolve-application-role-id.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/resolve-application-role-id.util.ts
index 83947b61d3d..83f616e241f 100644
--- a/packages/twenty-server/src/engine/permissions/principal/utils/resolve-application-role-id.util.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/resolve-application-role-id.util.ts
@@ -2,33 +2,18 @@ import { isDefined } from 'twenty-shared/utils';
import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';
import { isOAuthOnlyApplication } from 'src/engine/core-modules/application/utils/is-oauth-only-application.util';
-import { type RoleIdsBySource } from 'src/engine/permissions/principal/types/role-permission-config.type';
-
-// RoleIdsBySource tells no restriction (undefined) apart from allows nothing (null);
-// we may want explicit literals for both instead of relying on that difference
-const NO_APPLICATION_RESTRICTION = {} as const;
-
-const APPLICATION_ALLOWS_NOTHING = { applicationRoleId: null } as const;
// OAuth-only applications have no role yet, so they act with the role of the member they act for
export const resolveApplicationRoleId = ({
application,
userRoleId,
}: {
- application:
- | Pick<FlatApplication, 'defaultRoleId' | 'sourceType'>
- | undefined;
- userRoleId?: string | null;
-}): Pick<RoleIdsBySource, 'applicationRoleId'> => {
- if (!isDefined(application)) {
- return NO_APPLICATION_RESTRICTION;
- }
-
+ application: Pick<FlatApplication, 'defaultRoleId' | 'sourceType'>;
+ userRoleId?: string;
+}): string | undefined => {
if (isDefined(application.defaultRoleId)) {
- return { applicationRoleId: application.defaultRoleId };
+ return application.defaultRoleId;
}
- return isOAuthOnlyApplication(application) && isDefined(userRoleId)
- ? { applicationRoleId: userRoleId }
- : APPLICATION_ALLOWS_NOTHING;
+ return isOAuthOnlyApplication(application) ? userRoleId : undefined;
};
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
index e1dfc6dbdc2..0cf5c53a91e 100644
--- 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
@@ -23,7 +23,7 @@ import { type FlatRoleTarget } from 'src/engine/metadata-modules/flat-role-targe
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 = {
+export type PermissionsPrincipalRoleMaps = {
flatWorkspaceMemberMaps: {
byId: Partial<Record<string, Pick<FlatWorkspaceMember, 'userId'>>>;
userWorkspaceIdByUserId: FlatWorkspaceMemberMaps['userWorkspaceIdByUserId'];
@@ -107,18 +107,14 @@ const findMainPrincipalRoleId = ({
}
};
-// 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;
+ limitingPrincipal: PermissionsLimitingPrincipal;
roleMaps: PermissionsPrincipalRoleMaps;
}): PermissionsLimitingPrincipalWithRole | undefined => {
- if (
- !isDefined(limitingPrincipal) ||
- limitingPrincipal.type === 'deprecatedRoleOnly'
- ) {
+ if (limitingPrincipal.type === 'deprecatedRoleOnly') {
return limitingPrincipal;
}
@@ -150,7 +146,7 @@ const resolveApplicationPrincipal = ({
return undefined;
}
- const { applicationRoleId } = resolveApplicationRoleId({
+ const applicationRoleId = resolveApplicationRoleId({
application: flatApplication,
userRoleId:
mainPrincipal.type === 'workspaceMember'
@@ -164,7 +160,7 @@ const resolveApplicationPrincipal = ({
roleId: applicationRoleId,
applicationId: applicationPrincipal.applicationId,
}
- : { type: 'customApplication' };
+ : undefined;
};
export const resolvePermissionsPrincipalsWithRoles = ({
@@ -198,13 +194,23 @@ export const resolvePermissionsPrincipalsWithRoles = ({
return undefined;
}
+ const { limitingPrincipal } = principalsContext;
+ const limitingPrincipalWithRole = isDefined(limitingPrincipal)
+ ? resolveLimitingPrincipal({ limitingPrincipal, roleMaps })
+ : undefined;
+
+ // Dropping a limiting agent that lost its role would widen access, so deny instead
+ if (isDefined(limitingPrincipal) && !isDefined(limitingPrincipalWithRole)) {
+ return undefined;
+ }
+
return {
workspaceId: principalsContext.workspaceId,
mainPrincipal,
- limitingPrincipal: resolveLimitingPrincipal({
- limitingPrincipal: principalsContext.limitingPrincipal,
- roleMaps,
- }),
+ limitingPrincipal: limitingPrincipalWithRole,
applicationPrincipal,
+ ...(isDefined(principalsContext.scope)
+ ? { scope: principalsContext.scope }
+ : {}),
};
};
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/resolve-role-permission-config.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/resolve-role-permission-config.util.ts
deleted file mode 100644
index 04000ef9def..00000000000
--- a/packages/twenty-server/src/engine/permissions/principal/utils/resolve-role-permission-config.util.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-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 { isSystemAuthContext } from 'src/engine/core-modules/auth/guards/is-system-auth-context.guard';
-import { isUserAuthContext } from 'src/engine/core-modules/auth/guards/is-user-auth-context.guard';
-import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
-import { type FlatRoleTargetByAgentIdMaps } from 'src/engine/metadata-modules/flat-agent/types/flat-role-target-by-agent-id-maps.type';
-import { type UserWorkspaceRoleMap } from 'src/engine/metadata-modules/role-target/types/user-workspace-role-map.type';
-import {
- type RolePermissionConfig,
- type RoleIdsBySource,
-} from 'src/engine/permissions/principal/types/role-permission-config.type';
-import { buildAgentRoleIdsBySource } from 'src/engine/permissions/principal/utils/build-agent-role-ids-by-source.util';
-import { buildUserRoleIdsBySource } from 'src/engine/permissions/principal/utils/build-user-role-ids-by-source.util';
-import { isDenyingRoleIdsBySource } from 'src/engine/permissions/principal/utils/is-denying-role-ids-by-source.util';
-
-const resolveRoleIdsBySourceFromAuthContext = ({
- authContext,
- userWorkspaceRoleMap,
- apiKeyRoleMap,
- flatRoleTargetByAgentIdMaps,
-}: {
- authContext: WorkspaceAuthContext;
- userWorkspaceRoleMap: UserWorkspaceRoleMap;
- apiKeyRoleMap: Record<string, string>;
- flatRoleTargetByAgentIdMaps: FlatRoleTargetByAgentIdMaps;
-}): RoleIdsBySource => {
- if (isUserAuthContext(authContext)) {
- return {
- ...buildUserRoleIdsBySource({
- userRoleId: userWorkspaceRoleMap[authContext.userWorkspaceId],
- application: authContext.application,
- }),
- ...buildAgentRoleIdsBySource({
- agentId: authContext.agentId,
- flatRoleTargetByAgentIdMaps,
- }),
- };
- }
-
- if (isApiKeyAuthContext(authContext)) {
- return { apiKeyRoleId: apiKeyRoleMap[authContext.apiKey.id] ?? null };
- }
-
- if (isApplicationAuthContext(authContext)) {
- return {
- applicationRoleId: authContext.application.defaultRoleId ?? null,
- ...buildAgentRoleIdsBySource({
- agentId: authContext.agentId,
- flatRoleTargetByAgentIdMaps,
- }),
- };
- }
-
- return {};
-};
-
-// null when the context allows nothing, which each caller turns into its own denial
-export const resolveRolePermissionConfig = ({
- authContext,
- userWorkspaceRoleMap,
- apiKeyRoleMap,
- flatRoleTargetByAgentIdMaps,
-}: {
- authContext: WorkspaceAuthContext;
- userWorkspaceRoleMap: UserWorkspaceRoleMap;
- apiKeyRoleMap: Record<string, string>;
- flatRoleTargetByAgentIdMaps: FlatRoleTargetByAgentIdMaps;
-}): RolePermissionConfig | null => {
- if (isSystemAuthContext(authContext)) {
- return { shouldBypassPermissionChecks: true };
- }
-
- const roleIdsBySource = resolveRoleIdsBySourceFromAuthContext({
- authContext,
- userWorkspaceRoleMap,
- apiKeyRoleMap,
- flatRoleTargetByAgentIdMaps,
- });
-
- return isDenyingRoleIdsBySource(roleIdsBySource)
- ? null
- : { intersectionOf: roleIdsBySource };
-};
diff --git a/packages/twenty-server/src/engine/permissions/private-record/services/private-record-storage.service.ts b/packages/twenty-server/src/engine/permissions/private-record/services/private-record-storage.service.ts
index 9d657f9255b..f3e590e7460 100644
--- a/packages/twenty-server/src/engine/permissions/private-record/services/private-record-storage.service.ts
+++ b/packages/twenty-server/src/engine/permissions/private-record/services/private-record-storage.service.ts
@@ -169,10 +169,11 @@ export class PrivateRecordStorageService {
}): Promise<TResult> {
if (isDefined(transactionScope)) {
return work(
- transactionScope.getRepository(
+ transactionScope.getRepositoryWithoutPermissionChecks(
flatObjectMetadata.nameSingular,
- { shouldBypassPermissionChecks: true },
- { shouldSkipEventEmission: true },
+ {
+ shouldSkipEventEmission: true,
+ },
),
);
}
@@ -180,9 +181,8 @@ export class PrivateRecordStorageService {
return this.workspaceOrmManager.executeInWorkspaceContext(
() =>
work(
- this.workspaceOrmManager.getRepository(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
flatObjectMetadata.nameSingular,
- { shouldBypassPermissionChecks: true },
{ shouldSkipEventEmission: true },
),
),
diff --git a/packages/twenty-server/src/engine/permissions/record-permissions/services/record-permissions.service.ts b/packages/twenty-server/src/engine/permissions/record-permissions/services/record-permissions.service.ts
index 5168b090659..4eb56b34ad5 100644
--- a/packages/twenty-server/src/engine/permissions/record-permissions/services/record-permissions.service.ts
+++ b/packages/twenty-server/src/engine/permissions/record-permissions/services/record-permissions.service.ts
@@ -22,9 +22,7 @@ export class RecordPermissionsService {
await this.workspaceOrmManager.executeInWorkspaceContext(
() =>
this.workspaceOrmManager
- .getRepositoryWithContextPermissions(
- flatObjectMetadata.nameSingular,
- )
+ .getRepository(flatObjectMetadata.nameSingular)
.findRecordIdsAllowedForOperations({
recordIds,
operationTypes: ['select', 'update', 'delete', 'soft-delete'],
diff --git a/packages/twenty-server/src/engine/permissions/record-share/services/record-share-storage.service.ts b/packages/twenty-server/src/engine/permissions/record-share/services/record-share-storage.service.ts
index 2e420a6b516..e81d4b865de 100644
--- a/packages/twenty-server/src/engine/permissions/record-share/services/record-share-storage.service.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/services/record-share-storage.service.ts
@@ -353,9 +353,8 @@ export class RecordShareStorageService {
}
return work(
- transactionScope.getRepository<RecordShare>(
+ transactionScope.getRepositoryWithoutPermissionChecks<RecordShare>(
RECORD_SHARE_OBJECT_METADATA_NAME,
- { shouldBypassPermissionChecks: true },
{ shouldSkipEventEmission: true },
),
);
@@ -364,9 +363,8 @@ export class RecordShareStorageService {
return this.workspaceOrmManager.executeInWorkspaceContext(
() =>
work(
- this.workspaceOrmManager.getRepository<RecordShare>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<RecordShare>(
RECORD_SHARE_OBJECT_METADATA_NAME,
- { shouldBypassPermissionChecks: true },
{ shouldSkipEventEmission: true },
),
),
diff --git a/packages/twenty-server/src/engine/permissions/record-share/services/record-sharing.service.ts b/packages/twenty-server/src/engine/permissions/record-share/services/record-sharing.service.ts
index 5b5f49a669a..731401c7446 100644
--- a/packages/twenty-server/src/engine/permissions/record-share/services/record-sharing.service.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/services/record-sharing.service.ts
@@ -39,10 +39,12 @@ import { type RecordPermissionsDTO } from 'src/engine/permissions/record-permiss
import { type RecordTargetInput } from 'src/engine/permissions/record-permissions/dtos/record-target.input';
import { RecordPermissionsService } from 'src/engine/permissions/record-permissions/services/record-permissions.service';
import { type WorkspaceTransactionScope } from 'src/engine/twenty-orm/types/workspace-transaction-scope.type';
-import { getRoleIdsFromRolePermissionConfig } from 'src/engine/permissions/principal/utils/get-role-ids-from-role-permission-config.util';
import { resolvePrincipalIdsFromAuthContext } from 'src/engine/permissions/principal/utils/resolve-principal-ids-from-auth-context.util';
-import { resolveRolePermissionConfig } from 'src/engine/permissions/principal/utils/resolve-role-permission-config.util';
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
+import { buildPermissionsPrincipalRoleMaps } from 'src/engine/permissions/principal/utils/build-permissions-principal-role-maps.util';
+import { getPermissionsPrincipalRoleIds } from 'src/engine/permissions/principal/utils/get-permissions-principal-role-ids.util';
+import { getPermissionsPrincipalsFromAuthContext } from 'src/engine/permissions/principal/utils/get-permissions-principals-from-auth-context.util';
+import { resolvePermissionsPrincipalsWithRoles } from 'src/engine/permissions/principal/utils/resolve-permissions-principals-with-roles.util';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';
import { escapeIdentifier } from 'src/engine/workspace-manager/workspace-migration/utils/remove-sql-injection.util';
@@ -187,11 +189,9 @@ export class RecordSharingService {
`SELECT id FROM ${escapeIdentifier(getWorkspaceSchemaName(workspaceId))}.${escapeIdentifier(computeObjectTargetTable(flatObjectMetadata))} WHERE id = $1 FOR UPDATE`,
[args.recordId],
);
- const repository =
- this.workspaceOrmManager.getRepositoryWithContextPermissions(
- flatObjectMetadata.nameSingular,
- transactionScope,
- );
+ const repository = transactionScope.getRepository(
+ flatObjectMetadata.nameSingular,
+ );
const writableIds =
await repository.findRecordIdsAllowedForOperation({
recordIds: [args.recordId],
@@ -466,25 +466,40 @@ export class RecordSharingService {
userWorkspaceRoleMap,
apiKeyRoleMap,
flatRoleTargetByAgentIdMaps,
+ flatApplicationMaps,
+ flatWorkspaceMemberMaps,
roleIdsWithAllRecordsAccess,
} = await this.workspaceCacheService.getOrRecompute(workspaceId, [
'userWorkspaceRoleMap',
'apiKeyRoleMap',
'flatRoleTargetByAgentIdMaps',
+ 'flatApplicationMaps',
+ 'flatWorkspaceMemberMaps',
'roleIdsWithAllRecordsAccess',
]);
- const roleMaps = {
- authContext,
- userWorkspaceRoleMap,
- apiKeyRoleMap,
- flatRoleTargetByAgentIdMaps,
- };
- const principalIds = resolvePrincipalIdsFromAuthContext(roleMaps) ?? [];
- const rolePermissionConfig = resolveRolePermissionConfig(roleMaps);
+ const principalIds =
+ resolvePrincipalIdsFromAuthContext({
+ authContext,
+ userWorkspaceRoleMap,
+ apiKeyRoleMap,
+ }) ?? [];
+ const principals = getPermissionsPrincipalsFromAuthContext(authContext);
+ const principal = isDefined(principals)
+ ? resolvePermissionsPrincipalsWithRoles({
+ principalsContext: principals,
+ roleMaps: buildPermissionsPrincipalRoleMaps({
+ flatWorkspaceMemberMaps,
+ userWorkspaceRoleMap,
+ apiKeyRoleMap,
+ flatRoleTargetByAgentIdMaps,
+ flatApplicationMaps,
+ }),
+ })
+ : undefined;
const canAccessAllRecords =
- isDefined(rolePermissionConfig) &&
+ isDefined(principal) &&
canRolesAccessAllRecords({
- roleIds: getRoleIdsFromRolePermissionConfig(rolePermissionConfig),
+ roleIds: getPermissionsPrincipalRoleIds(principal),
roleIdsWithAllRecordsAccess,
});
const shares = await this.recordShareStorageService.findByRecordIds({
@@ -575,7 +590,7 @@ export class RecordSharingService {
return this.workspaceOrmManager.executeInWorkspaceContext(
() =>
this.workspaceOrmManager
- .getRepositoryWithContextPermissions(flatObjectMetadata.nameSingular)
+ .getRepository(flatObjectMetadata.nameSingular)
.isObjectOperationPermittedByRole('update'),
authContext,
);
diff --git a/packages/twenty-server/src/engine/permissions/role-assignment/user-role.service.ts b/packages/twenty-server/src/engine/permissions/role-assignment/user-role.service.ts
index 61c7b494520..61e605021fe 100644
--- a/packages/twenty-server/src/engine/permissions/role-assignment/user-role.service.ts
+++ b/packages/twenty-server/src/engine/permissions/role-assignment/user-role.service.ts
@@ -265,9 +265,8 @@ export class UserRoleService {
return this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const workspaceMemberRepository =
- this.workspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkspaceMemberWorkspaceEntity>(
'workspaceMember',
- { shouldBypassPermissionChecks: true },
);
const workspaceMember = await workspaceMemberRepository.findOne({
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__/compute-objects-permissions-for-roles.util.spec.ts
similarity index 59%
rename from packages/twenty-server/src/engine/permissions/role/utils/__tests__/get-objects-permissions-from-role-permission-config.util.spec.ts
rename to packages/twenty-server/src/engine/permissions/role/utils/__tests__/compute-objects-permissions-for-roles.util.spec.ts
index 97364bc198b..eaf813593d8 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__/compute-objects-permissions-for-roles.util.spec.ts
@@ -1,24 +1,35 @@
import {
FieldMetadataType,
type ObjectPermissions,
+ type ObjectsPermissions,
type ObjectsPermissionsByRoleId,
type RowLevelPermissionPredicate,
RowLevelPermissionPredicateOperand,
} from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
+import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';
import { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/constant/create-empty-flat-entity-maps.constant';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
-import { 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 { getObjectsPermissionsFromRolePermissionConfig } from 'src/engine/permissions/role/utils/get-objects-permissions-from-role-permission-config.util';
import { validateOperationIsPermittedOrThrow } from 'src/engine/permissions/role/utils/validate-operation-is-permitted-or-throw.util';
-import { type ApplicationDefaultRoleMaps } from 'src/engine/permissions/principal/types/application-default-role-maps.type';
import { getFlatFieldMetadataMock } from 'src/engine/metadata-modules/flat-field-metadata/__mocks__/get-flat-field-metadata.mock';
import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-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 FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.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 { buildPermissionsPrincipalRoleMaps } from 'src/engine/permissions/principal/utils/build-permissions-principal-role-maps.util';
+import {
+ type PermissionsPrincipalRoleMaps,
+ resolvePermissionsPrincipalsWithRoles,
+} from 'src/engine/permissions/principal/utils/resolve-permissions-principals-with-roles.util';
+import { computeObjectsPermissionsForRoles } from 'src/engine/permissions/role/utils/compute-objects-permissions-for-roles.util';
+
+type PrincipalWithRoles = Pick<
+ PermissionsPrincipalsWithRolesContext,
+ 'mainPrincipal' | 'limitingPrincipal' | 'applicationPrincipal'
+>;
const OBJECT_ID = 'object-1';
@@ -26,9 +37,18 @@ const EMPTY_FLAT_OBJECT_METADATA_MAPS: FlatEntityMaps<FlatObjectMetadata> =
createEmptyFlatEntityMaps();
const EMPTY_FLAT_FIELD_METADATA_MAPS: FlatEntityMaps<OrmFlatFieldMetadata> =
createEmptyFlatEntityMaps();
-const EMPTY_APPLICATION_DEFAULT_ROLE_MAPS: ApplicationDefaultRoleMaps = {
- byId: {},
-};
+
+const buildRoleMaps = (
+ flatApplicationMaps: PermissionsPrincipalRoleMaps['flatApplicationMaps'] = {
+ byId: {},
+ },
+): PermissionsPrincipalRoleMaps =>
+ buildPermissionsPrincipalRoleMaps({
+ userWorkspaceRoleMap: {},
+ apiKeyRoleMap: {},
+ flatRoleTargetByAgentIdMaps: {},
+ flatApplicationMaps,
+ });
const agentRolePermissions = {
[OBJECT_ID]: {
@@ -59,71 +79,91 @@ const rolesPermissions: ObjectsPermissionsByRoleId = {
'default-role-id': defaultRolePermissions,
};
-describe('getObjectsPermissionsFromRolePermissionConfig', () => {
- it('should resolve a single role unchanged', () => {
- expect(
- getObjectsPermissionsFromRolePermissionConfig({
- principals: undefined,
+const computeForPrincipal = (principal: PrincipalWithRoles) =>
+ computeObjectsPermissionsForRoles({
+ principal,
+ rolesPermissions,
+ flatObjectMetadataMaps: EMPTY_FLAT_OBJECT_METADATA_MAPS,
+ flatFieldMetadataMaps: EMPTY_FLAT_FIELD_METADATA_MAPS,
+ flatApplicationMaps: { byId: {} },
+ });
+
+const computeForPrincipalsContext = ({
+ principalsContext,
+ roleMaps,
+}: {
+ principalsContext: PermissionsPrincipalsContext;
+ roleMaps: PermissionsPrincipalRoleMaps;
+}): ObjectsPermissions => {
+ const principal = resolvePermissionsPrincipalsWithRoles({
+ principalsContext,
+ roleMaps,
+ });
+
+ return isDefined(principal)
+ ? computeObjectsPermissionsForRoles({
+ principal,
rolesPermissions,
flatObjectMetadataMaps: EMPTY_FLAT_OBJECT_METADATA_MAPS,
flatFieldMetadataMaps: EMPTY_FLAT_FIELD_METADATA_MAPS,
- flatApplicationMaps: EMPTY_APPLICATION_DEFAULT_ROLE_MAPS,
- rolePermissionConfig: {
- intersectionOf: { agentRoleId: 'agent-role-id' },
- },
+ flatApplicationMaps: roleMaps.flatApplicationMaps,
+ })
+ : {};
+};
+
+describe('computeObjectsPermissionsForRoles', () => {
+ it('should resolve a single role unchanged', () => {
+ expect(
+ computeForPrincipal({
+ mainPrincipal: { type: 'deprecatedRoleOnly', roleId: 'agent-role-id' },
+ applicationPrincipal: { type: 'customApplication' },
}),
- ).toBe(agentRolePermissions);
+ ).toEqual(agentRolePermissions);
});
- it('should resolve a role held by several sources as that role alone', () => {
+ it('should resolve a role held by several principals as that role alone', () => {
expect(
- getObjectsPermissionsFromRolePermissionConfig({
- principals: undefined,
- rolesPermissions,
- flatObjectMetadataMaps: EMPTY_FLAT_OBJECT_METADATA_MAPS,
- flatFieldMetadataMaps: EMPTY_FLAT_FIELD_METADATA_MAPS,
- flatApplicationMaps: EMPTY_APPLICATION_DEFAULT_ROLE_MAPS,
- rolePermissionConfig: {
- intersectionOf: {
- userWorkspaceRoleId: 'default-role-id',
- applicationRoleId: 'default-role-id',
- },
+ computeForPrincipal({
+ mainPrincipal: {
+ type: 'deprecatedRoleOnly',
+ roleId: 'default-role-id',
+ },
+ applicationPrincipal: {
+ type: 'deprecatedRoleOnly',
+ roleId: 'default-role-id',
},
}),
- ).toBe(defaultRolePermissions);
+ ).toEqual(defaultRolePermissions);
});
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,
- flatApplicationMaps: EMPTY_APPLICATION_DEFAULT_ROLE_MAPS,
- rolePermissionConfig: {
- intersectionOf: {
- agentRoleId: 'agent-role-id',
- userWorkspaceRoleId: 'default-role-id',
- },
+ computeForPrincipal({
+ mainPrincipal: {
+ type: 'deprecatedRoleOnly',
+ roleId: 'default-role-id',
+ },
+ limitingPrincipal: {
+ type: 'agent',
+ agentId: 'agent-id',
+ roleId: 'agent-role-id',
},
+ applicationPrincipal: { type: 'customApplication' },
}),
).toEqual(defaultRolePermissions);
});
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,
- flatApplicationMaps: EMPTY_APPLICATION_DEFAULT_ROLE_MAPS,
- rolePermissionConfig: {
- intersectionOf: {
- userWorkspaceRoleId: 'default-role-id',
- applicationRoleId: 'agent-role-id',
- },
+ computeForPrincipal({
+ mainPrincipal: {
+ type: 'deprecatedRoleOnly',
+ roleId: 'default-role-id',
+ },
+ applicationPrincipal: {
+ type: 'application',
+ applicationId: 'application-id',
+ roleId: 'agent-role-id',
},
})[OBJECT_ID].canReadObjectRecords,
).toBe(false);
@@ -131,87 +171,152 @@ 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,
- flatApplicationMaps: EMPTY_APPLICATION_DEFAULT_ROLE_MAPS,
- rolePermissionConfig: {
- intersectionOf: {
- agentRoleId: 'agent-role-id',
- applicationRoleId: 'missing-role-id',
- },
+ computeForPrincipal({
+ mainPrincipal: { type: 'deprecatedRoleOnly', roleId: 'agent-role-id' },
+ limitingPrincipal: {
+ type: 'agent',
+ agentId: 'agent-id',
+ roleId: 'agent-role-id',
+ },
+ applicationPrincipal: {
+ type: 'application',
+ applicationId: 'application-id',
+ roleId: 'missing-role-id',
},
- }),
- ).toEqual({});
- });
-
- 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,
- flatApplicationMaps: EMPTY_APPLICATION_DEFAULT_ROLE_MAPS,
- rolePermissionConfig: { shouldBypassPermissionChecks: true },
}),
).toEqual({});
});
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,
- flatApplicationMaps: EMPTY_APPLICATION_DEFAULT_ROLE_MAPS,
- rolePermissionConfig: {
- intersectionOf: { apiKeyRoleId: 'missing-role-id' },
+ computeForPrincipal({
+ mainPrincipal: {
+ type: 'apiKey',
+ apiKeyId: 'api-key-id',
+ roleId: 'missing-role-id',
},
+ applicationPrincipal: { type: 'customApplication' },
}),
).toEqual({});
});
it('should deny when the main principal has no role', () => {
expect(
- getObjectsPermissionsFromRolePermissionConfig({
- principals: {
- workspaceId: 'workspace-1',
+ computeForPrincipalsContext({
+ principalsContext: {
+ workspaceId: 'workspace-id',
mainPrincipal: {
type: 'workspaceMember',
workspaceMemberId: 'member-id',
},
- applicationPrincipal: { type: 'customApplication' },
- },
- rolesPermissions,
- flatObjectMetadataMaps: EMPTY_FLAT_OBJECT_METADATA_MAPS,
- flatFieldMetadataMaps: EMPTY_FLAT_FIELD_METADATA_MAPS,
- flatApplicationMaps: EMPTY_APPLICATION_DEFAULT_ROLE_MAPS,
- rolePermissionConfig: {
- intersectionOf: {
- agentRoleId: 'agent-role-id',
- userWorkspaceRoleId: null,
+ limitingPrincipal: {
+ type: 'deprecatedRoleOnly',
+ roleId: 'agent-role-id',
},
+ applicationPrincipal: { type: 'customApplication' },
},
+ roleMaps: buildRoleMaps(),
}),
).toEqual({});
});
- it('should deny when no actor restricts the call', () => {
+ it('should deny when the limiting agent has lost its role', () => {
+ const roleMaps = {
+ ...buildRoleMaps(),
+ apiKeyRoleMap: { 'api-key-id': 'default-role-id' },
+ };
+ const principalsContext: PermissionsPrincipalsContext = {
+ workspaceId: 'workspace-id',
+ mainPrincipal: { type: 'apiKey', apiKeyId: 'api-key-id' },
+ applicationPrincipal: { type: 'customApplication' },
+ };
+
expect(
- getObjectsPermissionsFromRolePermissionConfig({
- principals: undefined,
- rolesPermissions,
- flatObjectMetadataMaps: EMPTY_FLAT_OBJECT_METADATA_MAPS,
- flatFieldMetadataMaps: EMPTY_FLAT_FIELD_METADATA_MAPS,
- flatApplicationMaps: EMPTY_APPLICATION_DEFAULT_ROLE_MAPS,
- rolePermissionConfig: { intersectionOf: {} },
+ computeForPrincipalsContext({ principalsContext, roleMaps }),
+ ).toEqual(defaultRolePermissions);
+ expect(
+ computeForPrincipalsContext({
+ principalsContext: {
+ ...principalsContext,
+ limitingPrincipal: { type: 'agent', agentId: 'deleted-agent-id' },
+ },
+ roleMaps,
}),
).toEqual({});
});
+
+ describe('with member and application principals', () => {
+ const computeForMemberThroughApplication = ({
+ sourceType = ApplicationRegistrationSourceType.LOCAL,
+ applicationRoleId = null,
+ memberRoleId = 'default-role-id',
+ }: {
+ sourceType?: ApplicationRegistrationSourceType;
+ applicationRoleId?: string | null;
+ memberRoleId?: string | null;
+ }) =>
+ computeForPrincipalsContext({
+ principalsContext: {
+ workspaceId: 'workspace-id',
+ mainPrincipal: {
+ type: 'workspaceMember',
+ workspaceMemberId: 'workspace-member-id',
+ },
+ applicationPrincipal: {
+ type: 'application',
+ applicationId: 'application-id',
+ },
+ },
+ roleMaps: {
+ ...buildRoleMaps({
+ byId: {
+ 'application-id': {
+ id: 'application-id',
+ defaultRoleId: applicationRoleId,
+ sourceType,
+ deletedAt: null,
+ },
+ },
+ }),
+ flatWorkspaceMemberMaps: {
+ byId: { 'workspace-member-id': { userId: 'user-id' } },
+ userWorkspaceIdByUserId: { 'user-id': 'user-workspace-id' },
+ },
+ userWorkspaceRoleMap: isDefined(memberRoleId)
+ ? { 'user-workspace-id': memberRoleId }
+ : {},
+ },
+ });
+
+ it('should intersect the member role with the application role', () => {
+ expect(
+ computeForMemberThroughApplication({
+ applicationRoleId: 'agent-role-id',
+ }),
+ ).toEqual(defaultRolePermissions);
+ });
+
+ it('should deny a member without a role', () => {
+ expect(
+ computeForMemberThroughApplication({
+ applicationRoleId: 'agent-role-id',
+ memberRoleId: null,
+ }),
+ ).toEqual({});
+ });
+
+ it('should deny an installed application without a role', () => {
+ expect(computeForMemberThroughApplication({})).toEqual({});
+ });
+
+ it('should fall back to the member role for an OAuth-only application', () => {
+ expect(
+ computeForMemberThroughApplication({
+ sourceType: ApplicationRegistrationSourceType.OAUTH_ONLY,
+ }),
+ ).toEqual(defaultRolePermissions);
+ });
+ });
});
const INVOICE_ID = 'invoice-id';
@@ -255,20 +360,23 @@ flatFieldMetadataMaps.byUniversalIdentifier.amount = getFlatFieldMetadataMock({
});
flatFieldMetadataMaps.universalIdentifierById[AMOUNT_FIELD_ID] = 'amount';
-const flatApplicationMaps: ApplicationDefaultRoleMaps = {
- byId: {
- 'owning-application-id': {
- id: 'owning-application-id',
- defaultRoleId: 'owning-application-role-id',
- deletedAt: null,
- },
- 'other-application-id': {
- id: 'other-application-id',
- defaultRoleId: 'other-application-role-id',
- deletedAt: null,
+const flatApplicationMaps: PermissionsPrincipalRoleMaps['flatApplicationMaps'] =
+ {
+ byId: {
+ 'owning-application-id': {
+ id: 'owning-application-id',
+ defaultRoleId: 'owning-application-role-id',
+ sourceType: ApplicationRegistrationSourceType.LOCAL,
+ deletedAt: null,
+ },
+ 'other-application-id': {
+ id: 'other-application-id',
+ defaultRoleId: 'other-application-role-id',
+ sourceType: ApplicationRegistrationSourceType.LOCAL,
+ deletedAt: null,
+ },
},
- },
-};
+ };
const disabledActionRolesPermissions = Object.fromEntries(
[
@@ -278,135 +386,129 @@ const disabledActionRolesPermissions = Object.fromEntries(
].map((roleId) => [roleId, { [INVOICE_ID]: FULL_ACCESS }]),
);
-describe('getObjectsPermissionsFromRolePermissionConfig disabled actions', () => {
+describe('computeObjectsPermissionsForRoles disabled actions', () => {
it.each<{
actor: string;
- principals: PermissionsPrincipalsContext;
- intersectionOf: RoleIdsBySource;
+ principal: PrincipalWithRoles;
canDestroy: boolean;
}>([
{
actor: 'the owning application',
- principals: {
- workspaceId: 'workspace-1',
+ principal: {
mainPrincipal: {
type: 'application',
applicationId: 'owning-application-id',
+ roleId: 'owning-application-role-id',
},
applicationPrincipal: {
type: 'application',
applicationId: 'owning-application-id',
+ roleId: 'owning-application-role-id',
},
},
- intersectionOf: { applicationRoleId: 'owning-application-role-id' },
canDestroy: true,
},
{
actor: 'another application',
- principals: {
- workspaceId: 'workspace-1',
+ principal: {
mainPrincipal: {
type: 'application',
applicationId: 'other-application-id',
+ roleId: 'other-application-role-id',
},
applicationPrincipal: {
type: 'application',
applicationId: 'other-application-id',
+ roleId: 'other-application-role-id',
},
},
- intersectionOf: { applicationRoleId: 'other-application-role-id' },
canDestroy: false,
},
{
actor: 'a user',
- principals: {
- workspaceId: 'workspace-1',
+ principal: {
mainPrincipal: {
type: 'workspaceMember',
workspaceMemberId: 'member-id',
+ roleId: 'user-role-id',
},
applicationPrincipal: { type: 'customApplication' },
},
- intersectionOf: { userWorkspaceRoleId: 'user-role-id' },
canDestroy: false,
},
{
actor: 'a user through the owning application',
- principals: {
- workspaceId: 'workspace-1',
+ principal: {
mainPrincipal: {
type: 'workspaceMember',
workspaceMemberId: 'member-id',
+ roleId: 'user-role-id',
},
applicationPrincipal: {
type: 'application',
applicationId: 'owning-application-id',
+ roleId: 'owning-application-role-id',
},
},
- intersectionOf: {
- userWorkspaceRoleId: 'user-role-id',
- applicationRoleId: 'owning-application-role-id',
- },
canDestroy: false,
},
{
actor: "a user holding the owning application's default role",
- principals: {
- workspaceId: 'workspace-1',
+ principal: {
mainPrincipal: {
type: 'workspaceMember',
workspaceMemberId: 'member-id',
+ roleId: 'owning-application-role-id',
},
applicationPrincipal: { type: 'customApplication' },
},
- intersectionOf: { userWorkspaceRoleId: 'owning-application-role-id' },
canDestroy: false,
},
{
actor: "an API key holding the owning application's default role",
- principals: {
- workspaceId: 'workspace-1',
- mainPrincipal: { type: 'apiKey', apiKeyId: 'api-key-id' },
+ principal: {
+ mainPrincipal: {
+ type: 'apiKey',
+ apiKeyId: 'api-key-id',
+ roleId: 'owning-application-role-id',
+ },
applicationPrincipal: { type: 'customApplication' },
},
- intersectionOf: { apiKeyRoleId: 'owning-application-role-id' },
canDestroy: false,
},
{
actor: "an agent holding the owning application's default role",
- principals: {
- workspaceId: 'workspace-1',
- mainPrincipal: { type: 'agent', agentId: 'agent-id' },
+ principal: {
+ mainPrincipal: {
+ type: 'agent',
+ agentId: 'agent-id',
+ roleId: 'owning-application-role-id',
+ },
applicationPrincipal: { type: 'customApplication' },
},
- intersectionOf: { agentRoleId: 'owning-application-role-id' },
canDestroy: false,
},
{
actor: 'the owning application with a user holding its default role',
- principals: {
- workspaceId: 'workspace-1',
+ principal: {
mainPrincipal: {
type: 'workspaceMember',
workspaceMemberId: 'member-id',
+ roleId: 'owning-application-role-id',
},
applicationPrincipal: {
type: 'application',
applicationId: 'owning-application-id',
+ roleId: 'owning-application-role-id',
},
},
- intersectionOf: {
- userWorkspaceRoleId: 'owning-application-role-id',
- applicationRoleId: 'owning-application-role-id',
- },
canDestroy: false,
},
])(
'disabled actions allowed for $actor: $canDestroy',
- ({ principals, intersectionOf, canDestroy }) => {
- const invoicePermissions = getObjectsPermissionsFromRolePermissionConfig({
- rolePermissionConfig: { intersectionOf },
- principals,
+ ({ principal, canDestroy }) => {
+ const invoicePermissions = computeObjectsPermissionsForRoles({
+ principal,
rolesPermissions: disabledActionRolesPermissions,
flatObjectMetadataMaps,
flatFieldMetadataMaps,
@@ -482,10 +584,14 @@ describe('getObjectsPermissionsFromRolePermissionConfig disabled actions', () =>
flatFieldMetadata.universalIdentifier;
}
- const objectsPermissions = getObjectsPermissionsFromRolePermissionConfig({
- principals: undefined,
- rolePermissionConfig: {
- intersectionOf: { userWorkspaceRoleId: 'user-role-id' },
+ const objectsPermissions = computeObjectsPermissionsForRoles({
+ principal: {
+ mainPrincipal: {
+ type: 'workspaceMember',
+ workspaceMemberId: 'member-id',
+ roleId: 'user-role-id',
+ },
+ applicationPrincipal: { type: 'customApplication' },
},
rolesPermissions: {
'user-role-id': {
@@ -515,7 +621,7 @@ describe('getObjectsPermissionsFromRolePermissionConfig disabled actions', () =>
});
});
-describe('getObjectsPermissionsFromRolePermissionConfig with a scope', () => {
+describe('computeObjectsPermissionsForRoles with a scope', () => {
const USER_PREDICATE: RowLevelPermissionPredicate = {
id: 'predicate-id',
fieldMetadataId: AMOUNT_FIELD_ID,
@@ -540,32 +646,46 @@ describe('getObjectsPermissionsFromRolePermissionConfig with a scope', () => {
};
const compute = ({
- intersectionOf,
+ mainPrincipal = { type: 'deprecatedRoleOnly', roleId: 'user-role-id' },
scopeObjectPermissions,
+ hasScope = true,
}: {
- intersectionOf: RoleIdsBySource;
+ mainPrincipal?: PermissionsPrincipalsContext['mainPrincipal'];
scopeObjectPermissions?: ObjectPermissions;
- }) =>
- getObjectsPermissionsFromRolePermissionConfig({
- principals: undefined,
- rolePermissionConfig: {
- intersectionOf,
- scope: {
- objectsPermissions: isDefined(scopeObjectPermissions)
- ? { [INVOICE_ID]: scopeObjectPermissions }
- : {},
- permissionFlags: {},
- },
+ hasScope?: boolean;
+ }) => {
+ const principal = resolvePermissionsPrincipalsWithRoles({
+ principalsContext: {
+ workspaceId: 'workspace-id',
+ mainPrincipal,
+ applicationPrincipal: { type: 'customApplication' },
+ ...(hasScope
+ ? {
+ scope: {
+ objectsPermissions: isDefined(scopeObjectPermissions)
+ ? { [INVOICE_ID]: scopeObjectPermissions }
+ : {},
+ permissionFlags: {},
+ },
+ }
+ : {}),
},
- rolesPermissions: rolesPermissionsWithPredicate,
- flatObjectMetadataMaps,
- flatFieldMetadataMaps,
- flatApplicationMaps,
- })[INVOICE_ID];
+ roleMaps: buildRoleMaps(flatApplicationMaps),
+ });
+
+ return isDefined(principal)
+ ? computeObjectsPermissionsForRoles({
+ principal,
+ rolesPermissions: rolesPermissionsWithPredicate,
+ flatObjectMetadataMaps,
+ flatFieldMetadataMaps,
+ flatApplicationMaps,
+ })[INVOICE_ID]
+ : undefined;
+ };
it('narrows the roles to what the scope allows', () => {
const invoicePermissions = compute({
- intersectionOf: { userWorkspaceRoleId: 'user-role-id' },
scopeObjectPermissions: {
...FULL_ACCESS,
canUpdateObjectRecords: false,
@@ -578,7 +698,6 @@ describe('getObjectsPermissionsFromRolePermissionConfig with a scope', () => {
it('never grants what the roles deny', () => {
const invoicePermissions = compute({
- intersectionOf: { userWorkspaceRoleId: 'user-role-id' },
scopeObjectPermissions: FULL_ACCESS,
});
@@ -586,9 +705,7 @@ describe('getObjectsPermissionsFromRolePermissionConfig with a scope', () => {
});
it('denies an object the scope leaves out', () => {
- const invoicePermissions = compute({
- intersectionOf: { userWorkspaceRoleId: 'user-role-id' },
- });
+ const invoicePermissions = compute({});
expect(invoicePermissions?.canReadObjectRecords).toBe(false);
expect(invoicePermissions?.canUpdateObjectRecords).toBe(false);
@@ -596,7 +713,6 @@ describe('getObjectsPermissionsFromRolePermissionConfig with a scope', () => {
it("keeps the roles' row-level predicates", () => {
const invoicePermissions = compute({
- intersectionOf: { userWorkspaceRoleId: 'user-role-id' },
scopeObjectPermissions: FULL_ACCESS,
});
@@ -607,7 +723,6 @@ describe('getObjectsPermissionsFromRolePermissionConfig with a scope', () => {
it('adds the field restrictions of the scope', () => {
const invoicePermissions = compute({
- intersectionOf: { userWorkspaceRoleId: 'user-role-id' },
scopeObjectPermissions: {
...FULL_ACCESS,
restrictedFields: {
@@ -639,27 +754,13 @@ describe('getObjectsPermissionsFromRolePermissionConfig with a scope', () => {
});
it('is allowed without a scope', () => {
- expect(() =>
- insertAmount(
- getObjectsPermissionsFromRolePermissionConfig({
- principals: undefined,
- rolePermissionConfig: {
- intersectionOf: { userWorkspaceRoleId: 'user-role-id' },
- },
- rolesPermissions: rolesPermissionsWithPredicate,
- flatObjectMetadataMaps,
- flatFieldMetadataMaps,
- flatApplicationMaps,
- })[INVOICE_ID],
- ),
- ).not.toThrow();
+ expect(() => insertAmount(compute({ hasScope: false }))).not.toThrow();
});
it('is allowed when the scope does not restrict the field', () => {
expect(() =>
insertAmount(
compute({
- intersectionOf: { userWorkspaceRoleId: 'user-role-id' },
scopeObjectPermissions: FULL_ACCESS,
}),
),
@@ -670,7 +771,6 @@ describe('getObjectsPermissionsFromRolePermissionConfig with a scope', () => {
expect(() =>
insertAmount(
compute({
- intersectionOf: { userWorkspaceRoleId: 'user-role-id' },
scopeObjectPermissions: {
...FULL_ACCESS,
restrictedFields: {
@@ -685,7 +785,10 @@ describe('getObjectsPermissionsFromRolePermissionConfig with a scope', () => {
it('grants nothing without a role', () => {
expect(
- compute({ intersectionOf: {}, scopeObjectPermissions: FULL_ACCESS }),
+ compute({
+ mainPrincipal: { type: 'apiKey', apiKeyId: 'api-key-without-role' },
+ scopeObjectPermissions: FULL_ACCESS,
+ }),
).toBeUndefined();
});
});
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
deleted file mode 100644
index 5c337002386..00000000000
--- a/packages/twenty-server/src/engine/permissions/role/utils/get-objects-permissions-from-role-permission-config.util.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-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';
-import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
-import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
-import { 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 { 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;
-}): ObjectsPermissions => {
- if ('shouldBypassPermissionChecks' in rolePermissionConfig) {
- return {};
- }
-
- const { intersectionOf, scope } = rolePermissionConfig;
- const principalRoles = buildPermissionsPrincipalRoles({
- roleIdsBySource: intersectionOf,
- principalsContext: principals,
- });
-
- if (!isDefined(principalRoles)) {
- return {};
- }
-
- return computeObjectsPermissionsForRoles({
- principal: { ...principalRoles, scope },
- rolesPermissions,
- flatObjectMetadataMaps,
- flatFieldMetadataMaps,
- 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 46dbe35d58f..b54cbe042ea 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
@@ -4,56 +4,71 @@ import {
} from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
+import { isSystemAuthContext } from 'src/engine/core-modules/auth/guards/is-system-auth-context.guard';
+import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
-import { type 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';
+import { type PermissionsPrincipalsWithRolesContext } from 'src/engine/permissions/principal/types/permissions-principals-with-roles-context.type';
+import { getPermissionsPrincipalsFromAuthContext } from 'src/engine/permissions/principal/utils/get-permissions-principals-from-auth-context.util';
+import {
+ type PermissionsPrincipalRoleMaps,
+ resolvePermissionsPrincipalsWithRoles,
+} from 'src/engine/permissions/principal/utils/resolve-permissions-principals-with-roles.util';
+import { computeObjectsPermissionsForRoles } from 'src/engine/permissions/role/utils/compute-objects-permissions-for-roles.util';
+
+export type ObjectRecordsPermissionsResolution = {
+ objectRecordsPermissions: ObjectsPermissions;
+ shouldBypassPermissionChecks: boolean;
+ permissionsPrincipal: PermissionsPrincipalsWithRolesContext | undefined;
+};
export const resolveObjectRecordsPermissions = ({
- rolePermissionConfig,
- principals,
+ authContext,
+ roleMaps,
objectPermissionsByRoleId,
flatObjectMetadataMaps,
flatFieldMetadataMaps,
- flatApplicationMaps,
}: {
- rolePermissionConfig?: RolePermissionConfig;
- principals: PermissionsPrincipalsContext | undefined;
+ authContext: WorkspaceAuthContext;
+ roleMaps: PermissionsPrincipalRoleMaps;
objectPermissionsByRoleId: ObjectsPermissionsByRoleId;
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
- flatApplicationMaps: ApplicationDefaultRoleMaps;
-}): {
- objectRecordsPermissions: ObjectsPermissions;
- shouldBypassPermissionChecks: boolean;
-} => {
- if (!isDefined(rolePermissionConfig)) {
+}): ObjectRecordsPermissionsResolution => {
+ if (isSystemAuthContext(authContext)) {
return {
objectRecordsPermissions: {},
- shouldBypassPermissionChecks: false,
+ shouldBypassPermissionChecks: true,
+ permissionsPrincipal: undefined,
};
}
- if ('shouldBypassPermissionChecks' in rolePermissionConfig) {
+ const principals = getPermissionsPrincipalsFromAuthContext(authContext);
+ const permissionsPrincipal = isDefined(principals)
+ ? resolvePermissionsPrincipalsWithRoles({
+ principalsContext: principals,
+ roleMaps,
+ })
+ : undefined;
+
+ if (!isDefined(permissionsPrincipal)) {
return {
objectRecordsPermissions: {},
- shouldBypassPermissionChecks:
- rolePermissionConfig.shouldBypassPermissionChecks,
+ shouldBypassPermissionChecks: false,
+ permissionsPrincipal: undefined,
};
}
return {
- objectRecordsPermissions: getObjectsPermissionsFromRolePermissionConfig({
- rolePermissionConfig,
- principals,
+ objectRecordsPermissions: computeObjectsPermissionsForRoles({
+ principal: permissionsPrincipal,
rolesPermissions: objectPermissionsByRoleId,
flatObjectMetadataMaps,
flatFieldMetadataMaps,
- flatApplicationMaps,
+ flatApplicationMaps: roleMaps.flatApplicationMaps,
}),
shouldBypassPermissionChecks: false,
+ permissionsPrincipal,
};
};
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 c4a0006acde..39644b63c5e 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
@@ -1,3 +1,4 @@
+import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { Injectable, Logger } from '@nestjs/common';
import { QUERY_MAX_RECORDS_FROM_RELATION } from 'twenty-shared/constants';
@@ -6,7 +7,6 @@ import {
Nullable,
ObjectRecord,
type ObjectsPermissions,
- type ObjectsPermissionsByRoleId,
type RecordGqlOperationSignature,
} from 'twenty-shared/types';
import { isDefined, isRecordGqlOperationSignature } from 'twenty-shared/utils';
@@ -16,16 +16,12 @@ import { ProcessNestedRelationsHelper } from 'src/engine/api/common/common-neste
import { CommonSelectFieldsBuilder } from 'src/engine/api/common/common-select-fields/common-select-fields-builder';
import { DatabaseEventAction } from 'src/engine/api/graphql/graphql-query-runner/enums/database-event-action';
import { GraphqlQueryParser } from 'src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query.parser';
-import { type FlatApplicationCacheMaps } from 'src/engine/core-modules/application/types/flat-application-cache-maps.type';
-import { findActiveFlatApplicationById } from 'src/engine/core-modules/application/utils/find-active-flat-application-by-id.util';
import { type SerializableAuthContext } from 'src/engine/core-modules/auth/types/serializable-auth-context.type';
-import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { type FlatWorkspaceMemberMaps } from 'src/engine/core-modules/user/types/flat-workspace-member-maps.type';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
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 { UserWorkspaceRoleMap } from 'src/engine/metadata-modules/role-target/types/user-workspace-role-map.type';
import { type FlatRowLevelPermissionPredicateGroupMaps } from 'src/engine/metadata-modules/row-level-permission-predicate/types/flat-row-level-permission-predicate-group-maps.type';
import { type FlatRowLevelPermissionPredicateMaps } from 'src/engine/metadata-modules/row-level-permission-predicate/types/flat-row-level-permission-predicate-maps.type';
import { RecordAccessPolicyService } from 'src/engine/permissions/combine/services/record-access-policy.service';
@@ -39,17 +35,10 @@ import {
} from 'src/engine/subscriptions/types/event-stream-data.type';
import { type EventStreamPayload } from 'src/engine/subscriptions/types/event-stream-payload.type';
import { ObjectRecordSubscriptionEvent } from 'src/engine/subscriptions/types/object-record-subscription-event.type';
-import {
- RolePermissionConfig,
- RoleIdsBySource,
-} from 'src/engine/permissions/principal/types/role-permission-config.type';
-import { computePermissionIntersection } from 'src/engine/permissions/role/utils/compute-permission-intersection.util';
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 { UserWorkspaceAuthContextService } from 'src/engine/core-modules/user-workspace/services/user-workspace-auth-context.service';
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
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';
@@ -60,9 +49,6 @@ type StreamPermissionsContext = {
flatRowLevelPermissionPredicateGroupMaps: FlatRowLevelPermissionPredicateGroupMaps;
flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
- userWorkspaceRoleMap: UserWorkspaceRoleMap;
- rolesPermissions: ObjectsPermissionsByRoleId;
- flatApplicationMaps: FlatApplicationCacheMaps;
};
@Injectable()
@@ -78,6 +64,7 @@ export class ObjectRecordEventPublisher {
private readonly commonSelectFieldsBuilder: CommonSelectFieldsBuilder,
private readonly recordAccessPolicyService: RecordAccessPolicyService,
private readonly workspaceOrmManager: WorkspaceOrmManager,
+ private readonly userWorkspaceAuthContextService: UserWorkspaceAuthContextService,
) {}
async publish(
@@ -108,6 +95,10 @@ export class ObjectRecordEventPublisher {
this.recordAccessPolicyService.buildEventRecordAccessGate(eventBatch);
const streamIdsToRemove: string[] = [];
+ const subscriberAuthContexts = new Map<
+ string,
+ Promise<WorkspaceAuthContext>
+ >();
for (const [streamChannelId, streamData] of streamsData) {
if (!isDefined(streamData)) {
@@ -126,6 +117,7 @@ export class ObjectRecordEventPublisher {
permissionsContext,
workspaceMemberIdByUserId,
eventRecordAccessGate,
+ subscriberAuthContexts,
});
}
@@ -152,6 +144,7 @@ export class ObjectRecordEventPublisher {
permissionsContext,
workspaceMemberIdByUserId,
eventRecordAccessGate,
+ subscriberAuthContexts,
}: {
streamChannelId: string;
streamData: EventStreamData;
@@ -159,23 +152,35 @@ export class ObjectRecordEventPublisher {
permissionsContext: StreamPermissionsContext;
workspaceMemberIdByUserId: Map<string, string>;
eventRecordAccessGate: EventRecordAccessGate;
+ subscriberAuthContexts: Map<string, Promise<WorkspaceAuthContext>>;
}): Promise<void> {
- const rolePermissionConfig = this.resolveStreamRolePermissionConfig(
- streamData.authContext,
- permissionsContext,
- );
- const roleIds = isDefined(rolePermissionConfig)
- ? getRoleIdsToIntersect(rolePermissionConfig.intersectionOf)
- : null;
+ const subscriberAuthContext: SerializableAuthContext = {
+ ...streamData.authContext,
+ workspaceMemberId: this.resolveSubscriberWorkspaceMemberId({
+ subscriberAuthContext: streamData.authContext,
+ workspaceMemberIdByUserId,
+ }),
+ };
+ const { userWorkspaceId, workspaceMemberId } = subscriberAuthContext;
- if (!isDefined(rolePermissionConfig) || !isDefined(roleIds)) {
+ if (!isDefined(userWorkspaceId) || !isDefined(workspaceMemberId)) {
return;
}
- const objectsPermissions = this.resolveStreamObjectsPermissions(
- roleIds,
- permissionsContext.rolesPermissions,
- );
+ const principals = buildPermissionsPrincipalsContext({
+ workspaceId: workspaceEventBatch.workspaceId,
+ workspaceMemberId,
+ apiKeyId: undefined,
+ applicationId: subscriberAuthContext.applicationId,
+ agentId: undefined,
+ });
+
+ if (!isDefined(principals)) {
+ return;
+ }
+
+ const objectsPermissions =
+ await this.recordAccessPolicyService.findObjectsPermissions(principals);
if (!isDefined(objectsPermissions)) {
return;
@@ -198,26 +203,6 @@ export class ObjectRecordEventPublisher {
objectRecordEvent: ObjectRecordSubscriptionEvent;
}[] = [];
- const subscriberAuthContext: SerializableAuthContext = {
- ...streamData.authContext,
- workspaceMemberId: this.resolveSubscriberWorkspaceMemberId({
- subscriberAuthContext: streamData.authContext,
- workspaceMemberIdByUserId,
- }),
- };
-
- const principals = buildPermissionsPrincipalsContext({
- workspaceId: workspaceEventBatch.workspaceId,
- workspaceMemberId: subscriberAuthContext.workspaceMemberId,
- apiKeyId: subscriberAuthContext.apiKeyId,
- applicationId: subscriberAuthContext.applicationId,
- agentId: undefined,
- });
-
- if (!isDefined(principals)) {
- return;
- }
-
const admittedRecordIds =
await eventRecordAccessGate.resolveAdmittedRecordIds(principals);
@@ -281,9 +266,13 @@ export class ObjectRecordEventPublisher {
events: matchedEvents.map(
(matchedEvent) => matchedEvent.objectRecordEvent,
),
- streamData,
workspaceId: workspaceEventBatch.workspaceId,
- rolePermissionConfig,
+ subscriberAuthContext: this.findSubscriberAuthContext({
+ subscriberAuthContexts,
+ workspaceId: workspaceEventBatch.workspaceId,
+ userWorkspaceId,
+ applicationId: subscriberAuthContext.applicationId,
+ }),
principals,
objectsPermissions,
});
@@ -310,19 +299,17 @@ export class ObjectRecordEventPublisher {
}
private async enrichEventBatchWithNestedRelations({
- streamData,
objectMetadata,
events,
workspaceId,
- rolePermissionConfig,
+ subscriberAuthContext,
principals,
objectsPermissions,
}: {
- streamData: EventStreamData;
objectMetadata: FlatObjectMetadata;
events: ObjectRecordEvent[];
workspaceId: string;
- rolePermissionConfig: RolePermissionConfig;
+ subscriberAuthContext: Promise<WorkspaceAuthContext>;
principals: PermissionsPrincipalsContext;
objectsPermissions: ObjectsPermissions;
}) {
@@ -378,7 +365,9 @@ export class ObjectRecordEventPublisher {
const selectedFieldsResult =
commonQueryParser.parseSelectedFields(selectedFields);
- // The ambient context is the writer's, so relations load as the subscriber's roles alone
+ // The ambient context is the writer's, so relations load as the subscriber
+ const resolvedSubscriberAuthContext = await subscriberAuthContext;
+
await this.workspaceOrmManager.executeInWorkspaceContext(
() =>
this.processNestedRelationsHelper.processNestedRelations({
@@ -386,75 +375,46 @@ export class ObjectRecordEventPublisher {
flatFieldMetadataMaps,
parentObjectMetadataItem: objectMetadata,
parentObjectRecords: allRecords,
- authContext:
- streamData.authContext as unknown as WorkspaceAuthContext,
+ authContext: resolvedSubscriberAuthContext,
limit: QUERY_MAX_RECORDS_FROM_RELATION,
- rolePermissionConfig,
relations: selectedFieldsResult.relations as Record<
string,
FindOptionsRelations<ObjectLiteral>
>,
selectedFields: selectedFieldsResult.select,
}),
- buildSystemAuthContext(workspaceId),
+ resolvedSubscriberAuthContext,
);
}
- private resolveStreamRolePermissionConfig(
- subscriberAuthContext: SerializableAuthContext,
- permissionsContext: Pick<
- StreamPermissionsContext,
- 'userWorkspaceRoleMap' | 'flatApplicationMaps'
- >,
- ): { intersectionOf: RoleIdsBySource } | undefined {
- const { userWorkspaceId, applicationId } = subscriberAuthContext;
-
- if (!isDefined(userWorkspaceId)) {
- return undefined;
- }
-
- const userRoleId = permissionsContext.userWorkspaceRoleMap[userWorkspaceId];
-
- if (!isDefined(applicationId)) {
- return {
- intersectionOf: buildUserRoleIdsBySource({
- userRoleId,
- application: undefined,
- }),
- };
- }
-
- // The cache keeps soft-deleted applications; a gone one must not fall back to the user alone and widen the stream
- const application = findActiveFlatApplicationById(
- permissionsContext.flatApplicationMaps,
- applicationId,
- );
-
- if (!isDefined(application)) {
- return undefined;
+ // Streams of one member share their auth context within a batch; null keeps the writer's application out
+ private findSubscriberAuthContext({
+ subscriberAuthContexts,
+ workspaceId,
+ userWorkspaceId,
+ applicationId,
+ }: {
+ subscriberAuthContexts: Map<string, Promise<WorkspaceAuthContext>>;
+ workspaceId: string;
+ userWorkspaceId: string;
+ applicationId: string | undefined;
+ }): Promise<WorkspaceAuthContext> {
+ const key = `${userWorkspaceId}:${applicationId ?? ''}`;
+ const cachedAuthContext = subscriberAuthContexts.get(key);
+
+ if (isDefined(cachedAuthContext)) {
+ return cachedAuthContext;
}
- return {
- intersectionOf: buildUserRoleIdsBySource({
- userRoleId,
- application,
- }),
- };
- }
-
- private resolveStreamObjectsPermissions(
- roleIds: string[],
- rolesPermissions: ObjectsPermissionsByRoleId,
- ): ObjectsPermissions | undefined {
- const allRolePermissions = roleIds.map(
- (roleId) => rolesPermissions[roleId],
- );
+ const authContext = this.userWorkspaceAuthContextService.resolve({
+ workspaceId,
+ userWorkspaceId,
+ applicationId: applicationId ?? null,
+ });
- if (!allRolePermissions.every(isDefined)) {
- return undefined;
- }
+ subscriberAuthContexts.set(key, authContext);
- return computePermissionIntersection(allRolePermissions);
+ return authContext;
}
private buildWorkspaceMemberIdByUserId(
@@ -594,17 +554,11 @@ export class ObjectRecordEventPublisher {
flatRowLevelPermissionPredicateGroupMaps,
flatFieldMetadataMaps,
flatObjectMetadataMaps,
- userWorkspaceRoleMap,
- rolesPermissions,
- flatApplicationMaps,
} = await this.workspaceCacheService.getOrRecompute(workspaceId, [
'flatRowLevelPermissionPredicateMaps',
'flatRowLevelPermissionPredicateGroupMaps',
'flatFieldMetadataMaps',
'flatObjectMetadataMaps',
- 'userWorkspaceRoleMap',
- 'rolesPermissions',
- 'flatApplicationMaps',
]);
return {
@@ -612,9 +566,6 @@ export class ObjectRecordEventPublisher {
flatRowLevelPermissionPredicateGroupMaps,
flatFieldMetadataMaps,
flatObjectMetadataMaps,
- userWorkspaceRoleMap,
- rolesPermissions,
- flatApplicationMaps,
};
}
}
diff --git a/packages/twenty-server/src/engine/subscriptions/subscriptions.module.ts b/packages/twenty-server/src/engine/subscriptions/subscriptions.module.ts
index 02e70b0a84d..57dbbdeaac4 100644
--- a/packages/twenty-server/src/engine/subscriptions/subscriptions.module.ts
+++ b/packages/twenty-server/src/engine/subscriptions/subscriptions.module.ts
@@ -1,3 +1,4 @@
+import { UserWorkspaceModule } from 'src/engine/core-modules/user-workspace/user-workspace.module';
import { Global, Module } from '@nestjs/common';
import { ProcessNestedRelationsHelper } from 'src/engine/api/common/common-nested-relations-processor/process-nested-relations.helper';
@@ -30,6 +31,7 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache
NavigationMenuItemModule,
ApplicationTranslationCatalogModule,
RecordShareModule,
+ UserWorkspaceModule,
],
providers: [
SubscriptionService,
diff --git a/packages/twenty-server/src/engine/trash-cleanup/services/trash-cleanup.service.ts b/packages/twenty-server/src/engine/trash-cleanup/services/trash-cleanup.service.ts
index e229d34ae56..8d79f9f94c2 100644
--- a/packages/twenty-server/src/engine/trash-cleanup/services/trash-cleanup.service.ts
+++ b/packages/twenty-server/src/engine/trash-cleanup/services/trash-cleanup.service.ts
@@ -102,9 +102,10 @@ export class TrashCleanupService {
const authContext = buildSystemAuthContext(workspaceId);
return this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const repository = this.workspaceOrmManager.getRepository(objectName, {
- shouldBypassPermissionChecks: true,
- });
+ const repository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ objectName,
+ );
let deleted = 0;
diff --git a/packages/twenty-server/src/engine/twenty-orm/__tests__/workspace-orm-context-permissions.spec.ts b/packages/twenty-server/src/engine/twenty-orm/__tests__/workspace-orm-context-permissions.spec.ts
deleted file mode 100644
index c3ab4adbb13..00000000000
--- a/packages/twenty-server/src/engine/twenty-orm/__tests__/workspace-orm-context-permissions.spec.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import { getWorkspaceContext } from 'src/engine/twenty-orm/storage/orm-workspace-context.storage';
-import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
-
-jest.mock(
- 'src/engine/twenty-orm/storage/orm-workspace-context.storage',
- () => ({ getWorkspaceContext: jest.fn() }),
-);
-
-const setup = (userRoleId: string | undefined = 'member-role') => {
- const repository = {};
- const getRepository = jest.fn().mockReturnValue(repository);
- const manager = new WorkspaceOrmManager(
- {} as never,
- { getDataSource: () => ({ getRepository }) } as never,
- {} as never,
- {} as never,
- );
- jest.mocked(getWorkspaceContext).mockReturnValue({
- authContext: {
- type: 'user',
- userWorkspaceId: 'membership',
- application: { defaultRoleId: 'application-role' },
- },
- userWorkspaceRoleMap: { membership: userRoleId },
- apiKeyRoleMap: {},
- } as never);
- return { manager, getRepository, repository };
-};
-
-describe('Domain repository permissions', () => {
- it('intersects member and application roles rather than using a privileged repository', () => {
- const { manager, getRepository, repository } = setup();
- expect(manager.getRepositoryWithContextPermissions('note')).toBe(
- repository,
- );
- expect(getRepository).toHaveBeenCalledWith(
- 'note',
- {
- intersectionOf: {
- userWorkspaceRoleId: 'member-role',
- applicationRoleId: 'application-role',
- },
- },
- { shouldSkipEventEmission: false },
- );
- });
-
- it('keeps the same role intersection inside a transaction', () => {
- const { manager, getRepository } = setup();
- const transactionalRepository = jest.fn();
- manager.getRepositoryWithContextPermissions('note', {
- getRepository: transactionalRepository,
- } as never);
- expect(transactionalRepository).toHaveBeenCalledWith('note', {
- intersectionOf: {
- userWorkspaceRoleId: 'member-role',
- applicationRoleId: 'application-role',
- },
- });
- expect(getRepository).not.toHaveBeenCalled();
- });
-
- it('fails closed when the user no longer has a role', () => {
- const { manager, getRepository } = setup();
- jest.mocked(getWorkspaceContext).mockReturnValue({
- authContext: { type: 'user', userWorkspaceId: 'membership' },
- userWorkspaceRoleMap: {},
- apiKeyRoleMap: {},
- } as never);
- expect(() => manager.getRepositoryWithContextPermissions('note')).toThrow();
- expect(getRepository).not.toHaveBeenCalled();
- });
-});
diff --git a/packages/twenty-server/src/engine/twenty-orm/datasource/__tests__/workspace-data-source.spec.ts b/packages/twenty-server/src/engine/twenty-orm/datasource/__tests__/workspace-data-source.spec.ts
index 775cb010e63..71b0307b2d2 100644
--- a/packages/twenty-server/src/engine/twenty-orm/datasource/__tests__/workspace-data-source.spec.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/datasource/__tests__/workspace-data-source.spec.ts
@@ -80,7 +80,7 @@ const sumPetColumn = ({
authContext: {} as WorkspaceAuthContext,
objectPermissionsByRoleId: {},
})
- .getRepository('pet', { shouldBypassPermissionChecks: true })
+ .getRepositoryWithoutPermissionChecks('pet')
.sum(columnName);
const expectSingleQueryContaining = (pool: Pool, sqlFragment: string) => {
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 4ef75ba8844..fefeeb15770 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
@@ -15,7 +15,7 @@ import { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-m
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 WorkspaceInternalContext } from 'src/engine/twenty-orm/interfaces/workspace-internal-context.interface';
-import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
+import { type WorkspaceRepositoryOptions } from 'src/engine/twenty-orm/types/workspace-repository-options.type';
import { type WorkspaceTransactionScope } from 'src/engine/twenty-orm/types/workspace-transaction-scope.type';
import { ClientQueryExecutor } from 'src/engine/twenty-orm/executor/client-query-executor';
import { PoolQueryExecutor } from 'src/engine/twenty-orm/executor/pool-query-executor';
@@ -28,20 +28,30 @@ import { runInRollbackSafeTransaction } from 'src/engine/twenty-orm/datasource/u
import { WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace-repository';
import { type WorkspaceTableShape } from 'src/engine/twenty-orm/table-shape/types/workspace-table-shape.type';
import { buildWorkspaceTableShape } from 'src/engine/twenty-orm/table-shape/utils/build-workspace-table-shape.util';
-import { 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';
+import {
+ type ObjectRecordsPermissionsResolution,
+ resolveObjectRecordsPermissions,
+} from 'src/engine/permissions/role/utils/resolve-object-records-permissions.util';
+import { buildPermissionsPrincipalRoleMaps } from 'src/engine/permissions/principal/utils/build-permissions-principal-role-maps.util';
const tableShapeCache = new WeakMap<
FlatEntityMaps<OrmFlatFieldMetadata>,
WeakMap<FlatObjectMetadata, WorkspaceTableShape>
>();
+const SYSTEM_PERMISSIONS: ObjectRecordsPermissionsResolution = {
+ objectRecordsPermissions: {},
+ shouldBypassPermissionChecks: true,
+ permissionsPrincipal: undefined,
+};
+
export class WorkspaceDataSource {
private readonly logger = new Logger(WorkspaceDataSource.name);
private readonly pool: Pool;
private readonly internalContext: WorkspaceInternalContext;
private readonly authContext: WorkspaceAuthContext;
private readonly objectPermissionsByRoleId: ObjectsPermissionsByRoleId;
+ private contextPermissions?: ObjectRecordsPermissionsResolution;
constructor({
pool,
@@ -62,12 +72,24 @@ export class WorkspaceDataSource {
getRepository<T extends ObjectLiteral = ObjectRecord>(
nameSingular: string,
- rolePermissionConfig?: RolePermissionConfig,
- repositoryOptions?: { shouldSkipEventEmission?: boolean },
+ repositoryOptions?: WorkspaceRepositoryOptions,
): WorkspaceRepository<T> {
return this.buildRepository<T>({
nameSingular,
- rolePermissionConfig,
+ shouldBypassPermissionChecks: false,
+ executor: new PoolQueryExecutor({ pool: this.pool }),
+ shouldSkipEventEmission:
+ repositoryOptions?.shouldSkipEventEmission ?? false,
+ });
+ }
+
+ getRepositoryWithoutPermissionChecks<T extends ObjectLiteral = ObjectRecord>(
+ nameSingular: string,
+ repositoryOptions?: WorkspaceRepositoryOptions,
+ ): WorkspaceRepository<T> {
+ return this.buildRepository<T>({
+ nameSingular,
+ shouldBypassPermissionChecks: true,
executor: new PoolQueryExecutor({ pool: this.pool }),
shouldSkipEventEmission:
repositoryOptions?.shouldSkipEventEmission ?? false,
@@ -110,12 +132,26 @@ export class WorkspaceDataSource {
workspaceId: this.internalContext.workspaceId,
getRepository: <T extends ObjectLiteral = ObjectRecord>(
nameSingular: string,
- rolePermissionConfig?: RolePermissionConfig,
- repositoryOptions?: { shouldSkipEventEmission?: boolean },
+ repositoryOptions?: WorkspaceRepositoryOptions,
) =>
this.buildRepository<T>({
nameSingular,
- rolePermissionConfig,
+ shouldBypassPermissionChecks: false,
+ executor,
+ isTransactional: true,
+ shouldSkipEventEmission:
+ repositoryOptions?.shouldSkipEventEmission ?? false,
+ internalContext: transactionalInternalContext,
+ }),
+ getRepositoryWithoutPermissionChecks: <
+ T extends ObjectLiteral = ObjectRecord,
+ >(
+ nameSingular: string,
+ repositoryOptions?: WorkspaceRepositoryOptions,
+ ) =>
+ this.buildRepository<T>({
+ nameSingular,
+ shouldBypassPermissionChecks: true,
executor,
isTransactional: true,
shouldSkipEventEmission:
@@ -153,14 +189,14 @@ export class WorkspaceDataSource {
private buildRepository<T extends ObjectLiteral = ObjectRecord>({
nameSingular,
- rolePermissionConfig,
+ shouldBypassPermissionChecks,
executor,
isTransactional = false,
shouldSkipEventEmission = false,
internalContext = this.internalContext,
}: {
nameSingular: string;
- rolePermissionConfig?: RolePermissionConfig;
+ shouldBypassPermissionChecks: boolean;
executor: QueryExecutor;
isTransactional?: boolean;
shouldSkipEventEmission?: boolean;
@@ -178,7 +214,7 @@ export class WorkspaceDataSource {
return this.buildRepositoryForObjectMetadataId<T>({
objectMetadataId,
- rolePermissionConfig,
+ shouldBypassPermissionChecks,
executor,
isTransactional,
shouldSkipEventEmission,
@@ -190,14 +226,14 @@ export class WorkspaceDataSource {
T extends ObjectLiteral = ObjectRecord,
>({
objectMetadataId,
- rolePermissionConfig,
+ shouldBypassPermissionChecks,
executor,
isTransactional = false,
shouldSkipEventEmission = false,
internalContext = this.internalContext,
}: {
objectMetadataId: string;
- rolePermissionConfig?: RolePermissionConfig;
+ shouldBypassPermissionChecks: boolean;
executor: QueryExecutor;
isTransactional?: boolean;
shouldSkipEventEmission?: boolean;
@@ -206,18 +242,9 @@ export class WorkspaceDataSource {
const flatObjectMetadata =
this.getFlatObjectMetadataOrThrow(objectMetadataId);
- const repositoryRolePermissionConfig: RolePermissionConfig =
- rolePermissionConfig ?? { intersectionOf: {} };
-
- const { objectRecordsPermissions, shouldBypassPermissionChecks } =
- resolveObjectRecordsPermissions({
- rolePermissionConfig: repositoryRolePermissionConfig,
- principals: getPermissionsPrincipalsFromAuthContext(this.authContext),
- objectPermissionsByRoleId: this.objectPermissionsByRoleId,
- flatObjectMetadataMaps: this.internalContext.flatObjectMetadataMaps,
- flatFieldMetadataMaps: this.internalContext.flatFieldMetadataMaps,
- flatApplicationMaps: this.internalContext.flatApplicationMaps,
- });
+ const permissions = shouldBypassPermissionChecks
+ ? SYSTEM_PERMISSIONS
+ : this.resolveContextPermissions();
return new WorkspaceRepository<T>({
tableShape: this.getTableShape(objectMetadataId),
@@ -225,10 +252,10 @@ export class WorkspaceDataSource {
internalContext,
authContext: this.authContext,
executor,
- objectRecordsPermissions,
+ objectRecordsPermissions: permissions.objectRecordsPermissions,
rolesPermissions: this.objectPermissionsByRoleId,
- rolePermissionConfig: repositoryRolePermissionConfig,
- shouldBypassPermissionChecks,
+ permissionsPrincipal: permissions.permissionsPrincipal,
+ shouldBypassPermissionChecks: permissions.shouldBypassPermissionChecks,
shouldSkipEventEmission: shouldSkipEventEmission ?? false,
tableShapeByObjectMetadataId: (targetObjectMetadataId) =>
this.getTableShape(targetObjectMetadataId),
@@ -241,7 +268,7 @@ export class WorkspaceDataSource {
) =>
this.buildRepositoryForObjectMetadataId<Entity>({
objectMetadataId: targetObjectMetadataId,
- rolePermissionConfig,
+ shouldBypassPermissionChecks,
executor,
isTransactional,
shouldSkipEventEmission,
@@ -251,16 +278,30 @@ export class WorkspaceDataSource {
runInNewTransaction: (work) =>
this.transaction((transactionScope) =>
work(
- transactionScope.getRepository<T>(
- flatObjectMetadata.nameSingular,
- rolePermissionConfig,
- { shouldSkipEventEmission },
- ),
+ shouldBypassPermissionChecks
+ ? transactionScope.getRepositoryWithoutPermissionChecks<T>(
+ flatObjectMetadata.nameSingular,
+ { shouldSkipEventEmission },
+ )
+ : transactionScope.getRepository<T>(
+ flatObjectMetadata.nameSingular,
+ { shouldSkipEventEmission },
+ ),
),
),
});
}
+ private resolveContextPermissions(): ObjectRecordsPermissionsResolution {
+ return (this.contextPermissions ??= resolveObjectRecordsPermissions({
+ authContext: this.authContext,
+ roleMaps: buildPermissionsPrincipalRoleMaps(this.internalContext),
+ objectPermissionsByRoleId: this.objectPermissionsByRoleId,
+ flatObjectMetadataMaps: this.internalContext.flatObjectMetadataMaps,
+ flatFieldMetadataMaps: this.internalContext.flatFieldMetadataMaps,
+ }));
+ }
+
private getTableShape(objectMetadataId: string): WorkspaceTableShape {
const { flatFieldMetadataMaps } = this.internalContext;
const flatObjectMetadata =
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 559dce4c251..9be4f949f57 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
@@ -144,7 +144,15 @@ const buildRepository = ({
},
},
},
- rolePermissionConfig: { intersectionOf: { apiKeyRoleId: ROLE_ID } },
+ permissionsPrincipal: {
+ workspaceId: 'workspace-id',
+ mainPrincipal: {
+ type: 'apiKey',
+ apiKeyId: 'api-key-id',
+ roleId: ROLE_ID,
+ },
+ applicationPrincipal: { type: 'customApplication' },
+ },
shouldBypassPermissionChecks,
shouldSkipEventEmission,
tableShapeByObjectMetadataId: () => tableShape,
diff --git a/packages/twenty-server/src/engine/twenty-orm/repository/workspace-repository.ts b/packages/twenty-server/src/engine/twenty-orm/repository/workspace-repository.ts
index 4e2afa0eeea..1f0b2a81ecf 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
@@ -55,7 +55,6 @@ import {
mergeRecordsWithUpdateValues,
} from 'src/engine/twenty-orm/utils/merge-records-with-update-values.util';
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';
import { getActiveValidationRules } from 'src/engine/twenty-orm/utils/get-active-validation-rules.util';
@@ -108,8 +107,6 @@ import {
type WorkspaceRelationShape,
type WorkspaceTableShape,
} from 'src/engine/twenty-orm/table-shape/types/workspace-table-shape.type';
-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<
@@ -132,7 +129,7 @@ type WorkspaceRepositoryOptions<TEntity extends ObjectLiteral> = {
executor: QueryExecutor;
objectRecordsPermissions: ObjectsPermissions;
rolesPermissions: ObjectsPermissionsByRoleId;
- rolePermissionConfig: RolePermissionConfig;
+ permissionsPrincipal: PermissionsPrincipalsWithRolesContext | undefined;
shouldBypassPermissionChecks: boolean;
// Suppresses database events and their snapshot SELECT, for bulk system writes only: webhooks, workflow triggers
// and timeline activities will NOT fire
@@ -161,8 +158,6 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
private _filesFieldSync?: FilesFieldSync;
- private permissionsPrincipal?: PermissionsPrincipalsWithRolesContext;
-
private permissionsMetadataMaps?: PermissionsMetadataMaps;
constructor(options: WorkspaceRepositoryOptions<TEntity>) {
@@ -2292,24 +2287,16 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
}
private resolvePermissionsPrincipalOrThrow(): PermissionsPrincipalsWithRolesContext {
- this.permissionsPrincipal ??= buildPermissionsPrincipalsWithRolesFromConfig(
- {
- workspaceId: this.options.internalContext.workspaceId,
- rolePermissionConfig: this.options.rolePermissionConfig,
- principalsContext: getPermissionsPrincipalsFromAuthContext(
- this.options.authContext,
- ),
- },
- );
+ const { permissionsPrincipal } = this.options;
- if (!isDefined(this.permissionsPrincipal)) {
+ if (!isDefined(permissionsPrincipal)) {
throw new PermissionsException(
PermissionsExceptionMessage.PERMISSION_DENIED,
PermissionsExceptionCode.PERMISSION_DENIED,
);
}
- return this.permissionsPrincipal;
+ return permissionsPrincipal;
}
private resolvePermissionsMetadataMaps(): PermissionsMetadataMaps {
diff --git a/packages/twenty-server/src/engine/twenty-orm/types/workspace-repository-options.type.ts b/packages/twenty-server/src/engine/twenty-orm/types/workspace-repository-options.type.ts
new file mode 100644
index 00000000000..d2979e03729
--- /dev/null
+++ b/packages/twenty-server/src/engine/twenty-orm/types/workspace-repository-options.type.ts
@@ -0,0 +1,3 @@
+export type WorkspaceRepositoryOptions = {
+ shouldSkipEventEmission?: boolean;
+};
diff --git a/packages/twenty-server/src/engine/twenty-orm/types/workspace-transaction-scope.type.ts b/packages/twenty-server/src/engine/twenty-orm/types/workspace-transaction-scope.type.ts
index 3bc00669ed1..755e5249589 100644
--- a/packages/twenty-server/src/engine/twenty-orm/types/workspace-transaction-scope.type.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/types/workspace-transaction-scope.type.ts
@@ -2,15 +2,20 @@ import { type ObjectLiteral } from 'typeorm';
import { type ObjectRecord } from 'twenty-shared/types';
-import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace-repository';
+import { type WorkspaceRepositoryOptions } from 'src/engine/twenty-orm/types/workspace-repository-options.type';
export type WorkspaceTransactionScope = {
workspaceId: string;
getRepository: <T extends ObjectLiteral = ObjectRecord>(
objectMetadataName: string,
- rolePermissionConfig?: RolePermissionConfig,
- repositoryOptions?: { shouldSkipEventEmission?: boolean },
+ repositoryOptions?: WorkspaceRepositoryOptions,
+ ) => WorkspaceRepository<T>;
+ getRepositoryWithoutPermissionChecks: <
+ T extends ObjectLiteral = ObjectRecord,
+ >(
+ objectMetadataName: string,
+ repositoryOptions?: WorkspaceRepositoryOptions,
) => WorkspaceRepository<T>;
executeRawQuery: (
sql: string,
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/get-workspace-repository-with-optional-transaction.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/get-workspace-repository-with-optional-transaction.util.ts
index a6c344c83eb..8b871ba221c 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/get-workspace-repository-with-optional-transaction.util.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/utils/get-workspace-repository-with-optional-transaction.util.ts
@@ -1,8 +1,6 @@
-import { isDefined } from 'twenty-shared/utils';
import { type ObjectLiteral } from 'typeorm';
import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace-repository';
-import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
import { type WorkspaceTransactionScope } from 'src/engine/twenty-orm/types/workspace-transaction-scope.type';
import { type WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
@@ -12,19 +10,18 @@ export const getWorkspaceRepositoryWithOptionalTransaction = <
objectMetadataName,
transactionScope,
workspaceOrmManager,
- rolePermissionConfig,
+ shouldBypassPermissionChecks = false,
}: {
objectMetadataName: string;
transactionScope?: WorkspaceTransactionScope;
workspaceOrmManager: WorkspaceOrmManager;
- rolePermissionConfig?: RolePermissionConfig;
-}): WorkspaceRepository<Entity> =>
- isDefined(transactionScope)
- ? transactionScope.getRepository<Entity>(
+ shouldBypassPermissionChecks?: boolean;
+}): WorkspaceRepository<Entity> => {
+ const repositorySource = transactionScope ?? workspaceOrmManager;
+
+ return shouldBypassPermissionChecks
+ ? repositorySource.getRepositoryWithoutPermissionChecks<Entity>(
objectMetadataName,
- rolePermissionConfig,
)
- : workspaceOrmManager.getRepository<Entity>(
- objectMetadataName,
- rolePermissionConfig,
- );
+ : repositorySource.getRepository<Entity>(objectMetadataName);
+};
diff --git a/packages/twenty-server/src/engine/twenty-orm/workspace-orm.manager.ts b/packages/twenty-server/src/engine/twenty-orm/workspace-orm.manager.ts
index 0e4ebcc8fd1..96321ac2c92 100644
--- a/packages/twenty-server/src/engine/twenty-orm/workspace-orm.manager.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/workspace-orm.manager.ts
@@ -1,16 +1,10 @@
-import {
- PermissionsException,
- PermissionsExceptionCode,
- PermissionsExceptionMessage,
-} from 'src/engine/permissions/permissions.exception';
-import { resolveRolePermissionConfig } from 'src/engine/permissions/principal/utils/resolve-role-permission-config.util';
+import { isUserAuthContext } from 'src/engine/core-modules/auth/guards/is-user-auth-context.guard';
import { isValidationRuleEnforcementEnabled } from 'src/engine/twenty-orm/utils/is-validation-rule-enforcement-enabled.util';
import { Injectable, type Type } from '@nestjs/common';
import { type ObjectLiteral } from 'typeorm';
import { type ObjectRecord } from 'twenty-shared/types';
-import { isDefined } from 'twenty-shared/utils';
import { getWorkspaceAuthContext } from 'src/engine/core-modules/auth/storage/workspace-auth-context.storage';
import { EnterprisePlanService } from 'src/engine/core-modules/enterprise/services/enterprise-plan.service';
@@ -22,9 +16,8 @@ import { type WorkspaceTransactionScope } from 'src/engine/twenty-orm/types/work
import {
type ORMWorkspaceContext,
withWorkspaceContext,
- getWorkspaceContext,
} from 'src/engine/twenty-orm/storage/orm-workspace-context.storage';
-import type { RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
+import { type WorkspaceRepositoryOptions } from 'src/engine/twenty-orm/types/workspace-repository-options.type';
import { WorkspaceDataSourceService } from 'src/engine/twenty-orm/datasource/workspace-data-source.service';
import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace-repository';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
@@ -33,6 +26,10 @@ import { hasWorkspaceMemberBoundPredicates } from 'src/engine/permissions/rls/ut
import { type FlatWorkspaceMemberMaps } from 'src/engine/core-modules/user/types/flat-workspace-member-maps.type';
import { type FlatRowLevelPermissionPredicateMaps } from 'src/engine/metadata-modules/row-level-permission-predicate/types/flat-row-level-permission-predicate-maps.type';
+type OrmRepositoryOptions = WorkspaceRepositoryOptions & {
+ useReplica?: boolean;
+};
+
@Injectable()
export class WorkspaceOrmManager {
constructor(
@@ -42,65 +39,33 @@ export class WorkspaceOrmManager {
private readonly twentyConfigService: TwentyConfigService,
) {}
- getRepository<T extends ObjectLiteral = ObjectRecord>(
- workspaceEntity: Type<T>,
- permissionOptions?: RolePermissionConfig,
- repositoryOptions?: {
- useReplica?: boolean;
- shouldSkipEventEmission?: boolean;
- },
- ): WorkspaceRepository<T>;
-
- getRepository<T extends ObjectLiteral = ObjectRecord>(
- objectMetadataName: string,
- permissionOptions?: RolePermissionConfig,
- repositoryOptions?: {
- useReplica?: boolean;
- shouldSkipEventEmission?: boolean;
- },
- ): WorkspaceRepository<T>;
-
getRepository<T extends ObjectLiteral = ObjectRecord>(
workspaceEntityOrObjectMetadataName: Type<T> | string,
- permissionOptions?: RolePermissionConfig,
- repositoryOptions?: {
- useReplica?: boolean;
- shouldSkipEventEmission?: boolean;
- },
+ repositoryOptions?: OrmRepositoryOptions,
): WorkspaceRepository<T> {
- const objectMetadataName = this.resolveObjectMetadataName(
- workspaceEntityOrObjectMetadataName,
+ return this.getDataSource(repositoryOptions).getRepository<T>(
+ this.resolveObjectMetadataName(workspaceEntityOrObjectMetadataName),
+ { shouldSkipEventEmission: repositoryOptions?.shouldSkipEventEmission },
);
+ }
- return this.workspaceDataSourceService
- .getDataSource({ useReplica: repositoryOptions?.useReplica ?? false })
- .getRepository<T>(objectMetadataName, permissionOptions, {
- shouldSkipEventEmission:
- repositoryOptions?.shouldSkipEventEmission ?? false,
- });
+ // Only for work the system does itself, never on behalf of a caller
+ getRepositoryWithoutPermissionChecks<T extends ObjectLiteral = ObjectRecord>(
+ workspaceEntityOrObjectMetadataName: Type<T> | string,
+ repositoryOptions?: OrmRepositoryOptions,
+ ): WorkspaceRepository<T> {
+ return this.getDataSource(
+ repositoryOptions,
+ ).getRepositoryWithoutPermissionChecks<T>(
+ this.resolveObjectMetadataName(workspaceEntityOrObjectMetadataName),
+ { shouldSkipEventEmission: repositoryOptions?.shouldSkipEventEmission },
+ );
}
- // Domain APIs must evaluate the same role intersection as ordinary record APIs.
- getRepositoryWithContextPermissions<
- TData extends ObjectLiteral = ObjectRecord,
- >(
- objectMetadataName: string,
- transactionScope?: WorkspaceTransactionScope,
- ): WorkspaceRepository<TData> {
- const context = getWorkspaceContext();
- const permissionConfig = resolveRolePermissionConfig(context);
- if (!isDefined(permissionConfig)) {
- throw new PermissionsException(
- PermissionsExceptionMessage.PERMISSION_DENIED,
- PermissionsExceptionCode.PERMISSION_DENIED,
- );
- }
- return isDefined(transactionScope)
- ? transactionScope.getRepository<TData>(
- objectMetadataName,
- permissionConfig,
- )
- : this.getRepository<TData>(objectMetadataName, permissionConfig);
+ private getDataSource(repositoryOptions?: OrmRepositoryOptions) {
+ return this.workspaceDataSourceService.getDataSource({
+ useReplica: repositoryOptions?.useReplica ?? false,
+ });
}
private resolveObjectMetadataName<T extends ObjectLiteral>(
@@ -172,11 +137,10 @@ export class WorkspaceOrmManager {
const { idByNameSingular: objectIdByNameSingular } =
buildObjectIdByNameMaps(flatObjectMetadataMaps);
- const flatWorkspaceMemberMaps =
- await this.loadWorkspaceMemberMapsForRowLevelPermissions({
- workspaceId,
- flatRowLevelPermissionPredicateMaps,
- });
+ const flatWorkspaceMemberMaps = await this.loadFlatWorkspaceMemberMaps({
+ authContext,
+ flatRowLevelPermissionPredicateMaps,
+ });
const flatValidationRuleMaps = isValidationRuleEnforcementEnabled({
billingEntitlements,
@@ -210,23 +174,26 @@ export class WorkspaceOrmManager {
};
}
- private async loadWorkspaceMemberMapsForRowLevelPermissions({
- workspaceId,
+ // Member principals resolve their role through these maps; row-level predicates read them too
+ private async loadFlatWorkspaceMemberMaps({
+ authContext,
flatRowLevelPermissionPredicateMaps,
}: {
- workspaceId: string;
+ authContext: WorkspaceAuthContext;
flatRowLevelPermissionPredicateMaps: FlatRowLevelPermissionPredicateMaps;
}): Promise<FlatWorkspaceMemberMaps | undefined> {
if (
+ !isUserAuthContext(authContext) &&
!hasWorkspaceMemberBoundPredicates(flatRowLevelPermissionPredicateMaps)
) {
return undefined;
}
const { flatWorkspaceMemberMaps } =
- await this.workspaceCacheService.getOrRecompute(workspaceId, [
- 'flatWorkspaceMemberMaps',
- ]);
+ await this.workspaceCacheService.getOrRecompute(
+ authContext.workspace.id,
+ ['flatWorkspaceMemberMaps'],
+ );
return flatWorkspaceMemberMaps;
}
diff --git a/packages/twenty-server/src/modules/blocklist/repositories/blocklist.repository.ts b/packages/twenty-server/src/modules/blocklist/repositories/blocklist.repository.ts
index 443eff9a3ef..4640ee967f0 100644
--- a/packages/twenty-server/src/modules/blocklist/repositories/blocklist.repository.ts
+++ b/packages/twenty-server/src/modules/blocklist/repositories/blocklist.repository.ts
@@ -22,12 +22,10 @@ export class BlocklistRepository {
const authContext = buildSystemAuthContext(workspaceId);
return this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const blockListRepository = this.workspaceOrmManager.getRepository(
- BlocklistWorkspaceEntity,
- {
- shouldBypassPermissionChecks: true,
- },
- );
+ const blockListRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ BlocklistWorkspaceEntity,
+ );
return blockListRepository.findOne({
where: { id },
@@ -50,12 +48,10 @@ export class BlocklistRepository {
const authContext = buildSystemAuthContext(workspaceId);
return this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const blockListRepository = this.workspaceOrmManager.getRepository(
- BlocklistWorkspaceEntity,
- {
- shouldBypassPermissionChecks: true,
- },
- );
+ const blockListRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ BlocklistWorkspaceEntity,
+ );
return blockListRepository.find({
where: { id: In(ids) },
@@ -121,10 +117,10 @@ export class BlocklistRepository {
const authContext = buildSystemAuthContext(workspaceId);
return this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const blockListRepository = this.workspaceOrmManager.getRepository(
- BlocklistWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- );
+ const blockListRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ BlocklistWorkspaceEntity,
+ );
return blockListRepository.find({ where });
}, authContext);
diff --git a/packages/twenty-server/src/modules/calendar/blocklist-manager/jobs/blocklist-reimport-calendar-events.job.ts b/packages/twenty-server/src/modules/calendar/blocklist-manager/jobs/blocklist-reimport-calendar-events.job.ts
index 76f0c876081..4699457efbd 100644
--- a/packages/twenty-server/src/modules/calendar/blocklist-manager/jobs/blocklist-reimport-calendar-events.job.ts
+++ b/packages/twenty-server/src/modules/calendar/blocklist-manager/jobs/blocklist-reimport-calendar-events.job.ts
@@ -101,9 +101,8 @@ export class BlocklistReimportCalendarEventsJob {
workspaceId: string;
}): Promise<string | null> {
const workspaceMemberRepository =
- this.workspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkspaceMemberWorkspaceEntity>(
'workspaceMember',
- { shouldBypassPermissionChecks: true },
);
const workspaceMember = await workspaceMemberRepository.findOne({
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-cleaner/services/calendar-event-cleaner.service.ts b/packages/twenty-server/src/modules/calendar/calendar-event-cleaner/services/calendar-event-cleaner.service.ts
index a42e78e7aa5..4c0f4fc2f59 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-cleaner/services/calendar-event-cleaner.service.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-cleaner/services/calendar-event-cleaner.service.ts
@@ -30,9 +30,8 @@ export class CalendarEventCleanerService {
await this.workspaceOrmManager.runInWorkspaceTransaction(
async (transactionScope) => {
const calendarChannelEventAssociationRepository =
- transactionScope.getRepository<CalendarChannelEventAssociationWorkspaceEntity>(
+ transactionScope.getRepositoryWithoutPermissionChecks<CalendarChannelEventAssociationWorkspaceEntity>(
'calendarChannelEventAssociation',
- { shouldBypassPermissionChecks: true },
);
for (;;) {
@@ -81,14 +80,12 @@ export class CalendarEventCleanerService {
await this.workspaceOrmManager.runInWorkspaceTransaction(
async (transactionScope) => {
const calendarEventRepository =
- transactionScope.getRepository<CalendarEventWorkspaceEntity>(
+ transactionScope.getRepositoryWithoutPermissionChecks<CalendarEventWorkspaceEntity>(
'calendarEvent',
- { shouldBypassPermissionChecks: true },
);
const calendarChannelEventAssociationRepository =
- transactionScope.getRepository<CalendarChannelEventAssociationWorkspaceEntity>(
+ transactionScope.getRepositoryWithoutPermissionChecks<CalendarChannelEventAssociationWorkspaceEntity>(
'calendarChannelEventAssociation',
- { shouldBypassPermissionChecks: true },
);
for (
@@ -135,14 +132,12 @@ export class CalendarEventCleanerService {
await this.workspaceOrmManager.runInWorkspaceTransaction(
async (transactionScope) => {
const calendarEventRepository =
- transactionScope.getRepository<CalendarEventWorkspaceEntity>(
+ transactionScope.getRepositoryWithoutPermissionChecks<CalendarEventWorkspaceEntity>(
'calendarEvent',
- { shouldBypassPermissionChecks: true },
);
const calendarChannelEventAssociationRepository =
- transactionScope.getRepository<CalendarChannelEventAssociationWorkspaceEntity>(
+ transactionScope.getRepositoryWithoutPermissionChecks<CalendarChannelEventAssociationWorkspaceEntity>(
'calendarChannelEventAssociation',
- { shouldBypassPermissionChecks: true },
);
let cursor: string | undefined;
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-events-import.service.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-events-import.service.ts
index 594c0beab64..9f4f98fe9d9 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-events-import.service.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-events-import.service.ts
@@ -91,9 +91,8 @@ export class CalendarEventsImportService {
});
const workspaceMemberRepository =
- this.workspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkspaceMemberWorkspaceEntity>(
'workspaceMember',
- { shouldBypassPermissionChecks: true },
);
const workspaceMember = userWorkspace
@@ -156,9 +155,8 @@ export class CalendarEventsImportService {
}
if (eventExternalIdsToRemove.length > 0) {
const calendarChannelEventAssociationRepository =
- this.workspaceOrmManager.getRepository<CalendarChannelEventAssociationWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<CalendarChannelEventAssociationWorkspaceEntity>(
'calendarChannelEventAssociation',
- { shouldBypassPermissionChecks: true },
);
const associationsToDelete =
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-fetch-events.service.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-fetch-events.service.ts
index 60af0183744..b8c030a4323 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-fetch-events.service.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-fetch-events.service.ts
@@ -61,9 +61,8 @@ export class CalendarFetchEventsService {
if (calendarEventIdsToDelete.length > 0) {
const calendarChannelEventAssociationRepository =
- this.workspaceOrmManager.getRepository<CalendarChannelEventAssociationWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<CalendarChannelEventAssociationWorkspaceEntity>(
'calendarChannelEventAssociation',
- { shouldBypassPermissionChecks: true },
);
const associationsToDelete =
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-save-events.service.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-save-events.service.ts
index f30beb66eaa..1ffadfd8fc5 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-save-events.service.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-save-events.service.ts
@@ -59,15 +59,13 @@ export class CalendarSaveEventsService {
} = await this.workspaceOrmManager.executeInWorkspaceContext(
async () => {
const calendarChannelEventAssociationRepository =
- this.workspaceOrmManager.getRepository<CalendarChannelEventAssociationWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<CalendarChannelEventAssociationWorkspaceEntity>(
'calendarChannelEventAssociation',
- { shouldBypassPermissionChecks: true },
);
const calendarEventRepository =
- this.workspaceOrmManager.getRepository<CalendarEventWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<CalendarEventWorkspaceEntity>(
'calendarEvent',
- { shouldBypassPermissionChecks: true },
);
const existingAssociations =
@@ -224,15 +222,13 @@ export class CalendarSaveEventsService {
await this.workspaceOrmManager.runInWorkspaceTransaction(
async (transactionScope) => {
const calendarEventRepository =
- transactionScope.getRepository<CalendarEventWorkspaceEntity>(
+ transactionScope.getRepositoryWithoutPermissionChecks<CalendarEventWorkspaceEntity>(
'calendarEvent',
- { shouldBypassPermissionChecks: true },
);
const associationRepository =
- transactionScope.getRepository<CalendarChannelEventAssociationWorkspaceEntity>(
+ transactionScope.getRepositoryWithoutPermissionChecks<CalendarChannelEventAssociationWorkspaceEntity>(
'calendarChannelEventAssociation',
- { shouldBypassPermissionChecks: true },
);
if (saveOperations.calendarEventsToInsert.length > 0) {
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/services/calendar-event-participant.service.ts b/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/services/calendar-event-participant.service.ts
index b864ec59b1a..bf6361212aa 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/services/calendar-event-participant.service.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/services/calendar-event-participant.service.ts
@@ -37,9 +37,8 @@ export class CalendarEventParticipantService {
calendarEventIds: string[];
}): Promise<CalendarEventParticipantWorkspaceEntity[]> {
const calendarEventParticipantRepository =
- this.workspaceOrmManager.getRepository<CalendarEventParticipantWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<CalendarEventParticipantWorkspaceEntity>(
'calendarEventParticipant',
- { shouldBypassPermissionChecks: true },
);
return calendarEventParticipantRepository.find({
@@ -55,9 +54,8 @@ export class CalendarEventParticipantService {
transactionScope: WorkspaceTransactionScope;
}): Promise<void> {
const calendarEventParticipantRepository =
- transactionScope.getRepository<CalendarEventParticipantWorkspaceEntity>(
+ transactionScope.getRepositoryWithoutPermissionChecks<CalendarEventParticipantWorkspaceEntity>(
'calendarEventParticipant',
- { shouldBypassPermissionChecks: true },
);
if (operations.participantIdsToDelete.length > 0) {
@@ -101,9 +99,8 @@ export class CalendarEventParticipantService {
await this.workspaceOrmManager.executeInWorkspaceContext(
async () => {
const calendarEventParticipantRepository =
- this.workspaceOrmManager.getRepository<CalendarEventParticipantWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<CalendarEventParticipantWorkspaceEntity>(
'calendarEventParticipant',
- { shouldBypassPermissionChecks: true },
);
const savedParticipants: CalendarEventParticipantWorkspaceEntity[] = [];
diff --git a/packages/twenty-server/src/modules/calendar/common/query-hooks/calendar-event/services/apply-calendar-events-visibility-restrictions.service.ts b/packages/twenty-server/src/modules/calendar/common/query-hooks/calendar-event/services/apply-calendar-events-visibility-restrictions.service.ts
index 2551321f2ca..521b593f19e 100644
--- a/packages/twenty-server/src/modules/calendar/common/query-hooks/calendar-event/services/apply-calendar-events-visibility-restrictions.service.ts
+++ b/packages/twenty-server/src/modules/calendar/common/query-hooks/calendar-event/services/apply-calendar-events-visibility-restrictions.service.ts
@@ -95,9 +95,8 @@ export class ApplyCalendarEventsVisibilityRestrictionsService
await this.workspaceOrmManager.executeInWorkspaceContext(
async () =>
this.workspaceOrmManager
- .getRepository<CalendarChannelEventAssociationWorkspaceEntity>(
+ .getRepositoryWithoutPermissionChecks<CalendarChannelEventAssociationWorkspaceEntity>(
'calendarChannelEventAssociation',
- { shouldBypassPermissionChecks: true },
)
.find({
where: { calendarEventId: In(calendarEventIds) },
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 765276a6484..50f5ccbca8f 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
@@ -4,7 +4,7 @@ import { isDefined } from 'twenty-shared/utils';
import { getWorkspaceContext } from 'src/engine/twenty-orm/storage/orm-workspace-context.storage';
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
import { resolveObjectRecordsPermissions } from 'src/engine/permissions/role/utils/resolve-object-records-permissions.util';
-import { resolveRolePermissionConfig } from 'src/engine/permissions/principal/utils/resolve-role-permission-config.util';
+import { buildPermissionsPrincipalRoleMaps } from 'src/engine/permissions/principal/utils/build-permissions-principal-role-maps.util';
import {
PermissionsException,
PermissionsExceptionCode,
@@ -12,7 +12,6 @@ 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,
@@ -30,31 +29,14 @@ export class CallRecordingService {
): Promise<string | undefined> {
return this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const workspaceContext = getWorkspaceContext();
- const rolePermissionConfig = resolveRolePermissionConfig({
- authContext: workspaceContext.authContext,
- userWorkspaceRoleMap: workspaceContext.userWorkspaceRoleMap,
- apiKeyRoleMap: workspaceContext.apiKeyRoleMap,
- flatRoleTargetByAgentIdMaps:
- workspaceContext.flatRoleTargetByAgentIdMaps,
- });
-
- if (!isDefined(rolePermissionConfig)) {
- throw new PermissionsException(
- PermissionsExceptionMessage.PERMISSION_DENIED,
- PermissionsExceptionCode.PERMISSION_DENIED,
- );
- }
const { objectRecordsPermissions, shouldBypassPermissionChecks } =
resolveObjectRecordsPermissions({
- rolePermissionConfig,
- principals: getPermissionsPrincipalsFromAuthContext(
- workspaceContext.authContext,
- ),
+ authContext: workspaceContext.authContext,
+ roleMaps: buildPermissionsPrincipalRoleMaps(workspaceContext),
objectPermissionsByRoleId: workspaceContext.permissionsPerRoleId,
flatObjectMetadataMaps: workspaceContext.flatObjectMetadataMaps,
flatFieldMetadataMaps: workspaceContext.flatFieldMetadataMaps,
- flatApplicationMaps: workspaceContext.flatApplicationMaps,
});
const callRecordingObjectMetadataId =
workspaceContext.objectIdByNameSingular.callRecording;
@@ -74,7 +56,6 @@ export class CallRecordingService {
const callRecordingRepository =
this.workspaceOrmManager.getRepository<CallRecordingWorkspaceEntity>(
'callRecording',
- rolePermissionConfig,
);
const callRecordingsByCreation = await callRecordingRepository.find({
diff --git a/packages/twenty-server/src/modules/contact-creation-manager/services/create-company-and-contact.service.ts b/packages/twenty-server/src/modules/contact-creation-manager/services/create-company-and-contact.service.ts
index 7ac93c55e12..3fe3fc1e412 100644
--- a/packages/twenty-server/src/modules/contact-creation-manager/services/create-company-and-contact.service.ts
+++ b/packages/twenty-server/src/modules/contact-creation-manager/services/create-company-and-contact.service.ts
@@ -63,17 +63,15 @@ export class CreateCompanyAndPersonService {
const authContext = buildSystemAuthContext(workspaceId);
return this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const personRepository = this.workspaceOrmManager.getRepository(
- PersonWorkspaceEntity,
- {
- shouldBypassPermissionChecks: true,
- },
- );
+ const personRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ PersonWorkspaceEntity,
+ );
- const workspaceMemberRepository = this.workspaceOrmManager.getRepository(
- WorkspaceMemberWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- );
+ const workspaceMemberRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ WorkspaceMemberWorkspaceEntity,
+ );
const workspaceMembers = await workspaceMemberRepository.find();
@@ -194,9 +192,8 @@ export class CreateCompanyAndPersonService {
const accountOwner =
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const workspaceMemberRepository =
- this.workspaceOrmManager.getRepository(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
WorkspaceMemberWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
);
return workspaceMemberRepository.findOne({
diff --git a/packages/twenty-server/src/modules/contact-creation-manager/services/create-company.service.ts b/packages/twenty-server/src/modules/contact-creation-manager/services/create-company.service.ts
index 58956431235..cf520215010 100644
--- a/packages/twenty-server/src/modules/contact-creation-manager/services/create-company.service.ts
+++ b/packages/twenty-server/src/modules/contact-creation-manager/services/create-company.service.ts
@@ -56,12 +56,10 @@ export class CreateCompanyService {
const authContext = buildSystemAuthContext(workspaceId);
return this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const companyRepository = this.workspaceOrmManager.getRepository(
- CompanyWorkspaceEntity,
- {
- shouldBypassPermissionChecks: true,
- },
- );
+ const companyRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ CompanyWorkspaceEntity,
+ );
const normalizedCompanies = companies.map((company) => ({
...company,
@@ -199,12 +197,10 @@ export class CreateCompanyService {
return [];
}
- const companyRepository = this.workspaceOrmManager.getRepository(
- CompanyWorkspaceEntity,
- {
- shouldBypassPermissionChecks: true,
- },
- );
+ const companyRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ CompanyWorkspaceEntity,
+ );
const containmentConditions = domainNames
.map(
diff --git a/packages/twenty-server/src/modules/contact-creation-manager/services/create-person.service.ts b/packages/twenty-server/src/modules/contact-creation-manager/services/create-person.service.ts
index 7eca4b589b5..6a25e552186 100644
--- a/packages/twenty-server/src/modules/contact-creation-manager/services/create-person.service.ts
+++ b/packages/twenty-server/src/modules/contact-creation-manager/services/create-person.service.ts
@@ -21,10 +21,10 @@ export class CreatePersonService {
const authContext = buildSystemAuthContext(workspaceId);
return this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const personRepository = this.workspaceOrmManager.getRepository(
- PersonWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- );
+ const personRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ PersonWorkspaceEntity,
+ );
const lastPersonPosition =
await this.getLastPersonPosition(personRepository);
@@ -51,12 +51,10 @@ export class CreatePersonService {
const authContext = buildSystemAuthContext(workspaceId);
return this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const personRepository = this.workspaceOrmManager.getRepository(
- PersonWorkspaceEntity,
- {
- shouldBypassPermissionChecks: true,
- },
- );
+ const personRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ PersonWorkspaceEntity,
+ );
const restoredPeople = await personRepository.updateMany(
people.map(({ personId, companyId }) => ({
@@ -83,12 +81,10 @@ export class CreatePersonService {
const authContext = buildSystemAuthContext(workspaceId);
return this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const personRepository = this.workspaceOrmManager.getRepository(
- PersonWorkspaceEntity,
- {
- shouldBypassPermissionChecks: true,
- },
- );
+ const personRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ PersonWorkspaceEntity,
+ );
const enrichedPeople = await personRepository.updateMany(
peopleToEnrich.map(({ personId, name }) => ({
diff --git a/packages/twenty-server/src/modules/dashboard-sync/services/dashboard-sync.service.ts b/packages/twenty-server/src/modules/dashboard-sync/services/dashboard-sync.service.ts
index 8632b8e80ee..69ae51a66b6 100644
--- a/packages/twenty-server/src/modules/dashboard-sync/services/dashboard-sync.service.ts
+++ b/packages/twenty-server/src/modules/dashboard-sync/services/dashboard-sync.service.ts
@@ -64,12 +64,10 @@ export class DashboardSyncService {
try {
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const dashboardRepository = this.workspaceOrmManager.getRepository(
- 'dashboard',
- {
- shouldBypassPermissionChecks: true,
- },
- );
+ const dashboardRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ 'dashboard',
+ );
await dashboardRepository.update({ pageLayoutId }, { updatedAt });
}, authContext);
diff --git a/packages/twenty-server/src/modules/dashboard/chart-data/services/chart-relation-label.service.ts b/packages/twenty-server/src/modules/dashboard/chart-data/services/chart-relation-label.service.ts
index 350706a8a5c..bcae942b4ba 100644
--- a/packages/twenty-server/src/modules/dashboard/chart-data/services/chart-relation-label.service.ts
+++ b/packages/twenty-server/src/modules/dashboard/chart-data/services/chart-relation-label.service.ts
@@ -9,9 +9,7 @@ import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-m
import { buildFieldMapsFromFlatObjectMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/build-field-maps-from-flat-object-metadata.util';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
-import { getWorkspaceContext } from 'src/engine/twenty-orm/storage/orm-workspace-context.storage';
import { formatResult } from 'src/engine/twenty-orm/utils/format-result.util';
-import { resolveRolePermissionConfig } from 'src/engine/permissions/principal/utils/resolve-role-permission-config.util';
import { CHART_RELATION_LABEL_BATCH_SIZE } from 'src/modules/dashboard/chart-data/constants/chart-relation-label-batch-size.constant';
import { type ChartRelationLabelAxisInput } from 'src/modules/dashboard/chart-data/types/chart-relation-label-axis-input.type';
import { type GroupByRawResult } from 'src/modules/dashboard/chart-data/types/group-by-raw-result.type';
@@ -192,22 +190,8 @@ export class ChartRelationLabelService {
try {
return await this.workspaceOrmManager.executeInWorkspaceContext(
async () => {
- const workspaceContext = getWorkspaceContext();
- const rolePermissionConfig = resolveRolePermissionConfig({
- authContext: workspaceContext.authContext,
- userWorkspaceRoleMap: workspaceContext.userWorkspaceRoleMap,
- apiKeyRoleMap: workspaceContext.apiKeyRoleMap,
- flatRoleTargetByAgentIdMaps:
- workspaceContext.flatRoleTargetByAgentIdMaps,
- });
-
- if (!isDefined(rolePermissionConfig)) {
- return [];
- }
-
const repository = this.workspaceOrmManager.getRepository(
targetFlatObjectMetadata.nameSingular,
- rolePermissionConfig,
);
const alias = targetFlatObjectMetadata.nameSingular;
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 ebb0da8f898..1000553f968 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
@@ -18,10 +18,9 @@ import {
getWorkspaceContext,
type ORMWorkspaceContext,
} from 'src/engine/twenty-orm/storage/orm-workspace-context.storage';
-import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
import { isObjectOperationPermitted } from 'src/engine/permissions/role/utils/is-object-operation-permitted.util';
import { resolveObjectRecordsPermissions } from 'src/engine/permissions/role/utils/resolve-object-records-permissions.util';
-import { resolveRolePermissionConfig } from 'src/engine/permissions/principal/utils/resolve-role-permission-config.util';
+import { buildPermissionsPrincipalRoleMaps } from 'src/engine/permissions/principal/utils/build-permissions-principal-role-maps.util';
import { DuplicatedDashboardDTO } from 'src/modules/dashboard/dtos/duplicated-dashboard.dto';
import {
DashboardException,
@@ -30,7 +29,6 @@ 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)[] = [
@@ -66,25 +64,10 @@ export class DashboardDuplicationService {
return this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const workspaceContext = getWorkspaceContext();
- const rolePermissionConfig = resolveRolePermissionConfig({
- authContext: workspaceContext.authContext,
- userWorkspaceRoleMap: workspaceContext.userWorkspaceRoleMap,
- apiKeyRoleMap: workspaceContext.apiKeyRoleMap,
- flatRoleTargetByAgentIdMaps:
- workspaceContext.flatRoleTargetByAgentIdMaps,
- });
-
- if (!isDefined(rolePermissionConfig)) {
- throw new PermissionsException(
- PermissionsExceptionMessage.PERMISSION_DENIED,
- PermissionsExceptionCode.PERMISSION_DENIED,
- );
- }
const dashboardRepository =
this.workspaceOrmManager.getRepository<DashboardWorkspaceEntity>(
'dashboard',
- rolePermissionConfig,
);
const originalDashboard = await dashboardRepository.findOne({
@@ -115,7 +98,6 @@ export class DashboardDuplicationService {
// The layout copy lives outside the dashboard insert, so refuse before creating it
this.assertCanCreateDashboardOrThrow({
workspaceContext,
- rolePermissionConfig,
});
try {
@@ -155,21 +137,16 @@ export class DashboardDuplicationService {
private assertCanCreateDashboardOrThrow({
workspaceContext,
- rolePermissionConfig,
}: {
workspaceContext: ORMWorkspaceContext;
- rolePermissionConfig: RolePermissionConfig;
}): void {
const { objectRecordsPermissions, shouldBypassPermissionChecks } =
resolveObjectRecordsPermissions({
- rolePermissionConfig,
- principals: getPermissionsPrincipalsFromAuthContext(
- workspaceContext.authContext,
- ),
+ authContext: workspaceContext.authContext,
+ roleMaps: buildPermissionsPrincipalRoleMaps(workspaceContext),
objectPermissionsByRoleId: workspaceContext.permissionsPerRoleId,
flatObjectMetadataMaps: workspaceContext.flatObjectMetadataMaps,
flatFieldMetadataMaps: workspaceContext.flatFieldMetadataMaps,
- flatApplicationMaps: workspaceContext.flatApplicationMaps,
});
if (shouldBypassPermissionChecks) {
diff --git a/packages/twenty-server/src/modules/dashboard/services/dashboard-to-page-layout-sync.service.ts b/packages/twenty-server/src/modules/dashboard/services/dashboard-to-page-layout-sync.service.ts
index 9825674de03..7016200ac94 100644
--- a/packages/twenty-server/src/modules/dashboard/services/dashboard-to-page-layout-sync.service.ts
+++ b/packages/twenty-server/src/modules/dashboard/services/dashboard-to-page-layout-sync.service.ts
@@ -58,9 +58,8 @@ export class DashboardToPageLayoutSyncService {
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const dashboardRepository =
- this.workspaceOrmManager.getRepository<DashboardWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<DashboardWorkspaceEntity>(
'dashboard',
- { shouldBypassPermissionChecks: true },
);
const dashboards = await dashboardRepository.find({
diff --git a/packages/twenty-server/src/modules/dashboard/tools/__tests__/create-complete-dashboard.tool.spec.ts b/packages/twenty-server/src/modules/dashboard/tools/__tests__/create-complete-dashboard.tool.spec.ts
index 953435f27db..1315d2c85c5 100644
--- a/packages/twenty-server/src/modules/dashboard/tools/__tests__/create-complete-dashboard.tool.spec.ts
+++ b/packages/twenty-server/src/modules/dashboard/tools/__tests__/create-complete-dashboard.tool.spec.ts
@@ -1,8 +1,12 @@
+import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { createCreateCompleteDashboardTool } from 'src/modules/dashboard/tools/create-complete-dashboard.tool';
import { type DashboardToolDependencies } from 'src/modules/dashboard/tools/types/dashboard-tool-dependencies.type';
const WORKSPACE_ID = '20202020-aaaa-4d02-bf25-6aeccf7ea419';
-const ROLE_ID = '20202020-bbbb-4d02-bf25-6aeccf7ea419';
+const AUTH_CONTEXT = {
+ type: 'user',
+ workspace: { id: WORKSPACE_ID },
+} as WorkspaceAuthContext;
const PAGE_LAYOUT_ID = '20202020-cccc-4d02-bf25-6aeccf7ea419';
const buildDeps = ({ insert }: { insert: jest.Mock }) => {
@@ -38,9 +42,7 @@ describe('createCreateCompleteDashboardTool', () => {
const tool = createCreateCompleteDashboardTool(deps, {
workspaceId: WORKSPACE_ID,
- rolePermissionConfig: {
- intersectionOf: { userWorkspaceRoleId: ROLE_ID },
- },
+ authContext: AUTH_CONTEXT,
});
const result = await tool.execute({ title: 'Revenue' });
@@ -60,9 +62,7 @@ describe('createCreateCompleteDashboardTool', () => {
const tool = createCreateCompleteDashboardTool(deps, {
workspaceId: WORKSPACE_ID,
- rolePermissionConfig: {
- intersectionOf: { userWorkspaceRoleId: ROLE_ID },
- },
+ authContext: AUTH_CONTEXT,
});
const result = await tool.execute({ title: 'Revenue' });
diff --git a/packages/twenty-server/src/modules/dashboard/tools/__tests__/get-dashboard.tool.spec.ts b/packages/twenty-server/src/modules/dashboard/tools/__tests__/get-dashboard.tool.spec.ts
index 5658405c5e3..4f6a07e095d 100644
--- a/packages/twenty-server/src/modules/dashboard/tools/__tests__/get-dashboard.tool.spec.ts
+++ b/packages/twenty-server/src/modules/dashboard/tools/__tests__/get-dashboard.tool.spec.ts
@@ -1,3 +1,4 @@
+import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import {
FieldMetadataType,
PageLayoutTabLayoutMode,
@@ -8,6 +9,10 @@ import { createGetDashboardTool } from 'src/modules/dashboard/tools/get-dashboar
import { type DashboardToolDependencies } from 'src/modules/dashboard/tools/types/dashboard-tool-dependencies.type';
const WORKSPACE_ID = '20202020-aaaa-4d02-bf25-6aeccf7ea419';
+const AUTH_CONTEXT = {
+ type: 'user',
+ workspace: { id: WORKSPACE_ID },
+} as WorkspaceAuthContext;
const AGG_FIELD_ID = '20202020-bbbb-4d02-bf25-6aeccf7ea419';
const OWNER_FIELD_ID = '20202020-cccc-4d02-bf25-6aeccf7ea419';
@@ -143,7 +148,7 @@ describe('get_dashboard tool', () => {
>,
{
workspaceId: WORKSPACE_ID,
- rolePermissionConfig: { shouldBypassPermissionChecks: true },
+ authContext: AUTH_CONTEXT,
},
);
diff --git a/packages/twenty-server/src/modules/dashboard/tools/__tests__/list-dashboards.tool.spec.ts b/packages/twenty-server/src/modules/dashboard/tools/__tests__/list-dashboards.tool.spec.ts
index 8d24f9a1328..7cada8ce4d4 100644
--- a/packages/twenty-server/src/modules/dashboard/tools/__tests__/list-dashboards.tool.spec.ts
+++ b/packages/twenty-server/src/modules/dashboard/tools/__tests__/list-dashboards.tool.spec.ts
@@ -1,8 +1,12 @@
+import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { createListDashboardsTool } from 'src/modules/dashboard/tools/list-dashboards.tool';
import { type DashboardToolDependencies } from 'src/modules/dashboard/tools/types/dashboard-tool-dependencies.type';
const WORKSPACE_ID = '20202020-aaaa-4d02-bf25-6aeccf7ea419';
-const ROLE_ID = '20202020-bbbb-4d02-bf25-6aeccf7ea419';
+const AUTH_CONTEXT = {
+ type: 'user',
+ workspace: { id: WORKSPACE_ID },
+} as WorkspaceAuthContext;
const buildDeps = () => {
const getRepository = jest.fn().mockReturnValue({
@@ -23,22 +27,21 @@ const buildDeps = () => {
};
describe('createListDashboardsTool', () => {
- it('reads dashboards through the caller role rather than bypassing permissions', async () => {
+ it('reads dashboards as the caller rather than bypassing permissions', async () => {
const { deps, getRepository } = buildDeps();
const tool = createListDashboardsTool(deps, {
workspaceId: WORKSPACE_ID,
- rolePermissionConfig: {
- intersectionOf: { userWorkspaceRoleId: ROLE_ID },
- },
+ authContext: AUTH_CONTEXT,
});
const result = await tool.execute({});
expect(result.success).toBe(true);
expect(getRepository).toHaveBeenCalledTimes(1);
- expect(getRepository).toHaveBeenCalledWith('dashboard', {
- intersectionOf: { userWorkspaceRoleId: ROLE_ID },
- });
+ expect(getRepository).toHaveBeenCalledWith('dashboard');
+ expect(
+ deps.workspaceOrmManager.executeInWorkspaceContext,
+ ).toHaveBeenCalledWith(expect.any(Function), AUTH_CONTEXT);
});
});
diff --git a/packages/twenty-server/src/modules/dashboard/tools/create-complete-dashboard.tool.ts b/packages/twenty-server/src/modules/dashboard/tools/create-complete-dashboard.tool.ts
index a88cc249772..7b4fe729e86 100644
--- a/packages/twenty-server/src/modules/dashboard/tools/create-complete-dashboard.tool.ts
+++ b/packages/twenty-server/src/modules/dashboard/tools/create-complete-dashboard.tool.ts
@@ -7,7 +7,6 @@ import {
type PageLayoutWidgetGridPosition,
type WidgetType,
} from 'twenty-shared/types';
-import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
import {
widgetPositionSchema,
widgetConfigurationSchema,
@@ -261,13 +260,9 @@ const createDashboardRecord = async ({
title,
pageLayoutId,
}: CreateDashboardRecordParams): Promise<string> => {
- const authContext = buildSystemAuthContext(context.workspaceId);
-
return deps.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const dashboardRepository = deps.workspaceOrmManager.getRepository(
- 'dashboard',
- context.rolePermissionConfig,
- );
+ const dashboardRepository =
+ deps.workspaceOrmManager.getRepository('dashboard');
const position = await deps.recordPositionService.buildRecordPosition({
value: 'first',
@@ -280,5 +275,5 @@ const createDashboardRecord = async ({
await dashboardRepository.insert(dashboard);
return dashboard.id;
- }, authContext);
+ }, context.authContext);
};
diff --git a/packages/twenty-server/src/modules/dashboard/tools/get-dashboard.tool.ts b/packages/twenty-server/src/modules/dashboard/tools/get-dashboard.tool.ts
index 333f774a932..c386f4ad11a 100644
--- a/packages/twenty-server/src/modules/dashboard/tools/get-dashboard.tool.ts
+++ b/packages/twenty-server/src/modules/dashboard/tools/get-dashboard.tool.ts
@@ -6,7 +6,6 @@ import { WidgetConfigurationType } from 'src/engine/metadata-modules/page-layout
import { WidgetType } from 'twenty-shared/types';
import { findActiveFlatFieldMetadataById } from 'src/engine/metadata-modules/page-layout-widget/utils/find-active-flat-field-metadata-by-id.util';
import { isChartReferencingFieldInConfiguration } from 'src/engine/metadata-modules/page-layout-widget/utils/is-chart-referencing-field-in-configuration.util';
-import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
import {
type DashboardToolContextWithPermissions,
type DashboardToolDependencies,
@@ -30,7 +29,6 @@ export const createGetDashboardTool = (
inputSchema: getDashboardSchema,
execute: async (parameters: { dashboardId: string }) => {
try {
- const authContext = buildSystemAuthContext(context.workspaceId);
const { flatFieldMetadataMaps } =
await deps.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
{
@@ -77,13 +75,10 @@ export const createGetDashboardTool = (
const dashboard =
await deps.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const repo = deps.workspaceOrmManager.getRepository(
- 'dashboard',
- context.rolePermissionConfig,
- );
+ const repo = deps.workspaceOrmManager.getRepository('dashboard');
return repo.findOne({ where: { id: parameters.dashboardId } });
- }, authContext);
+ }, context.authContext);
if (!isDefined(dashboard)) {
return {
diff --git a/packages/twenty-server/src/modules/dashboard/tools/list-dashboards.tool.ts b/packages/twenty-server/src/modules/dashboard/tools/list-dashboards.tool.ts
index f49f101e521..c9301bdad9d 100644
--- a/packages/twenty-server/src/modules/dashboard/tools/list-dashboards.tool.ts
+++ b/packages/twenty-server/src/modules/dashboard/tools/list-dashboards.tool.ts
@@ -1,6 +1,5 @@
import { z } from 'zod';
-import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
import {
type DashboardToolContextWithPermissions,
type DashboardToolDependencies,
@@ -26,17 +25,13 @@ export const createListDashboardsTool = (
execute: async (parameters: { limit?: number }) => {
try {
const limit = parameters.limit ?? 20;
- const authContext = buildSystemAuthContext(context.workspaceId);
const dashboards =
await deps.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const repo = deps.workspaceOrmManager.getRepository(
- 'dashboard',
- context.rolePermissionConfig,
- );
+ const repo = deps.workspaceOrmManager.getRepository('dashboard');
return repo.find({ take: limit, order: { position: 'ASC' } });
- }, authContext);
+ }, context.authContext);
const dashboardList = dashboards.map((d) => ({
id: d.id,
diff --git a/packages/twenty-server/src/modules/dashboard/tools/services/dashboard-tool.workspace-service.ts b/packages/twenty-server/src/modules/dashboard/tools/services/dashboard-tool.workspace-service.ts
index 53eca8c935c..d488a9a7503 100644
--- a/packages/twenty-server/src/modules/dashboard/tools/services/dashboard-tool.workspace-service.ts
+++ b/packages/twenty-server/src/modules/dashboard/tools/services/dashboard-tool.workspace-service.ts
@@ -1,3 +1,4 @@
+import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { Injectable } from '@nestjs/common';
import { type ToolSet } from 'ai';
@@ -9,7 +10,6 @@ import { PageLayoutTabService } from 'src/engine/metadata-modules/page-layout-ta
import { PageLayoutWidgetService } from 'src/engine/metadata-modules/page-layout-widget/services/page-layout-widget.service';
import { PageLayoutService } from 'src/engine/metadata-modules/page-layout/services/page-layout.service';
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
-import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
import { createAddDashboardTabTool } from 'src/modules/dashboard/tools/add-dashboard-tab.tool';
import { createAddDashboardWidgetTool } from 'src/modules/dashboard/tools/add-dashboard-widget.tool';
import { createCreateCompleteDashboardTool } from 'src/modules/dashboard/tools/create-complete-dashboard.tool';
@@ -45,10 +45,10 @@ export class DashboardToolWorkspaceService {
generateDashboardTools(
workspaceId: string,
- rolePermissionConfig: RolePermissionConfig,
+ authContext: WorkspaceAuthContext,
): ToolSet {
const context = { workspaceId };
- const contextWithPermissions = { workspaceId, rolePermissionConfig };
+ const contextWithPermissions = { workspaceId, authContext };
const createCompleteDashboard = createCreateCompleteDashboardTool(
this.deps,
diff --git a/packages/twenty-server/src/modules/dashboard/tools/types/dashboard-tool-dependencies.type.ts b/packages/twenty-server/src/modules/dashboard/tools/types/dashboard-tool-dependencies.type.ts
index 216bbb052ca..462c907868a 100644
--- a/packages/twenty-server/src/modules/dashboard/tools/types/dashboard-tool-dependencies.type.ts
+++ b/packages/twenty-server/src/modules/dashboard/tools/types/dashboard-tool-dependencies.type.ts
@@ -1,3 +1,4 @@
+import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import type { ApplicationService } from 'src/engine/core-modules/application/application.service';
import type { RecordPositionService } from 'src/engine/core-modules/record-position/services/record-position.service';
import type { PageLayoutTabService } from 'src/engine/metadata-modules/page-layout-tab/services/page-layout-tab.service';
@@ -5,7 +6,6 @@ import type { PageLayoutWidgetService } from 'src/engine/metadata-modules/page-l
import type { PageLayoutService } from 'src/engine/metadata-modules/page-layout/services/page-layout.service';
import type { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
import type { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
-import type { RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
export type DashboardToolDependencies = {
pageLayoutService: PageLayoutService;
@@ -22,5 +22,5 @@ export type DashboardToolContext = {
};
export type DashboardToolContextWithPermissions = DashboardToolContext & {
- rolePermissionConfig: RolePermissionConfig;
+ authContext: WorkspaceAuthContext;
};
diff --git a/packages/twenty-server/src/modules/emailing/resolvers/emailing-send.resolver.ts b/packages/twenty-server/src/modules/emailing/resolvers/emailing-send.resolver.ts
index f925daa27c9..6649b1a1cac 100644
--- a/packages/twenty-server/src/modules/emailing/resolvers/emailing-send.resolver.ts
+++ b/packages/twenty-server/src/modules/emailing/resolvers/emailing-send.resolver.ts
@@ -121,13 +121,12 @@ export class EmailingSendResolver {
async previewMessageCampaignAudience(
@Args('input') input: PreviewMessageCampaignAudienceInput,
@AuthWorkspace() currentWorkspace: WorkspaceEntity,
- @AuthUserWorkspaceId() userWorkspaceId: string,
+ @AuthUserWorkspaceId() _userWorkspaceId: string,
): Promise<CampaignAudiencePreviewDTO> {
this.emailGroupAccessService.validateEmailGroupAccessOrThrow();
return this.messageCampaignAudienceService.previewAudience({
workspaceId: currentWorkspace.id,
- userWorkspaceId,
listId: input.listId,
unsubscribeTopicId: input.unsubscribeTopicId,
});
diff --git a/packages/twenty-server/src/modules/emailing/services/add-people-to-message-list-job.service.ts b/packages/twenty-server/src/modules/emailing/services/add-people-to-message-list-job.service.ts
index 4e3c516a8c8..448f8ddc994 100644
--- a/packages/twenty-server/src/modules/emailing/services/add-people-to-message-list-job.service.ts
+++ b/packages/twenty-server/src/modules/emailing/services/add-people-to-message-list-job.service.ts
@@ -96,9 +96,7 @@ export class AddPeopleToMessageListJobService {
await this.workspaceOrmManager.executeInWorkspaceContext(
() =>
this.workspaceOrmManager
- .getRepositoryWithContextPermissions<MessageListWorkspaceEntity>(
- 'messageList',
- )
+ .getRepository<MessageListWorkspaceEntity>('messageList')
.findOne({ where: { id: messageListId } }),
authContext,
);
diff --git a/packages/twenty-server/src/modules/emailing/services/add-people-to-message-list.service.ts b/packages/twenty-server/src/modules/emailing/services/add-people-to-message-list.service.ts
index 04ef7e6dece..209ce466818 100644
--- a/packages/twenty-server/src/modules/emailing/services/add-people-to-message-list.service.ts
+++ b/packages/twenty-server/src/modules/emailing/services/add-people-to-message-list.service.ts
@@ -119,7 +119,7 @@ export class AddPeopleToMessageListService {
await this.workspaceOrmManager.executeInWorkspaceContext(
() =>
this.workspaceOrmManager
- .getRepositoryWithContextPermissions<MessageListMemberWorkspaceEntity>(
+ .getRepository<MessageListMemberWorkspaceEntity>(
'messageListMember',
)
.insert(members, { onConflictDoNothing: true }),
diff --git a/packages/twenty-server/src/modules/emailing/services/campaign-engagement-recording.service.ts b/packages/twenty-server/src/modules/emailing/services/campaign-engagement-recording.service.ts
index a5a585b3363..e075330357b 100644
--- a/packages/twenty-server/src/modules/emailing/services/campaign-engagement-recording.service.ts
+++ b/packages/twenty-server/src/modules/emailing/services/campaign-engagement-recording.service.ts
@@ -32,9 +32,7 @@ export class CampaignEngagementRecordingService {
const delivery = await this.workspaceOrmManager.executeInWorkspaceContext(
() =>
this.workspaceOrmManager
- .getRepository(CampaignDeliveryWorkspaceEntity, {
- shouldBypassPermissionChecks: true,
- })
+ .getRepositoryWithoutPermissionChecks(CampaignDeliveryWorkspaceEntity)
.findOneBy({ id: observation.deliveryId }),
buildSystemAuthContext(observation.workspaceId),
);
diff --git a/packages/twenty-server/src/modules/emailing/services/message-campaign-audience.service.ts b/packages/twenty-server/src/modules/emailing/services/message-campaign-audience.service.ts
index 215149d59d3..06a13826227 100644
--- a/packages/twenty-server/src/modules/emailing/services/message-campaign-audience.service.ts
+++ b/packages/twenty-server/src/modules/emailing/services/message-campaign-audience.service.ts
@@ -14,7 +14,6 @@ import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager
import { MessageSuppressionService } from 'src/modules/emailing/services/message-suppression.service';
import { MessageListMemberWorkspaceEntity } from 'src/modules/emailing/standard-objects/message-list-member.workspace-entity';
import { PersonWorkspaceEntity } from 'src/modules/person/standard-objects/person.workspace-entity';
-import { buildEmailingRolePermissionConfig } from 'src/modules/emailing/utils/build-emailing-role-permission-config.util';
@Injectable()
export class MessageCampaignAudienceService {
@@ -27,19 +26,16 @@ export class MessageCampaignAudienceService {
async resolveNormalizedAudience({
workspaceId,
listId,
- roleId,
unsubscribeTopicId,
}: {
workspaceId: string;
listId: string;
- roleId: string;
unsubscribeTopicId?: string;
}): Promise<CampaignAudienceResolution> {
return this.workspaceOrmManager.executeInWorkspaceContext(() =>
this.resolveAudience({
workspaceId,
listId,
- roleId,
unsubscribeTopicId,
}),
);
@@ -48,18 +44,15 @@ export class MessageCampaignAudienceService {
private async resolveAudience({
workspaceId,
listId,
- roleId,
unsubscribeTopicId,
}: {
workspaceId: string;
listId: string;
- roleId: string;
unsubscribeTopicId?: string;
}): Promise<CampaignAudienceResolution> {
const { rawRecipients, totalMemberCount } =
await this.resolveRecipientsFromList({
listId,
- roleId,
});
const emailAddresses = rawRecipients
@@ -109,26 +102,18 @@ export class MessageCampaignAudienceService {
async previewAudience({
workspaceId,
- userWorkspaceId,
listId,
unsubscribeTopicId,
}: {
workspaceId: string;
- userWorkspaceId: string;
listId: string;
unsubscribeTopicId?: string;
}): Promise<CampaignAudienceResolution['audience']> {
- const roleId = await this.userRoleService.getRoleIdForUserWorkspace({
- workspaceId,
- userWorkspaceId,
- });
-
const { audience } =
await this.workspaceOrmManager.executeInWorkspaceContext(() =>
this.resolveAudience({
workspaceId,
listId,
- roleId,
unsubscribeTopicId,
}),
);
@@ -138,17 +123,14 @@ export class MessageCampaignAudienceService {
private async resolveRecipientsFromList({
listId,
- roleId,
}: {
listId: string;
- roleId: string;
}): Promise<{
rawRecipients: RawCampaignRecipient[];
totalMemberCount: number;
}> {
const listMemberRepository = this.workspaceOrmManager.getRepository(
MessageListMemberWorkspaceEntity,
- buildEmailingRolePermissionConfig(roleId),
);
const members = await listMemberRepository.find({ where: { listId } });
@@ -160,7 +142,6 @@ export class MessageCampaignAudienceService {
const personRepository = this.workspaceOrmManager.getRepository(
PersonWorkspaceEntity,
- buildEmailingRolePermissionConfig(roleId),
);
const people = await personRepository.find({
diff --git a/packages/twenty-server/src/modules/emailing/services/message-campaign-batch-delivery.service.ts b/packages/twenty-server/src/modules/emailing/services/message-campaign-batch-delivery.service.ts
index 37c898e7142..030d21b15df 100644
--- a/packages/twenty-server/src/modules/emailing/services/message-campaign-batch-delivery.service.ts
+++ b/packages/twenty-server/src/modules/emailing/services/message-campaign-batch-delivery.service.ts
@@ -317,10 +317,10 @@ export class MessageCampaignBatchDeliveryService {
bodyTemplate: campaign.bodyTemplate ?? '',
});
- const personRepository = this.workspaceOrmManager.getRepository(
- PersonWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- );
+ const personRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ PersonWorkspaceEntity,
+ );
const people = await personRepository.find({
where: {
@@ -524,11 +524,11 @@ export class MessageCampaignBatchDeliveryService {
template: EmailingDomainEmailTemplate;
replacements: Record<string, string>;
}): Promise<void> {
- const messageRepository = this.workspaceOrmManager.getRepository(
- MessageWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- { shouldSkipEventEmission: true },
- );
+ const messageRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ MessageWorkspaceEntity,
+ { shouldSkipEventEmission: true },
+ );
await messageRepository.update(deliveryId, {
headerMessageId,
@@ -536,11 +536,11 @@ export class MessageCampaignBatchDeliveryService {
text: applyReplacementTags(template.text, replacements),
});
- const associationRepository = this.workspaceOrmManager.getRepository(
- MessageChannelMessageAssociationWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- { shouldSkipEventEmission: true },
- );
+ const associationRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ MessageChannelMessageAssociationWorkspaceEntity,
+ { shouldSkipEventEmission: true },
+ );
await associationRepository.update(
{ messageId: deliveryId },
@@ -587,11 +587,9 @@ export class MessageCampaignBatchDeliveryService {
claimToken: string;
}): Promise<string[]> {
const { generatedMaps: claimedDeliveries } = await this.workspaceOrmManager
- .getRepository(
- CampaignDeliveryWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- { shouldSkipEventEmission: true },
- )
+ .getRepositoryWithoutPermissionChecks(CampaignDeliveryWorkspaceEntity, {
+ shouldSkipEventEmission: true,
+ })
.update(
{ id: In(deliveryIds), state: In(CLAIMABLE_CAMPAIGN_DELIVERY_STATES) },
{
@@ -622,11 +620,9 @@ export class MessageCampaignBatchDeliveryService {
}
await this.workspaceOrmManager
- .getRepository(
- CampaignDeliveryWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- { shouldSkipEventEmission: true },
- )
+ .getRepositoryWithoutPermissionChecks(CampaignDeliveryWorkspaceEntity, {
+ shouldSkipEventEmission: true,
+ })
.update(
{
id: In(recipients.map((recipient) => recipient.messageId)),
@@ -662,11 +658,9 @@ export class MessageCampaignBatchDeliveryService {
});
const settledRows = await this.workspaceOrmManager
- .getRepository(
- CampaignDeliveryWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- { shouldSkipEventEmission: true },
- )
+ .getRepositoryWithoutPermissionChecks(CampaignDeliveryWorkspaceEntity, {
+ shouldSkipEventEmission: true,
+ })
.executeRaw<{ id: string }>(sql, parameters);
return new Set(settledRows.map((row) => row.id));
@@ -678,11 +672,9 @@ export class MessageCampaignBatchDeliveryService {
claimToken: string;
}): Promise<void> {
await this.workspaceOrmManager
- .getRepository(
- CampaignDeliveryWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- { shouldSkipEventEmission: true },
- )
+ .getRepositoryWithoutPermissionChecks(CampaignDeliveryWorkspaceEntity, {
+ shouldSkipEventEmission: true,
+ })
.update(
{ claimToken },
{
diff --git a/packages/twenty-server/src/modules/emailing/services/message-campaign-delivery-feedback.service.ts b/packages/twenty-server/src/modules/emailing/services/message-campaign-delivery-feedback.service.ts
index 9c3605b9aae..4c99ed96050 100644
--- a/packages/twenty-server/src/modules/emailing/services/message-campaign-delivery-feedback.service.ts
+++ b/packages/twenty-server/src/modules/emailing/services/message-campaign-delivery-feedback.service.ts
@@ -40,11 +40,11 @@ export class MessageCampaignDeliveryFeedbackService {
const {
generatedMaps: [updatedDelivery],
} = await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const campaignDeliveryRepository = this.workspaceOrmManager.getRepository(
- CampaignDeliveryWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- { shouldSkipEventEmission: true },
- );
+ const campaignDeliveryRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ CampaignDeliveryWorkspaceEntity,
+ { shouldSkipEventEmission: true },
+ );
return campaignDeliveryRepository.update({ providerMessageId }, update, {
columnsToReturn: ['campaignId'],
});
diff --git a/packages/twenty-server/src/modules/emailing/services/message-campaign-delivery.service.ts b/packages/twenty-server/src/modules/emailing/services/message-campaign-delivery.service.ts
index a5a5033d88d..ad86d111678 100644
--- a/packages/twenty-server/src/modules/emailing/services/message-campaign-delivery.service.ts
+++ b/packages/twenty-server/src/modules/emailing/services/message-campaign-delivery.service.ts
@@ -69,11 +69,9 @@ export class MessageCampaignDeliveryService {
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const isStillClaimable = await this.workspaceOrmManager
- .getRepository(
- CampaignDeliveryWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- { shouldSkipEventEmission: true },
- )
+ .getRepositoryWithoutPermissionChecks(CampaignDeliveryWorkspaceEntity, {
+ shouldSkipEventEmission: true,
+ })
.existsBy({
id: data.messageId,
state: In(CLAIMABLE_CAMPAIGN_DELIVERY_STATES),
@@ -109,11 +107,11 @@ export class MessageCampaignDeliveryService {
return;
}
- const messageRepository = this.workspaceOrmManager.getRepository(
- MessageWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- { shouldSkipEventEmission: true },
- );
+ const messageRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ MessageWorkspaceEntity,
+ { shouldSkipEventEmission: true },
+ );
const sendContext = await this.loadSendContext({ data, campaign });
@@ -191,11 +189,9 @@ export class MessageCampaignDeliveryService {
messageId: string;
}): Promise<void> {
const { generatedMaps: failedDeliveries } = await this.workspaceOrmManager
- .getRepository(
- CampaignDeliveryWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- { shouldSkipEventEmission: true },
- )
+ .getRepositoryWithoutPermissionChecks(CampaignDeliveryWorkspaceEntity, {
+ shouldSkipEventEmission: true,
+ })
.update(
{ id: messageId, state: In(CLAIMABLE_CAMPAIGN_DELIVERY_STATES) },
{
@@ -225,10 +221,10 @@ export class MessageCampaignDeliveryService {
}): Promise<SendContext | null> {
const { campaignId, messageId, personId } = data;
- const campaignRepository = this.workspaceOrmManager.getRepository(
- MessageCampaignWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- );
+ const campaignRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ MessageCampaignWorkspaceEntity,
+ );
const claimToken = await this.claimDeliveryForSending({
messageId,
@@ -256,10 +252,10 @@ export class MessageCampaignDeliveryService {
return null;
}
- const personRepository = this.workspaceOrmManager.getRepository(
- PersonWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- );
+ const personRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ PersonWorkspaceEntity,
+ );
return {
campaign,
@@ -393,11 +389,11 @@ export class MessageCampaignDeliveryService {
messageId: string;
providerMessageId: string;
}): Promise<void> {
- const associationRepository = this.workspaceOrmManager.getRepository(
- MessageChannelMessageAssociationWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- { shouldSkipEventEmission: true },
- );
+ const associationRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ MessageChannelMessageAssociationWorkspaceEntity,
+ { shouldSkipEventEmission: true },
+ );
await associationRepository.update(
{ messageId },
@@ -481,11 +477,9 @@ export class MessageCampaignDeliveryService {
const claimToken = v4();
const { generatedMaps: claimedDeliveries } = await this.workspaceOrmManager
- .getRepository(
- CampaignDeliveryWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- { shouldSkipEventEmission: true },
- )
+ .getRepositoryWithoutPermissionChecks(CampaignDeliveryWorkspaceEntity, {
+ shouldSkipEventEmission: true,
+ })
.update(
{ id: messageId, state: In(CLAIMABLE_CAMPAIGN_DELIVERY_STATES) },
{
@@ -517,11 +511,9 @@ export class MessageCampaignDeliveryService {
>;
}): Promise<number> {
const { generatedMaps: settledDeliveries } = await this.workspaceOrmManager
- .getRepository(
- CampaignDeliveryWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- { shouldSkipEventEmission: true },
- )
+ .getRepositoryWithoutPermissionChecks(CampaignDeliveryWorkspaceEntity, {
+ shouldSkipEventEmission: true,
+ })
.update(
{ id: messageId, claimToken },
{ ...update, claimToken: null, claimExpiresAt: null },
diff --git a/packages/twenty-server/src/modules/emailing/services/message-campaign-draft.service.ts b/packages/twenty-server/src/modules/emailing/services/message-campaign-draft.service.ts
index a9b0de71bb5..42a4b33613c 100644
--- a/packages/twenty-server/src/modules/emailing/services/message-campaign-draft.service.ts
+++ b/packages/twenty-server/src/modules/emailing/services/message-campaign-draft.service.ts
@@ -14,7 +14,7 @@ import {
EmailingDomainException,
EmailingDomainExceptionCode,
} from 'src/engine/core-modules/emailing-domain/exceptions/emailing-domain.exception';
-import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
+import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
import { CampaignVariableService } from 'src/modules/emailing/services/campaign-variable.service';
import { MessageCampaignWorkspaceEntity } from 'src/modules/emailing/standard-objects/message-campaign.workspace-entity';
@@ -23,7 +23,7 @@ import { collectCampaignVariableNamesFromStringOrThrow } from 'src/modules/email
export type SaveDraftCampaignArgs = {
workspaceId: string;
- rolePermissionConfig: RolePermissionConfig;
+ authContext: WorkspaceAuthContext;
campaignId?: string;
name?: string;
subject?: string;
@@ -49,7 +49,7 @@ export class MessageCampaignDraftService {
async saveDraft({
workspaceId,
- rolePermissionConfig,
+ authContext,
campaignId,
name,
subject,
@@ -78,9 +78,8 @@ export class MessageCampaignDraftService {
}
return this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const campaignRepository = this.workspaceOrmManager.getRepository(
+ const campaignRepository = await this.workspaceOrmManager.getRepository(
MessageCampaignWorkspaceEntity,
- rolePermissionConfig,
);
if (!isDefined(campaignId)) {
@@ -156,7 +155,7 @@ export class MessageCampaignDraftService {
blockCount: stampedDocument?.content?.length,
variablesUsed,
};
- });
+ }, authContext);
}
private parseAndStampDocument(body: unknown): EmailDocument {
diff --git a/packages/twenty-server/src/modules/emailing/services/message-campaign-lifecycle.service.ts b/packages/twenty-server/src/modules/emailing/services/message-campaign-lifecycle.service.ts
index 4426f51f84c..0852ef0b8a9 100644
--- a/packages/twenty-server/src/modules/emailing/services/message-campaign-lifecycle.service.ts
+++ b/packages/twenty-server/src/modules/emailing/services/message-campaign-lifecycle.service.ts
@@ -20,7 +20,6 @@ import { MessageCampaignWorkspaceEntity } from 'src/modules/emailing/standard-ob
import { computeCampaignTerminalStatus } from 'src/modules/emailing/utils/compute-campaign-terminal-status.util';
import { MessageCampaignStatus } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { buildEmailingRolePermissionConfig } from 'src/modules/emailing/utils/build-emailing-role-permission-config.util';
type CampaignStatusTransition = {
workspaceId: string;
@@ -68,9 +67,6 @@ export class MessageCampaignLifecycleService {
async () => {
const campaignRepository = this.workspaceOrmManager.getRepository(
MessageCampaignWorkspaceEntity,
- isDefined(roleId)
- ? buildEmailingRolePermissionConfig(roleId)
- : { shouldBypassPermissionChecks: true },
);
const { affected } = await campaignRepository.update(criteria, update);
@@ -91,10 +87,10 @@ export class MessageCampaignLifecycleService {
scheduledAt: Date;
}): Promise<boolean> {
return this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const campaignRepository = this.workspaceOrmManager.getRepository(
- MessageCampaignWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- );
+ const campaignRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ MessageCampaignWorkspaceEntity,
+ );
return campaignRepository.existsBy({
id: campaignId,
@@ -109,10 +105,10 @@ export class MessageCampaignLifecycleService {
async findRunningCampaign(
campaignId: string,
): Promise<MessageCampaignWorkspaceEntity | null> {
- const campaignRepository = this.workspaceOrmManager.getRepository(
- MessageCampaignWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- );
+ const campaignRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ MessageCampaignWorkspaceEntity,
+ );
const campaign = await campaignRepository.findOne({
where: { id: campaignId },
@@ -267,9 +263,8 @@ export class MessageCampaignLifecycleService {
const { generatedMaps: settledDeliveries } =
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const campaignDeliveryRepository =
- this.workspaceOrmManager.getRepository(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
CampaignDeliveryWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
{ shouldSkipEventEmission: true },
);
return campaignDeliveryRepository.update(criteria, update);
@@ -291,9 +286,8 @@ export class MessageCampaignLifecycleService {
const hasUnfinishedDelivery =
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const campaignDeliveryRepository =
- this.workspaceOrmManager.getRepository(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
CampaignDeliveryWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
{ shouldSkipEventEmission: true },
);
return campaignDeliveryRepository.existsBy({
@@ -327,10 +321,10 @@ export class MessageCampaignLifecycleService {
: [MessageCampaignStatus.SENDING];
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const campaignRepository = this.workspaceOrmManager.getRepository(
- MessageCampaignWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- );
+ const campaignRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ MessageCampaignWorkspaceEntity,
+ );
await campaignRepository.update(
{ id: campaignId, status: In(correctableStatuses) },
diff --git a/packages/twenty-server/src/modules/emailing/services/message-campaign-materialization.service.ts b/packages/twenty-server/src/modules/emailing/services/message-campaign-materialization.service.ts
index 4d3566b6fc1..329eb684d20 100644
--- a/packages/twenty-server/src/modules/emailing/services/message-campaign-materialization.service.ts
+++ b/packages/twenty-server/src/modules/emailing/services/message-campaign-materialization.service.ts
@@ -69,10 +69,10 @@ export class MessageCampaignMaterializationService {
recipients,
}: MaterializeCampaignJobData): Promise<void> {
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const campaignRepository = this.workspaceOrmManager.getRepository(
- MessageCampaignWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- );
+ const campaignRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ MessageCampaignWorkspaceEntity,
+ );
const campaign = await campaignRepository.findOne({
where: { id: campaignId },
@@ -91,11 +91,9 @@ export class MessageCampaignMaterializationService {
});
const existingDeliveries = await this.workspaceOrmManager
- .getRepository(
- CampaignDeliveryWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- { shouldSkipEventEmission: true },
- )
+ .getRepositoryWithoutPermissionChecks(CampaignDeliveryWorkspaceEntity, {
+ shouldSkipEventEmission: true,
+ })
.find({
where: { campaignId },
select: { id: true, state: true },
@@ -207,10 +205,10 @@ export class MessageCampaignMaterializationService {
recipients,
}: MaterializeCampaignChunkJobData): Promise<void> {
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const campaignRepository = this.workspaceOrmManager.getRepository(
- MessageCampaignWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- );
+ const campaignRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ MessageCampaignWorkspaceEntity,
+ );
const campaign = await campaignRepository.findOne({
where: { id: campaignId },
@@ -283,10 +281,10 @@ export class MessageCampaignMaterializationService {
return [];
}
- const messageRepository = this.workspaceOrmManager.getRepository(
- MessageWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- );
+ const messageRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ MessageWorkspaceEntity,
+ );
const alreadyMaterialized = await messageRepository.find({
where: {
@@ -422,11 +420,9 @@ export class MessageCampaignMaterializationService {
}
await this.workspaceOrmManager
- .getRepository(
- CampaignDeliveryWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- { shouldSkipEventEmission: true },
- )
+ .getRepositoryWithoutPermissionChecks(CampaignDeliveryWorkspaceEntity, {
+ shouldSkipEventEmission: true,
+ })
.insert(
recipients.map((recipient) => ({
id: recipient.messageId,
@@ -459,11 +455,9 @@ export class MessageCampaignMaterializationService {
await this.workspaceOrmManager.runInWorkspaceTransaction(
async (transactionScope) => {
const repositoryFor = <T extends ObjectLiteral>(objectName: string) =>
- transactionScope.getRepository<T>(
- objectName,
- { shouldBypassPermissionChecks: true },
- { shouldSkipEventEmission: true },
- );
+ transactionScope.getRepositoryWithoutPermissionChecks<T>(objectName, {
+ shouldSkipEventEmission: true,
+ });
await repositoryFor<MessageThreadWorkspaceEntity>(
'messageThread',
diff --git a/packages/twenty-server/src/modules/emailing/services/message-campaign-recovery.service.ts b/packages/twenty-server/src/modules/emailing/services/message-campaign-recovery.service.ts
index e29a03bff31..0049a0c96a4 100644
--- a/packages/twenty-server/src/modules/emailing/services/message-campaign-recovery.service.ts
+++ b/packages/twenty-server/src/modules/emailing/services/message-campaign-recovery.service.ts
@@ -45,10 +45,10 @@ export class MessageCampaignRecoveryService {
const staleCampaigns =
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const campaignRepository = this.workspaceOrmManager.getRepository(
- MessageCampaignWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- );
+ const campaignRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ MessageCampaignWorkspaceEntity,
+ );
return campaignRepository.find({
where: {
@@ -97,10 +97,10 @@ export class MessageCampaignRecoveryService {
staleSince: string;
}): Promise<boolean> {
return this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const messageRepository = this.workspaceOrmManager.getRepository(
- MessageWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- );
+ const messageRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ MessageWorkspaceEntity,
+ );
return messageRepository.exists({
where: {
diff --git a/packages/twenty-server/src/modules/emailing/services/message-campaign-schedule.service.ts b/packages/twenty-server/src/modules/emailing/services/message-campaign-schedule.service.ts
index e4675619153..4f3b0c072e4 100644
--- a/packages/twenty-server/src/modules/emailing/services/message-campaign-schedule.service.ts
+++ b/packages/twenty-server/src/modules/emailing/services/message-campaign-schedule.service.ts
@@ -1,8 +1,11 @@
+import { PermissionsException } from 'src/engine/permissions/permissions.exception';
+import { AuthException } from 'src/engine/core-modules/auth/auth.exception';
import { Injectable, Logger } from '@nestjs/common';
import { MessageCampaignStatus } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
+import { UserWorkspaceAuthContextService } from 'src/engine/core-modules/user-workspace/services/user-workspace-auth-context.service';
import { withWorkspaceAuthContext } from 'src/engine/core-modules/auth/storage/workspace-auth-context.storage';
import { BillingService } from 'src/engine/core-modules/billing/services/billing.service';
import { CAMPAIGN_SEND_RETRY_BACKOFF } from 'src/engine/core-modules/emailing-domain/constants/campaign-send-retry-backoff.constant';
@@ -15,7 +18,6 @@ import { type SendScheduledCampaignJobData } from 'src/engine/core-modules/email
import { InjectMessageQueue } from 'src/engine/core-modules/message-queue/decorators/message-queue.decorator';
import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
import { MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';
-import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
import { SEND_SCHEDULED_CAMPAIGN_JOB } from 'src/modules/emailing/constants/send-scheduled-campaign-job.constant';
import { EmailBillingService } from 'src/modules/emailing/services/email-billing.service';
import { MessageCampaignLifecycleService } from 'src/modules/emailing/services/message-campaign-lifecycle.service';
@@ -33,6 +35,7 @@ export class MessageCampaignScheduleService {
private readonly messageCampaignService: MessageCampaignService,
private readonly billingService: BillingService,
private readonly emailBillingService: EmailBillingService,
+ private readonly userWorkspaceAuthContextService: UserWorkspaceAuthContextService,
) {}
async sendNowOrScheduleOrThrow({
@@ -170,68 +173,91 @@ export class MessageCampaignScheduleService {
userWorkspaceId,
scheduledAt,
}: SendScheduledCampaignJobData): Promise<void> {
- await withWorkspaceAuthContext(
- buildSystemAuthContext(workspaceId),
- async () => {
- const scheduledAtDate = new Date(scheduledAt);
+ const scheduledAtDate = new Date(scheduledAt);
- const isStillScheduledForThisTime =
- await this.messageCampaignLifecycleService.isCampaignScheduledFor({
- workspaceId,
- campaignId,
- scheduledAt: scheduledAtDate,
- });
+ const isStillScheduledForThisTime =
+ await this.messageCampaignLifecycleService.isCampaignScheduledFor({
+ workspaceId,
+ campaignId,
+ scheduledAt: scheduledAtDate,
+ });
+
+ if (!isStillScheduledForThisTime) {
+ return;
+ }
- if (!isStillScheduledForThisTime) {
- return;
+ const schedulerAuthContext = await this.userWorkspaceAuthContextService
+ .resolve({ workspaceId, userWorkspaceId })
+ .catch(async (error) => {
+ if (!(error instanceof AuthException)) {
+ throw error;
}
- const prepared = await this.messageCampaignService
- .prepareCampaignSendOrThrow({
- workspaceId,
- userWorkspaceId,
- campaignId,
- })
- .catch(async (error) => {
- if (!(error instanceof EmailingDomainException)) {
- throw error;
- }
+ await this.releaseUnsendableScheduledCampaign({
+ workspaceId,
+ campaignId,
+ scheduledAt: scheduledAtDate,
+ reason:
+ 'the member who scheduled it can no longer act in the workspace',
+ });
- await this.releaseUnsendableScheduledCampaign({
- workspaceId,
- campaignId,
- scheduledAt: scheduledAtDate,
- reason: error.message,
- });
+ return null;
+ });
- return null;
- });
+ if (!isDefined(schedulerAuthContext)) {
+ return;
+ }
- if (!isDefined(prepared)) {
- return;
- }
+ // Runs as the member who scheduled it, so it only reaches the records they can
+ await withWorkspaceAuthContext(schedulerAuthContext, async () => {
+ const prepared = await this.messageCampaignService
+ .prepareCampaignSendOrThrow({
+ workspaceId,
+ userWorkspaceId,
+ campaignId,
+ })
+ .catch(async (error) => {
+ if (
+ !(error instanceof EmailingDomainException) &&
+ !(error instanceof PermissionsException)
+ ) {
+ throw error;
+ }
- if (prepared.sendableRecipients.length === 0) {
await this.releaseUnsendableScheduledCampaign({
workspaceId,
campaignId,
scheduledAt: scheduledAtDate,
- reason: 'no recipient remains sendable',
+ reason: error.message,
});
- return;
- }
+ return null;
+ });
+
+ if (!isDefined(prepared)) {
+ return;
+ }
- await this.messageCampaignService.claimAndMaterializeOrThrow({
+ if (prepared.sendableRecipients.length === 0) {
+ await this.releaseUnsendableScheduledCampaign({
workspaceId,
- userWorkspaceId,
campaignId,
- prepared,
- from: MessageCampaignStatus.SCHEDULED,
- fromScheduledAt: scheduledAtDate,
+ scheduledAt: scheduledAtDate,
+ reason: 'no recipient remains sendable',
});
- },
- );
+
+ return;
+ }
+
+ await this.messageCampaignService.claimAndMaterializeOrThrow({
+ workspaceId,
+ userWorkspaceId,
+ campaignId,
+ prepared,
+ from: MessageCampaignStatus.SCHEDULED,
+ fromScheduledAt: scheduledAtDate,
+ });
+ });
}
private async releaseUnsendableScheduledCampaign({
diff --git a/packages/twenty-server/src/modules/emailing/services/message-campaign-statistics.service.ts b/packages/twenty-server/src/modules/emailing/services/message-campaign-statistics.service.ts
index 2a740cd4190..5f92a046ba6 100644
--- a/packages/twenty-server/src/modules/emailing/services/message-campaign-statistics.service.ts
+++ b/packages/twenty-server/src/modules/emailing/services/message-campaign-statistics.service.ts
@@ -69,9 +69,8 @@ export class MessageCampaignStatisticsService {
const groups = await this.workspaceOrmManager.executeInWorkspaceContext(
async () => {
const campaignDeliveryRepository =
- this.workspaceOrmManager.getRepository(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
CampaignDeliveryWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
{ shouldSkipEventEmission: true },
);
return campaignDeliveryRepository.executeRaw<CampaignCountGroup>(
@@ -133,10 +132,10 @@ export class MessageCampaignStatisticsService {
}): Promise<void> {
const campaignIds =
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const campaignRepository = this.workspaceOrmManager.getRepository(
- MessageCampaignWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- );
+ const campaignRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ MessageCampaignWorkspaceEntity,
+ );
const campaigns = await campaignRepository.find({
where: [
@@ -168,10 +167,10 @@ export class MessageCampaignStatisticsService {
counts: CampaignCounts;
}): Promise<void> {
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const campaignRepository = this.workspaceOrmManager.getRepository(
- MessageCampaignWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- );
+ const campaignRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ MessageCampaignWorkspaceEntity,
+ );
const campaign = await campaignRepository.findOne({
where: { id: campaignId },
@@ -228,10 +227,10 @@ export class MessageCampaignStatisticsService {
deliveredCount: number;
}): Promise<void> {
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const campaignRepository = this.workspaceOrmManager.getRepository(
- MessageCampaignWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- );
+ const campaignRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ MessageCampaignWorkspaceEntity,
+ );
const campaign = await campaignRepository.findOne({
where: { id: campaignId },
diff --git a/packages/twenty-server/src/modules/emailing/services/message-campaign.service.ts b/packages/twenty-server/src/modules/emailing/services/message-campaign.service.ts
index 45c67f11fce..4f8058c49a0 100644
--- a/packages/twenty-server/src/modules/emailing/services/message-campaign.service.ts
+++ b/packages/twenty-server/src/modules/emailing/services/message-campaign.service.ts
@@ -46,7 +46,6 @@ import { collectCampaignVariableNamesFromTemplatesOrThrow } from 'src/modules/em
import { renderCampaignEmail } from 'src/modules/emailing/utils/render-campaign-email.util';
import { sendableCampaignSchema } from 'src/modules/emailing/zod-schemas/sendable-campaign.zod-schema';
import { getDomainFromEmail } from 'src/utils/get-domain-from-email';
-import { buildEmailingRolePermissionConfig } from 'src/modules/emailing/utils/build-emailing-role-permission-config.util';
type SendableCampaign = z.infer<typeof sendableCampaignSchema>;
@@ -114,16 +113,10 @@ export class MessageCampaignService {
scheduledAt?: Date;
locale?: keyof typeof APP_LOCALES;
}): Promise<PreviewMessageCampaignSendOutputDTO> {
- const roleId = await this.userRoleService.getRoleIdForUserWorkspace({
- workspaceId,
- userWorkspaceId,
- });
-
const checkFailure = await this.checkCampaignSendOrThrow({
workspaceId,
userWorkspaceId,
campaignId,
- roleId,
requestedScheduledAt: scheduledAt,
})
.then(() => null)
@@ -137,9 +130,7 @@ export class MessageCampaignService {
const audience = await this.previewCampaignAudienceOrNull({
workspaceId,
- userWorkspaceId,
campaignId,
- roleId,
});
const sendBlocker =
@@ -198,7 +189,6 @@ export class MessageCampaignService {
workspaceId,
userWorkspaceId,
campaignId,
- roleId,
requestedScheduledAt,
});
@@ -234,13 +224,11 @@ export class MessageCampaignService {
workspaceId,
userWorkspaceId,
campaignId,
- roleId,
requestedScheduledAt,
}: {
workspaceId: string;
userWorkspaceId: string;
campaignId: string;
- roleId: string;
requestedScheduledAt?: Date;
}) {
if (
@@ -259,7 +247,6 @@ export class MessageCampaignService {
await this.findSendableCampaignOrThrow({
workspaceId,
campaignId,
- roleId,
});
return {
@@ -280,7 +267,6 @@ export class MessageCampaignService {
await this.messageCampaignAudienceService.resolveNormalizedAudience({
workspaceId,
listId,
- roleId,
unsubscribeTopicId: unsubscribeTopicId ?? undefined,
});
@@ -393,18 +379,10 @@ export class MessageCampaignService {
campaignId: string;
toAddress: string;
}): Promise<EmailingDomainSendEmailResult> {
- const roleId = await this.userRoleService.getRoleIdForUserWorkspace({
- workspaceId,
- userWorkspaceId,
- });
-
const campaign = await this.workspaceOrmManager.executeInWorkspaceContext(
() =>
this.workspaceOrmManager
- .getRepository(
- MessageCampaignWorkspaceEntity,
- buildEmailingRolePermissionConfig(roleId),
- )
+ .getRepository(MessageCampaignWorkspaceEntity)
.findOne({ where: { id: campaignId } }),
);
@@ -577,22 +555,15 @@ export class MessageCampaignService {
private async previewCampaignAudienceOrNull({
workspaceId,
- userWorkspaceId,
campaignId,
- roleId,
}: {
workspaceId: string;
- userWorkspaceId: string;
campaignId: string;
- roleId: string;
}) {
const campaign = await this.workspaceOrmManager.executeInWorkspaceContext(
() =>
this.workspaceOrmManager
- .getRepository(
- MessageCampaignWorkspaceEntity,
- buildEmailingRolePermissionConfig(roleId),
- )
+ .getRepository(MessageCampaignWorkspaceEntity)
.findOne({ where: { id: campaignId }, relations: { list: true } }),
);
@@ -606,7 +577,6 @@ export class MessageCampaignService {
return this.messageCampaignAudienceService.previewAudience({
workspaceId,
- userWorkspaceId,
listId: campaign.list.id,
unsubscribeTopicId: campaign.unsubscribeTopicId ?? undefined,
});
@@ -615,15 +585,12 @@ export class MessageCampaignService {
private async findSendableCampaignOrThrow({
workspaceId,
campaignId,
- roleId,
}: {
workspaceId: string;
campaignId: string;
- roleId: string;
}): Promise<SendableCampaign> {
const campaignRepository = this.workspaceOrmManager.getRepository(
MessageCampaignWorkspaceEntity,
- buildEmailingRolePermissionConfig(roleId),
);
const campaign = await campaignRepository.findOne({
diff --git a/packages/twenty-server/src/modules/emailing/services/message-list-duplication.service.ts b/packages/twenty-server/src/modules/emailing/services/message-list-duplication.service.ts
index 4e4c9fc6075..fc39215284b 100644
--- a/packages/twenty-server/src/modules/emailing/services/message-list-duplication.service.ts
+++ b/packages/twenty-server/src/modules/emailing/services/message-list-duplication.service.ts
@@ -22,7 +22,6 @@ import {
} from 'src/modules/emailing/exceptions/message-list.exception';
import { type MessageListMemberWorkspaceEntity } from 'src/modules/emailing/standard-objects/message-list-member.workspace-entity';
import { type MessageListWorkspaceEntity } from 'src/modules/emailing/standard-objects/message-list.workspace-entity';
-import { buildEmailingRolePermissionConfig } from 'src/modules/emailing/utils/build-emailing-role-permission-config.util';
const DUPLICATED_OBJECT_UNIVERSAL_IDENTIFIERS = [
STANDARD_OBJECTS.messageList.universalIdentifier,
@@ -55,18 +54,12 @@ export class MessageListDuplicationService {
userWorkspaceId,
});
- const roleId = await this.userRoleService.getRoleIdForUserWorkspace({
- workspaceId,
- userWorkspaceId,
- });
-
// One transaction so a failed member insert never leaves a list copy without its members
return this.workspaceOrmManager.executeInWorkspaceContext(
() =>
this.workspaceOrmManager.runInWorkspaceTransaction((transactionScope) =>
this.duplicateInTransaction({
messageListId,
- roleId,
authContext,
transactionScope,
}),
@@ -115,24 +108,18 @@ export class MessageListDuplicationService {
private async duplicateInTransaction({
messageListId,
- roleId,
authContext,
transactionScope,
}: {
messageListId: string;
- roleId: string;
authContext: WorkspaceAuthContext;
transactionScope: WorkspaceTransactionScope;
}): Promise<DuplicatedMessageListDTO> {
const messageListRepository =
- transactionScope.getRepository<MessageListWorkspaceEntity>(
- 'messageList',
- buildEmailingRolePermissionConfig(roleId),
- );
+ transactionScope.getRepository<MessageListWorkspaceEntity>('messageList');
const messageListMemberRepository =
transactionScope.getRepository<MessageListMemberWorkspaceEntity>(
'messageListMember',
- buildEmailingRolePermissionConfig(roleId),
);
const originalMessageList = await messageListRepository.findOne({
diff --git a/packages/twenty-server/src/modules/emailing/services/message-suppression.service.ts b/packages/twenty-server/src/modules/emailing/services/message-suppression.service.ts
index dd552dd7c14..25522bf19c1 100644
--- a/packages/twenty-server/src/modules/emailing/services/message-suppression.service.ts
+++ b/packages/twenty-server/src/modules/emailing/services/message-suppression.service.ts
@@ -91,11 +91,11 @@ export class MessageSuppressionService {
}> {
const [records, totalCount] =
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const suppressionRepository = this.workspaceOrmManager.getRepository(
- MessageSuppressionWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- { shouldSkipEventEmission: true },
- );
+ const suppressionRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ MessageSuppressionWorkspaceEntity,
+ { shouldSkipEventEmission: true },
+ );
return suppressionRepository.findAndCount({
where: {
...(isDefined(reason) ? { reason } : {}),
@@ -129,11 +129,11 @@ export class MessageSuppressionService {
}
return this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const suppressionRepository = this.workspaceOrmManager.getRepository(
- MessageSuppressionWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- { shouldSkipEventEmission: true },
- );
+ const suppressionRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ MessageSuppressionWorkspaceEntity,
+ { shouldSkipEventEmission: true },
+ );
return suppressionRepository.find({
where: [
{
@@ -163,11 +163,11 @@ export class MessageSuppressionService {
const optOuts = await this.workspaceOrmManager.executeInWorkspaceContext(
async () => {
- const suppressionRepository = this.workspaceOrmManager.getRepository(
- MessageSuppressionWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- { shouldSkipEventEmission: true },
- );
+ const suppressionRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ MessageSuppressionWorkspaceEntity,
+ { shouldSkipEventEmission: true },
+ );
return suppressionRepository.find({
where: {
@@ -224,11 +224,11 @@ export class MessageSuppressionService {
}
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const suppressionRepository = this.workspaceOrmManager.getRepository(
- MessageSuppressionWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- { shouldSkipEventEmission: true },
- );
+ const suppressionRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ MessageSuppressionWorkspaceEntity,
+ { shouldSkipEventEmission: true },
+ );
await suppressionRepository.delete({
emailAddress: normalizedEmailAddress,
@@ -267,11 +267,11 @@ export class MessageSuppressionService {
};
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const suppressionRepository = this.workspaceOrmManager.getRepository(
- MessageSuppressionWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- { shouldSkipEventEmission: true },
- );
+ const suppressionRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ MessageSuppressionWorkspaceEntity,
+ { shouldSkipEventEmission: true },
+ );
const escalateExisting = async (): Promise<boolean> => {
const existing = await suppressionRepository.findOneBy(whereKey);
@@ -335,11 +335,11 @@ export class MessageSuppressionService {
const suppression =
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const suppressionRepository = this.workspaceOrmManager.getRepository(
- MessageSuppressionWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- { shouldSkipEventEmission: true },
- );
+ const suppressionRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ MessageSuppressionWorkspaceEntity,
+ { shouldSkipEventEmission: true },
+ );
return suppressionRepository.findOneBy({
emailAddress: this.normalizeEmailAddress(emailAddress),
unsubscribeTopicId: isNonEmptyString(unsubscribeTopicId)
@@ -363,11 +363,11 @@ export class MessageSuppressionService {
suppressionId,
}: RemoveSuppressionArgs): Promise<void> {
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const suppressionRepository = this.workspaceOrmManager.getRepository(
- MessageSuppressionWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- { shouldSkipEventEmission: true },
- );
+ const suppressionRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ MessageSuppressionWorkspaceEntity,
+ { shouldSkipEventEmission: true },
+ );
const suppression = await suppressionRepository.findOneBy({
id: suppressionId,
});
@@ -412,11 +412,11 @@ export class MessageSuppressionService {
const optOuts = await this.workspaceOrmManager.executeInWorkspaceContext(
async () => {
- const suppressionRepository = this.workspaceOrmManager.getRepository(
- MessageSuppressionWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- { shouldSkipEventEmission: true },
- );
+ const suppressionRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ MessageSuppressionWorkspaceEntity,
+ { shouldSkipEventEmission: true },
+ );
return suppressionRepository.find({
where: [
{
@@ -552,11 +552,11 @@ export class MessageSuppressionService {
const normalizedEmailAddress = this.normalizeEmailAddress(emailAddress);
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const suppressionRepository = this.workspaceOrmManager.getRepository(
- MessageSuppressionWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- { shouldSkipEventEmission: true },
- );
+ const suppressionRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ MessageSuppressionWorkspaceEntity,
+ { shouldSkipEventEmission: true },
+ );
return suppressionRepository.delete({
emailAddress: normalizedEmailAddress,
unsubscribeTopicId: isNonEmptyString(unsubscribeTopicId)
diff --git a/packages/twenty-server/src/modules/emailing/tools/__tests__/save-campaign-tool.spec.ts b/packages/twenty-server/src/modules/emailing/tools/__tests__/save-campaign-tool.spec.ts
index c4b8c9c280d..6b7b4a6d202 100644
--- a/packages/twenty-server/src/modules/emailing/tools/__tests__/save-campaign-tool.spec.ts
+++ b/packages/twenty-server/src/modules/emailing/tools/__tests__/save-campaign-tool.spec.ts
@@ -5,7 +5,7 @@ import {
EmailingDomainExceptionCode,
} from 'src/engine/core-modules/emailing-domain/exceptions/emailing-domain.exception';
import { toToolJsonSchema } from 'src/engine/core-modules/record-crud/utils/to-tool-json-schema.util';
-import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
+import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { MessageCampaignDraftService } from 'src/modules/emailing/services/message-campaign-draft.service';
import { SaveCampaignTool } from 'src/modules/emailing/tools/save-campaign-tool';
import { SaveCampaignToolInputZodSchema } from 'src/modules/emailing/tools/save-campaign-tool.schema';
@@ -15,14 +15,15 @@ describe('SaveCampaignTool', () => {
let saveDraft: jest.Mock;
const campaignId = '20202020-0000-4000-8000-000000000001';
- const scopedRolePermissionConfig: RolePermissionConfig = {
- intersectionOf: { userWorkspaceRoleId: 'member-role-id' },
- scope: { objectsPermissions: {}, permissionFlags: {} },
- };
+ const memberAuthContext = {
+ type: 'user',
+ workspace: { id: 'workspace-1' },
+ userWorkspaceId: 'user-workspace-1',
+ } as WorkspaceAuthContext;
const memberContext = {
workspaceId: 'workspace-1',
userWorkspaceId: 'user-workspace-1',
- rolePermissionConfig: scopedRolePermissionConfig,
+ authContext: memberAuthContext,
};
beforeEach(async () => {
@@ -68,7 +69,7 @@ describe('SaveCampaignTool', () => {
]);
expect(saveDraft).toHaveBeenCalledWith({
workspaceId: 'workspace-1',
- rolePermissionConfig: scopedRolePermissionConfig,
+ authContext: memberAuthContext,
campaignId,
name: undefined,
subject: undefined,
diff --git a/packages/twenty-server/src/modules/emailing/tools/save-campaign-tool.ts b/packages/twenty-server/src/modules/emailing/tools/save-campaign-tool.ts
index 6dfe2496d1b..ea718740dde 100644
--- a/packages/twenty-server/src/modules/emailing/tools/save-campaign-tool.ts
+++ b/packages/twenty-server/src/modules/emailing/tools/save-campaign-tool.ts
@@ -33,7 +33,7 @@ export class SaveCampaignTool implements Tool {
): Promise<ToolOutput> {
if (
!isDefined(context.userWorkspaceId) ||
- !isDefined(context.rolePermissionConfig)
+ !isDefined(context.authContext)
) {
return {
success: false,
@@ -45,7 +45,7 @@ export class SaveCampaignTool implements Tool {
try {
const result = await this.messageCampaignDraftService.saveDraft({
workspaceId: context.workspaceId,
- rolePermissionConfig: context.rolePermissionConfig,
+ authContext: context.authContext,
campaignId: parameters.campaignId,
name: parameters.name,
subject: parameters.subject,
diff --git a/packages/twenty-server/src/modules/emailing/utils/build-emailing-role-permission-config.util.ts b/packages/twenty-server/src/modules/emailing/utils/build-emailing-role-permission-config.util.ts
deleted file mode 100644
index cc166f8b682..00000000000
--- a/packages/twenty-server/src/modules/emailing/utils/build-emailing-role-permission-config.util.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { isUserAuthContext } from 'src/engine/core-modules/auth/guards/is-user-auth-context.guard';
-import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
-import { getWorkspaceContext } from 'src/engine/twenty-orm/storage/orm-workspace-context.storage';
-import { buildAgentRoleIdsBySource } from 'src/engine/permissions/principal/utils/build-agent-role-ids-by-source.util';
-import { buildUserRoleIdsBySource } from 'src/engine/permissions/principal/utils/build-user-role-ids-by-source.util';
-
-export const buildEmailingRolePermissionConfig = (
- userRoleId: string,
-): RolePermissionConfig => {
- const { authContext, flatRoleTargetByAgentIdMaps } = getWorkspaceContext();
- const userAuthContext = isUserAuthContext(authContext)
- ? authContext
- : undefined;
-
- return {
- intersectionOf: {
- ...buildUserRoleIdsBySource({
- userRoleId,
- application: userAuthContext?.application,
- }),
- ...buildAgentRoleIdsBySource({
- agentId: userAuthContext?.agentId,
- flatRoleTargetByAgentIdMaps,
- }),
- },
- };
-};
diff --git a/packages/twenty-server/src/modules/match-participant/match-participant.service.ts b/packages/twenty-server/src/modules/match-participant/match-participant.service.ts
index 00af8030e82..e064a3b423e 100644
--- a/packages/twenty-server/src/modules/match-participant/match-participant.service.ts
+++ b/packages/twenty-server/src/modules/match-participant/match-participant.service.ts
@@ -101,7 +101,7 @@ export class MatchParticipantService<
objectMetadataName,
transactionScope,
workspaceOrmManager: this.workspaceOrmManager,
- rolePermissionConfig: { shouldBypassPermissionChecks: true },
+ shouldBypassPermissionChecks: true,
},
);
}
@@ -150,7 +150,7 @@ export class MatchParticipantService<
objectMetadataName: 'person',
transactionScope,
workspaceOrmManager: this.workspaceOrmManager,
- rolePermissionConfig: { shouldBypassPermissionChecks: true },
+ shouldBypassPermissionChecks: true,
});
const participantRepository = this.getParticipantRepository({
@@ -164,7 +164,7 @@ export class MatchParticipantService<
objectMetadataName: 'workspaceMember',
transactionScope,
workspaceOrmManager: this.workspaceOrmManager,
- rolePermissionConfig: { shouldBypassPermissionChecks: true },
+ shouldBypassPermissionChecks: true,
},
);
@@ -501,7 +501,7 @@ export class MatchParticipantService<
objectMetadataName: 'messageChannelMessageAssociation',
transactionScope,
workspaceOrmManager: this.workspaceOrmManager,
- rolePermissionConfig: { shouldBypassPermissionChecks: true },
+ shouldBypassPermissionChecks: true,
},
).find({
where: {
diff --git a/packages/twenty-server/src/modules/match-participant/participant-target-reconciliation.service.ts b/packages/twenty-server/src/modules/match-participant/participant-target-reconciliation.service.ts
index b13313d6a1b..02a80f0f066 100644
--- a/packages/twenty-server/src/modules/match-participant/participant-target-reconciliation.service.ts
+++ b/packages/twenty-server/src/modules/match-participant/participant-target-reconciliation.service.ts
@@ -498,7 +498,7 @@ export class ParticipantTargetReconciliationService {
objectMetadataName,
transactionScope,
workspaceOrmManager: this.workspaceOrmManager,
- rolePermissionConfig: { shouldBypassPermissionChecks: true },
+ shouldBypassPermissionChecks: true,
});
}
}
diff --git a/packages/twenty-server/src/modules/messaging/blocklist-manager/jobs/messaging-blocklist-item-delete-messages.job.ts b/packages/twenty-server/src/modules/messaging/blocklist-manager/jobs/messaging-blocklist-item-delete-messages.job.ts
index b115fdf2d2b..29d0de32179 100644
--- a/packages/twenty-server/src/modules/messaging/blocklist-manager/jobs/messaging-blocklist-item-delete-messages.job.ts
+++ b/packages/twenty-server/src/modules/messaging/blocklist-manager/jobs/messaging-blocklist-item-delete-messages.job.ts
@@ -55,9 +55,8 @@ export class BlocklistItemDeleteMessagesJob {
);
const blocklistRepository =
- this.workspaceOrmManager.getRepository<BlocklistWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<BlocklistWorkspaceEntity>(
'blocklist',
- { shouldBypassPermissionChecks: true },
);
const blocklist = await blocklistRepository.find({
@@ -120,9 +119,8 @@ export class BlocklistItemDeleteMessagesJob {
workspaceId: string;
}): Promise<MessageChannelEntity[]> {
const workspaceMemberRepository =
- this.workspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkspaceMemberWorkspaceEntity>(
'workspaceMember',
- { shouldBypassPermissionChecks: true },
);
const workspaceMember = await workspaceMemberRepository.findOne({
@@ -175,15 +173,13 @@ export class BlocklistItemDeleteMessagesJob {
handles: string[];
}): Promise<void> {
const messageChannelMessageAssociationRepository =
- this.workspaceOrmManager.getRepository<MessageChannelMessageAssociationWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<MessageChannelMessageAssociationWorkspaceEntity>(
'messageChannelMessageAssociation',
- { shouldBypassPermissionChecks: true },
);
const messageParticipantRepository =
- this.workspaceOrmManager.getRepository<MessageParticipantWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<MessageParticipantWorkspaceEntity>(
'messageParticipant',
- { shouldBypassPermissionChecks: true },
);
for (const messageChannel of messageChannels) {
diff --git a/packages/twenty-server/src/modules/messaging/blocklist-manager/jobs/messaging-blocklist-reimport-messages.job.ts b/packages/twenty-server/src/modules/messaging/blocklist-manager/jobs/messaging-blocklist-reimport-messages.job.ts
index 4bab85ff490..dde7a4b936e 100644
--- a/packages/twenty-server/src/modules/messaging/blocklist-manager/jobs/messaging-blocklist-reimport-messages.job.ts
+++ b/packages/twenty-server/src/modules/messaging/blocklist-manager/jobs/messaging-blocklist-reimport-messages.job.ts
@@ -103,9 +103,8 @@ export class BlocklistReimportMessagesJob {
workspaceId: string;
}): Promise<string[]> {
const workspaceMemberRepository =
- this.workspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkspaceMemberWorkspaceEntity>(
'workspaceMember',
- { shouldBypassPermissionChecks: true },
);
const workspaceMember = await workspaceMemberRepository.findOne({
diff --git a/packages/twenty-server/src/modules/messaging/common/query-hooks/message/apply-messages-visibility-restrictions.service.ts b/packages/twenty-server/src/modules/messaging/common/query-hooks/message/apply-messages-visibility-restrictions.service.ts
index 075a0d7bc62..72704a68e00 100644
--- a/packages/twenty-server/src/modules/messaging/common/query-hooks/message/apply-messages-visibility-restrictions.service.ts
+++ b/packages/twenty-server/src/modules/messaging/common/query-hooks/message/apply-messages-visibility-restrictions.service.ts
@@ -101,9 +101,8 @@ export class ApplyMessagesVisibilityRestrictionsService
await this.workspaceOrmManager.executeInWorkspaceContext(
async () =>
this.workspaceOrmManager
- .getRepository<MessageChannelMessageAssociationWorkspaceEntity>(
+ .getRepositoryWithoutPermissionChecks<MessageChannelMessageAssociationWorkspaceEntity>(
'messageChannelMessageAssociation',
- { shouldBypassPermissionChecks: true },
)
.find({
where: { messageId: In(messageIds) },
diff --git a/packages/twenty-server/src/modules/messaging/common/services/message-channel-sync-status.service.ts b/packages/twenty-server/src/modules/messaging/common/services/message-channel-sync-status.service.ts
index 08b6c3a19ef..a568b5a24a3 100644
--- a/packages/twenty-server/src/modules/messaging/common/services/message-channel-sync-status.service.ts
+++ b/packages/twenty-server/src/modules/messaging/common/services/message-channel-sync-status.service.ts
@@ -453,9 +453,8 @@ export class MessageChannelSyncStatusService {
});
const workspaceMemberRepository =
- this.workspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkspaceMemberWorkspaceEntity>(
'workspaceMember',
- { shouldBypassPermissionChecks: true },
);
for (const messageChannel of messageChannels) {
diff --git a/packages/twenty-server/src/modules/messaging/message-cleaner/services/messaging-message-cleaner.service.ts b/packages/twenty-server/src/modules/messaging/message-cleaner/services/messaging-message-cleaner.service.ts
index fb3b126486e..79673561d74 100644
--- a/packages/twenty-server/src/modules/messaging/message-cleaner/services/messaging-message-cleaner.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-cleaner/services/messaging-message-cleaner.service.ts
@@ -38,19 +38,16 @@ export class MessagingMessageCleanerService {
await this.workspaceOrmManager.runInWorkspaceTransaction(
async (transactionScope) => {
const messageRepository =
- transactionScope.getRepository<MessageWorkspaceEntity>(
+ transactionScope.getRepositoryWithoutPermissionChecks<MessageWorkspaceEntity>(
'message',
- { shouldBypassPermissionChecks: true },
);
const messageChannelMessageAssociationRepository =
- transactionScope.getRepository<MessageChannelMessageAssociationWorkspaceEntity>(
+ transactionScope.getRepositoryWithoutPermissionChecks<MessageChannelMessageAssociationWorkspaceEntity>(
'messageChannelMessageAssociation',
- { shouldBypassPermissionChecks: true },
);
const messageThreadRepository =
- transactionScope.getRepository<MessageThreadWorkspaceEntity>(
+ transactionScope.getRepositoryWithoutPermissionChecks<MessageThreadWorkspaceEntity>(
'messageThread',
- { shouldBypassPermissionChecks: true },
);
for (const messageExternalIdsChunk of chunk(
@@ -151,9 +148,8 @@ export class MessagingMessageCleanerService {
await this.workspaceOrmManager.runInWorkspaceTransaction(
async (transactionScope) => {
const messageChannelMessageAssociationRepository =
- transactionScope.getRepository<MessageChannelMessageAssociationWorkspaceEntity>(
+ transactionScope.getRepositoryWithoutPermissionChecks<MessageChannelMessageAssociationWorkspaceEntity>(
'messageChannelMessageAssociation',
- { shouldBypassPermissionChecks: true },
);
for (;;) {
@@ -192,19 +188,16 @@ export class MessagingMessageCleanerService {
await this.workspaceOrmManager.runInWorkspaceTransaction(
async (transactionScope) => {
const messageThreadRepository =
- transactionScope.getRepository<MessageThreadWorkspaceEntity>(
+ transactionScope.getRepositoryWithoutPermissionChecks<MessageThreadWorkspaceEntity>(
'messageThread',
- { shouldBypassPermissionChecks: true },
);
const messageRepository =
- transactionScope.getRepository<MessageWorkspaceEntity>(
+ transactionScope.getRepositoryWithoutPermissionChecks<MessageWorkspaceEntity>(
'message',
- { shouldBypassPermissionChecks: true },
);
const messageChannelMessageAssociationRepository =
- transactionScope.getRepository<MessageChannelMessageAssociationWorkspaceEntity>(
+ transactionScope.getRepositoryWithoutPermissionChecks<MessageChannelMessageAssociationWorkspaceEntity>(
'messageChannelMessageAssociation',
- { shouldBypassPermissionChecks: true },
);
await this.deleteOrphansByKeyset(
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/inbound-email/services/inbound-email-import.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/inbound-email/services/inbound-email-import.service.ts
index 7704f3cb736..2fe8487fdac 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/inbound-email/services/inbound-email-import.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/inbound-email/services/inbound-email-import.service.ts
@@ -183,9 +183,7 @@ export class InboundEmailImportService {
);
const referencedMessages = await this.workspaceOrmManager
- .getRepository<MessageWorkspaceEntity>('message', {
- shouldBypassPermissionChecks: true,
- })
+ .getRepositoryWithoutPermissionChecks<MessageWorkspaceEntity>('message')
.find({
where: {
headerMessageId: In(
@@ -200,9 +198,8 @@ export class InboundEmailImportService {
}
const channelAssociations = await this.workspaceOrmManager
- .getRepository<MessageChannelMessageAssociationWorkspaceEntity>(
+ .getRepositoryWithoutPermissionChecks<MessageChannelMessageAssociationWorkspaceEntity>(
'messageChannelMessageAssociation',
- { shouldBypassPermissionChecks: true },
)
.find({
where: {
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-delete-folder-messages.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-delete-folder-messages.service.ts
index fa010d14c33..fbab670ff72 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-delete-folder-messages.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-delete-folder-messages.service.ts
@@ -40,15 +40,13 @@ export class MessagingDeleteFolderMessagesService {
await this.workspaceOrmManager.executeInWorkspaceContext(
async () => {
const messageFolderAssociationRepository =
- this.workspaceOrmManager.getRepository<MessageChannelMessageAssociationMessageFolderWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<MessageChannelMessageAssociationMessageFolderWorkspaceEntity>(
'messageChannelMessageAssociationMessageFolder',
- { shouldBypassPermissionChecks: true },
);
const messageChannelMessageAssociationRepository =
- this.workspaceOrmManager.getRepository<MessageChannelMessageAssociationWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<MessageChannelMessageAssociationWorkspaceEntity>(
'messageChannelMessageAssociation',
- { shouldBypassPermissionChecks: true },
);
let hasMoreData = true;
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-delete-group-email-messages.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-delete-group-email-messages.service.ts
index bba2905a4ea..272742abb06 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-delete-group-email-messages.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-delete-group-email-messages.service.ts
@@ -40,15 +40,13 @@ export class MessagingDeleteGroupEmailMessagesService {
return this.workspaceOrmManager.executeInWorkspaceContext(
async () => {
const messageChannelMessageAssociationRepository =
- this.workspaceOrmManager.getRepository<MessageChannelMessageAssociationWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<MessageChannelMessageAssociationWorkspaceEntity>(
'messageChannelMessageAssociation',
- { shouldBypassPermissionChecks: true },
);
const messageParticipantRepository =
- this.workspaceOrmManager.getRepository<MessageParticipantWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<MessageParticipantWorkspaceEntity>(
'messageParticipant',
- { shouldBypassPermissionChecks: true },
);
let cursorId: string | undefined;
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-message-folder-association.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-message-folder-association.service.ts
index e7d077dc807..8371c1c7c52 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-message-folder-association.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-message-folder-association.service.ts
@@ -35,9 +35,8 @@ export class MessagingMessageFolderAssociationService {
await this.workspaceOrmManager.executeInWorkspaceContext(
async () => {
const repository =
- transactionScope.getRepository<MessageChannelMessageAssociationMessageFolderWorkspaceEntity>(
+ transactionScope.getRepositoryWithoutPermissionChecks<MessageChannelMessageAssociationMessageFolderWorkspaceEntity>(
'messageChannelMessageAssociationMessageFolder',
- { shouldBypassPermissionChecks: true },
);
const existingRecords = await repository.find({
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-message-list-fetch.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-message-list-fetch.service.ts
index 2af0206d27c..a4605f2d201 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-message-list-fetch.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-message-list-fetch.service.ts
@@ -151,9 +151,8 @@ export class MessagingMessageListFetchService {
);
const messageChannelMessageAssociationRepository =
- this.workspaceOrmManager.getRepository<MessageChannelMessageAssociationWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<MessageChannelMessageAssociationWorkspaceEntity>(
'messageChannelMessageAssociation',
- { shouldBypassPermissionChecks: true },
);
const messageExternalIdsChunks = chunk(messageExternalIds, 200);
@@ -363,9 +362,8 @@ export class MessagingMessageListFetchService {
messageExternalIds: string[],
) {
const messageChannelMessageAssociationRepository =
- this.workspaceOrmManager.getRepository<MessageChannelMessageAssociationWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<MessageChannelMessageAssociationWorkspaceEntity>(
'messageChannelMessageAssociation',
- { shouldBypassPermissionChecks: true },
);
const fullSyncMessageChannelMessageAssociationsToDelete = [];
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-message.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-message.service.ts
index bccad436e64..480a5d15832 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-message.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-message.service.ts
@@ -62,20 +62,18 @@ export class MessagingMessageService {
return this.workspaceOrmManager.executeInWorkspaceContext(
async () => {
const messageChannelMessageAssociationRepository =
- transactionScope.getRepository<MessageChannelMessageAssociationWorkspaceEntity>(
+ transactionScope.getRepositoryWithoutPermissionChecks<MessageChannelMessageAssociationWorkspaceEntity>(
'messageChannelMessageAssociation',
- { shouldBypassPermissionChecks: true },
);
const messageRepository =
- transactionScope.getRepository<MessageWorkspaceEntity>('message', {
- shouldBypassPermissionChecks: true,
- });
+ transactionScope.getRepositoryWithoutPermissionChecks<MessageWorkspaceEntity>(
+ 'message',
+ );
const messageThreadRepository =
- transactionScope.getRepository<MessageThreadWorkspaceEntity>(
+ transactionScope.getRepositoryWithoutPermissionChecks<MessageThreadWorkspaceEntity>(
'messageThread',
- { shouldBypassPermissionChecks: true },
);
const messageAccumulatorMap = new Map<string, MessageAccumulator>();
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-messages-import.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-messages-import.service.ts
index cf1e0863fe2..9d9d8f11e12 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-messages-import.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-messages-import.service.ts
@@ -152,9 +152,8 @@ export class MessagingMessagesImportService {
});
const workspaceMemberRepository =
- this.workspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkspaceMemberWorkspaceEntity>(
'workspaceMember',
- { shouldBypassPermissionChecks: true },
);
const workspaceMember = userWorkspace
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-save-messages-and-enqueue-contact-creation.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-save-messages-and-enqueue-contact-creation.service.ts
index e524447b629..074d63daf16 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-save-messages-and-enqueue-contact-creation.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-save-messages-and-enqueue-contact-creation.service.ts
@@ -290,9 +290,8 @@ export class MessagingSaveMessagesAndEnqueueContactCreationService {
return this.workspaceOrmManager.executeInWorkspaceContext(
async () =>
this.workspaceOrmManager
- .getRepository<MessageParticipantWorkspaceEntity>(
+ .getRepositoryWithoutPermissionChecks<MessageParticipantWorkspaceEntity>(
'messageParticipant',
- { shouldBypassPermissionChecks: true },
)
.find({ where: { messageId: Any(messageIds), personId: IsNull() } }),
buildSystemAuthContext(workspaceId),
diff --git a/packages/twenty-server/src/modules/messaging/message-outbound-manager/services/__tests__/sent-message-record-link.service.spec.ts b/packages/twenty-server/src/modules/messaging/message-outbound-manager/services/__tests__/sent-message-record-link.service.spec.ts
index 06b74269c68..3ff2ec33f31 100644
--- a/packages/twenty-server/src/modules/messaging/message-outbound-manager/services/__tests__/sent-message-record-link.service.spec.ts
+++ b/packages/twenty-server/src/modules/messaging/message-outbound-manager/services/__tests__/sent-message-record-link.service.spec.ts
@@ -19,7 +19,9 @@ const buildService = ({
executeInWorkspaceContext: jest.fn((callback: () => Promise<void>) =>
callback(),
),
- getRepository: jest.fn(() => messageThreadTargetRepository),
+ getRepositoryWithoutPermissionChecks: jest.fn(
+ () => messageThreadTargetRepository,
+ ),
};
const recordPermissionsService = {
getPermissionsForRecords: jest
diff --git a/packages/twenty-server/src/modules/messaging/message-outbound-manager/services/messaging-draft-send.service.ts b/packages/twenty-server/src/modules/messaging/message-outbound-manager/services/messaging-draft-send.service.ts
index 9999e881acb..e424223b1c4 100644
--- a/packages/twenty-server/src/modules/messaging/message-outbound-manager/services/messaging-draft-send.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-outbound-manager/services/messaging-draft-send.service.ts
@@ -67,9 +67,8 @@ export class MessagingDraftSendService {
return this.workspaceOrmManager.executeInWorkspaceContext(
async () => {
const messageChannelMessageAssociationRepository =
- this.workspaceOrmManager.getRepository<MessageChannelMessageAssociationWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<MessageChannelMessageAssociationWorkspaceEntity>(
'messageChannelMessageAssociation',
- { shouldBypassPermissionChecks: true },
);
const association =
@@ -136,9 +135,8 @@ export class MessagingDraftSendService {
await this.workspaceOrmManager.executeInWorkspaceContext(
async () => {
const messageChannelMessageAssociationRepository =
- this.workspaceOrmManager.getRepository<MessageChannelMessageAssociationWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<MessageChannelMessageAssociationWorkspaceEntity>(
'messageChannelMessageAssociation',
- { shouldBypassPermissionChecks: true },
);
return messageChannelMessageAssociationRepository.find({
diff --git a/packages/twenty-server/src/modules/messaging/message-outbound-manager/services/sent-message-record-link.service.ts b/packages/twenty-server/src/modules/messaging/message-outbound-manager/services/sent-message-record-link.service.ts
index 74761f39c48..ae0504076cc 100644
--- a/packages/twenty-server/src/modules/messaging/message-outbound-manager/services/sent-message-record-link.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-outbound-manager/services/sent-message-record-link.service.ts
@@ -48,9 +48,8 @@ export class SentMessageRecordLinkService {
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const messageThreadTargetRepository =
- this.workspaceOrmManager.getRepository<MessageThreadTargetWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<MessageThreadTargetWorkspaceEntity>(
'messageThreadTarget',
- { shouldBypassPermissionChecks: true },
);
const existingMessageThreadTarget =
diff --git a/packages/twenty-server/src/modules/messaging/message-participant-manager/services/messaging-message-participant.service.ts b/packages/twenty-server/src/modules/messaging/message-participant-manager/services/messaging-message-participant.service.ts
index c25ee21407f..35ff4c1d2ef 100644
--- a/packages/twenty-server/src/modules/messaging/message-participant-manager/services/messaging-message-participant.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-participant-manager/services/messaging-message-participant.service.ts
@@ -36,9 +36,8 @@ export class MessagingMessageParticipantService {
return this.workspaceOrmManager.executeInWorkspaceContext(
async () => {
const messageParticipantRepository =
- transactionScope.getRepository<MessageParticipantWorkspaceEntity>(
+ transactionScope.getRepositoryWithoutPermissionChecks<MessageParticipantWorkspaceEntity>(
'messageParticipant',
- { shouldBypassPermissionChecks: true },
);
const existingParticipantsBasedOnMessageIds =
diff --git a/packages/twenty-server/src/modules/note/query-hooks/note-post-query-hook.service.ts b/packages/twenty-server/src/modules/note/query-hooks/note-post-query-hook.service.ts
index 98081fff5ab..69706d37342 100644
--- a/packages/twenty-server/src/modules/note/query-hooks/note-post-query-hook.service.ts
+++ b/packages/twenty-server/src/modules/note/query-hooks/note-post-query-hook.service.ts
@@ -27,9 +27,8 @@ export class NotePostQueryHookService {
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const noteTargetRepository =
- this.workspaceOrmManager.getRepository<NoteTargetWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<NoteTargetWorkspaceEntity>(
'noteTarget',
- { shouldBypassPermissionChecks: true },
);
await noteTargetRepository.softDelete({
@@ -52,9 +51,8 @@ export class NotePostQueryHookService {
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const noteTargetRepository =
- this.workspaceOrmManager.getRepository<NoteTargetWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<NoteTargetWorkspaceEntity>(
'noteTarget',
- { shouldBypassPermissionChecks: true },
);
await noteTargetRepository.restore({
diff --git a/packages/twenty-server/src/modules/task/query-hooks/task-post-query-hook.service.ts b/packages/twenty-server/src/modules/task/query-hooks/task-post-query-hook.service.ts
index bc52384a759..15954556ad4 100644
--- a/packages/twenty-server/src/modules/task/query-hooks/task-post-query-hook.service.ts
+++ b/packages/twenty-server/src/modules/task/query-hooks/task-post-query-hook.service.ts
@@ -27,9 +27,8 @@ export class TaskPostQueryHookService {
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const taskTargetRepository =
- this.workspaceOrmManager.getRepository<TaskTargetWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<TaskTargetWorkspaceEntity>(
'taskTarget',
- { shouldBypassPermissionChecks: true },
);
await taskTargetRepository.softDelete({
@@ -52,9 +51,8 @@ export class TaskPostQueryHookService {
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const taskTargetRepository =
- this.workspaceOrmManager.getRepository<TaskTargetWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<TaskTargetWorkspaceEntity>(
'taskTarget',
- { shouldBypassPermissionChecks: true },
);
await taskTargetRepository.restore({
diff --git a/packages/twenty-server/src/modules/timeline/repositories/__tests__/timeline-activity.repository.spec.ts b/packages/twenty-server/src/modules/timeline/repositories/__tests__/timeline-activity.repository.spec.ts
index e74efb1b1d5..fd8a7d448b5 100644
--- a/packages/twenty-server/src/modules/timeline/repositories/__tests__/timeline-activity.repository.spec.ts
+++ b/packages/twenty-server/src/modules/timeline/repositories/__tests__/timeline-activity.repository.spec.ts
@@ -33,11 +33,14 @@ const buildTimelineActivityRepository = (
callback(),
runInWorkspaceTransaction: async (
callback: (transactionScope: {
- getRepository: () => typeof workspaceRepository;
+ getRepositoryWithoutPermissionChecks: () => typeof workspaceRepository;
executeRawQuery: typeof executeRawQuery;
}) => Promise<void>,
) =>
- callback({ getRepository: () => workspaceRepository, executeRawQuery }),
+ callback({
+ getRepositoryWithoutPermissionChecks: () => workspaceRepository,
+ executeRawQuery,
+ }),
} as unknown as WorkspaceOrmManager;
return {
diff --git a/packages/twenty-server/src/modules/timeline/repositories/timeline-activity.repository.ts b/packages/twenty-server/src/modules/timeline/repositories/timeline-activity.repository.ts
index a8f17a06d21..8227fe1a0c1 100644
--- a/packages/twenty-server/src/modules/timeline/repositories/timeline-activity.repository.ts
+++ b/packages/twenty-server/src/modules/timeline/repositories/timeline-activity.repository.ts
@@ -90,9 +90,8 @@ export class TimelineActivityRepository {
linkedRecordIds,
}: LinkedTimelineActivityHappensAtSyncUpdate) {
const sourceRepository =
- this.workspaceOrmManager.getRepository<ObjectLiteral>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<ObjectLiteral>(
sourceObjectNameSingular,
- { shouldBypassPermissionChecks: true },
);
// Queue retries can replay an older event, so read the value from the source row rather than the event snapshot
@@ -119,9 +118,8 @@ export class TimelineActivityRepository {
}
const timelineActivityRepository =
- this.workspaceOrmManager.getRepository<ObjectLiteral>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<ObjectLiteral>(
'timelineActivity',
- { shouldBypassPermissionChecks: true },
);
const timelineActivities = await timelineActivityRepository.find({
@@ -173,9 +171,9 @@ export class TimelineActivityRepository {
});
const timelineActivityRepository =
- transactionScope.getRepository<ObjectLiteral>('timelineActivity', {
- shouldBypassPermissionChecks: true,
- });
+ transactionScope.getRepositoryWithoutPermissionChecks<ObjectLiteral>(
+ 'timelineActivity',
+ );
const recentTimelineActivities =
await this.findRecentTimelineActivities({
@@ -298,10 +296,10 @@ export class TimelineActivityRepository {
return payloads;
}
- const targetRepository = transactionScope.getRepository<ObjectLiteral>(
- objectSingularName,
- { shouldBypassPermissionChecks: true },
- );
+ const targetRepository =
+ transactionScope.getRepositoryWithoutPermissionChecks<ObjectLiteral>(
+ objectSingularName,
+ );
const existingRecords = await targetRepository.find({
select: ['id'],
diff --git a/packages/twenty-server/src/modules/timeline/services/timeline-activity-target-query.service.ts b/packages/twenty-server/src/modules/timeline/services/timeline-activity-target-query.service.ts
index ef17ba0888e..e62cf27a089 100644
--- a/packages/twenty-server/src/modules/timeline/services/timeline-activity-target-query.service.ts
+++ b/packages/twenty-server/src/modules/timeline/services/timeline-activity-target-query.service.ts
@@ -50,10 +50,10 @@ export class TimelineActivityTargetQueryService {
const { junctionObjectNameSingular, junctionSourceJoinColumnName } =
rule.targetShape;
- const junctionRepository = this.workspaceOrmManager.getRepository(
- junctionObjectNameSingular,
- { shouldBypassPermissionChecks: true },
- );
+ const junctionRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ junctionObjectNameSingular,
+ );
const junctionRows = await junctionRepository.find({
where: { [junctionSourceJoinColumnName]: In(sourceRecordIds) },
@@ -109,10 +109,10 @@ export class TimelineActivityTargetQueryService {
return sourceRecordsByRecordId;
}
- const repository = this.workspaceOrmManager.getRepository(
- rule.sourceFlatObjectMetadata.nameSingular,
- { shouldBypassPermissionChecks: true },
- );
+ const repository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ rule.sourceFlatObjectMetadata.nameSingular,
+ );
const records = await repository.find({ where: { id: In(recordIds) } });
diff --git a/packages/twenty-server/src/modules/timeline/services/timeline-activity.service.ts b/packages/twenty-server/src/modules/timeline/services/timeline-activity.service.ts
index c3482474588..8bd44f5281e 100644
--- a/packages/twenty-server/src/modules/timeline/services/timeline-activity.service.ts
+++ b/packages/twenty-server/src/modules/timeline/services/timeline-activity.service.ts
@@ -493,12 +493,10 @@ export class TimelineActivityService {
return events;
}
- const workspaceMemberRepository = this.workspaceOrmManager.getRepository(
- WorkspaceMemberWorkspaceEntity,
- {
- shouldBypassPermissionChecks: true,
- },
- );
+ const workspaceMemberRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ WorkspaceMemberWorkspaceEntity,
+ );
const workspaceMembers = await workspaceMemberRepository.findBy({
userId: In(userIds),
diff --git a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-operations.workspace-service.ts b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-operations.workspace-service.ts
index 5b04625a170..b802c5f87ee 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-operations.workspace-service.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-operations.workspace-service.ts
@@ -754,10 +754,7 @@ export class WorkflowVersionStepOperationsWorkspaceService {
workspaceId: string;
step: WorkflowFormAction;
response: object;
- recordReadContext?: Pick<
- WorkflowExecutionContext,
- 'authContext' | 'rolePermissionConfig'
- >;
+ recordReadContext?: Pick<WorkflowExecutionContext, 'authContext'>;
}) {
const authContext = buildSystemAuthContext(workspaceId);
@@ -807,10 +804,10 @@ export class WorkflowVersionStepOperationsWorkspaceService {
.filter((field) => field.type === FieldMetadataType.RELATION)
.map((field) => field.name);
- const repository = this.workspaceOrmManager.getRepository(
- field.settings.objectName,
- { shouldBypassPermissionChecks: true },
- );
+ const repository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ field.settings.objectName,
+ );
const record = await repository.findOne({
// @ts-expect-error legacy noImplicitAny
@@ -842,17 +839,13 @@ export class WorkflowVersionStepOperationsWorkspaceService {
}: {
objectName: string;
recordId: string;
- recordReadContext: Pick<
- WorkflowExecutionContext,
- 'authContext' | 'rolePermissionConfig'
- >;
+ recordReadContext: Pick<WorkflowExecutionContext, 'authContext'>;
}) {
const { success, result } = await this.findRecordsService.execute({
objectName,
filter: { id: { eq: recordId } },
limit: 1,
authContext: recordReadContext.authContext,
- rolePermissionConfig: recordReadContext.rolePermissionConfig,
shouldBuildEffectiveSelectFields: false,
});
diff --git a/packages/twenty-server/src/modules/workflow/workflow-deletion/services/workflow-deletion-cleanup.workspace-service.ts b/packages/twenty-server/src/modules/workflow/workflow-deletion/services/workflow-deletion-cleanup.workspace-service.ts
index 38bcae486dd..d4639054914 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-deletion/services/workflow-deletion-cleanup.workspace-service.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-deletion/services/workflow-deletion-cleanup.workspace-service.ts
@@ -46,9 +46,8 @@ export class WorkflowDeletionCleanupWorkspaceService {
where: { coreWorkflowId: string } | { coreWorkflowVersionId: string };
}): Promise<void> {
const workflowRunRepository =
- this.workspaceOrmManager.getRepository<WorkflowRunWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkflowRunWorkspaceEntity>(
'workflowRun',
- { shouldBypassPermissionChecks: true },
);
const findRunBatch = () =>
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/services/__tests__/workflow-execution-context.service.spec.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/services/__tests__/workflow-execution-context.service.spec.ts
index 5a7676ad0b2..619f5864616 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/services/__tests__/workflow-execution-context.service.spec.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/services/__tests__/workflow-execution-context.service.spec.ts
@@ -1,3 +1,4 @@
+import { type PermissionsService } from 'src/engine/permissions/permissions.service';
import { TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER } from 'twenty-shared/application';
import { FieldActorSource } from 'twenty-shared/types';
@@ -82,9 +83,11 @@ const buildWorkflowRun = ({
const buildService = ({
workflowRun = buildWorkflowRun({ coreWorkflowId: WORKSPACE_WORKFLOW_ID }),
applications = [installedApplication, workspaceCustomApplication],
+ roleIds = ['installed-app-role-id'],
}: {
workflowRun?: WorkflowRunWorkspaceEntity;
applications?: FlatApplication[];
+ roleIds?: string[];
} = {}) =>
new WorkflowExecutionContextService(
{
@@ -112,7 +115,6 @@ const buildService = ({
]),
),
},
- userWorkspaceRoleMap: {},
}),
} as unknown as WorkspaceCacheService,
{
@@ -121,6 +123,9 @@ const buildService = ({
workspaceCustomApplicationId: WORKSPACE_CUSTOM_APPLICATION_ID,
}),
} as unknown as CoreEntityCacheService,
+ {
+ getRoleIds: jest.fn().mockResolvedValue(roleIds),
+ } as unknown as PermissionsService,
);
const runInfo = { workflowRunId: 'workflow-run-id', workspaceId: WORKSPACE_ID };
@@ -139,9 +144,17 @@ describe('WorkflowExecutionContextService', () => {
type: 'application',
application: installedApplication,
});
- expect(executionContext.rolePermissionConfig).toEqual({
- intersectionOf: { applicationRoleId: 'installed-app-role-id' },
- });
+ });
+
+ it('refuses a run left with no role', async () => {
+ await expect(
+ buildService({
+ workflowRun: buildWorkflowRun({
+ coreWorkflowId: INSTALLED_APPLICATION_WORKFLOW_ID,
+ }),
+ roleIds: [],
+ }).getExecutionContext(runInfo),
+ ).rejects.toThrow('No role is left to run this step with');
});
it('takes the application from the workflow of the run, not from the one stamped on it', async () => {
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/services/workflow-execution-context.module.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/services/workflow-execution-context.module.ts
index e9234446cd4..104e592b3d8 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/services/workflow-execution-context.module.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/services/workflow-execution-context.module.ts
@@ -2,6 +2,7 @@ import { Module } from '@nestjs/common';
import { CoreEntityCacheModule } from 'src/engine/core-entity-cache/core-entity-cache.module';
import { UserWorkspaceModule } from 'src/engine/core-modules/user-workspace/user-workspace.module';
+import { PermissionsModule } from 'src/engine/permissions/permissions.module';
import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';
import { WorkflowExecutionContextService } from 'src/modules/workflow/workflow-executor/services/workflow-execution-context.service';
import { WorkflowRunModule } from 'src/modules/workflow/workflow-runner/workflow-run/workflow-run.module';
@@ -12,6 +13,7 @@ import { WorkflowRunModule } from 'src/modules/workflow/workflow-runner/workflow
WorkflowRunModule,
WorkspaceCacheModule,
CoreEntityCacheModule,
+ PermissionsModule,
],
providers: [WorkflowExecutionContextService],
exports: [WorkflowExecutionContextService],
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/services/workflow-execution-context.service.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/services/workflow-execution-context.service.ts
index 05f0fc4a68c..1e8b8bb5996 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/services/workflow-execution-context.service.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/services/workflow-execution-context.service.ts
@@ -15,7 +15,7 @@ import { CoreEntityCacheService } from 'src/engine/core-entity-cache/services/co
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
import { type FlatWorkflow } from 'src/engine/metadata-modules/flat-workflow/types/flat-workflow.type';
-import { resolveRolePermissionConfig } from 'src/engine/permissions/principal/utils/resolve-role-permission-config.util';
+import { PermissionsService } from 'src/engine/permissions/permissions.service';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
import { type WorkflowRunWorkspaceEntity } from 'src/modules/workflow/common/standard-objects/workflow-run.workspace-entity';
import {
@@ -35,6 +35,7 @@ export class WorkflowExecutionContextService {
private readonly userWorkspaceService: UserWorkspaceService,
private readonly workspaceCacheService: WorkspaceCacheService,
private readonly coreEntityCacheService: CoreEntityCacheService,
+ private readonly permissionsService: PermissionsService,
) {}
async getExecutionContext(
@@ -110,11 +111,10 @@ export class WorkflowExecutionContextService {
workflowRun: WorkflowRunWorkspaceEntity,
workspace: FlatWorkspace,
): Promise<WorkflowExecutionContext> {
- const { flatApplicationMaps, flatWorkflowMaps, userWorkspaceRoleMap } =
+ const { flatApplicationMaps, flatWorkflowMaps } =
await this.workspaceCacheService.getOrRecompute(workspace.id, [
'flatApplicationMaps',
'flatWorkflowMaps',
- 'userWorkspaceRoleMap',
]);
const application = resolveWorkflowRunApplicationOrThrow({
@@ -134,14 +134,9 @@ export class WorkflowExecutionContextService {
})
: buildApplicationAuthContext({ workspace, application });
- const rolePermissionConfig = resolveRolePermissionConfig({
- authContext,
- userWorkspaceRoleMap,
- apiKeyRoleMap: {},
- flatRoleTargetByAgentIdMaps: {},
- });
+ const roleIds = await this.permissionsService.getRoleIds(authContext);
- if (!isDefined(rolePermissionConfig)) {
+ if (roleIds.length === 0) {
throw new WorkflowStepExecutorException(
'No role is left to run this step with',
WorkflowStepExecutorExceptionCode.FORBIDDEN,
@@ -151,7 +146,6 @@ export class WorkflowExecutionContextService {
return {
isActingOnBehalfOfUser,
initiator: workflowRun.createdBy,
- rolePermissionConfig,
authContext,
application,
};
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/services/workflow-run-inbox-sender.workspace-service.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/services/workflow-run-inbox-sender.workspace-service.ts
index 33a94939933..f77e7b9b195 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/services/workflow-run-inbox-sender.workspace-service.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/services/workflow-run-inbox-sender.workspace-service.ts
@@ -35,9 +35,9 @@ export class WorkflowRunInboxSenderWorkspaceService {
await this.workspaceOrmManager.executeInWorkspaceContext(
() =>
this.workspaceOrmManager
- .getRepository<WorkflowRunWorkspaceEntity>('workflowRun', {
- shouldBypassPermissionChecks: true,
- })
+ .getRepositoryWithoutPermissionChecks<WorkflowRunWorkspaceEntity>(
+ 'workflowRun',
+ )
.findOne({
where: { id: workflowRunId },
select: ['id', 'coreWorkflowId'],
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/types/workflow-execution-context.type.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/types/workflow-execution-context.type.ts
index d835cf61c00..6c46ad63ae8 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/types/workflow-execution-context.type.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/types/workflow-execution-context.type.ts
@@ -2,12 +2,10 @@ import { type ActorMetadata } from 'twenty-shared/types';
import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
-import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
export type WorkflowExecutionContext = {
isActingOnBehalfOfUser: boolean;
initiator: ActorMetadata;
- rolePermissionConfig: RolePermissionConfig;
authContext: WorkspaceAuthContext;
application: FlatApplication;
};
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/utils/build-workflow-agent-run-execution-context.util.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/utils/build-workflow-agent-run-execution-context.util.ts
index 192044d0ac7..7e5eb12f5e9 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/utils/build-workflow-agent-run-execution-context.util.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/utils/build-workflow-agent-run-execution-context.util.ts
@@ -1,26 +1,10 @@
import { type ActorMetadata } from 'twenty-shared/types';
import { type AgentRunExecutionContext } from 'src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-execution-context.type';
-import { type AgentRunRoleIds } from 'src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-role-ids.type';
-import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
import { type WorkflowExecutionContext } from 'src/modules/workflow/workflow-executor/types/workflow-execution-context.type';
import { getWorkflowRunUserWorkspaceId } from 'src/modules/workflow/workflow-executor/workflow-actions/ai-agent/utils/get-workflow-run-user-workspace-id.util';
-// A run that bypasses permission checks adds no restriction to the agent's role
-const getAgentRunRoleIdsFromRolePermissionConfig = (
- rolePermissionConfig: RolePermissionConfig,
-): AgentRunRoleIds => {
- if ('shouldBypassPermissionChecks' in rolePermissionConfig) {
- return {};
- }
-
- const { agentRoleId: _agentRoleId, ...agentRunRoleIds } =
- rolePermissionConfig.intersectionOf;
-
- return agentRunRoleIds;
-};
-
-// The run's roles narrow the step's agent, derived again each time the agent continues
+// The step's agent acts with the run's permissions, derived again each time the agent continues
export const buildWorkflowAgentRunExecutionContext = ({
executionContext,
turnCreatedBy,
@@ -34,7 +18,4 @@ export const buildWorkflowAgentRunExecutionContext = ({
: undefined,
turnCreatedBy,
userWorkspaceId: getWorkflowRunUserWorkspaceId(executionContext),
- agentRunRoleIds: getAgentRunRoleIdsFromRolePermissionConfig(
- executionContext.rolePermissionConfig,
- ),
});
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/mail-sender/__tests__/draft-email.workflow-action.spec.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/mail-sender/__tests__/draft-email.workflow-action.spec.ts
index f3ce0a13fee..3e2b3b0e219 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/mail-sender/__tests__/draft-email.workflow-action.spec.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/mail-sender/__tests__/draft-email.workflow-action.spec.ts
@@ -78,7 +78,9 @@ describe('DraftEmailWorkflowAction', () => {
provide: WorkspaceOrmManager,
useValue: {
executeInWorkspaceContext: jest.fn((callback) => callback()),
- getRepository: jest.fn().mockReturnValue(workspaceMemberRepository),
+ getRepositoryWithoutPermissionChecks: jest
+ .fn()
+ .mockReturnValue(workspaceMemberRepository),
},
},
{
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/mail-sender/__tests__/send-email.workflow-action.spec.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/mail-sender/__tests__/send-email.workflow-action.spec.ts
index 8dd263271b0..7d6ff1fd947 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/mail-sender/__tests__/send-email.workflow-action.spec.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/mail-sender/__tests__/send-email.workflow-action.spec.ts
@@ -82,7 +82,9 @@ describe('SendEmailWorkflowAction', () => {
provide: WorkspaceOrmManager,
useValue: {
executeInWorkspaceContext: jest.fn((callback) => callback()),
- getRepository: jest.fn().mockReturnValue(workspaceMemberRepository),
+ getRepositoryWithoutPermissionChecks: jest
+ .fn()
+ .mockReturnValue(workspaceMemberRepository),
},
},
{
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/mail-sender/email-workflow-action.base.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/mail-sender/email-workflow-action.base.ts
index 1702b899901..f370451870d 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/mail-sender/email-workflow-action.base.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/mail-sender/email-workflow-action.base.ts
@@ -140,9 +140,8 @@ export abstract class EmailWorkflowActionBase extends ToolBackedWorkflowAction<W
workspaceMemberId: string,
): Promise<WorkspaceMemberWorkspaceEntity | null> {
const workspaceMemberRepository =
- this.workspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkspaceMemberWorkspaceEntity>(
'workspaceMember',
- { shouldBypassPermissionChecks: true },
);
return workspaceMemberRepository.findOne({
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/create-record.workflow-action.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/create-record.workflow-action.ts
index 4ae31e21134..821c57239bc 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/create-record.workflow-action.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/create-record.workflow-action.ts
@@ -85,7 +85,6 @@ export class CreateRecordWorkflowAction implements WorkflowAction {
objectRecord: filteredObjectRecord,
authContext: executionContext.authContext,
createdBy,
- rolePermissionConfig: executionContext.rolePermissionConfig,
});
if (!toolOutput.success) {
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/delete-record.workflow-action.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/delete-record.workflow-action.ts
index d919596bb91..6f537e5a1fd 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/delete-record.workflow-action.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/delete-record.workflow-action.ts
@@ -64,7 +64,6 @@ export class DeleteRecordWorkflowAction implements WorkflowAction {
objectName: workflowActionInput.objectName,
objectRecordId: workflowActionInput.objectRecordId,
authContext: executionContext.authContext,
- rolePermissionConfig: executionContext.rolePermissionConfig,
soft: true,
});
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/find-records.workflow-action.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/find-records.workflow-action.ts
index 0142139cb41..e1894dbfd63 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/find-records.workflow-action.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/find-records.workflow-action.ts
@@ -135,7 +135,6 @@ export class FindRecordsWorkflowAction implements WorkflowAction {
limit: resolveLimitInput(workflowActionInput.limit),
offset: resolveOffsetInput(workflowActionInput.offset),
authContext: executionContext.authContext,
- rolePermissionConfig: executionContext.rolePermissionConfig,
shouldBuildEffectiveSelectFields: false,
});
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/pick-record.workflow-action.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/pick-record.workflow-action.ts
index 4c21f338ebe..e5caeceadbb 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/pick-record.workflow-action.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/pick-record.workflow-action.ts
@@ -80,7 +80,6 @@ export class PickRecordWorkflowAction implements WorkflowAction {
objectName,
filter: { id: { in: recordIds } },
authContext: executionContext.authContext,
- rolePermissionConfig: executionContext.rolePermissionConfig,
shouldBuildEffectiveSelectFields: false,
});
@@ -148,7 +147,6 @@ export class PickRecordWorkflowAction implements WorkflowAction {
groupBy: [{ [loadBalance.fieldName]: { id: true } }],
filter: { [loadBalance.fieldName]: { id: { in: candidateIds } } },
authContext: executionContext.authContext,
- rolePermissionConfig: executionContext.rolePermissionConfig,
});
if (!groupByOutput.success) {
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/update-record.workflow-action.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/update-record.workflow-action.ts
index f2661f8cbd9..b330747f4c8 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/update-record.workflow-action.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/update-record.workflow-action.ts
@@ -127,7 +127,6 @@ export class UpdateRecordWorkflowAction implements WorkflowAction {
fieldsToUpdate: filteredFieldsToUpdate,
authContext: executionContext.authContext,
updatedBy,
- rolePermissionConfig: executionContext.rolePermissionConfig,
});
if (!toolOutput.success) {
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/upsert-record.workflow-action.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/upsert-record.workflow-action.ts
index e5c3f8c670b..fcd844263be 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/upsert-record.workflow-action.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/upsert-record.workflow-action.ts
@@ -100,7 +100,6 @@ export class UpsertRecordWorkflowAction implements WorkflowAction {
objectName: workflowActionInput.objectName,
objectRecord: filteredObjectRecord,
authContext: executionContext.authContext,
- rolePermissionConfig: executionContext.rolePermissionConfig,
});
if (!toolOutput.success) {
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/send-chat-message/__tests__/send-chat-message.workflow-action.spec.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/send-chat-message/__tests__/send-chat-message.workflow-action.spec.ts
index 7a5c9af6de8..d794ee6991b 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/send-chat-message/__tests__/send-chat-message.workflow-action.spec.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/send-chat-message/__tests__/send-chat-message.workflow-action.spec.ts
@@ -17,7 +17,7 @@ const WORKFLOW_RUN_ID = 'workflow-run-id';
const WORKFLOW_ID = 'workflow-id';
const WORKSPACE_MEMBER_ID = '20202020-2222-4222-8222-222222222222';
const EXECUTION_CONTEXT = {
- rolePermissionConfig: { intersectionOf: { applicationRoleId: 'role-id' } },
+ authContext: { type: 'application', workspace: { id: WORKSPACE_ID } },
};
const buildStep = (input: Record<string, unknown>): WorkflowAction =>
@@ -71,7 +71,7 @@ describe('SendChatMessageWorkflowAction', () => {
new WorkflowRunInboxSenderWorkspaceService(
{
executeInWorkspaceContext: jest.fn((callback) => callback()),
- getRepository: jest
+ getRepositoryWithoutPermissionChecks: jest
.fn()
.mockReturnValue({ findOne: findWorkflowRun }),
} as unknown as WorkspaceOrmManager,
diff --git a/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run-queue/cron/jobs/workflow-clean-workflow-runs.cron.job.ts b/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run-queue/cron/jobs/workflow-clean-workflow-runs.cron.job.ts
index 78791e015a5..c7a96aa9f13 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run-queue/cron/jobs/workflow-clean-workflow-runs.cron.job.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run-queue/cron/jobs/workflow-clean-workflow-runs.cron.job.ts
@@ -143,10 +143,10 @@ export class WorkflowCleanWorkflowRunsCronJob {
return this.workspaceOrmManager.executeInWorkspaceContext(
async () => {
- const workflowRunRepository = this.workspaceOrmManager.getRepository(
- WorkflowRunWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- );
+ const workflowRunRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ WorkflowRunWorkspaceEntity,
+ );
const hasOldRuns = await workflowRunRepository.exists({
where: getRunsToCleanFindOptions(),
diff --git a/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run-queue/workspace-services/__tests__/workflow-run-enqueue.workspace-service.spec.ts b/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run-queue/workspace-services/__tests__/workflow-run-enqueue.workspace-service.spec.ts
index 6fd1a8f1406..0f081d96299 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run-queue/workspace-services/__tests__/workflow-run-enqueue.workspace-service.spec.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run-queue/workspace-services/__tests__/workflow-run-enqueue.workspace-service.spec.ts
@@ -59,7 +59,9 @@ const buildService = (
workflowThrottlingWorkspaceService as never,
{
executeInWorkspaceContext: jest.fn().mockImplementation((work) => work()),
- getRepository: jest.fn().mockReturnValue(workflowRunRepository),
+ getRepositoryWithoutPermissionChecks: jest
+ .fn()
+ .mockReturnValue(workflowRunRepository),
} as never,
messageQueueService as never,
{ incrementCounterForEvent: jest.fn() } as never,
diff --git a/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run-queue/workspace-services/workflow-handle-staled-runs.workspace-service.ts b/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run-queue/workspace-services/workflow-handle-staled-runs.workspace-service.ts
index 896cb2b393a..4df8e99f55d 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run-queue/workspace-services/workflow-handle-staled-runs.workspace-service.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run-queue/workspace-services/workflow-handle-staled-runs.workspace-service.ts
@@ -50,10 +50,10 @@ export class WorkflowHandleStaledRunsWorkspaceService {
const authContext = buildSystemAuthContext(workspaceId);
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const workflowRunRepository = this.workspaceOrmManager.getRepository(
- WorkflowRunWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- );
+ const workflowRunRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ WorkflowRunWorkspaceEntity,
+ );
const staledRunsCount = await workflowRunRepository.count({
where: getStaledRunsFindOptions(),
@@ -283,10 +283,10 @@ export class WorkflowHandleStaledRunsWorkspaceService {
const authContext = buildSystemAuthContext(workspaceId);
return this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const workflowRunRepository = this.workspaceOrmManager.getRepository(
- WorkflowRunWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- );
+ const workflowRunRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ WorkflowRunWorkspaceEntity,
+ );
const runIds: string[] = [];
let page: WorkflowRunWorkspaceEntity[];
diff --git a/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run-queue/workspace-services/workflow-run-enqueue.workspace-service.ts b/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run-queue/workspace-services/workflow-run-enqueue.workspace-service.ts
index 36c427a9064..cc15a4e516f 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run-queue/workspace-services/workflow-run-enqueue.workspace-service.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run-queue/workspace-services/workflow-run-enqueue.workspace-service.ts
@@ -53,10 +53,10 @@ export class WorkflowRunEnqueueWorkspaceService {
const authContext = buildSystemAuthContext(workspaceId);
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const workflowRunRepository = this.workspaceOrmManager.getRepository(
- WorkflowRunWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- );
+ const workflowRunRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ WorkflowRunWorkspaceEntity,
+ );
const notStartedRunsCount = isCacheMode
? await this.workflowThrottlingWorkspaceService.getNotStartedRunsCountFromCache(
diff --git a/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run-queue/workspace-services/workflow-throttling.workspace-service.ts b/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run-queue/workspace-services/workflow-throttling.workspace-service.ts
index 357e40b7d59..e4deb446957 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run-queue/workspace-services/workflow-throttling.workspace-service.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run-queue/workspace-services/workflow-throttling.workspace-service.ts
@@ -68,10 +68,10 @@ export class WorkflowThrottlingWorkspaceService {
const currentlyNotStartedWorkflowRunCount =
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const workflowRunRepository = this.workspaceOrmManager.getRepository(
- WorkflowRunWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- );
+ const workflowRunRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ WorkflowRunWorkspaceEntity,
+ );
return workflowRunRepository.count({
where: NOT_STARTED_RUNS_FIND_OPTIONS,
@@ -94,10 +94,10 @@ export class WorkflowThrottlingWorkspaceService {
const authContext = buildSystemAuthContext(workspaceId);
return this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const workflowRunRepository = this.workspaceOrmManager.getRepository(
- WorkflowRunWorkspaceEntity,
- { shouldBypassPermissionChecks: true },
- );
+ const workflowRunRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ WorkflowRunWorkspaceEntity,
+ );
return workflowRunRepository.count({
where: NOT_STARTED_RUNS_FIND_OPTIONS,
diff --git a/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/command/delete-workflow-runs.command.ts b/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/command/delete-workflow-runs.command.ts
index 5595786513a..41267f2b854 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/command/delete-workflow-runs.command.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/command/delete-workflow-runs.command.ts
@@ -51,9 +51,8 @@ export class DeleteWorkflowRunsCommand extends ProvisionedWorkspaceCommandRunner
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
try {
const workflowRunRepository =
- this.workspaceOrmManager.getRepository<WorkflowRunWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkflowRunWorkspaceEntity>(
'workflowRun',
- { shouldBypassPermissionChecks: true },
);
const createdAtCondition = {
diff --git a/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/workflow-run.workspace-service.ts b/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/workflow-run.workspace-service.ts
index e56f23b6675..7969b24848f 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/workflow-run.workspace-service.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/workflow-run.workspace-service.ts
@@ -77,9 +77,8 @@ export class WorkflowRunWorkspaceService {
return this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const workflowRunRepository =
- this.workspaceOrmManager.getRepository<WorkflowRunWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkflowRunWorkspaceEntity>(
'workflowRun',
- { shouldBypassPermissionChecks: true },
);
const position = await this.recordPositionService.buildRecordPosition({
value: 'first',
@@ -503,9 +502,8 @@ export class WorkflowRunWorkspaceService {
return this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const workflowRunRepository =
- this.workspaceOrmManager.getRepository<WorkflowRunWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkflowRunWorkspaceEntity>(
'workflowRun',
- { shouldBypassPermissionChecks: true },
);
return await workflowRunRepository.findOne({
@@ -527,9 +525,9 @@ export class WorkflowRunWorkspaceService {
await this.workspaceOrmManager.executeInWorkspaceContext(
async () =>
this.workspaceOrmManager
- .getRepository<WorkflowRunWorkspaceEntity>('workflowRun', {
- shouldBypassPermissionChecks: true,
- })
+ .getRepositoryWithoutPermissionChecks<WorkflowRunWorkspaceEntity>(
+ 'workflowRun',
+ )
.findOne({
where: { id: workflowRunId },
select: ['id', 'coreWorkflowId'],
@@ -548,9 +546,7 @@ export class WorkflowRunWorkspaceService {
const workflowRun =
await this.workspaceOrmManager.executeInWorkspaceContext(() =>
this.workspaceOrmManager
- .getRepositoryWithContextPermissions<WorkflowRunWorkspaceEntity>(
- 'workflowRun',
- )
+ .getRepository<WorkflowRunWorkspaceEntity>('workflowRun')
.findOne({ where: { id: workflowRunId }, select: { id: true } }),
);
@@ -599,9 +595,8 @@ export class WorkflowRunWorkspaceService {
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const workflowRunRepository =
- this.workspaceOrmManager.getRepository<WorkflowRunWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkflowRunWorkspaceEntity>(
'workflowRun',
- { shouldBypassPermissionChecks: true },
);
const workflowRunToUpdate = await workflowRunRepository.findOneBy({
diff --git a/packages/twenty-server/src/modules/workflow/workflow-runner/workspace-services/__tests__/workflow-waiting-step.workspace-service.spec.ts b/packages/twenty-server/src/modules/workflow/workflow-runner/workspace-services/__tests__/workflow-waiting-step.workspace-service.spec.ts
index 138f8593d11..8b6df0cdffd 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-runner/workspace-services/__tests__/workflow-waiting-step.workspace-service.spec.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-runner/workspace-services/__tests__/workflow-waiting-step.workspace-service.spec.ts
@@ -63,9 +63,6 @@ const buildService = ({
const workflowExecutionContextService = {
getExecutionContext: jest.fn().mockResolvedValue({
authContext: { type: 'system' },
- rolePermissionConfig: {
- intersectionOf: { userWorkspaceRoleId: 'role-id' },
- },
}),
};
const findRecordsService = {
diff --git a/packages/twenty-server/src/modules/workflow/workflow-tools/services/workflow-tool.workspace-service.ts b/packages/twenty-server/src/modules/workflow/workflow-tools/services/workflow-tool.workspace-service.ts
index c90c69ea656..fade3f5f2b4 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-tools/services/workflow-tool.workspace-service.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-tools/services/workflow-tool.workspace-service.ts
@@ -1,3 +1,4 @@
+import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { Injectable } from '@nestjs/common';
import { type ToolSet } from 'ai';
@@ -11,7 +12,6 @@ import { CoreWorkflowVersionWriteService } from 'src/engine/core-modules/workflo
import { AgentService } from 'src/engine/metadata-modules/ai/ai-agent/agent.service';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
import { LogicFunctionFromSourceService } from 'src/engine/metadata-modules/logic-function/services/logic-function-from-source.service';
-import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
import { WorkflowSchemaWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-schema/workflow-schema.workspace-service';
import { WorkflowAiAgentStepAgentService } from 'src/modules/workflow/workflow-builder/workflow-version-step/services/workflow-ai-agent-step-agent.service';
@@ -77,17 +77,17 @@ export class WorkflowToolWorkspaceService {
generateWorkflowTools({
workspaceId,
- rolePermissionConfig,
+ authContext,
userWorkspaceId,
}: {
workspaceId: string;
- rolePermissionConfig: RolePermissionConfig;
+ authContext: WorkspaceAuthContext;
userWorkspaceId?: string;
}): ToolSet {
const context: WorkflowToolContext = {
workspaceId,
- rolePermissionConfig,
userWorkspaceId,
+ authContext,
};
const tools = [
diff --git a/packages/twenty-server/src/modules/workflow/workflow-tools/tools/__tests__/create-complete-workflow.tool.spec.ts b/packages/twenty-server/src/modules/workflow/workflow-tools/tools/__tests__/create-complete-workflow.tool.spec.ts
index 532e9e67f0f..5bad766f60e 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-tools/tools/__tests__/create-complete-workflow.tool.spec.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-tools/tools/__tests__/create-complete-workflow.tool.spec.ts
@@ -1,3 +1,4 @@
+import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import {
WorkflowVersionStepException,
WorkflowVersionStepExceptionCode,
@@ -7,6 +8,10 @@ import { createCreateCompleteWorkflowTool } from 'src/modules/workflow/workflow-
const CORE_WORKFLOW_ID = 'b3b8a4f0-0000-4000-8000-000000000001';
const CORE_WORKFLOW_VERSION_ID = 'b3b8a4f0-0000-4000-8000-000000000002';
const WORKSPACE_WORKFLOW_ID = 'b3b8a4f0-0000-4000-8000-000000000003';
+const AUTH_CONTEXT = {
+ type: 'user',
+ workspace: { id: 'workspace-id' },
+} as WorkspaceAuthContext;
const STEP_ID = 'f47ac10b-58cc-4372-a567-0e02b2c3d479';
const trigger = {
@@ -58,7 +63,7 @@ const buildTool = () => {
const tool = createCreateCompleteWorkflowTool(dependencies, {
workspaceId: 'workspace-id',
userWorkspaceId: 'user-workspace-id',
- rolePermissionConfig: { shouldBypassPermissionChecks: true },
+ authContext: AUTH_CONTEXT,
});
return {
diff --git a/packages/twenty-server/src/modules/workflow/workflow-tools/tools/__tests__/delete-workflow.tool.spec.ts b/packages/twenty-server/src/modules/workflow/workflow-tools/tools/__tests__/delete-workflow.tool.spec.ts
index 3afea0ab37c..639318fc91f 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-tools/tools/__tests__/delete-workflow.tool.spec.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-tools/tools/__tests__/delete-workflow.tool.spec.ts
@@ -1,6 +1,11 @@
+import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { createDeleteWorkflowTool } from 'src/modules/workflow/workflow-tools/tools/delete-workflow.tool';
const CORE_WORKFLOW_ID = 'b3b8a4f0-0000-4000-8000-000000000000';
+const AUTH_CONTEXT = {
+ type: 'user',
+ workspace: { id: 'workspace-id' },
+} as WorkspaceAuthContext;
const buildTool = () => {
const coreWorkflowListService = {
@@ -17,7 +22,7 @@ const buildTool = () => {
} as never,
{
workspaceId: 'workspace-id',
- rolePermissionConfig: { shouldBypassPermissionChecks: true },
+ authContext: AUTH_CONTEXT,
},
);
diff --git a/packages/twenty-server/src/modules/workflow/workflow-tools/tools/__tests__/get-workflow-current-version.tool.spec.ts b/packages/twenty-server/src/modules/workflow/workflow-tools/tools/__tests__/get-workflow-current-version.tool.spec.ts
index 313c18e1c28..8782dc8ae9b 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-tools/tools/__tests__/get-workflow-current-version.tool.spec.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-tools/tools/__tests__/get-workflow-current-version.tool.spec.ts
@@ -1,3 +1,4 @@
+import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { WorkflowVersionStatus as CoreWorkflowVersionStatus } from 'src/engine/core-modules/workflow/entities/workflow-version.entity';
import { type WorkflowToolDependencies } from 'src/modules/workflow/workflow-tools/types/workflow-tool-dependencies.type';
@@ -5,13 +6,16 @@ import { createGetWorkflowCurrentVersionTool } from '../get-workflow-current-ver
const WORKSPACE_ID = '20202020-aaaa-4d02-bf25-6aeccf7ea419';
const CORE_WORKFLOW_ID = '20202020-bbbb-4d02-bf25-6aeccf7ea419';
-const ROLE_ID = '20202020-cccc-4d02-bf25-6aeccf7ea419';
const CORE_DRAFT_VERSION_ID = '20202020-dddd-4d02-bf25-6aeccf7ea419';
const CORE_ACTIVE_VERSION_ID = '20202020-eeee-4d02-bf25-6aeccf7ea419';
+const AUTH_CONTEXT = {
+ type: 'user',
+ workspace: { id: WORKSPACE_ID },
+} as WorkspaceAuthContext;
const buildContext = () => ({
workspaceId: WORKSPACE_ID,
- rolePermissionConfig: { intersectionOf: { userWorkspaceRoleId: ROLE_ID } },
+ authContext: AUTH_CONTEXT,
});
const buildDeps = ({
diff --git a/packages/twenty-server/src/modules/workflow/workflow-tools/tools/__tests__/get-workflow-run.tool.spec.ts b/packages/twenty-server/src/modules/workflow/workflow-tools/tools/__tests__/get-workflow-run.tool.spec.ts
index 104f7540a4f..177f04ad698 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-tools/tools/__tests__/get-workflow-run.tool.spec.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-tools/tools/__tests__/get-workflow-run.tool.spec.ts
@@ -1,3 +1,4 @@
+import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { StepStatus } from 'twenty-shared/workflow';
import { type WorkflowToolDependencies } from 'src/modules/workflow/workflow-tools/types/workflow-tool-dependencies.type';
@@ -6,7 +7,10 @@ import { createGetWorkflowRunTool } from '../get-workflow-run.tool';
const WORKSPACE_ID = '20202020-aaaa-4d02-bf25-6aeccf7ea419';
const WORKFLOW_RUN_ID = '20202020-bbbb-4d02-bf25-6aeccf7ea419';
-const ROLE_ID = '20202020-cccc-4d02-bf25-6aeccf7ea419';
+const AUTH_CONTEXT = {
+ type: 'user',
+ workspace: { id: WORKSPACE_ID },
+} as WorkspaceAuthContext;
const buildDeps = (findOneResult: unknown) => ({
workspaceOrmManager: {
@@ -19,11 +23,11 @@ const buildDeps = (findOneResult: unknown) => ({
const buildContext = () => ({
workspaceId: WORKSPACE_ID,
- rolePermissionConfig: { intersectionOf: { userWorkspaceRoleId: ROLE_ID } },
+ authContext: AUTH_CONTEXT,
});
describe('get_workflow_run tool', () => {
- it('should pass rolePermissionConfig to getRepository', async () => {
+ it('should read as the caller rather than bypassing permissions', async () => {
const deps = buildDeps({ id: WORKFLOW_RUN_ID, state: {}, stepLogs: {} });
const context = buildContext();
@@ -36,8 +40,10 @@ describe('get_workflow_run tool', () => {
expect(deps.workspaceOrmManager.getRepository).toHaveBeenCalledWith(
'workflowRun',
- context.rolePermissionConfig,
);
+ expect(
+ deps.workspaceOrmManager.executeInWorkspaceContext,
+ ).toHaveBeenCalledWith(expect.any(Function), AUTH_CONTEXT);
});
it('should return workflow run details on success', async () => {
diff --git a/packages/twenty-server/src/modules/workflow/workflow-tools/tools/__tests__/list-workflow-runs.tool.spec.ts b/packages/twenty-server/src/modules/workflow/workflow-tools/tools/__tests__/list-workflow-runs.tool.spec.ts
index b4a83ba8e56..78f028793b7 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-tools/tools/__tests__/list-workflow-runs.tool.spec.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-tools/tools/__tests__/list-workflow-runs.tool.spec.ts
@@ -1,10 +1,14 @@
+import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { WorkflowRunStatus } from 'src/modules/workflow/common/standard-objects/workflow-run.workspace-entity';
import { type WorkflowToolDependencies } from 'src/modules/workflow/workflow-tools/types/workflow-tool-dependencies.type';
import { createListWorkflowRunsTool } from '../list-workflow-runs.tool';
const WORKSPACE_ID = '20202020-aaaa-4d02-bf25-6aeccf7ea419';
-const ROLE_ID = '20202020-cccc-4d02-bf25-6aeccf7ea419';
+const AUTH_CONTEXT = {
+ type: 'user',
+ workspace: { id: WORKSPACE_ID },
+} as WorkspaceAuthContext;
const buildDeps = (findResult: unknown[]) => ({
workspaceOrmManager: {
@@ -17,11 +21,11 @@ const buildDeps = (findResult: unknown[]) => ({
const buildContext = () => ({
workspaceId: WORKSPACE_ID,
- rolePermissionConfig: { intersectionOf: { userWorkspaceRoleId: ROLE_ID } },
+ authContext: AUTH_CONTEXT,
});
describe('list_workflow_runs tool', () => {
- it('should pass rolePermissionConfig to getRepository', async () => {
+ it('should read as the caller rather than bypassing permissions', async () => {
const deps = buildDeps([]);
const context = buildContext();
@@ -34,8 +38,10 @@ describe('list_workflow_runs tool', () => {
expect(deps.workspaceOrmManager.getRepository).toHaveBeenCalledWith(
'workflowRun',
- context.rolePermissionConfig,
);
+ expect(
+ deps.workspaceOrmManager.executeInWorkspaceContext,
+ ).toHaveBeenCalledWith(expect.any(Function), AUTH_CONTEXT);
});
it('should return workflow runs on success', async () => {
diff --git a/packages/twenty-server/src/modules/workflow/workflow-tools/tools/__tests__/update-workflow-version-step.tool.spec.ts b/packages/twenty-server/src/modules/workflow/workflow-tools/tools/__tests__/update-workflow-version-step.tool.spec.ts
index bb2c4aae5d6..ef12023c6f5 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-tools/tools/__tests__/update-workflow-version-step.tool.spec.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-tools/tools/__tests__/update-workflow-version-step.tool.spec.ts
@@ -1,6 +1,11 @@
+import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { createUpdateWorkflowVersionStepTool } from 'src/modules/workflow/workflow-tools/tools/update-workflow-version-step.tool';
const CORE_WORKFLOW_VERSION_ID = 'b3b8a4f0-0000-4000-8000-000000000000';
+const AUTH_CONTEXT = {
+ type: 'user',
+ workspace: { id: 'workspace-id' },
+} as WorkspaceAuthContext;
const mockStep = {
id: 'f47ac10b-58cc-4372-a567-0e02b2c3d479',
@@ -19,7 +24,7 @@ const buildTool = () => {
{ coreWorkflowVersionMutationService } as never,
{
workspaceId: 'workspace-id',
- rolePermissionConfig: { shouldBypassPermissionChecks: true },
+ authContext: AUTH_CONTEXT,
},
);
diff --git a/packages/twenty-server/src/modules/workflow/workflow-tools/tools/get-workflow-run.tool.ts b/packages/twenty-server/src/modules/workflow/workflow-tools/tools/get-workflow-run.tool.ts
index 0fbbf49395e..7fce1c6d7a9 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-tools/tools/get-workflow-run.tool.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-tools/tools/get-workflow-run.tool.ts
@@ -2,7 +2,6 @@ import { isDefined } from 'twenty-shared/utils';
import { StepStatus } from 'twenty-shared/workflow';
import { z } from 'zod';
-import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
import { type WorkflowRunWorkspaceEntity } from 'src/modules/workflow/common/standard-objects/workflow-run.workspace-entity';
import {
type WorkflowToolContext,
@@ -30,14 +29,11 @@ export const createGetWorkflowRunTool = (
inputSchema: getWorkflowRunSchema,
execute: async (parameters: GetWorkflowRunInput) => {
try {
- const authContext = buildSystemAuthContext(context.workspaceId);
-
return await deps.workspaceOrmManager.executeInWorkspaceContext(
async () => {
const workflowRunRepository =
deps.workspaceOrmManager.getRepository<WorkflowRunWorkspaceEntity>(
'workflowRun',
- context.rolePermissionConfig,
);
const workflowRun = await workflowRunRepository.findOne({
@@ -94,7 +90,7 @@ export const createGetWorkflowRunTool = (
},
};
},
- authContext,
+ context.authContext,
);
} catch (error) {
return {
diff --git a/packages/twenty-server/src/modules/workflow/workflow-tools/tools/list-workflow-runs.tool.ts b/packages/twenty-server/src/modules/workflow/workflow-tools/tools/list-workflow-runs.tool.ts
index 324ff665850..a2906e7dc87 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-tools/tools/list-workflow-runs.tool.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-tools/tools/list-workflow-runs.tool.ts
@@ -2,7 +2,6 @@ import { isDefined } from 'twenty-shared/utils';
import { type FindOptionsWhere } from 'typeorm';
import { z } from 'zod';
-import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
import {
WorkflowRunStatus,
type WorkflowRunWorkspaceEntity,
@@ -49,14 +48,11 @@ export const createListWorkflowRunsTool = (
inputSchema: listWorkflowRunsSchema,
execute: async (parameters: ListWorkflowRunsInput) => {
try {
- const authContext = buildSystemAuthContext(context.workspaceId);
-
return await deps.workspaceOrmManager.executeInWorkspaceContext(
async () => {
const workflowRunRepository =
deps.workspaceOrmManager.getRepository<WorkflowRunWorkspaceEntity>(
'workflowRun',
- context.rolePermissionConfig,
);
const where: FindOptionsWhere<WorkflowRunWorkspaceEntity> = {};
@@ -89,7 +85,7 @@ export const createListWorkflowRunsTool = (
})),
};
},
- authContext,
+ context.authContext,
);
} catch (error) {
return {
diff --git a/packages/twenty-server/src/modules/workflow/workflow-tools/types/workflow-tool-dependencies.type.ts b/packages/twenty-server/src/modules/workflow/workflow-tools/types/workflow-tool-dependencies.type.ts
index 823085f3b2d..f8f5477ec4f 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-tools/types/workflow-tool-dependencies.type.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-tools/types/workflow-tool-dependencies.type.ts
@@ -1,3 +1,4 @@
+import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import type { CoreWorkflowLifecycleWorkspaceService } from 'src/engine/core-modules/workflow/services/core-workflow-lifecycle.workspace-service';
import type { CoreWorkflowListService } from 'src/engine/core-modules/workflow/services/core-workflow-list.service';
import type { CoreWorkflowMutationWorkspaceService } from 'src/engine/core-modules/workflow/services/core-workflow-mutation.workspace-service';
@@ -7,7 +8,6 @@ import type { CoreWorkflowVersionWriteService } from 'src/engine/core-modules/wo
import type { AgentService } from 'src/engine/metadata-modules/ai/ai-agent/agent.service';
import type { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
import type { LogicFunctionFromSourceService } from 'src/engine/metadata-modules/logic-function/services/logic-function-from-source.service';
-import type { RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
import type { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
import type { WorkflowSchemaWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-schema/workflow-schema.workspace-service';
import type { WorkflowAiAgentStepAgentService } from 'src/modules/workflow/workflow-builder/workflow-version-step/services/workflow-ai-agent-step-agent.service';
@@ -29,6 +29,6 @@ export type WorkflowToolDependencies = {
export type WorkflowToolContext = {
workspaceId: string;
- rolePermissionConfig: RolePermissionConfig;
userWorkspaceId?: string;
+ authContext: WorkspaceAuthContext;
};
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 bd3789f0ae6..393113efe29 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
@@ -308,10 +308,10 @@ export class WorkflowDatabaseEventTriggerListener {
continue;
}
- const relatedObjectRepository = this.workspaceOrmManager.getRepository(
- relatedObjectMetadataNameSingular,
- { shouldBypassPermissionChecks: true },
- );
+ const relatedObjectRepository =
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ relatedObjectMetadataNameSingular,
+ );
const relatedRecords = await relatedObjectRepository.find({
where: { id: In(joinRecordIds) },
diff --git a/packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-delete-one.post-query.hook.ts b/packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-delete-one.post-query.hook.ts
index cfdeaeeb344..c265f3cd3be 100644
--- a/packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-delete-one.post-query.hook.ts
+++ b/packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-delete-one.post-query.hook.ts
@@ -61,9 +61,8 @@ export class WorkspaceMemberDeleteOnePostQueryHook implements WorkspacePostQuery
const workspaceMember =
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const workspaceMemberRepository =
- this.workspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>(
+ this.workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkspaceMemberWorkspaceEntity>(
'workspaceMember',
- { shouldBypassPermissionChecks: true },
);
return workspaceMemberRepository.findOne({
diff --git a/packages/twenty-server/test/integration/ai/suites/agent-run-wait.integration-spec.ts b/packages/twenty-server/test/integration/ai/suites/agent-run-wait.integration-spec.ts
index 73453dd96d3..09a84409c6e 100644
--- a/packages/twenty-server/test/integration/ai/suites/agent-run-wait.integration-spec.ts
+++ b/packages/twenty-server/test/integration/ai/suites/agent-run-wait.integration-spec.ts
@@ -93,27 +93,6 @@ const findWaitCallStatus = async (threadId: string) => {
return part?.status;
};
-const findCallerRoleId = async (roleTargetId: string): Promise<string> => {
- const [{ roleId }] = await global.testDataSource.query(
- `SELECT "roleId" FROM core."roleTarget"
- WHERE $1 IN ("userWorkspaceId", "apiKeyId") AND "workspaceId" = $2`,
- [roleTargetId, workspaceId],
- );
-
- return roleId;
-};
-
-const findApplicationDefaultRoleId = async (
- applicationId: string,
-): Promise<string> => {
- const [{ defaultRoleId }] = await global.testDataSource.query(
- `SELECT "defaultRoleId" FROM core.application WHERE id = $1`,
- [applicationId],
- );
-
- return defaultRoleId;
-};
-
const findTurnStatuses = async (threadId: string) =>
(
await global.testDataSource.query(
@@ -442,8 +421,6 @@ describe('agent runs that wait (integration)', () => {
type: 'user',
userWorkspaceId: USER_WORKSPACE_DATA_SEED_IDS.JANE,
},
- roleTargetId: USER_WORKSPACE_DATA_SEED_IDS.JANE,
- callerRoleSource: 'userWorkspaceRoleId',
},
{
title: 'the API key that made it',
@@ -452,12 +429,10 @@ describe('agent runs that wait (integration)', () => {
type: 'apiKey',
apiKey: expect.objectContaining({ id: API_KEY_DATA_SEED_IDS.ID_1 }),
},
- roleTargetId: API_KEY_DATA_SEED_IDS.ID_1,
- callerRoleSource: 'apiKeyRoleId',
},
])(
'goes on with a waiting runAgent call as $title',
- async ({ token, authContext, roleTargetId, callerRoleSource }) => {
+ async ({ token, authContext }) => {
const runTurn = mockAgent(
buildWaitingAgentExecutionResult(),
replyingResult,
@@ -504,17 +479,16 @@ describe('agent runs that wait (integration)', () => {
expect.objectContaining(authContext),
]);
- const agentRunRoleIds = {
- [callerRoleSource]: await findCallerRoleId(roleTargetId),
- applicationRoleId:
- await findApplicationDefaultRoleId(agentApplicationId),
- };
+ const agentRunAuthContext = expect.objectContaining({
+ agentId,
+ application: expect.objectContaining({ id: agentApplicationId }),
+ });
expect(
runTurn.mock.calls.map(
- ([execution]) => execution.executionContext.agentRunRoleIds,
+ ([execution]) => execution.executionContext.authContext,
),
- ).toEqual([agentRunRoleIds, agentRunRoleIds]);
+ ).toEqual([agentRunAuthContext, agentRunAuthContext]);
},
);
diff --git a/packages/twenty-server/test/integration/emailing/save-campaign-variable-validation.integration-spec.ts b/packages/twenty-server/test/integration/emailing/save-campaign-variable-validation.integration-spec.ts
index 5f145ea5e87..b960bcc158a 100644
--- a/packages/twenty-server/test/integration/emailing/save-campaign-variable-validation.integration-spec.ts
+++ b/packages/twenty-server/test/integration/emailing/save-campaign-variable-validation.integration-spec.ts
@@ -1,6 +1,7 @@
import { executeToolThroughMcp } from 'test/integration/ai/utils/execute-tool-through-mcp.util';
import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';
+import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';
import { type MessageCampaignDraftService } from 'src/modules/emailing/services/message-campaign-draft.service';
@@ -29,7 +30,7 @@ const saveDraftWithVariables = (...variables: string[]) =>
'MessageCampaignDraftService',
).saveDraft({
workspaceId: SEED_APPLE_WORKSPACE_ID,
- rolePermissionConfig: { shouldBypassPermissionChecks: true },
+ authContext: buildSystemAuthContext(SEED_APPLE_WORKSPACE_ID),
subject: 'Hello',
body: buildBodyWithVariables(variables),
});
diff --git a/packages/twenty-server/test/integration/graphql/suites/ai-chat-inbox-message.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/ai-chat-inbox-message.integration-spec.ts
index 79d57a06b05..71a2adeed7a 100644
--- a/packages/twenty-server/test/integration/graphql/suites/ai-chat-inbox-message.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/ai-chat-inbox-message.integration-spec.ts
@@ -323,9 +323,9 @@ describe('Sending an inbox message as an application', () => {
await workspaceOrmManager.executeInWorkspaceContext(
() =>
Object.getPrototypeOf(
- workspaceOrmManager.getRepository('agentMessagePart', {
- shouldBypassPermissionChecks: true,
- }),
+ workspaceOrmManager.getRepositoryWithoutPermissionChecks(
+ 'agentMessagePart',
+ ),
),
buildSystemAuthContext(SEED_APPLE_WORKSPACE_ID),
{ lite: true },
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 cedfdb34451..e65e46b4158 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
@@ -496,10 +496,9 @@ describe('Conversation sharing through the authenticated API', () => {
},
});
- expect(senderAuthorization?.rolePermissionConfig).toEqual({
- intersectionOf: {
- userWorkspaceRoleId: userWorkspaceRoleMap[sender.userWorkspaceId],
- },
+ expect(senderAuthorization?.authContext).toMatchObject({
+ type: 'user',
+ userWorkspaceId: sender.userWorkspaceId,
});
await expect(
actors.authorizeJob({
diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/failing-code-interpreter-token-beyond-agent-role.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/failing-code-interpreter-token-beyond-agent-role.integration-spec.ts
index 6cf67785463..1406e428595 100644
--- a/packages/twenty-server/test/integration/graphql/suites/user-session/failing-code-interpreter-token-beyond-agent-role.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/failing-code-interpreter-token-beyond-agent-role.integration-spec.ts
@@ -58,9 +58,6 @@ const captureSandboxTokenForAgentRun = async ({
token,
})
).executionContext.authContext,
- rolePermissionConfig: {
- intersectionOf: { agentRoleId: globalTestContext.agentRoleId },
- },
agentId: isAgentPassed ? globalTestContext.agentId : undefined,
});
diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/successful-agent-run-tool-role-for-caller.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/successful-agent-run-tool-role-for-caller.integration-spec.ts
index fbab90f727b..559985c7e69 100644
--- a/packages/twenty-server/test/integration/graphql/suites/user-session/successful-agent-run-tool-role-for-caller.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/successful-agent-run-tool-role-for-caller.integration-spec.ts
@@ -1,3 +1,5 @@
+import { type PermissionsMainPrincipal } 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 { captureAgentRunExecution } from 'test/integration/graphql/suites/user-session/utils/capture-agent-run-execution.util';
import { cleanupApplicationAndAppRegistration } from 'test/integration/metadata/suites/application/utils/cleanup-application-and-app-registration.util';
import {
@@ -13,13 +15,11 @@ import {
import { isDefined } from 'twenty-shared/utils';
import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
-import { USER_WORKSPACE_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/core/utils/seed-user-workspaces.util';
import { API_KEY_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/data/constants/api-key-data-seeds.constant';
import { WORKSPACE_MEMBER_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/data/constants/workspace-member-data-seeds.constant';
type GlobalTestContext = {
agentUniversalIdentifier: string;
- applicationRoleId: string;
applicationToken: string;
janeApplicationToken: string;
};
@@ -27,8 +27,7 @@ type GlobalTestContext = {
type TestContext = {
token: (globalContext: GlobalTestContext) => string;
runAsWorkspaceMemberId?: string;
- roleTargetId: string;
- callerRoleSource: 'userWorkspaceRoleId' | 'apiKeyRoleId';
+ mainPrincipal: PermissionsMainPrincipal;
};
const callerRunTestCases: EachTestingContext<TestContext>[] = [
@@ -36,16 +35,20 @@ const callerRunTestCases: EachTestingContext<TestContext>[] = [
title: 'a member session runs another application agent',
context: {
token: () => APPLE_JONY_MEMBER_ACCESS_TOKEN,
- roleTargetId: USER_WORKSPACE_DATA_SEED_IDS.JONY,
- callerRoleSource: 'userWorkspaceRoleId',
+ mainPrincipal: {
+ type: 'workspaceMember',
+ workspaceMemberId: WORKSPACE_MEMBER_DATA_SEED_IDS.JONY,
+ },
},
},
{
title: 'an application token issued for a member runs its own agent',
context: {
token: (globalContext) => globalContext.janeApplicationToken,
- roleTargetId: USER_WORKSPACE_DATA_SEED_IDS.JANE,
- callerRoleSource: 'userWorkspaceRoleId',
+ mainPrincipal: {
+ type: 'workspaceMember',
+ workspaceMemberId: WORKSPACE_MEMBER_DATA_SEED_IDS.JANE,
+ },
},
},
{
@@ -53,30 +56,21 @@ const callerRunTestCases: EachTestingContext<TestContext>[] = [
context: {
token: (globalContext) => globalContext.applicationToken,
runAsWorkspaceMemberId: WORKSPACE_MEMBER_DATA_SEED_IDS.JONY,
- roleTargetId: USER_WORKSPACE_DATA_SEED_IDS.JONY,
- callerRoleSource: 'userWorkspaceRoleId',
+ mainPrincipal: {
+ type: 'workspaceMember',
+ workspaceMemberId: WORKSPACE_MEMBER_DATA_SEED_IDS.JONY,
+ },
},
},
{
title: 'an API key runs an application agent',
context: {
token: () => API_KEY_ACCESS_TOKEN,
- roleTargetId: API_KEY_DATA_SEED_IDS.ID_1,
- callerRoleSource: 'apiKeyRoleId',
+ mainPrincipal: { type: 'apiKey', apiKeyId: API_KEY_DATA_SEED_IDS.ID_1 },
},
},
];
-const findCallerRoleId = async (roleTargetId: string): Promise<string> => {
- const [{ roleId }] = await globalThis.testDataSource.query(
- `SELECT "roleId" FROM core."roleTarget"
- WHERE $1 IN ("userWorkspaceId", "apiKeyId") AND "workspaceId" = $2`,
- [roleTargetId, SEED_APPLE_WORKSPACE_ID],
- );
-
- return roleId;
-};
-
describe('Agent run tools should be limited to the caller role', () => {
let application: ApplicationWithResources;
let globalTestContext: GlobalTestContext;
@@ -92,12 +86,6 @@ describe('Agent run tools should be limited to the caller role', () => {
[application.agentId],
);
- const [{ defaultRoleId: applicationRoleId }] =
- await globalThis.testDataSource.query(
- `SELECT "defaultRoleId" FROM core."application" WHERE id = $1`,
- [application.id],
- );
-
const [applicationTokenPair, janeApplicationTokenPair] = await Promise.all([
generateApplicationTokenPair({
workspaceId: SEED_APPLE_WORKSPACE_ID,
@@ -110,7 +98,6 @@ describe('Agent run tools should be limited to the caller role', () => {
globalTestContext = {
agentUniversalIdentifier,
- applicationRoleId,
applicationToken: applicationTokenPair.applicationAccessToken.token,
janeApplicationToken:
janeApplicationTokenPair.applicationAccessToken.token,
@@ -128,7 +115,7 @@ describe('Agent run tools should be limited to the caller role', () => {
});
it.each(eachTestingContextFilter(callerRunTestCases))(
- 'should restrict the agent role to the caller and application roles when $title',
+ 'should restrict the agent role to the caller and the agent application when $title',
async ({ context }) => {
const { executionContext } = await captureAgentRunExecution({
agentUniversalIdentifier: globalTestContext.agentUniversalIdentifier,
@@ -136,11 +123,16 @@ describe('Agent run tools should be limited to the caller role', () => {
runAsWorkspaceMemberId: context.runAsWorkspaceMemberId,
});
- expect(executionContext.agentRunRoleIds).toEqual({
- [context.callerRoleSource]: await findCallerRoleId(
- context.roleTargetId,
- ),
- applicationRoleId: globalTestContext.applicationRoleId,
+ expect(
+ getPermissionsPrincipalsFromAuthContext(executionContext.authContext),
+ ).toEqual({
+ workspaceId: SEED_APPLE_WORKSPACE_ID,
+ mainPrincipal: context.mainPrincipal,
+ limitingPrincipal: { type: 'agent', agentId: application.agentId },
+ applicationPrincipal: {
+ type: 'application',
+ applicationId: application.id,
+ },
});
},
);
@@ -151,8 +143,16 @@ describe('Agent run tools should be limited to the caller role', () => {
token: globalTestContext.applicationToken,
});
- expect(executionContext.agentRunRoleIds).toEqual({
- applicationRoleId: globalTestContext.applicationRoleId,
+ expect(
+ getPermissionsPrincipalsFromAuthContext(executionContext.authContext),
+ ).toEqual({
+ workspaceId: SEED_APPLE_WORKSPACE_ID,
+ mainPrincipal: { type: 'application', applicationId: application.id },
+ limitingPrincipal: { type: 'agent', agentId: application.agentId },
+ applicationPrincipal: {
+ type: 'application',
+ applicationId: application.id,
+ },
});
});
});
diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/successful-code-interpreter-token-for-agent-run-caller.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/successful-code-interpreter-token-for-agent-run-caller.integration-spec.ts
index 6e56c7c80a8..d83b5a38046 100644
--- a/packages/twenty-server/test/integration/graphql/suites/user-session/successful-code-interpreter-token-for-agent-run-caller.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/successful-code-interpreter-token-for-agent-run-caller.integration-spec.ts
@@ -33,11 +33,6 @@ const captureSandboxTokenForAgentRun = async ({
token,
})
).executionContext.authContext,
- rolePermissionConfig: {
- intersectionOf: {
- applicationRoleId: globalTestContext.applicationRoleId,
- },
- },
});
describe('Code interpreter sandbox token for an agent run should follow the caller', () => {
diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/capture-code-interpreter-sandbox-token.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/capture-code-interpreter-sandbox-token.util.ts
index 140a4eb3162..afdbc444971 100644
--- a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/capture-code-interpreter-sandbox-token.util.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/capture-code-interpreter-sandbox-token.util.ts
@@ -5,15 +5,12 @@ import { isUserAuthContext } from 'src/engine/core-modules/auth/guards/is-user-a
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { type CodeInterpreterService } from 'src/engine/core-modules/code-interpreter/code-interpreter.service';
import { type ToolExecutorService } from 'src/engine/core-modules/tool-provider/services/tool-executor.service';
-import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
export const captureCodeInterpreterSandboxToken = async ({
authContext,
- rolePermissionConfig,
agentId,
}: {
authContext: WorkspaceAuthContext;
- rolePermissionConfig: RolePermissionConfig;
agentId?: string;
}): Promise<string | undefined> => {
const executeSpy = jest
@@ -39,7 +36,6 @@ export const captureCodeInterpreterSandboxToken = async ({
{ code: 'pass' },
{
workspaceId: authContext.workspace.id,
- rolePermissionConfig,
authContext,
agentId,
...(isUserAuthContext(authContext)
diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/capture-code-interpreter-sandbox-tokens.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/capture-code-interpreter-sandbox-tokens.util.ts
index 312043c984c..8e81c275847 100644
--- a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/capture-code-interpreter-sandbox-tokens.util.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/capture-code-interpreter-sandbox-tokens.util.ts
@@ -38,7 +38,7 @@ export const captureCodeInterpreterSandboxTokens = async ({
throw new Error(`Application ${applicationId} is not in the cache`);
}
- const { authContext: runAsJaneContext, roleId: janeRoleId } =
+ const { authContext: runAsJaneContext } =
await getAppProviderByClassName<AgentActorContextService>(
'AgentActorContextService',
).buildRunAsWorkspaceMemberContext({
@@ -59,17 +59,11 @@ export const captureCodeInterpreterSandboxTokens = async ({
applicationRunAsJaneToken: requireToken(
await captureCodeInterpreterSandboxToken({
authContext: runAsJaneContext,
- rolePermissionConfig: {
- intersectionOf: { userWorkspaceRoleId: janeRoleId },
- },
}),
),
janeDirectRunToken: requireToken(
await captureCodeInterpreterSandboxToken({
authContext: janeContext,
- rolePermissionConfig: {
- intersectionOf: { userWorkspaceRoleId: janeRoleId },
- },
}),
),
};
diff --git a/packages/twenty-server/test/integration/resend/suites/inbound-email-body-text.integration-spec.ts b/packages/twenty-server/test/integration/resend/suites/inbound-email-body-text.integration-spec.ts
index 6a191a01037..b834aa0f3eb 100644
--- a/packages/twenty-server/test/integration/resend/suites/inbound-email-body-text.integration-spec.ts
+++ b/packages/twenty-server/test/integration/resend/suites/inbound-email-body-text.integration-spec.ts
@@ -88,9 +88,9 @@ describe('Inbound email body text (integration)', () => {
return workspaceOrmManager.executeInWorkspaceContext(
async () => {
const message = await workspaceOrmManager
- .getRepository<MessageWorkspaceEntity>('message', {
- shouldBypassPermissionChecks: true,
- })
+ .getRepositoryWithoutPermissionChecks<MessageWorkspaceEntity>(
+ 'message',
+ )
.createQueryBuilder('message')
.where('message.headerMessageId = :headerMessageId', {
headerMessageId,
diff --git a/packages/twenty-server/test/integration/resend/suites/inbound-email-exclude-group-emails.integration-spec.ts b/packages/twenty-server/test/integration/resend/suites/inbound-email-exclude-group-emails.integration-spec.ts
index 06a2cc268ee..2f9a333a957 100644
--- a/packages/twenty-server/test/integration/resend/suites/inbound-email-exclude-group-emails.integration-spec.ts
+++ b/packages/twenty-server/test/integration/resend/suites/inbound-email-exclude-group-emails.integration-spec.ts
@@ -86,9 +86,9 @@ describe('Inbound email exclude group emails (integration)', () => {
return workspaceOrmManager.executeInWorkspaceContext(
() =>
workspaceOrmManager
- .getRepository<MessageWorkspaceEntity>('message', {
- shouldBypassPermissionChecks: true,
- })
+ .getRepositoryWithoutPermissionChecks<MessageWorkspaceEntity>(
+ 'message',
+ )
.createQueryBuilder('message')
.where('message.headerMessageId = :headerMessageId', {
headerMessageId,
diff --git a/packages/twenty-server/test/integration/resend/suites/inbound-email-reply-threading.integration-spec.ts b/packages/twenty-server/test/integration/resend/suites/inbound-email-reply-threading.integration-spec.ts
index 65af6303a20..48332159d1c 100644
--- a/packages/twenty-server/test/integration/resend/suites/inbound-email-reply-threading.integration-spec.ts
+++ b/packages/twenty-server/test/integration/resend/suites/inbound-email-reply-threading.integration-spec.ts
@@ -96,15 +96,13 @@ describe('Inbound email reply threading (integration)', () => {
const messageId = randomUUID();
await workspaceOrmManager
- .getRepository<MessageThreadWorkspaceEntity>('messageThread', {
- shouldBypassPermissionChecks: true,
- })
+ .getRepositoryWithoutPermissionChecks<MessageThreadWorkspaceEntity>(
+ 'messageThread',
+ )
.insert({ id: messageThreadId });
await workspaceOrmManager
- .getRepository<MessageWorkspaceEntity>('message', {
- shouldBypassPermissionChecks: true,
- })
+ .getRepositoryWithoutPermissionChecks<MessageWorkspaceEntity>('message')
.insert({
id: messageId,
headerMessageId: providerMessageId,
@@ -114,9 +112,8 @@ describe('Inbound email reply threading (integration)', () => {
});
await workspaceOrmManager
- .getRepository<MessageChannelMessageAssociationWorkspaceEntity>(
+ .getRepositoryWithoutPermissionChecks<MessageChannelMessageAssociationWorkspaceEntity>(
'messageChannelMessageAssociation',
- { shouldBypassPermissionChecks: true },
)
.insert({
id: randomUUID(),
@@ -161,9 +158,7 @@ describe('Inbound email reply threading (integration)', () => {
const findThreadIdOfMessage = (headerMessageId: string) =>
inWorkspace(async (workspaceOrmManager) => {
const message = await workspaceOrmManager
- .getRepository<MessageWorkspaceEntity>('message', {
- shouldBypassPermissionChecks: true,
- })
+ .getRepositoryWithoutPermissionChecks<MessageWorkspaceEntity>('message')
.createQueryBuilder('message')
.where('message.headerMessageId = :headerMessageId', {
headerMessageId,
diff --git a/packages/twenty-server/test/integration/upgrade/suites/2-44-workspace-command-1790772993322-record-pending-form-conversations.integration-spec.ts b/packages/twenty-server/test/integration/upgrade/suites/2-44-workspace-command-1790772993322-record-pending-form-conversations.integration-spec.ts
index d16594187d5..74cdb0294ed 100644
--- a/packages/twenty-server/test/integration/upgrade/suites/2-44-workspace-command-1790772993322-record-pending-form-conversations.integration-spec.ts
+++ b/packages/twenty-server/test/integration/upgrade/suites/2-44-workspace-command-1790772993322-record-pending-form-conversations.integration-spec.ts
@@ -38,9 +38,8 @@ describe('2-44 workspace command 1790772993322 - RecordPendingFormConversationsC
);
const workflowRunRepository = () =>
- workspaceOrmManager.getRepository<WorkflowRunWorkspaceEntity>(
+ workspaceOrmManager.getRepositoryWithoutPermissionChecks<WorkflowRunWorkspaceEntity>(
'workflowRun',
- { shouldBypassPermissionChecks: true },
);
beforeAll(async () => {
@@ -135,9 +134,7 @@ describe('2-44 workspace command 1790772993322 - RecordPendingFormConversationsC
const countThreads = () =>
inWorkspace(() =>
workspaceOrmManager
- .getRepository('agentChatThread', {
- shouldBypassPermissionChecks: true,
- })
+ .getRepositoryWithoutPermissionChecks('agentChatThread')
.count({ withDeleted: true }),
);
const threadCountBefore = await countThreads();