Skip to content

The open alternative to Salesforce, designed for AI.

Derive repository object permissions from the permissions principal (#29563)

Charles Bochete01afae73333
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 8ba36e9b973..b61effcf7a4 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
@@ -97,7 +97,6 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);
const workspaceDataSourceOptions = {
pool,
authContext: buildSystemAuthContext(WORKSPACE_ID),
- objectPermissionsByRoleId: {},
internalContext: {
workspaceId: WORKSPACE_ID,
flatObjectMetadataMaps: metadata.flatObjectMetadataMaps,
@@ -112,6 +111,7 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);
billingEntitlements: {},
userWorkspaceRoleMap: {},
apiKeyRoleMap: {},
+ rolesPermissions: {},
flatRoleTargetByAgentIdMaps: {},
flatApplicationMaps: { byId: {}, idByUniversalIdentifier: {} },
roleIdsWithAllRecordsAccess: [],
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 a7fa606943c..13e42faa3a8 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
@@ -17,7 +17,7 @@ import {
PermissionsExceptionMessage,
} from 'src/engine/permissions/permissions.exception';
import { PermissionsService } from 'src/engine/permissions/permissions.service';
-import { getPermissionsPrincipalObjectsPermissions } from 'src/engine/permissions/role/utils/get-permissions-principal-objects-permissions.util';
+import { getPermissionsPrincipalsObjectsPermissions } from 'src/engine/permissions/role/utils/get-permissions-principals-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';
@@ -27,11 +27,11 @@ import {
type PermissionsObjectAccessRequest,
} from 'src/engine/permissions/combine/types/row-access-policy.type';
import { type PermissionsPrincipalsWithRolesContext } from 'src/engine/permissions/principal/types/permissions-principals-with-roles-context.type';
-import { getPermissionsPrincipalRoleIds } from 'src/engine/permissions/principal/utils/get-permissions-principal-role-ids.util';
-import { getPermissionsPrincipalShareKeys } from 'src/engine/permissions/principal/utils/get-permissions-principal-share-keys.util';
+import { getPermissionsPrincipalsRoleIds } from 'src/engine/permissions/principal/utils/get-permissions-principals-role-ids.util';
+import { getPermissionsPrincipalsShareKeys } from 'src/engine/permissions/principal/utils/get-permissions-principals-share-keys.util';
import { resolvePermissionsShareGrant } from 'src/engine/permissions/record-share/utils/resolve-permissions-share-grant.util';
-import { isObjectOperationDeniedToPrincipal } from 'src/engine/permissions/role/utils/is-object-operation-denied-to-principal.util';
-import { isObjectOperationDisabledToPrincipal } from 'src/engine/permissions/role/utils/is-object-operation-disabled-to-principal.util';
+import { isObjectOperationDeniedToPrincipals } from 'src/engine/permissions/role/utils/is-object-operation-denied-to-principals.util';
+import { isObjectOperationDisabledToPrincipals } from 'src/engine/permissions/role/utils/is-object-operation-disabled-to-principals.util';
import { hasWorkspaceMemberBoundPredicates } from 'src/engine/permissions/rls/utils/has-workspace-member-bound-predicates.util';
import { isRolePermittingOperation } from 'src/engine/permissions/role/utils/is-role-permitting-operation.util';
import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace-repository';
@@ -47,7 +47,7 @@ import { type WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/typ
type ObjectAccessRequest = Omit<
PermissionsObjectAccessRequest,
- 'principal' | 'metadataMaps'
+ 'principals' | 'metadataMaps'
>;
type AuthContextAccessRequest = ObjectAccessRequest & {
@@ -60,7 +60,7 @@ type RecordsAccessRequest = ObjectAccessRequest & {
transactionScope?: WorkspaceTransactionScope;
};
-type PrincipalWithRoles = Promise<
+type PrincipalsWithRoles = Promise<
PermissionsPrincipalsWithRolesContext | undefined
>;
@@ -72,12 +72,12 @@ export type ScopedRecordAccessPolicy = {
@Injectable()
export class RecordAccessPolicyService {
- private readonly metadataMapsByPrincipal = new WeakMap<
+ private readonly metadataMapsByPrincipals = new WeakMap<
PermissionsPrincipalsWithRolesContext,
Promise<PermissionsMetadataMaps>
>();
- private readonly sharedAccessLevelsByPrincipal = new WeakMap<
+ private readonly sharedAccessLevelsByPrincipals = new WeakMap<
PermissionsPrincipalsWithRolesContext,
Promise<Map<string, RecordShareAccessLevel[]>>
>();
@@ -93,15 +93,15 @@ export class RecordAccessPolicyService {
forAuthContext(
authContext: PermissionsAuthContext,
): ScopedRecordAccessPolicy {
- const principal = this.resolvePrincipalsWithRoles(authContext);
+ const principals = this.resolvePrincipalsWithRoles(authContext);
return {
hasAccessToSomeRecords: (request) =>
- this.hasPrincipalAccessToSomeRecords({ ...request, principal }),
+ this.hasPrincipalsAccessToSomeRecords({ ...request, principals }),
hasAccessToRecords: (request) =>
- this.hasPrincipalAccessToRecords({ ...request, principal }),
+ this.hasPrincipalsAccessToRecords({ ...request, principals }),
findObjectsPermissions: () =>
- this.findPrincipalObjectsPermissions(principal),
+ this.findPrincipalsObjectsPermissions(principals),
};
}
@@ -109,9 +109,9 @@ export class RecordAccessPolicyService {
authContext,
...request
}: AuthContextAccessRequest): Promise<boolean> {
- return this.hasPrincipalAccessToSomeRecords({
+ return this.hasPrincipalsAccessToSomeRecords({
...request,
- principal: this.resolvePrincipalsWithRoles(authContext),
+ principals: this.resolvePrincipalsWithRoles(authContext),
});
}
@@ -119,36 +119,36 @@ export class RecordAccessPolicyService {
authContext,
...request
}: AuthContextAccessRequest & RecordsAccessRequest): Promise<boolean> {
- return this.hasPrincipalAccessToRecords({
+ return this.hasPrincipalsAccessToRecords({
...request,
- principal: this.resolvePrincipalsWithRoles(authContext),
+ principals: this.resolvePrincipalsWithRoles(authContext),
});
}
// Shares only count once a row exists, so an object reached by nothing stays out of reach
- private async hasPrincipalAccessToSomeRecords({
- principal: principalWithRoles,
+ private async hasPrincipalsAccessToSomeRecords({
+ principals: principalsWithRoles,
flatObjectMetadata,
operationType,
}: Pick<ObjectAccessRequest, 'flatObjectMetadata' | 'operationType'> & {
- principal: PrincipalWithRoles;
+ principals: PrincipalsWithRoles;
}): Promise<boolean> {
- const principal = await principalWithRoles;
+ const principals = await principalsWithRoles;
- if (!isDefined(principal)) {
+ if (!isDefined(principals)) {
return false;
}
const request = {
- principal,
- metadataMaps: await this.findPrincipalMetadataMaps(principal),
+ principals,
+ metadataMaps: await this.findPrincipalsMetadataMaps(principals),
flatObjectMetadata,
operationType,
};
if (
- isObjectOperationDisabledToPrincipal(request) ||
- isObjectOperationDeniedToPrincipal(request)
+ isObjectOperationDisabledToPrincipals(request) ||
+ isObjectOperationDeniedToPrincipals(request)
) {
return false;
}
@@ -164,7 +164,7 @@ export class RecordAccessPolicyService {
}
const sharedAccessLevels =
- (await this.findSharedAccessLevelsByObjectMetadataId(principal)).get(
+ (await this.findSharedAccessLevelsByObjectMetadataId(principals)).get(
flatObjectMetadata.id,
) ?? [];
@@ -173,34 +173,34 @@ export class RecordAccessPolicyService {
);
}
- private async hasPrincipalAccessToRecords({
- principal: principalWithRoles,
+ private async hasPrincipalsAccessToRecords({
+ principals: principalsWithRoles,
flatObjectMetadata,
operationType,
recordIds,
hypotheticalRecordShareAccessLevel,
transactionScope,
}: RecordsAccessRequest & {
- principal: PrincipalWithRoles;
+ principals: PrincipalsWithRoles;
}): Promise<boolean> {
const uniqueRecordIds = [
...new Set(recordIds.map((recordId) => recordId.toLowerCase())),
];
- const principal = await principalWithRoles;
+ const principals = await principalsWithRoles;
- if (uniqueRecordIds.length === 0 || !isDefined(principal)) {
+ if (uniqueRecordIds.length === 0 || !isDefined(principals)) {
return false;
}
const findAdmittedRecordIds = (repository: WorkspaceRepository) =>
- repository.findPrincipalAdmittedRecordIds({
- principal,
+ repository.findPrincipalsAdmittedRecordIds({
+ principals,
recordIds: uniqueRecordIds,
operationType,
hypotheticalRecordShareAccessLevel,
});
const admittedRecordIds = await this.withBypassingRepository({
- workspaceId: principal.workspaceId,
+ workspaceId: principals.workspaceId,
objectNameSingular: flatObjectMetadata.nameSingular,
transactionScope,
work: findAdmittedRecordIds,
@@ -227,23 +227,23 @@ export class RecordAccessPolicyService {
async findObjectsPermissions(
authContext: PermissionsAuthContext,
): Promise<ObjectsPermissions | undefined> {
- return this.findPrincipalObjectsPermissions(
+ return this.findPrincipalsObjectsPermissions(
this.resolvePrincipalsWithRoles(authContext),
);
}
- private async findPrincipalObjectsPermissions(
- principalWithRoles: PrincipalWithRoles,
+ private async findPrincipalsObjectsPermissions(
+ principalsWithRoles: PrincipalsWithRoles,
): Promise<ObjectsPermissions | undefined> {
- const principal = await principalWithRoles;
+ const principals = await principalsWithRoles;
- if (!isDefined(principal)) {
+ if (!isDefined(principals)) {
return undefined;
}
- return getPermissionsPrincipalObjectsPermissions({
- principal,
- metadataMaps: await this.findPrincipalMetadataMaps(principal),
+ return getPermissionsPrincipalsObjectsPermissions({
+ principals,
+ metadataMaps: await this.findPrincipalsMetadataMaps(principals),
});
}
@@ -374,10 +374,10 @@ export class RecordAccessPolicyService {
(metadataMaps ??= this.loadPermissionsMetadataMaps(workspaceId));
const findAdmittedRecordIds = async (
- principal: PermissionsPrincipalsWithRolesContext,
+ principals: PermissionsPrincipalsWithRolesContext,
) =>
findPermissionsAdmittedRecordIds({
- principal,
+ principals,
metadataMaps: await loadMetadataMaps(),
flatObjectMetadata: objectMetadata,
operationType: 'select',
@@ -391,19 +391,19 @@ export class RecordAccessPolicyService {
return {
resolveAdmittedRecordIds: async (authContext) => {
- const principal = await this.resolvePrincipalsWithRoles(authContext);
+ const principals = await this.resolvePrincipalsWithRoles(authContext);
- return isDefined(principal)
- ? findAdmittedRecordIds(principal)
+ return isDefined(principals)
+ ? findAdmittedRecordIds(principals)
: new Set<string>();
},
resolveReadableEvents: async ({
authContext,
events: candidateEvents,
}) => {
- const principal = await this.resolvePrincipalsWithRoles(authContext);
+ const principals = await this.resolvePrincipalsWithRoles(authContext);
- if (!isDefined(principal)) {
+ if (!isDefined(principals)) {
return [];
}
@@ -411,7 +411,7 @@ export class RecordAccessPolicyService {
// A role missing from the cache must not fall through to share or creator admission
if (
- getPermissionsPrincipalRoleIds(principal).some(
+ getPermissionsPrincipalsRoleIds(principals).some(
(roleId) =>
!isDefined(principalMetadataMaps.rolesPermissions[roleId]),
)
@@ -421,10 +421,10 @@ export class RecordAccessPolicyService {
return filterReadableEvents({
events: candidateEvents,
- admittedRecordIds: await findAdmittedRecordIds(principal),
+ admittedRecordIds: await findAdmittedRecordIds(principals),
objectMetadata,
- objectsPermissions: getPermissionsPrincipalObjectsPermissions({
- principal,
+ objectsPermissions: getPermissionsPrincipalsObjectsPermissions({
+ principals,
metadataMaps: principalMetadataMaps,
}),
metadataMaps: principalMetadataMaps,
@@ -466,32 +466,32 @@ export class RecordAccessPolicyService {
private resolvePrincipalsWithRoles(
authContext: PermissionsAuthContext,
): Promise<PermissionsPrincipalsWithRolesContext | undefined> {
- return this.permissionsService.findPrincipalWithRoles(authContext);
+ return this.permissionsService.findPrincipalsWithRoles(authContext);
}
- private findPrincipalMetadataMaps(
- principal: PermissionsPrincipalsWithRolesContext,
+ private findPrincipalsMetadataMaps(
+ principals: PermissionsPrincipalsWithRolesContext,
): Promise<PermissionsMetadataMaps> {
- const cachedMetadataMaps = this.metadataMapsByPrincipal.get(principal);
+ const cachedMetadataMaps = this.metadataMapsByPrincipals.get(principals);
if (isDefined(cachedMetadataMaps)) {
return cachedMetadataMaps;
}
const metadataMaps = this.loadPermissionsMetadataMaps(
- principal.workspaceId,
+ principals.workspaceId,
);
- this.metadataMapsByPrincipal.set(principal, metadataMaps);
+ this.metadataMapsByPrincipals.set(principals, metadataMaps);
return metadataMaps;
}
private findSharedAccessLevelsByObjectMetadataId(
- principal: PermissionsPrincipalsWithRolesContext,
+ principals: PermissionsPrincipalsWithRolesContext,
): Promise<Map<string, RecordShareAccessLevel[]>> {
const cachedSharedAccessLevels =
- this.sharedAccessLevelsByPrincipal.get(principal);
+ this.sharedAccessLevelsByPrincipals.get(principals);
if (isDefined(cachedSharedAccessLevels)) {
return cachedSharedAccessLevels;
@@ -499,11 +499,11 @@ export class RecordAccessPolicyService {
const sharedAccessLevels =
this.recordShareStorageService.findAccessLevelsByObjectMetadataId({
- workspaceId: principal.workspaceId,
- principalIds: getPermissionsPrincipalShareKeys(principal),
+ workspaceId: principals.workspaceId,
+ principalIds: getPermissionsPrincipalsShareKeys(principals),
});
- this.sharedAccessLevelsByPrincipal.set(principal, sharedAccessLevels);
+ this.sharedAccessLevelsByPrincipals.set(principals, sharedAccessLevels);
return sharedAccessLevels;
}
diff --git a/packages/twenty-server/src/engine/permissions/combine/types/row-access-policy.type.ts b/packages/twenty-server/src/engine/permissions/combine/types/row-access-policy.type.ts
index 2a1699a80a6..f3218977382 100644
--- a/packages/twenty-server/src/engine/permissions/combine/types/row-access-policy.type.ts
+++ b/packages/twenty-server/src/engine/permissions/combine/types/row-access-policy.type.ts
@@ -32,7 +32,7 @@ export type PermissionsMetadataMaps = {
};
export type PermissionsRowAccessRequest = {
- principal: PermissionsPrincipalsWithRolesContext;
+ principals: PermissionsPrincipalsWithRolesContext;
metadataMaps: PermissionsMetadataMaps;
flatObjectMetadata: FlatObjectMetadata;
operationType: OperationType;
@@ -41,7 +41,7 @@ export type PermissionsRowAccessRequest = {
export type PermissionsObjectAccessRequest = Pick<
PermissionsRowAccessRequest,
- 'principal' | 'metadataMaps' | 'flatObjectMetadata' | 'operationType'
+ 'principals' | 'metadataMaps' | 'flatObjectMetadata' | 'operationType'
>;
export type RowAccessRecord = { id: string } & Record<string, unknown>;
diff --git a/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/build-permissions-condition.util.spec.ts b/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/build-permissions-condition.util.spec.ts
index 8124e0cf260..67b463c6c54 100644
--- a/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/build-permissions-condition.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/build-permissions-condition.util.spec.ts
@@ -153,16 +153,16 @@ const withoutObjectPermission: PermissionsPrincipalsWithRolesContext = {
};
const build = ({
- principal,
+ principals,
flatObjectMetadata,
policyMetadataMaps = metadataMaps,
}: {
- principal: PermissionsPrincipalsWithRolesContext;
+ principals: PermissionsPrincipalsWithRolesContext;
flatObjectMetadata: FlatObjectMetadata;
policyMetadataMaps?: typeof metadataMaps;
}) =>
buildConditionOutcome({
- principal,
+ principals,
metadataMaps: policyMetadataMaps,
tableAlias: flatObjectMetadata.nameSingular,
flatObjectMetadata,
@@ -170,15 +170,15 @@ const build = ({
});
const gatedSql = ({
- principal,
+ principals,
flatObjectMetadata,
policyMetadataMaps = metadataMaps,
}: {
- principal: PermissionsPrincipalsWithRolesContext;
+ principals: PermissionsPrincipalsWithRolesContext;
flatObjectMetadata: FlatObjectMetadata;
policyMetadataMaps?: typeof metadataMaps;
}): string => {
- const policy = build({ principal, flatObjectMetadata, policyMetadataMaps });
+ const policy = build({ principals, flatObjectMetadata, policyMetadataMaps });
expect(policy.kind).toBe('gated');
@@ -202,11 +202,11 @@ describe('buildPermissionsCondition', () => {
disabledObjectPermissionActions: ['canReadObjectRecords' as const],
};
expect(
- build({ principal: readEverything, flatObjectMetadata: object }),
+ build({ principals: readEverything, flatObjectMetadata: object }),
).toEqual({ kind: 'denied' });
expect(
build({
- principal: owningApplication,
+ principals: owningApplication,
flatObjectMetadata: object,
}),
).toMatchObject({ kind: 'gated' });
@@ -215,7 +215,7 @@ describe('buildPermissionsCondition', () => {
it('keeps private records to their creator and shares once record sharing is enabled', () => {
const company = buildObject({ id: 'company' });
const policy = buildConditionOutcome({
- principal: readEverything,
+ principals: readEverything,
metadataMaps: sharingMetadataMaps,
tableAlias: 'company',
flatObjectMetadata: company,
@@ -235,7 +235,7 @@ describe('buildPermissionsCondition', () => {
it('gates every object on private records once they are enabled, without record sharing', () => {
expect(
gatedSql({
- principal: readEverything,
+ principals: readEverything,
flatObjectMetadata: person,
}),
).toContain('recordShare');
@@ -244,7 +244,7 @@ describe('buildPermissionsCondition', () => {
it('gates a system object on private records too', () => {
expect(
buildConditionOutcome({
- principal: readEverything,
+ principals: readEverything,
metadataMaps: sharingMetadataMaps,
tableAlias: 'note',
flatObjectMetadata: { ...note, isSystem: true },
@@ -256,7 +256,7 @@ describe('buildPermissionsCondition', () => {
it('leaves an object open to inserts when record sharing is enabled', () => {
expect(
buildConditionOutcome({
- principal: readEverything,
+ principals: readEverything,
metadataMaps: sharingMetadataMaps,
tableAlias: 'note',
flatObjectMetadata: note,
@@ -268,11 +268,11 @@ describe('buildPermissionsCondition', () => {
describe('with a record shared beyond the role', () => {
const company = buildObject({ id: 'company' });
const buildForCompany = (
- principal: PermissionsPrincipalsWithRolesContext,
+ principals: PermissionsPrincipalsWithRolesContext,
operationType: 'select' | 'update' | 'delete' = 'select',
) =>
buildConditionOutcome({
- principal,
+ principals,
metadataMaps: sharingMetadataMaps,
tableAlias: 'company',
flatObjectMetadata: company,
@@ -355,7 +355,7 @@ describe('buildPermissionsCondition', () => {
it('denies an object the principal has no permission on', () => {
expect(
build({
- principal: withoutObjectPermission,
+ principals: withoutObjectPermission,
flatObjectMetadata: note,
}),
).toEqual({
@@ -366,7 +366,7 @@ describe('buildPermissionsCondition', () => {
it('gates records on their share rows', () => {
expect(
gatedSql({
- principal: readEverything,
+ principals: readEverything,
flatObjectMetadata: person,
}),
).toContain('"person_recordShare"."recordId" = "person"."id"');
@@ -374,7 +374,7 @@ describe('buildPermissionsCondition', () => {
it('opens private records only to shares naming the member or their roles', () => {
const condition = buildCondition({
- principal: readEverything,
+ principals: readEverything,
metadataMaps,
flatObjectMetadata: person,
operationType: 'select',
@@ -397,7 +397,7 @@ describe('buildPermissionsCondition', () => {
NOTE_FILTER,
);
const sql = gatedSql({
- principal: readEverything,
+ principals: readEverything,
flatObjectMetadata: person,
});
@@ -408,7 +408,7 @@ describe('buildPermissionsCondition', () => {
it('keeps private records gated regardless of the sharing UI flag', () => {
const policy = buildConditionOutcome({
- principal: readEverything,
+ principals: readEverything,
metadataMaps,
tableAlias: 'person',
flatObjectMetadata: person,
@@ -421,7 +421,7 @@ describe('buildPermissionsCondition', () => {
});
describe('with a prospective named share', () => {
const prospectiveShareArguments = {
- principal: readEverything,
+ principals: readEverything,
metadataMaps: sharingMetadataMaps,
tableAlias: person.nameSingular,
flatObjectMetadata: person,
@@ -483,7 +483,7 @@ describe('buildPermissionsCondition', () => {
expect(
buildConditionOutcome({
...prospectiveShareArguments,
- principal: owningApplication,
+ principals: owningApplication,
flatObjectMetadata: {
...person,
disabledObjectPermissionActions: [
@@ -512,13 +512,13 @@ describe('buildPermissionsCondition', () => {
buildConditionOutcome({
...prospectiveShareArguments,
metadataMaps,
- principal: withoutObjectPermission,
+ principals: withoutObjectPermission,
}),
).toEqual({ kind: 'denied' });
expect(
buildConditionOutcome({
...prospectiveShareArguments,
- principal: withoutObjectPermission,
+ principals: withoutObjectPermission,
}),
).toEqual({ kind: 'open' });
});
@@ -545,10 +545,10 @@ describe('buildPermissionsCondition', () => {
}),
};
const buildForCreator = (
- principal: PermissionsPrincipalsWithRolesContext,
+ principals: PermissionsPrincipalsWithRolesContext,
) =>
buildConditionOutcome({
- principal,
+ principals,
metadataMaps: creatorMetadataMaps,
tableAlias: 'company',
flatObjectMetadata: company,
diff --git a/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/find-permissions-admitted-record-ids.util.spec.ts b/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/find-permissions-admitted-record-ids.util.spec.ts
index 544da4b112f..8fdda09f38e 100644
--- a/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/find-permissions-admitted-record-ids.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/find-permissions-admitted-record-ids.util.spec.ts
@@ -99,14 +99,14 @@ const fullAccess = {
rowLevelPermissionPredicateGroups: [],
};
-const rolePrincipal: PermissionsPrincipalsWithRolesContext = {
+const rolePrincipals: PermissionsPrincipalsWithRolesContext = {
workspaceId: 'workspace-id',
mainPrincipal: { type: 'deprecatedRoleOnly', roleId: MEMBER_ROLE_ID },
applicationPrincipal: { type: 'customApplication' },
};
-const memberPrincipal: PermissionsPrincipalsWithRolesContext = {
- ...rolePrincipal,
+const memberPrincipals: PermissionsPrincipalsWithRolesContext = {
+ ...rolePrincipals,
mainPrincipal: {
type: 'workspaceMember',
roleId: MEMBER_ROLE_ID,
@@ -115,8 +115,8 @@ const memberPrincipal: PermissionsPrincipalsWithRolesContext = {
applicationPrincipal: { type: 'customApplication' },
};
-const deniedPrincipal: PermissionsPrincipalsWithRolesContext = {
- ...memberPrincipal,
+const deniedPrincipals: PermissionsPrincipalsWithRolesContext = {
+ ...memberPrincipals,
mainPrincipal: {
type: 'workspaceMember',
roleId: 'missing-role',
@@ -141,16 +141,16 @@ const buildContext = (): RowAccessEvaluationContext => ({
});
const findAdmitted = ({
- principal,
+ principals,
featureFlagKeys = [],
context = buildContext(),
}: {
- principal: PermissionsPrincipalsWithRolesContext;
+ principals: PermissionsPrincipalsWithRolesContext;
featureFlagKeys?: FeatureFlagKey[];
context?: RowAccessEvaluationContext;
}) =>
findPermissionsAdmittedRecordIds({
- principal,
+ principals,
metadataMaps: {
flatFieldMetadataMaps,
flatObjectMetadataMaps: createEmptyFlatEntityMaps(),
@@ -176,13 +176,13 @@ describe('findPermissionsAdmittedRecordIds', () => {
});
it('admits no record to a role without access', async () => {
- expect(await findAdmitted({ principal: deniedPrincipal })).toEqual(
+ expect(await findAdmitted({ principals: deniedPrincipals })).toEqual(
new Set(),
);
});
it('keeps the role to public records, treating a record it cannot find as public', async () => {
- expect(await findAdmitted({ principal: rolePrincipal })).toEqual(
+ expect(await findAdmitted({ principals: rolePrincipals })).toEqual(
new Set(['active-shared', 'archived-shared']),
);
});
@@ -190,7 +190,7 @@ describe('findPermissionsAdmittedRecordIds', () => {
it('matches the role filter on public record values', async () => {
filterByStatus('active');
- expect(await findAdmitted({ principal: rolePrincipal })).toEqual(
+ expect(await findAdmitted({ principals: rolePrincipals })).toEqual(
new Set(['active-shared']),
);
});
@@ -198,7 +198,7 @@ describe('findPermissionsAdmittedRecordIds', () => {
it('admits records shared with or created by the member beyond the role', async () => {
expect(
await findAdmitted({
- principal: deniedPrincipal,
+ principals: deniedPrincipals,
featureFlagKeys: [FeatureFlagKey.IS_RECORD_LEVEL_SHARING_ENABLED],
}),
).toEqual(new Set(['active-shared', 'active-private', 'archived-shared']));
@@ -207,13 +207,13 @@ describe('findPermissionsAdmittedRecordIds', () => {
it('admits private records to their creator within the role filter', async () => {
filterByStatus('none');
- expect(await findAdmitted({ principal: memberPrincipal })).toEqual(
+ expect(await findAdmitted({ principals: memberPrincipals })).toEqual(
new Set(),
);
filterByStatus('active');
- expect(await findAdmitted({ principal: memberPrincipal })).toEqual(
+ expect(await findAdmitted({ principals: memberPrincipals })).toEqual(
new Set(['active-shared', 'active-private']),
);
});
@@ -225,7 +225,7 @@ describe('findPermissionsAdmittedRecordIds', () => {
expect(
await findAdmitted({
- principal: memberPrincipal,
+ principals: memberPrincipals,
featureFlagKeys: [FeatureFlagKey.IS_RECORD_LEVEL_SHARING_ENABLED],
context,
}),
diff --git a/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/has-access-to-all-records.util.spec.ts b/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/has-access-to-all-records.util.spec.ts
index ccfbece15d8..672afe721fb 100644
--- a/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/has-access-to-all-records.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/has-access-to-all-records.util.spec.ts
@@ -40,7 +40,7 @@ const readOnlyPermissions: ObjectPermissions = {
rowLevelPermissionPredicateGroups: [],
};
-const buildPrincipal = (
+const buildPrincipals = (
roleId: string,
): PermissionsPrincipalsWithRolesContext => {
const applicationId = APPLICATION_ID_BY_ROLE_ID[roleId];
@@ -74,7 +74,7 @@ const hasAccess = ({
disabledObjectPermissionActions?: typeof flatObjectMetadata.disabledObjectPermissionActions;
}) => {
const request: PermissionsObjectAccessRequest = {
- principal: buildPrincipal(roleId),
+ principals: buildPrincipals(roleId),
metadataMaps: {
flatFieldMetadataMaps: createEmptyFlatEntityMaps(),
flatObjectMetadataMaps: createEmptyFlatEntityMaps(),
diff --git a/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/resolve-permissions-row-access-outcome.util.spec.ts b/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/resolve-permissions-row-access-outcome.util.spec.ts
index 09cca6fda34..aa095712e64 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
@@ -33,13 +33,13 @@ const readOnlyPermissions: ObjectPermissions = {
rowLevelPermissionPredicateGroups: [],
};
-const readOnlyPrincipal: PermissionsPrincipalsWithRolesContext = {
+const readOnlyPrincipals: PermissionsPrincipalsWithRolesContext = {
workspaceId: 'workspace-id',
mainPrincipal: { type: 'deprecatedRoleOnly', roleId: READ_ONLY_ROLE_ID },
applicationPrincipal: { type: 'customApplication' },
};
-const owningApplicationPrincipal: PermissionsPrincipalsWithRolesContext = {
+const owningApplicationPrincipals: PermissionsPrincipalsWithRolesContext = {
workspaceId: 'workspace-id',
mainPrincipal: {
type: 'application',
@@ -54,20 +54,20 @@ const owningApplicationPrincipal: PermissionsPrincipalsWithRolesContext = {
};
const resolveOutcome = ({
- principal = readOnlyPrincipal,
+ principals = readOnlyPrincipals,
operationType = 'select',
featureFlagKeys = [],
disabledObjectPermissionActions = [],
hypotheticalRecordShareAccessLevel,
}: {
- principal?: PermissionsPrincipalsWithRolesContext;
+ principals?: PermissionsPrincipalsWithRolesContext;
operationType?: OperationType;
featureFlagKeys?: FeatureFlagKey[];
disabledObjectPermissionActions?: typeof flatObjectMetadata.disabledObjectPermissionActions;
hypotheticalRecordShareAccessLevel?: PermissionsRowAccessRequest['hypotheticalRecordShareAccessLevel'];
}) =>
resolvePermissionsRowAccessOutcome({
- principal,
+ principals,
metadataMaps: {
flatFieldMetadataMaps: createEmptyFlatEntityMaps(),
flatObjectMetadataMaps: createEmptyFlatEntityMaps(),
@@ -109,8 +109,8 @@ describe('resolvePermissionsRowAccessOutcome', () => {
expect(resolveOutcome({ operationType: 'update' })).toBe(false);
expect(
resolveOutcome({
- principal: {
- ...readOnlyPrincipal,
+ principals: {
+ ...readOnlyPrincipals,
mainPrincipal: { type: 'deprecatedRoleOnly', roleId: 'missing-role' },
applicationPrincipal: { type: 'customApplication' },
},
@@ -132,7 +132,7 @@ describe('resolvePermissionsRowAccessOutcome', () => {
).toBe(false);
expect(
resolveOutcome({
- principal: owningApplicationPrincipal,
+ principals: owningApplicationPrincipals,
disabledObjectPermissionActions: ['canReadObjectRecords'],
}),
).toBeUndefined();
@@ -155,12 +155,12 @@ describe('resolvePermissionsRowAccessOutcome', () => {
});
describe('for a principal narrowed by a scope', () => {
- const scopedPrincipal = ({
+ const scopedPrincipals = ({
canReadObjectRecords,
}: {
canReadObjectRecords: boolean;
}): PermissionsPrincipalsWithRolesContext => ({
- ...readOnlyPrincipal,
+ ...readOnlyPrincipals,
aiRunScope: {
objectsPermissions: {
[flatObjectMetadata.id]: {
@@ -175,26 +175,30 @@ describe('resolvePermissionsRowAccessOutcome', () => {
it('denies what the scope denies, though the role permits it', () => {
expect(
resolveOutcome({
- principal: scopedPrincipal({ canReadObjectRecords: false }),
+ principals: scopedPrincipals({ canReadObjectRecords: false }),
}),
).toBe(false);
expect(
resolveOutcome({
- principal: scopedPrincipal({ canReadObjectRecords: true }),
+ principals: scopedPrincipals({ canReadObjectRecords: true }),
}),
).toBeUndefined();
});
it('never lets a share carry it beyond its roles', () => {
- const principal = scopedPrincipal({ canReadObjectRecords: true });
+ const principals = scopedPrincipals({ canReadObjectRecords: true });
const featureFlagKeys = [FeatureFlagKey.IS_RECORD_LEVEL_SHARING_ENABLED];
expect(
- resolveOutcome({ principal, operationType: 'update', featureFlagKeys }),
+ resolveOutcome({
+ principals,
+ operationType: 'update',
+ featureFlagKeys,
+ }),
).toBe(false);
expect(
resolveOutcome({
- principal,
+ principals,
operationType: 'update',
featureFlagKeys,
hypotheticalRecordShareAccessLevel: RecordShareAccessLevel.READ_WRITE,
diff --git a/packages/twenty-server/src/engine/permissions/combine/utils/are-record-grants-held-to-row-level-permissions.util.ts b/packages/twenty-server/src/engine/permissions/combine/utils/are-record-grants-held-to-row-level-permissions.util.ts
index 4dd69cab4fb..59c7dc142cd 100644
--- a/packages/twenty-server/src/engine/permissions/combine/utils/are-record-grants-held-to-row-level-permissions.util.ts
+++ b/packages/twenty-server/src/engine/permissions/combine/utils/are-record-grants-held-to-row-level-permissions.util.ts
@@ -1,8 +1,8 @@
/* @license Enterprise */
import { type PermissionsRowAccessRequest } from 'src/engine/permissions/combine/types/row-access-policy.type';
-import { isOperationGrantedBeyondRoleToPrincipal } from 'src/engine/permissions/record-share/utils/is-operation-granted-beyond-role-to-principal.util';
+import { isOperationGrantedBeyondRoleToPrincipals } from 'src/engine/permissions/record-share/utils/is-operation-granted-beyond-role-to-principals.util';
export const areRecordGrantsHeldToRowLevelPermissions = (
request: PermissionsRowAccessRequest,
-): boolean => !isOperationGrantedBeyondRoleToPrincipal(request);
+): boolean => !isOperationGrantedBeyondRoleToPrincipals(request);
diff --git a/packages/twenty-server/src/engine/permissions/combine/utils/has-access-to-all-records.util.ts b/packages/twenty-server/src/engine/permissions/combine/utils/has-access-to-all-records.util.ts
index c82964190d8..520fe529d5c 100644
--- a/packages/twenty-server/src/engine/permissions/combine/utils/has-access-to-all-records.util.ts
+++ b/packages/twenty-server/src/engine/permissions/combine/utils/has-access-to-all-records.util.ts
@@ -4,13 +4,13 @@ import { isDefined } from 'twenty-shared/utils';
import { type PermissionsObjectAccessRequest } from 'src/engine/permissions/combine/types/row-access-policy.type';
import { resolveRowLevelPermissionRecordFilter } from 'src/engine/permissions/rls/utils/resolve-row-level-permission-record-filter.util';
-import { isObjectOperationDisabledToPrincipal } from 'src/engine/permissions/role/utils/is-object-operation-disabled-to-principal.util';
+import { isObjectOperationDisabledToPrincipals } from 'src/engine/permissions/role/utils/is-object-operation-disabled-to-principals.util';
import { isRolePermittingOperation } from 'src/engine/permissions/role/utils/is-role-permitting-operation.util';
// Private records are never covered: only their creator and shares reach them
export const hasAccessToAllRecords = (
request: PermissionsObjectAccessRequest,
): boolean =>
- !isObjectOperationDisabledToPrincipal(request) &&
+ !isObjectOperationDisabledToPrincipals(request) &&
isRolePermittingOperation(request) &&
!isDefined(resolveRowLevelPermissionRecordFilter(request));
diff --git a/packages/twenty-server/src/engine/permissions/combine/utils/resolve-permissions-row-access-outcome.util.ts b/packages/twenty-server/src/engine/permissions/combine/utils/resolve-permissions-row-access-outcome.util.ts
index 2ba5d94e280..65e006cce46 100644
--- a/packages/twenty-server/src/engine/permissions/combine/utils/resolve-permissions-row-access-outcome.util.ts
+++ b/packages/twenty-server/src/engine/permissions/combine/utils/resolve-permissions-row-access-outcome.util.ts
@@ -2,22 +2,22 @@
import { type PermissionsRowAccessRequest } from 'src/engine/permissions/combine/types/row-access-policy.type';
import { hasHypotheticalRecordShare } from 'src/engine/permissions/record-share/utils/has-hypothetical-record-share.util';
-import { isOperationGrantedBeyondRoleToPrincipal } from 'src/engine/permissions/record-share/utils/is-operation-granted-beyond-role-to-principal.util';
-import { isObjectOperationDeniedToPrincipal } from 'src/engine/permissions/role/utils/is-object-operation-denied-to-principal.util';
-import { isObjectOperationDisabledToPrincipal } from 'src/engine/permissions/role/utils/is-object-operation-disabled-to-principal.util';
+import { isOperationGrantedBeyondRoleToPrincipals } from 'src/engine/permissions/record-share/utils/is-operation-granted-beyond-role-to-principals.util';
+import { isObjectOperationDeniedToPrincipals } from 'src/engine/permissions/role/utils/is-object-operation-denied-to-principals.util';
+import { isObjectOperationDisabledToPrincipals } from 'src/engine/permissions/role/utils/is-object-operation-disabled-to-principals.util';
export const resolvePermissionsRowAccessOutcome = (
request: PermissionsRowAccessRequest,
): boolean | undefined => {
if (
- isObjectOperationDisabledToPrincipal(request) ||
- isObjectOperationDeniedToPrincipal(request)
+ isObjectOperationDisabledToPrincipals(request) ||
+ isObjectOperationDeniedToPrincipals(request)
) {
return false;
}
if (
- isOperationGrantedBeyondRoleToPrincipal(request) &&
+ isOperationGrantedBeyondRoleToPrincipals(request) &&
hasHypotheticalRecordShare(request)
) {
return true;
diff --git a/packages/twenty-server/src/engine/permissions/permissions.service.ts b/packages/twenty-server/src/engine/permissions/permissions.service.ts
index 75bc3d4f4b3..f9482d6321c 100644
--- a/packages/twenty-server/src/engine/permissions/permissions.service.ts
+++ b/packages/twenty-server/src/engine/permissions/permissions.service.ts
@@ -27,13 +27,13 @@ import { type UserWorkspaceRoleMap } from 'src/engine/metadata-modules/role-targ
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 PermissionsAuthContext } from 'src/engine/permissions/principal/types/permissions-auth-context.type';
-import { getPermissionsPrincipalRoleIds } from 'src/engine/permissions/principal/utils/get-permissions-principal-role-ids.util';
+import { getPermissionsPrincipalsRoleIds } from 'src/engine/permissions/principal/utils/get-permissions-principals-role-ids.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 { canAuthContextHoldRoles } from 'src/engine/permissions/principal/utils/can-auth-context-hold-roles.util';
-import { buildPermissionsPrincipalRoleMaps } from 'src/engine/permissions/principal/utils/build-permissions-principal-role-maps.util';
+import { buildPermissionsPrincipalsRoleMaps } from 'src/engine/permissions/principal/utils/build-permissions-principals-role-maps.util';
import {
- type PermissionsPrincipalRoleMaps,
+ type PermissionsPrincipalsRoleMaps,
resolvePermissionsPrincipalsWithRoles,
} from 'src/engine/permissions/principal/utils/resolve-permissions-principals-with-roles.util';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
@@ -90,7 +90,7 @@ export class PermissionsService {
return {
permissionFlags,
objectsPermissions: computeObjectsPermissionsForRoles({
- principal: {
+ principals: {
mainPrincipal: { type: 'deprecatedRoleOnly', roleId: flatRole.id },
applicationPrincipal: { type: 'customApplication' },
},
@@ -176,25 +176,25 @@ export class PermissionsService {
return true;
}
- const principal = await this.findPrincipalWithRoles(authContext);
+ const principals = await this.findPrincipalsWithRoles(authContext);
- if (!isDefined(principal)) {
+ if (!isDefined(principals)) {
return false;
}
const { flatRoleMaps, flatRolePermissionFlagMaps } =
- await this.workspaceCacheService.getOrRecompute(principal.workspaceId, [
+ await this.workspaceCacheService.getOrRecompute(principals.workspaceId, [
'flatRoleMaps',
'flatRolePermissionFlagMaps',
]);
- const { aiRunScope } = principal;
+ const { aiRunScope } = principals;
return (
(!isDefined(aiRunScope) ||
(aiRunScope.permissionFlags[setting] ?? false)) &&
this.isPermissionFlagGrantedToRoles({
- roleIds: getPermissionsPrincipalRoleIds(principal),
+ roleIds: getPermissionsPrincipalsRoleIds(principals),
setting,
flatRoleMaps,
flatRolePermissionFlagMaps,
@@ -210,14 +210,14 @@ export class PermissionsService {
return [];
}
- const principal = await this.findPrincipalWithRoles(authContext);
+ const principals = await this.findPrincipalsWithRoles(authContext);
- return isDefined(principal)
- ? getPermissionsPrincipalRoleIds(principal)
+ return isDefined(principals)
+ ? getPermissionsPrincipalsRoleIds(principals)
: [];
}
- public async findPrincipalWithRoles(
+ public async findPrincipalsWithRoles(
authContext: PermissionsAuthContext,
): Promise<PermissionsPrincipalsWithRolesContext | undefined> {
if (!canAuthContextHoldRoles(authContext)) {
@@ -232,7 +232,7 @@ export class PermissionsService {
private async loadPrincipalRoleMaps(
authContext: Pick<PermissionsAuthContext, 'type' | 'workspace'>,
- ): Promise<PermissionsPrincipalRoleMaps> {
+ ): Promise<PermissionsPrincipalsRoleMaps> {
const workspaceId = authContext.workspace.id;
const {
userWorkspaceRoleMap,
@@ -247,7 +247,7 @@ export class PermissionsService {
]);
return {
- ...buildPermissionsPrincipalRoleMaps({
+ ...buildPermissionsPrincipalsRoleMaps({
flatWorkspaceMemberMaps:
await this.loadFlatWorkspaceMemberMaps(authContext),
userWorkspaceRoleMap,
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/get-permissions-principal-acting-application-id.util.spec.ts b/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/get-permissions-principals-acting-application-id.util.spec.ts
similarity index 81%
rename from packages/twenty-server/src/engine/permissions/principal/utils/__tests__/get-permissions-principal-acting-application-id.util.spec.ts
rename to packages/twenty-server/src/engine/permissions/principal/utils/__tests__/get-permissions-principals-acting-application-id.util.spec.ts
index 02ea8439b7b..10b74c34ea9 100644
--- a/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/get-permissions-principal-acting-application-id.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/get-permissions-principals-acting-application-id.util.spec.ts
@@ -1,5 +1,5 @@
import { type ApplicationDefaultRoleMaps } from 'src/engine/permissions/principal/types/application-default-role-maps.type';
-import { getPermissionsPrincipalActingApplicationId } from 'src/engine/permissions/principal/utils/get-permissions-principal-acting-application-id.util';
+import { getPermissionsPrincipalsActingApplicationId } from 'src/engine/permissions/principal/utils/get-permissions-principals-acting-application-id.util';
const APPLICATION_ID = 'application-1';
const APPLICATION_ROLE_ID = 'application-role';
@@ -14,11 +14,11 @@ const flatApplicationMaps: ApplicationDefaultRoleMaps = {
},
};
-describe('getPermissionsPrincipalActingApplicationId', () => {
+describe('getPermissionsPrincipalsActingApplicationId', () => {
it('returns the application a member acts through', () => {
expect(
- getPermissionsPrincipalActingApplicationId({
- principal: {
+ getPermissionsPrincipalsActingApplicationId({
+ principals: {
mainPrincipal: {
type: 'workspaceMember',
roleId: 'user-role',
@@ -37,8 +37,8 @@ describe('getPermissionsPrincipalActingApplicationId', () => {
it('returns the application acting alone', () => {
expect(
- getPermissionsPrincipalActingApplicationId({
- principal: {
+ getPermissionsPrincipalsActingApplicationId({
+ principals: {
mainPrincipal: {
type: 'application',
roleId: APPLICATION_ROLE_ID,
@@ -57,8 +57,8 @@ describe('getPermissionsPrincipalActingApplicationId', () => {
it('looks up the application of a deprecated role-only app', () => {
expect(
- getPermissionsPrincipalActingApplicationId({
- principal: {
+ getPermissionsPrincipalsActingApplicationId({
+ principals: {
mainPrincipal: { type: 'deprecatedRoleOnly', roleId: 'user-role' },
applicationPrincipal: {
type: 'deprecatedRoleOnly',
@@ -72,8 +72,8 @@ describe('getPermissionsPrincipalActingApplicationId', () => {
it('keeps the owning application of a role-only application config', () => {
expect(
- getPermissionsPrincipalActingApplicationId({
- principal: {
+ getPermissionsPrincipalsActingApplicationId({
+ principals: {
mainPrincipal: {
type: 'deprecatedRoleOnly',
roleId: APPLICATION_ROLE_ID,
@@ -90,8 +90,8 @@ describe('getPermissionsPrincipalActingApplicationId', () => {
it('ignores an app role the member also holds', () => {
expect(
- getPermissionsPrincipalActingApplicationId({
- principal: {
+ getPermissionsPrincipalsActingApplicationId({
+ principals: {
mainPrincipal: {
type: 'workspaceMember',
roleId: APPLICATION_ROLE_ID,
@@ -110,8 +110,8 @@ describe('getPermissionsPrincipalActingApplicationId', () => {
it('ignores the custom app', () => {
expect(
- getPermissionsPrincipalActingApplicationId({
- principal: {
+ getPermissionsPrincipalsActingApplicationId({
+ principals: {
mainPrincipal: {
type: 'workspaceMember',
roleId: 'user-role',
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/get-permissions-principal-role-ids.util.spec.ts b/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/get-permissions-principals-role-ids.util.spec.ts
similarity index 77%
rename from packages/twenty-server/src/engine/permissions/principal/utils/__tests__/get-permissions-principal-role-ids.util.spec.ts
rename to packages/twenty-server/src/engine/permissions/principal/utils/__tests__/get-permissions-principals-role-ids.util.spec.ts
index 91a97c2e814..70190e074a1 100644
--- a/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/get-permissions-principal-role-ids.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/get-permissions-principals-role-ids.util.spec.ts
@@ -1,9 +1,9 @@
-import { getPermissionsPrincipalRoleIds } from 'src/engine/permissions/principal/utils/get-permissions-principal-role-ids.util';
+import { getPermissionsPrincipalsRoleIds } from 'src/engine/permissions/principal/utils/get-permissions-principals-role-ids.util';
-describe('getPermissionsPrincipalRoleIds', () => {
+describe('getPermissionsPrincipalsRoleIds', () => {
it('lists the limiting role first and drops duplicates', () => {
expect(
- getPermissionsPrincipalRoleIds({
+ getPermissionsPrincipalsRoleIds({
mainPrincipal: {
type: 'workspaceMember',
roleId: 'user-role',
@@ -25,7 +25,7 @@ describe('getPermissionsPrincipalRoleIds', () => {
it('leaves the custom app out of the intersection', () => {
expect(
- getPermissionsPrincipalRoleIds({
+ getPermissionsPrincipalsRoleIds({
mainPrincipal: {
type: 'workspaceMember',
roleId: 'user-role',
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-principals-role-maps.util.ts
similarity index 70%
rename from packages/twenty-server/src/engine/permissions/principal/utils/build-permissions-principal-role-maps.util.ts
rename to packages/twenty-server/src/engine/permissions/principal/utils/build-permissions-principals-role-maps.util.ts
index d46a91f00b5..4f16cfb3bd4 100644
--- 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-principals-role-maps.util.ts
@@ -1,22 +1,22 @@
/* @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';
+import { type PermissionsPrincipalsRoleMaps } from 'src/engine/permissions/principal/utils/resolve-permissions-principals-with-roles.util';
const EMPTY_WORKSPACE_MEMBER_MAPS = { byId: {}, userWorkspaceIdByUserId: {} };
-export const buildPermissionsPrincipalRoleMaps = ({
+export const buildPermissionsPrincipalsRoleMaps = ({
flatWorkspaceMemberMaps,
userWorkspaceRoleMap,
apiKeyRoleMap,
flatRoleTargetByAgentIdMaps,
flatApplicationMaps,
}: Omit<
- PermissionsPrincipalRoleMaps,
+ PermissionsPrincipalsRoleMaps,
'flatWorkspaceMemberMaps' | 'flatRoleTargetMaps'
> & {
flatWorkspaceMemberMaps?: FlatWorkspaceMemberMaps;
-}): PermissionsPrincipalRoleMaps => ({
+}): PermissionsPrincipalsRoleMaps => ({
flatWorkspaceMemberMaps:
flatWorkspaceMemberMaps ?? EMPTY_WORKSPACE_MEMBER_MAPS,
userWorkspaceRoleMap,
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principal-share-keys.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principal-share-keys.util.ts
deleted file mode 100644
index e7beb3e9fbc..00000000000
--- a/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principal-share-keys.util.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/* @license Enterprise */
-
-import { isDefined } from 'twenty-shared/utils';
-
-import { type PermissionsPrincipalsWithRolesContext } from 'src/engine/permissions/principal/types/permissions-principals-with-roles-context.type';
-import { getPermissionsPrincipalRoleIds } from 'src/engine/permissions/principal/utils/get-permissions-principal-role-ids.util';
-import { getPermissionsPrincipalWorkspaceMemberId } from 'src/engine/permissions/principal/utils/get-permissions-principal-workspace-member-id.util';
-
-export const getPermissionsPrincipalShareKeys = (
- principal: PermissionsPrincipalsWithRolesContext,
-): string[] => [
- ...new Set(
- [
- getPermissionsPrincipalWorkspaceMemberId(principal),
- ...getPermissionsPrincipalRoleIds(principal),
- ].filter(isDefined),
- ),
-];
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principal-workspace-member-id.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principal-workspace-member-id.util.ts
deleted file mode 100644
index f06c260d25c..00000000000
--- a/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principal-workspace-member-id.util.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/* @license Enterprise */
-
-import { type PermissionsPrincipalsWithRolesContext } from 'src/engine/permissions/principal/types/permissions-principals-with-roles-context.type';
-
-export const getPermissionsPrincipalWorkspaceMemberId = (
- principal: Pick<PermissionsPrincipalsWithRolesContext, 'mainPrincipal'>,
-): string | undefined =>
- principal.mainPrincipal.type === 'workspaceMember'
- ? principal.mainPrincipal.workspaceMemberId
- : undefined;
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principal-acting-application-id.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principals-acting-application-id.util.ts
similarity index 80%
rename from packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principal-acting-application-id.util.ts
rename to packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principals-acting-application-id.util.ts
index 49ed8ce18dc..d0501b55a08 100644
--- a/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principal-acting-application-id.util.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principals-acting-application-id.util.ts
@@ -4,19 +4,20 @@ import { isDefined } from 'twenty-shared/utils';
import { type ApplicationDefaultRoleMaps } from 'src/engine/permissions/principal/types/application-default-role-maps.type';
import { type PermissionsPrincipalsWithRolesContext } from 'src/engine/permissions/principal/types/permissions-principals-with-roles-context.type';
+import { isPermissionMainPrincipalWorkspaceMember } from 'src/engine/permissions/principal/utils/is-permission-main-principal-workspace-member.util';
// TODO(@charlesBochet): members hold Admin, the Standard app's default role (#28667); simplify once they no longer do
-export const getPermissionsPrincipalActingApplicationId = ({
- principal,
+export const getPermissionsPrincipalsActingApplicationId = ({
+ principals,
flatApplicationMaps,
}: {
- principal: Pick<
+ principals: Pick<
PermissionsPrincipalsWithRolesContext,
'mainPrincipal' | 'limitingPrincipal' | 'applicationPrincipal'
>;
flatApplicationMaps: ApplicationDefaultRoleMaps;
}): string | undefined => {
- const { mainPrincipal, limitingPrincipal, applicationPrincipal } = principal;
+ const { mainPrincipal, limitingPrincipal, applicationPrincipal } = principals;
if (mainPrincipal.type === 'application') {
return mainPrincipal.applicationId;
@@ -24,7 +25,7 @@ export const getPermissionsPrincipalActingApplicationId = ({
if (
applicationPrincipal.type === 'customApplication' ||
- (mainPrincipal.type === 'workspaceMember' &&
+ (isPermissionMainPrincipalWorkspaceMember(mainPrincipal) &&
applicationPrincipal.roleId === mainPrincipal.roleId) ||
applicationPrincipal.roleId === limitingPrincipal?.roleId
) {
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principal-role-ids.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principals-role-ids.util.ts
similarity index 61%
rename from packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principal-role-ids.util.ts
rename to packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principals-role-ids.util.ts
index efaeb2ba68d..6d843771f09 100644
--- a/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principal-role-ids.util.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principals-role-ids.util.ts
@@ -4,19 +4,19 @@ import { isDefined } from 'twenty-shared/utils';
import { type PermissionsPrincipalsWithRolesContext } from 'src/engine/permissions/principal/types/permissions-principals-with-roles-context.type';
-export const getPermissionsPrincipalRoleIds = (
- principal: Pick<
+export const getPermissionsPrincipalsRoleIds = (
+ principals: Pick<
PermissionsPrincipalsWithRolesContext,
'mainPrincipal' | 'limitingPrincipal' | 'applicationPrincipal'
>,
): string[] => [
...new Set(
[
- principal.limitingPrincipal?.roleId,
- principal.mainPrincipal.roleId,
- principal.applicationPrincipal.type === 'customApplication'
+ principals.limitingPrincipal?.roleId,
+ principals.mainPrincipal.roleId,
+ principals.applicationPrincipal.type === 'customApplication'
? undefined
- : principal.applicationPrincipal.roleId,
+ : principals.applicationPrincipal.roleId,
].filter(isDefined),
),
];
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principals-share-keys.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principals-share-keys.util.ts
new file mode 100644
index 00000000000..a10a7f8ae82
--- /dev/null
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principals-share-keys.util.ts
@@ -0,0 +1,20 @@
+/* @license Enterprise */
+
+import { isDefined } from 'twenty-shared/utils';
+
+import { type PermissionsPrincipalsWithRolesContext } from 'src/engine/permissions/principal/types/permissions-principals-with-roles-context.type';
+import { getPermissionsPrincipalsRoleIds } from 'src/engine/permissions/principal/utils/get-permissions-principals-role-ids.util';
+import { isPermissionMainPrincipalWorkspaceMember } from 'src/engine/permissions/principal/utils/is-permission-main-principal-workspace-member.util';
+
+export const getPermissionsPrincipalsShareKeys = (
+ principals: PermissionsPrincipalsWithRolesContext,
+): string[] => [
+ ...new Set(
+ [
+ isPermissionMainPrincipalWorkspaceMember(principals.mainPrincipal)
+ ? principals.mainPrincipal.workspaceMemberId
+ : undefined,
+ ...getPermissionsPrincipalsRoleIds(principals),
+ ].filter(isDefined),
+ ),
+];
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/is-permission-main-principal-workspace-member.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/is-permission-main-principal-workspace-member.util.ts
new file mode 100644
index 00000000000..d0684fdd3cc
--- /dev/null
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/is-permission-main-principal-workspace-member.util.ts
@@ -0,0 +1,10 @@
+/* @license Enterprise */
+
+import { type PermissionsMainPrincipal } from 'src/engine/permissions/principal/types/permissions-principal.type';
+
+export const isPermissionMainPrincipalWorkspaceMember = <
+ TMainPrincipal extends PermissionsMainPrincipal,
+>(
+ mainPrincipal: TMainPrincipal,
+): mainPrincipal is Extract<TMainPrincipal, { type: 'workspaceMember' }> =>
+ mainPrincipal.type === 'workspaceMember';
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/is-permissions-principal-owning-object.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/is-permissions-principals-owning-object.util.ts
similarity index 73%
rename from packages/twenty-server/src/engine/permissions/principal/utils/is-permissions-principal-owning-object.util.ts
rename to packages/twenty-server/src/engine/permissions/principal/utils/is-permissions-principals-owning-object.util.ts
index 1d7ca604922..8c18a233269 100644
--- a/packages/twenty-server/src/engine/permissions/principal/utils/is-permissions-principal-owning-object.util.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/is-permissions-principals-owning-object.util.ts
@@ -5,22 +5,22 @@ import { isDefined } from 'twenty-shared/utils';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { type ApplicationDefaultRoleMaps } from 'src/engine/permissions/principal/types/application-default-role-maps.type';
import { type PermissionsPrincipalsWithRolesContext } from 'src/engine/permissions/principal/types/permissions-principals-with-roles-context.type';
-import { getPermissionsPrincipalActingApplicationId } from 'src/engine/permissions/principal/utils/get-permissions-principal-acting-application-id.util';
+import { getPermissionsPrincipalsActingApplicationId } from 'src/engine/permissions/principal/utils/get-permissions-principals-acting-application-id.util';
-export const isPermissionsPrincipalOwningObject = ({
- principal,
+export const isPermissionsPrincipalsOwningObject = ({
+ principals,
flatObjectMetadata,
flatApplicationMaps,
}: {
- principal: Pick<
+ principals: Pick<
PermissionsPrincipalsWithRolesContext,
'mainPrincipal' | 'limitingPrincipal' | 'applicationPrincipal'
>;
flatObjectMetadata: Pick<FlatObjectMetadata, 'applicationId'>;
flatApplicationMaps: ApplicationDefaultRoleMaps;
}): boolean => {
- const actingApplicationId = getPermissionsPrincipalActingApplicationId({
- principal,
+ const actingApplicationId = getPermissionsPrincipalsActingApplicationId({
+ principals,
flatApplicationMaps,
});
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 14d74a2fec4..544674fa156 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,8 +23,9 @@ import { type FlatWorkspaceMemberMaps } from 'src/engine/core-modules/user/types
import { type FlatRoleTarget } from 'src/engine/metadata-modules/flat-role-target/types/flat-role-target.type';
import { type AllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-maps.type';
import { type UserWorkspaceRoleMap } from 'src/engine/metadata-modules/role-target/types/user-workspace-role-map.type';
+import { isPermissionMainPrincipalWorkspaceMember } from 'src/engine/permissions/principal/utils/is-permission-main-principal-workspace-member.util';
-export type PermissionsPrincipalRoleMaps = {
+export type PermissionsPrincipalsRoleMaps = {
flatWorkspaceMemberMaps: {
byId: Partial<Record<string, Pick<FlatWorkspaceMember, 'userId'>>>;
userWorkspaceIdByUserId: FlatWorkspaceMemberMaps['userWorkspaceIdByUserId'];
@@ -54,7 +55,7 @@ const findWorkspaceMemberRoleId = ({
}: {
workspaceMemberId: string;
roleMaps: Pick<
- PermissionsPrincipalRoleMaps,
+ PermissionsPrincipalsRoleMaps,
'flatWorkspaceMemberMaps' | 'userWorkspaceRoleMap'
>;
}): string | undefined => {
@@ -74,7 +75,7 @@ const findMainPrincipalRoleId = ({
roleMaps,
}: {
mainPrincipal: PermissionsMainPrincipal;
- roleMaps: PermissionsPrincipalRoleMaps;
+ roleMaps: PermissionsPrincipalsRoleMaps;
}): string | undefined => {
switch (mainPrincipal.type) {
case 'deprecatedRoleOnly':
@@ -113,7 +114,7 @@ const resolveLimitingPrincipal = ({
roleMaps,
}: {
limitingPrincipal: PermissionsLimitingPrincipal;
- roleMaps: PermissionsPrincipalRoleMaps;
+ roleMaps: PermissionsPrincipalsRoleMaps;
}): PermissionsLimitingPrincipalWithRole | undefined => {
if (limitingPrincipal.type === 'deprecatedRoleOnly') {
return limitingPrincipal;
@@ -134,7 +135,7 @@ const resolveApplicationPrincipal = ({
}: {
applicationPrincipal: PermissionsApplicationPrincipal;
mainPrincipal: PermissionsMainPrincipalWithRole;
- roleMaps: PermissionsPrincipalRoleMaps;
+ roleMaps: PermissionsPrincipalsRoleMaps;
}): PermissionsApplicationPrincipalWithRole | undefined => {
if (applicationPrincipal.type !== 'application') {
return applicationPrincipal;
@@ -149,10 +150,9 @@ const resolveApplicationPrincipal = ({
const applicationRoleId = resolveApplicationRoleId({
application: flatApplication,
- userRoleId:
- mainPrincipal.type === 'workspaceMember'
- ? mainPrincipal.roleId
- : undefined,
+ userRoleId: isPermissionMainPrincipalWorkspaceMember(mainPrincipal)
+ ? mainPrincipal.roleId
+ : undefined,
});
return isDefined(applicationRoleId)
@@ -234,7 +234,7 @@ export const resolvePermissionsPrincipalsWithRoles = ({
roleMaps,
}: {
authContext: PermissionsAuthContext;
- roleMaps: PermissionsPrincipalRoleMaps;
+ roleMaps: PermissionsPrincipalsRoleMaps;
}): PermissionsPrincipalsWithRolesContext | undefined => {
const identities = getPermissionsIdentitiesFromAuthContext(authContext);
diff --git a/packages/twenty-server/src/engine/permissions/private-record/utils/resolve-permissions-creator-workspace-member-id.util.ts b/packages/twenty-server/src/engine/permissions/private-record/utils/resolve-permissions-creator-workspace-member-id.util.ts
index 1feb32e7223..8e8aa51acb9 100644
--- a/packages/twenty-server/src/engine/permissions/private-record/utils/resolve-permissions-creator-workspace-member-id.util.ts
+++ b/packages/twenty-server/src/engine/permissions/private-record/utils/resolve-permissions-creator-workspace-member-id.util.ts
@@ -2,8 +2,8 @@
import { type PermissionsRowAccessRequest } from 'src/engine/permissions/combine/types/row-access-policy.type';
import { hasCreatedByField } from 'src/engine/permissions/private-record/utils/has-created-by-field.util';
-import { getPermissionsPrincipalWorkspaceMemberId } from 'src/engine/permissions/principal/utils/get-permissions-principal-workspace-member-id.util';
import { isRecordPrivacyApplicable } from 'src/engine/permissions/private-record/utils/is-record-privacy-applicable.util';
+import { isPermissionMainPrincipalWorkspaceMember } from 'src/engine/permissions/principal/utils/is-permission-main-principal-workspace-member.util';
export const resolvePermissionsCreatorWorkspaceMemberId = (
request: PermissionsRowAccessRequest,
@@ -12,6 +12,7 @@ export const resolvePermissionsCreatorWorkspaceMemberId = (
hasCreatedByField({
flatObjectMetadata: request.flatObjectMetadata,
flatFieldMetadataMaps: request.metadataMaps.flatFieldMetadataMaps,
- })
- ? getPermissionsPrincipalWorkspaceMemberId(request.principal)
+ }) &&
+ isPermissionMainPrincipalWorkspaceMember(request.principals.mainPrincipal)
+ ? request.principals.mainPrincipal.workspaceMemberId
: undefined;
diff --git a/packages/twenty-server/src/engine/permissions/record-share/services/record-share-principal.service.ts b/packages/twenty-server/src/engine/permissions/record-share/services/record-share-principal.service.ts
index b0b3fe4c938..5d40bbbab67 100644
--- a/packages/twenty-server/src/engine/permissions/record-share/services/record-share-principal.service.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/services/record-share-principal.service.ts
@@ -124,7 +124,7 @@ export class RecordSharePrincipalService {
continue;
}
- const rolePrincipal: PermissionsPrincipalsWithRolesContext = {
+ const rolePrincipals: PermissionsPrincipalsWithRolesContext = {
workspaceId,
mainPrincipal: { type: 'deprecatedRoleOnly', roleId },
applicationPrincipal: { type: 'customApplication' },
@@ -132,7 +132,7 @@ export class RecordSharePrincipalService {
if (
!isRolePermittingOperation({
- principal: rolePrincipal,
+ principals: rolePrincipals,
metadataMaps,
flatObjectMetadata,
operationType: 'select',
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 c8bf91398d7..e7f1fbdef4a 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
@@ -40,9 +40,9 @@ import { type RecordTargetInput } from 'src/engine/permissions/record-permission
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 { 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 { getPermissionsPrincipalShareKeys } from 'src/engine/permissions/principal/utils/get-permissions-principal-share-keys.util';
+import { buildPermissionsPrincipalsRoleMaps } from 'src/engine/permissions/principal/utils/build-permissions-principals-role-maps.util';
+import { getPermissionsPrincipalsRoleIds } from 'src/engine/permissions/principal/utils/get-permissions-principals-role-ids.util';
+import { getPermissionsPrincipalsShareKeys } from 'src/engine/permissions/principal/utils/get-permissions-principals-share-keys.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';
@@ -471,9 +471,9 @@ export class RecordSharingService {
'flatWorkspaceMemberMaps',
'roleIdsWithAllRecordsAccess',
]);
- const principal = resolvePermissionsPrincipalsWithRoles({
+ const principals = resolvePermissionsPrincipalsWithRoles({
authContext,
- roleMaps: buildPermissionsPrincipalRoleMaps({
+ roleMaps: buildPermissionsPrincipalsRoleMaps({
flatWorkspaceMemberMaps,
userWorkspaceRoleMap,
apiKeyRoleMap,
@@ -482,9 +482,9 @@ export class RecordSharingService {
}),
});
const canAccessAllRecords =
- isDefined(principal) &&
+ isDefined(principals) &&
canRolesAccessAllRecords({
- roleIds: getPermissionsPrincipalRoleIds(principal),
+ roleIds: getPermissionsPrincipalsRoleIds(principals),
roleIdsWithAllRecordsAccess,
});
const shares = await this.recordShareStorageService.findByRecordIds({
@@ -507,8 +507,8 @@ export class RecordSharingService {
recordShares: shares,
principalIds: [
EVERYONE_PRINCIPAL_ID,
- ...(isDefined(principal)
- ? getPermissionsPrincipalShareKeys(principal)
+ ...(isDefined(principals)
+ ? getPermissionsPrincipalsShareKeys(principals)
: []),
],
implicitAccessLevels: isShareable
diff --git a/packages/twenty-server/src/engine/permissions/record-share/utils/is-operation-granted-beyond-role-to-principal.util.ts b/packages/twenty-server/src/engine/permissions/record-share/utils/is-operation-granted-beyond-role-to-principals.util.ts
similarity index 78%
rename from packages/twenty-server/src/engine/permissions/record-share/utils/is-operation-granted-beyond-role-to-principal.util.ts
rename to packages/twenty-server/src/engine/permissions/record-share/utils/is-operation-granted-beyond-role-to-principals.util.ts
index ebbcb7016d0..9758116e62e 100644
--- a/packages/twenty-server/src/engine/permissions/record-share/utils/is-operation-granted-beyond-role-to-principal.util.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/utils/is-operation-granted-beyond-role-to-principals.util.ts
@@ -6,16 +6,16 @@ import { type PermissionsObjectAccessRequest } from 'src/engine/permissions/comb
import { isOperationGrantedBeyondRole } from 'src/engine/permissions/record-share/utils/is-operation-granted-beyond-role.util';
// a scope bounds everything a run reaches, so shares never carry a scoped principal past its roles
-export const isOperationGrantedBeyondRoleToPrincipal = ({
- principal,
+export const isOperationGrantedBeyondRoleToPrincipals = ({
+ principals,
flatObjectMetadata,
metadataMaps,
operationType,
}: Pick<
PermissionsObjectAccessRequest,
- 'principal' | 'flatObjectMetadata' | 'metadataMaps' | 'operationType'
+ 'principals' | 'flatObjectMetadata' | 'metadataMaps' | 'operationType'
>): boolean =>
- !isDefined(principal.aiRunScope) &&
+ !isDefined(principals.aiRunScope) &&
isOperationGrantedBeyondRole({
flatObjectMetadata,
featureFlagsMap: metadataMaps.featureFlagsMap,
diff --git a/packages/twenty-server/src/engine/permissions/record-share/utils/resolve-permissions-share-grant.util.ts b/packages/twenty-server/src/engine/permissions/record-share/utils/resolve-permissions-share-grant.util.ts
index aa27b2d4b3d..572b89f5798 100644
--- a/packages/twenty-server/src/engine/permissions/record-share/utils/resolve-permissions-share-grant.util.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/utils/resolve-permissions-share-grant.util.ts
@@ -4,9 +4,9 @@ import { type RecordShareAccessLevel } from 'twenty-shared/types';
import { isNonEmptyArray } from 'twenty-shared/utils';
import { type PermissionsRowAccessRequest } from 'src/engine/permissions/combine/types/row-access-policy.type';
-import { getPermissionsPrincipalShareKeys } from 'src/engine/permissions/principal/utils/get-permissions-principal-share-keys.util';
+import { getPermissionsPrincipalsShareKeys } from 'src/engine/permissions/principal/utils/get-permissions-principals-share-keys.util';
import { isRecordPrivacyApplicable } from 'src/engine/permissions/private-record/utils/is-record-privacy-applicable.util';
-import { isOperationGrantedBeyondRoleToPrincipal } from 'src/engine/permissions/record-share/utils/is-operation-granted-beyond-role-to-principal.util';
+import { isOperationGrantedBeyondRoleToPrincipals } from 'src/engine/permissions/record-share/utils/is-operation-granted-beyond-role-to-principals.util';
import { resolveRequiredRecordShareAccessLevels } from 'src/engine/permissions/record-share/utils/resolve-required-record-share-access-levels.util';
export const resolvePermissionsShareGrant = (
@@ -18,11 +18,11 @@ export const resolvePermissionsShareGrant = (
isLimitedToPrivateRecords: boolean;
}
| undefined => {
- const principalIds = getPermissionsPrincipalShareKeys(request.principal);
+ const principalIds = getPermissionsPrincipalsShareKeys(request.principals);
const accessLevels = resolveRequiredRecordShareAccessLevels(
request.operationType,
);
- const isGrantedBeyondRole = isOperationGrantedBeyondRoleToPrincipal(request);
+ const isGrantedBeyondRole = isOperationGrantedBeyondRoleToPrincipals(request);
if (
!isNonEmptyArray(principalIds) ||
diff --git a/packages/twenty-server/src/engine/permissions/rls/utils/resolve-permissions-row-level-permission-filter.util.ts b/packages/twenty-server/src/engine/permissions/rls/utils/resolve-permissions-row-level-permission-filter.util.ts
index 89462100c0d..99e16f4506d 100644
--- a/packages/twenty-server/src/engine/permissions/rls/utils/resolve-permissions-row-level-permission-filter.util.ts
+++ b/packages/twenty-server/src/engine/permissions/rls/utils/resolve-permissions-row-level-permission-filter.util.ts
@@ -17,14 +17,14 @@ export const resolvePermissionsRowLevelPermissionFilter = ({
}: PermissionsRowAccessRequest & { tableAlias: string }):
| { recordFilter: RecordGqlOperationFilter; condition: SqlCondition }
| undefined => {
- const { principal, metadataMaps, flatObjectMetadata } = request;
+ const { principals, metadataMaps, flatObjectMetadata } = request;
if (!isRolePermittingOperation(request)) {
return undefined;
}
const recordFilter = resolveRowLevelPermissionRecordFilter({
- principal,
+ principals,
metadataMaps,
flatObjectMetadata,
});
diff --git a/packages/twenty-server/src/engine/permissions/rls/utils/resolve-row-level-permission-record-filter.util.ts b/packages/twenty-server/src/engine/permissions/rls/utils/resolve-row-level-permission-record-filter.util.ts
index d7ba1da8748..875ad3b9727 100644
--- a/packages/twenty-server/src/engine/permissions/rls/utils/resolve-row-level-permission-record-filter.util.ts
+++ b/packages/twenty-server/src/engine/permissions/rls/utils/resolve-row-level-permission-record-filter.util.ts
@@ -6,21 +6,25 @@ import { isDefined } from 'twenty-shared/utils';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { type PermissionsMetadataMaps } from 'src/engine/permissions/combine/types/row-access-policy.type';
import { type PermissionsPrincipalsWithRolesContext } from 'src/engine/permissions/principal/types/permissions-principals-with-roles-context.type';
-import { getPermissionsPrincipalRoleIds } from 'src/engine/permissions/principal/utils/get-permissions-principal-role-ids.util';
-import { getPermissionsPrincipalWorkspaceMemberId } from 'src/engine/permissions/principal/utils/get-permissions-principal-workspace-member-id.util';
+import { getPermissionsPrincipalsRoleIds } from 'src/engine/permissions/principal/utils/get-permissions-principals-role-ids.util';
import { buildRowLevelPermissionRecordFilter } from 'src/engine/permissions/rls/utils/build-row-level-permission-record-filter.util';
+import { isPermissionMainPrincipalWorkspaceMember } from 'src/engine/permissions/principal/utils/is-permission-main-principal-workspace-member.util';
export const resolveRowLevelPermissionRecordFilter = ({
- principal,
+ principals,
metadataMaps,
flatObjectMetadata,
}: {
- principal: PermissionsPrincipalsWithRolesContext;
+ principals: PermissionsPrincipalsWithRolesContext;
metadataMaps: PermissionsMetadataMaps;
flatObjectMetadata: FlatObjectMetadata;
}): RecordGqlOperationFilter | null => {
- const roleIds = getPermissionsPrincipalRoleIds(principal);
- const workspaceMemberId = getPermissionsPrincipalWorkspaceMemberId(principal);
+ const roleIds = getPermissionsPrincipalsRoleIds(principals);
+ const workspaceMemberId = isPermissionMainPrincipalWorkspaceMember(
+ principals.mainPrincipal,
+ )
+ ? principals.mainPrincipal.workspaceMemberId
+ : undefined;
if (roleIds.length === 0) {
return null;
diff --git a/packages/twenty-server/src/engine/permissions/rls/utils/validate-rls-predicates-for-records.util.ts b/packages/twenty-server/src/engine/permissions/rls/utils/validate-rls-predicates-for-records.util.ts
index 211f74d790a..9b334ef7478 100644
--- a/packages/twenty-server/src/engine/permissions/rls/utils/validate-rls-predicates-for-records.util.ts
+++ b/packages/twenty-server/src/engine/permissions/rls/utils/validate-rls-predicates-for-records.util.ts
@@ -17,18 +17,18 @@ import { resolveRowLevelPermissionRecordFilter } from 'src/engine/permissions/rl
type ValidateRLSPredicatesForRecordsArgs<T extends ObjectLiteral> = {
records: T[];
objectMetadata: FlatObjectMetadata;
- principal: PermissionsPrincipalsWithRolesContext;
+ principals: PermissionsPrincipalsWithRolesContext;
metadataMaps: PermissionsMetadataMaps;
};
export const validateRLSPredicatesForRecords = <T extends ObjectLiteral>({
records,
objectMetadata,
- principal,
+ principals,
metadataMaps,
}: ValidateRLSPredicatesForRecordsArgs<T>): void => {
const recordFilter = resolveRowLevelPermissionRecordFilter({
- principal,
+ principals,
metadataMaps,
flatObjectMetadata: objectMetadata,
});
diff --git a/packages/twenty-server/src/engine/permissions/role/utils/__tests__/compute-objects-permissions-for-roles.util.spec.ts b/packages/twenty-server/src/engine/permissions/role/utils/__tests__/compute-objects-permissions-for-roles.util.spec.ts
index 52adc4a4d84..88432109448 100644
--- a/packages/twenty-server/src/engine/permissions/role/utils/__tests__/compute-objects-permissions-for-roles.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/role/utils/__tests__/compute-objects-permissions-for-roles.util.spec.ts
@@ -20,14 +20,14 @@ import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object
import { type PermissionsAuthContext } from 'src/engine/permissions/principal/types/permissions-auth-context.type';
import { type AiRunPermissionScope } from 'src/engine/permissions/principal/types/ai-run-permission-scope.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 { buildPermissionsPrincipalsRoleMaps } from 'src/engine/permissions/principal/utils/build-permissions-principals-role-maps.util';
import {
- type PermissionsPrincipalRoleMaps,
+ type PermissionsPrincipalsRoleMaps,
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<
+type PrincipalsWithRoles = Pick<
PermissionsPrincipalsWithRolesContext,
'mainPrincipal' | 'limitingPrincipal' | 'applicationPrincipal'
>;
@@ -40,11 +40,11 @@ const EMPTY_FLAT_FIELD_METADATA_MAPS: FlatEntityMaps<OrmFlatFieldMetadata> =
createEmptyFlatEntityMaps();
const buildRoleMaps = (
- flatApplicationMaps: PermissionsPrincipalRoleMaps['flatApplicationMaps'] = {
+ flatApplicationMaps: PermissionsPrincipalsRoleMaps['flatApplicationMaps'] = {
byId: {},
},
-): PermissionsPrincipalRoleMaps =>
- buildPermissionsPrincipalRoleMaps({
+): PermissionsPrincipalsRoleMaps =>
+ buildPermissionsPrincipalsRoleMaps({
userWorkspaceRoleMap: {},
apiKeyRoleMap: {},
flatRoleTargetByAgentIdMaps: {},
@@ -80,9 +80,9 @@ const rolesPermissions: ObjectsPermissionsByRoleId = {
'default-role-id': defaultRolePermissions,
};
-const computeForPrincipal = (principal: PrincipalWithRoles) =>
+const computeForPrincipals = (principals: PrincipalsWithRoles) =>
computeObjectsPermissionsForRoles({
- principal,
+ principals,
rolesPermissions,
flatObjectMetadataMaps: EMPTY_FLAT_OBJECT_METADATA_MAPS,
flatFieldMetadataMaps: EMPTY_FLAT_FIELD_METADATA_MAPS,
@@ -126,16 +126,16 @@ const computeForAuthContext = ({
roleMaps,
}: {
authContext: PermissionsAuthContext;
- roleMaps: PermissionsPrincipalRoleMaps;
+ roleMaps: PermissionsPrincipalsRoleMaps;
}): ObjectsPermissions => {
- const principal = resolvePermissionsPrincipalsWithRoles({
+ const principals = resolvePermissionsPrincipalsWithRoles({
authContext,
roleMaps,
});
- return isDefined(principal)
+ return isDefined(principals)
? computeObjectsPermissionsForRoles({
- principal,
+ principals,
rolesPermissions,
flatObjectMetadataMaps: EMPTY_FLAT_OBJECT_METADATA_MAPS,
flatFieldMetadataMaps: EMPTY_FLAT_FIELD_METADATA_MAPS,
@@ -147,7 +147,7 @@ const computeForAuthContext = ({
describe('computeObjectsPermissionsForRoles', () => {
it('should resolve a single role unchanged', () => {
expect(
- computeForPrincipal({
+ computeForPrincipals({
mainPrincipal: { type: 'deprecatedRoleOnly', roleId: 'agent-role-id' },
applicationPrincipal: { type: 'customApplication' },
}),
@@ -156,7 +156,7 @@ describe('computeObjectsPermissionsForRoles', () => {
it('should resolve a role held by several principals as that role alone', () => {
expect(
- computeForPrincipal({
+ computeForPrincipals({
mainPrincipal: {
type: 'deprecatedRoleOnly',
roleId: 'default-role-id',
@@ -171,7 +171,7 @@ describe('computeObjectsPermissionsForRoles', () => {
it('should intersect every role when several are provided', () => {
expect(
- computeForPrincipal({
+ computeForPrincipals({
mainPrincipal: {
type: 'deprecatedRoleOnly',
roleId: 'default-role-id',
@@ -188,7 +188,7 @@ describe('computeObjectsPermissionsForRoles', () => {
it('should not grant a permission that only one of the roles allows', () => {
expect(
- computeForPrincipal({
+ computeForPrincipals({
mainPrincipal: {
type: 'deprecatedRoleOnly',
roleId: 'default-role-id',
@@ -204,7 +204,7 @@ describe('computeObjectsPermissionsForRoles', () => {
it('should deny when one of the intersected roles is missing from the cache', () => {
expect(
- computeForPrincipal({
+ computeForPrincipals({
mainPrincipal: { type: 'deprecatedRoleOnly', roleId: 'agent-role-id' },
limitingPrincipal: {
type: 'agent',
@@ -222,7 +222,7 @@ describe('computeObjectsPermissionsForRoles', () => {
it('should return empty permissions when the role is missing from the cache', () => {
expect(
- computeForPrincipal({
+ computeForPrincipals({
mainPrincipal: {
type: 'apiKey',
apiKeyId: 'api-key-id',
@@ -421,7 +421,7 @@ flatFieldMetadataMaps.byUniversalIdentifier.amount = getFlatFieldMetadataMock({
});
flatFieldMetadataMaps.universalIdentifierById[AMOUNT_FIELD_ID] = 'amount';
-const flatApplicationMaps: PermissionsPrincipalRoleMaps['flatApplicationMaps'] =
+const flatApplicationMaps: PermissionsPrincipalsRoleMaps['flatApplicationMaps'] =
{
byId: {
'owning-application-id': {
@@ -450,12 +450,12 @@ const disabledActionRolesPermissions = Object.fromEntries(
describe('computeObjectsPermissionsForRoles disabled actions', () => {
it.each<{
actor: string;
- principal: PrincipalWithRoles;
+ principals: PrincipalsWithRoles;
canDestroy: boolean;
}>([
{
actor: 'the owning application',
- principal: {
+ principals: {
mainPrincipal: {
type: 'application',
applicationId: 'owning-application-id',
@@ -471,7 +471,7 @@ describe('computeObjectsPermissionsForRoles disabled actions', () => {
},
{
actor: 'another application',
- principal: {
+ principals: {
mainPrincipal: {
type: 'application',
applicationId: 'other-application-id',
@@ -487,7 +487,7 @@ describe('computeObjectsPermissionsForRoles disabled actions', () => {
},
{
actor: 'a user',
- principal: {
+ principals: {
mainPrincipal: {
type: 'workspaceMember',
workspaceMemberId: 'member-id',
@@ -499,7 +499,7 @@ describe('computeObjectsPermissionsForRoles disabled actions', () => {
},
{
actor: 'a user through the owning application',
- principal: {
+ principals: {
mainPrincipal: {
type: 'workspaceMember',
workspaceMemberId: 'member-id',
@@ -515,7 +515,7 @@ describe('computeObjectsPermissionsForRoles disabled actions', () => {
},
{
actor: "a user holding the owning application's default role",
- principal: {
+ principals: {
mainPrincipal: {
type: 'workspaceMember',
workspaceMemberId: 'member-id',
@@ -527,7 +527,7 @@ describe('computeObjectsPermissionsForRoles disabled actions', () => {
},
{
actor: "an API key holding the owning application's default role",
- principal: {
+ principals: {
mainPrincipal: {
type: 'apiKey',
apiKeyId: 'api-key-id',
@@ -539,7 +539,7 @@ describe('computeObjectsPermissionsForRoles disabled actions', () => {
},
{
actor: "an agent holding the owning application's default role",
- principal: {
+ principals: {
mainPrincipal: {
type: 'agent',
agentId: 'agent-id',
@@ -551,7 +551,7 @@ describe('computeObjectsPermissionsForRoles disabled actions', () => {
},
{
actor: 'the owning application with a user holding its default role',
- principal: {
+ principals: {
mainPrincipal: {
type: 'workspaceMember',
workspaceMemberId: 'member-id',
@@ -567,9 +567,9 @@ describe('computeObjectsPermissionsForRoles disabled actions', () => {
},
])(
'disabled actions allowed for $actor: $canDestroy',
- ({ principal, canDestroy }) => {
+ ({ principals, canDestroy }) => {
const invoicePermissions = computeObjectsPermissionsForRoles({
- principal,
+ principals,
rolesPermissions: disabledActionRolesPermissions,
flatObjectMetadataMaps,
flatFieldMetadataMaps,
@@ -646,7 +646,7 @@ describe('computeObjectsPermissionsForRoles disabled actions', () => {
}
const objectsPermissions = computeObjectsPermissionsForRoles({
- principal: {
+ principals: {
mainPrincipal: {
type: 'workspaceMember',
workspaceMemberId: 'member-id',
@@ -715,7 +715,7 @@ describe('computeObjectsPermissionsForRoles with a scope', () => {
scopeObjectPermissions?: ObjectPermissions;
hasScope?: boolean;
}) => {
- const principal = resolvePermissionsPrincipalsWithRoles({
+ const principals = resolvePermissionsPrincipalsWithRoles({
authContext: buildApiKeyAuthContext({
apiKeyId,
aiRunScope: hasScope
@@ -733,9 +733,9 @@ describe('computeObjectsPermissionsForRoles with a scope', () => {
},
});
- return isDefined(principal)
+ return isDefined(principals)
? computeObjectsPermissionsForRoles({
- principal,
+ principals,
rolesPermissions: rolesPermissionsWithPredicate,
flatObjectMetadataMaps,
flatFieldMetadataMaps,
diff --git a/packages/twenty-server/src/engine/permissions/role/utils/__tests__/resolve-ai-run-permission-scope.util.spec.ts b/packages/twenty-server/src/engine/permissions/role/utils/__tests__/resolve-ai-run-permission-scope.util.spec.ts
index 1a06cc4270a..7546e690190 100644
--- a/packages/twenty-server/src/engine/permissions/role/utils/__tests__/resolve-ai-run-permission-scope.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/role/utils/__tests__/resolve-ai-run-permission-scope.util.spec.ts
@@ -7,7 +7,7 @@ import { FieldMetadataType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { resolveAiRunPermissionScope } from 'src/engine/permissions/role/utils/resolve-ai-run-permission-scope.util';
-import { isObjectOperationDeniedToPrincipal } from 'src/engine/permissions/role/utils/is-object-operation-denied-to-principal.util';
+import { isObjectOperationDeniedToPrincipals } from 'src/engine/permissions/role/utils/is-object-operation-denied-to-principals.util';
import { type PermissionsPrincipalsWithRolesContext } from 'src/engine/permissions/principal/types/permissions-principals-with-roles-context.type';
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';
@@ -274,8 +274,8 @@ describe('resolveAiRunPermissionScope', () => {
const isInsertDenied = (
aiRunScope?: PermissionsPrincipalsWithRolesContext['aiRunScope'],
) =>
- isObjectOperationDeniedToPrincipal({
- principal: {
+ isObjectOperationDeniedToPrincipals({
+ principals: {
workspaceId: 'workspace-id',
mainPrincipal: {
type: 'workspaceMember',
diff --git a/packages/twenty-server/src/engine/permissions/role/utils/compute-objects-permissions-for-roles.util.ts b/packages/twenty-server/src/engine/permissions/role/utils/compute-objects-permissions-for-roles.util.ts
index ba9797d4469..ab5fae98d97 100644
--- a/packages/twenty-server/src/engine/permissions/role/utils/compute-objects-permissions-for-roles.util.ts
+++ b/packages/twenty-server/src/engine/permissions/role/utils/compute-objects-permissions-for-roles.util.ts
@@ -11,20 +11,20 @@ import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-fiel
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { type ApplicationDefaultRoleMaps } from 'src/engine/permissions/principal/types/application-default-role-maps.type';
import { type PermissionsPrincipalsWithRolesContext } from 'src/engine/permissions/principal/types/permissions-principals-with-roles-context.type';
-import { getPermissionsPrincipalActingApplicationId } from 'src/engine/permissions/principal/utils/get-permissions-principal-acting-application-id.util';
-import { getPermissionsPrincipalRoleIds } from 'src/engine/permissions/principal/utils/get-permissions-principal-role-ids.util';
+import { getPermissionsPrincipalsActingApplicationId } from 'src/engine/permissions/principal/utils/get-permissions-principals-acting-application-id.util';
+import { getPermissionsPrincipalsRoleIds } from 'src/engine/permissions/principal/utils/get-permissions-principals-role-ids.util';
import { computePermissionIntersection } from 'src/engine/permissions/role/utils/compute-permission-intersection.util';
import { restrictObjectsPermissionsToDisabledActions } from 'src/engine/permissions/role/utils/restrict-objects-permissions-to-disabled-actions.util';
import { restrictObjectsPermissionsToScope } from 'src/engine/permissions/role/utils/restrict-objects-permissions-to-scope.util';
export const computeObjectsPermissionsForRoles = ({
- principal,
+ principals,
rolesPermissions,
flatObjectMetadataMaps,
flatFieldMetadataMaps,
flatApplicationMaps,
}: {
- principal: Pick<
+ principals: Pick<
PermissionsPrincipalsWithRolesContext,
| 'mainPrincipal'
| 'limitingPrincipal'
@@ -36,14 +36,14 @@ export const computeObjectsPermissionsForRoles = ({
flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
flatApplicationMaps: ApplicationDefaultRoleMaps;
}): ObjectsPermissions => {
- const roleIds = getPermissionsPrincipalRoleIds(principal);
+ const roleIds = getPermissionsPrincipalsRoleIds(principals);
if (!isNonEmptyArray(roleIds)) {
return {};
}
- const actingApplicationId = getPermissionsPrincipalActingApplicationId({
- principal,
+ const actingApplicationId = getPermissionsPrincipalsActingApplicationId({
+ principals,
flatApplicationMaps,
});
@@ -73,10 +73,10 @@ export const computeObjectsPermissionsForRoles = ({
const objectsPermissions = computePermissionIntersection(permissionsPerRole);
- return isDefined(principal.aiRunScope)
+ return isDefined(principals.aiRunScope)
? restrictObjectsPermissionsToScope({
objectsPermissions,
- aiRunScope: principal.aiRunScope,
+ aiRunScope: principals.aiRunScope,
})
: objectsPermissions;
};
diff --git a/packages/twenty-server/src/engine/permissions/role/utils/get-permissions-principal-objects-permissions.util.ts b/packages/twenty-server/src/engine/permissions/role/utils/get-permissions-principals-objects-permissions.util.ts
similarity index 80%
rename from packages/twenty-server/src/engine/permissions/role/utils/get-permissions-principal-objects-permissions.util.ts
rename to packages/twenty-server/src/engine/permissions/role/utils/get-permissions-principals-objects-permissions.util.ts
index 52fd85da769..3e4b0b59a0a 100644
--- a/packages/twenty-server/src/engine/permissions/role/utils/get-permissions-principal-objects-permissions.util.ts
+++ b/packages/twenty-server/src/engine/permissions/role/utils/get-permissions-principals-objects-permissions.util.ts
@@ -7,24 +7,24 @@ import { type PermissionsMetadataMaps } from 'src/engine/permissions/combine/typ
import { type PermissionsPrincipalsWithRolesContext } from 'src/engine/permissions/principal/types/permissions-principals-with-roles-context.type';
import { computeObjectsPermissionsForRoles } from 'src/engine/permissions/role/utils/compute-objects-permissions-for-roles.util';
-const objectsPermissionsByMetadataMapsByPrincipal = new WeakMap<
+const objectsPermissionsByMetadataMapsByPrincipals = new WeakMap<
PermissionsPrincipalsWithRolesContext,
WeakMap<PermissionsMetadataMaps, ObjectsPermissions>
>();
-export const getPermissionsPrincipalObjectsPermissions = ({
- principal,
+export const getPermissionsPrincipalsObjectsPermissions = ({
+ principals,
metadataMaps,
}: {
- principal: PermissionsPrincipalsWithRolesContext;
+ principals: PermissionsPrincipalsWithRolesContext;
metadataMaps: PermissionsMetadataMaps;
}): ObjectsPermissions => {
const objectsPermissionsByMetadataMaps =
- objectsPermissionsByMetadataMapsByPrincipal.get(principal) ??
+ objectsPermissionsByMetadataMapsByPrincipals.get(principals) ??
new WeakMap<PermissionsMetadataMaps, ObjectsPermissions>();
- objectsPermissionsByMetadataMapsByPrincipal.set(
- principal,
+ objectsPermissionsByMetadataMapsByPrincipals.set(
+ principals,
objectsPermissionsByMetadataMaps,
);
@@ -36,7 +36,7 @@ export const getPermissionsPrincipalObjectsPermissions = ({
}
const objectsPermissions = computeObjectsPermissionsForRoles({
- principal,
+ principals,
rolesPermissions: metadataMaps.rolesPermissions,
flatObjectMetadataMaps: metadataMaps.flatObjectMetadataMaps,
flatFieldMetadataMaps: metadataMaps.flatFieldMetadataMaps,
diff --git a/packages/twenty-server/src/engine/permissions/role/utils/is-object-operation-denied-to-principal.util.ts b/packages/twenty-server/src/engine/permissions/role/utils/is-object-operation-denied-to-principals.util.ts
similarity index 57%
rename from packages/twenty-server/src/engine/permissions/role/utils/is-object-operation-denied-to-principal.util.ts
rename to packages/twenty-server/src/engine/permissions/role/utils/is-object-operation-denied-to-principals.util.ts
index e5baa94e75c..136e99bbfd6 100644
--- a/packages/twenty-server/src/engine/permissions/role/utils/is-object-operation-denied-to-principal.util.ts
+++ b/packages/twenty-server/src/engine/permissions/role/utils/is-object-operation-denied-to-principals.util.ts
@@ -1,11 +1,11 @@
/* @license Enterprise */
import { type PermissionsObjectAccessRequest } from 'src/engine/permissions/combine/types/row-access-policy.type';
-import { isOperationGrantedBeyondRoleToPrincipal } from 'src/engine/permissions/record-share/utils/is-operation-granted-beyond-role-to-principal.util';
+import { isOperationGrantedBeyondRoleToPrincipals } from 'src/engine/permissions/record-share/utils/is-operation-granted-beyond-role-to-principals.util';
import { isRolePermittingOperation } from 'src/engine/permissions/role/utils/is-role-permitting-operation.util';
-export const isObjectOperationDeniedToPrincipal = (
+export const isObjectOperationDeniedToPrincipals = (
request: PermissionsObjectAccessRequest,
): boolean =>
!isRolePermittingOperation(request) &&
- !isOperationGrantedBeyondRoleToPrincipal(request);
+ !isOperationGrantedBeyondRoleToPrincipals(request);
diff --git a/packages/twenty-server/src/engine/permissions/role/utils/is-object-operation-disabled-to-principal.util.ts b/packages/twenty-server/src/engine/permissions/role/utils/is-object-operation-disabled-to-principals.util.ts
similarity index 67%
rename from packages/twenty-server/src/engine/permissions/role/utils/is-object-operation-disabled-to-principal.util.ts
rename to packages/twenty-server/src/engine/permissions/role/utils/is-object-operation-disabled-to-principals.util.ts
index bc5cc3d113d..fff1472c81e 100644
--- a/packages/twenty-server/src/engine/permissions/role/utils/is-object-operation-disabled-to-principal.util.ts
+++ b/packages/twenty-server/src/engine/permissions/role/utils/is-object-operation-disabled-to-principals.util.ts
@@ -1,11 +1,11 @@
/* @license Enterprise */
import { type PermissionsObjectAccessRequest } from 'src/engine/permissions/combine/types/row-access-policy.type';
-import { isPermissionsPrincipalOwningObject } from 'src/engine/permissions/principal/utils/is-permissions-principal-owning-object.util';
+import { isPermissionsPrincipalsOwningObject } from 'src/engine/permissions/principal/utils/is-permissions-principals-owning-object.util';
import { isObjectOperationDisabled } from 'src/engine/permissions/role/utils/is-object-operation-disabled.util';
-export const isObjectOperationDisabledToPrincipal = ({
- principal,
+export const isObjectOperationDisabledToPrincipals = ({
+ principals,
metadataMaps,
flatObjectMetadata,
operationType,
@@ -14,8 +14,8 @@ export const isObjectOperationDisabledToPrincipal = ({
objectMetadata: flatObjectMetadata,
operationType,
}) &&
- !isPermissionsPrincipalOwningObject({
- principal,
+ !isPermissionsPrincipalsOwningObject({
+ principals,
flatObjectMetadata,
flatApplicationMaps: metadataMaps.flatApplicationMaps,
});
diff --git a/packages/twenty-server/src/engine/permissions/role/utils/is-role-permitting-operation.util.ts b/packages/twenty-server/src/engine/permissions/role/utils/is-role-permitting-operation.util.ts
index a75cc6d7301..d7a77b89e40 100644
--- a/packages/twenty-server/src/engine/permissions/role/utils/is-role-permitting-operation.util.ts
+++ b/packages/twenty-server/src/engine/permissions/role/utils/is-role-permitting-operation.util.ts
@@ -1,11 +1,11 @@
/* @license Enterprise */
import { type PermissionsObjectAccessRequest } from 'src/engine/permissions/combine/types/row-access-policy.type';
-import { getPermissionsPrincipalObjectsPermissions } from 'src/engine/permissions/role/utils/get-permissions-principal-objects-permissions.util';
+import { getPermissionsPrincipalsObjectsPermissions } from 'src/engine/permissions/role/utils/get-permissions-principals-objects-permissions.util';
import { isObjectOperationPermitted } from 'src/engine/permissions/role/utils/is-object-operation-permitted.util';
export const isRolePermittingOperation = ({
- principal,
+ principals,
metadataMaps,
flatObjectMetadata,
operationType,
@@ -13,8 +13,8 @@ export const isRolePermittingOperation = ({
isObjectOperationPermitted({
objectMetadata: flatObjectMetadata,
operationType,
- objectsPermissions: getPermissionsPrincipalObjectsPermissions({
- principal,
+ objectsPermissions: getPermissionsPrincipalsObjectsPermissions({
+ principals,
metadataMaps,
}),
});
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
deleted file mode 100644
index 7b676d10389..00000000000
--- a/packages/twenty-server/src/engine/permissions/role/utils/resolve-object-records-permissions.util.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import {
- type ObjectsPermissions,
- type ObjectsPermissionsByRoleId,
-} 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 PermissionsPrincipalsWithRolesContext } from 'src/engine/permissions/principal/types/permissions-principals-with-roles-context.type';
-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 = ({
- authContext,
- roleMaps,
- objectPermissionsByRoleId,
- flatObjectMetadataMaps,
- flatFieldMetadataMaps,
-}: {
- authContext: WorkspaceAuthContext;
- roleMaps: PermissionsPrincipalRoleMaps;
- objectPermissionsByRoleId: ObjectsPermissionsByRoleId;
- flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
- flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
-}): ObjectRecordsPermissionsResolution => {
- if (isSystemAuthContext(authContext)) {
- return {
- objectRecordsPermissions: {},
- shouldBypassPermissionChecks: true,
- permissionsPrincipal: undefined,
- };
- }
-
- const permissionsPrincipal = resolvePermissionsPrincipalsWithRoles({
- authContext,
- roleMaps,
- });
-
- if (!isDefined(permissionsPrincipal)) {
- return {
- objectRecordsPermissions: {},
- shouldBypassPermissionChecks: false,
- permissionsPrincipal: undefined,
- };
- }
-
- return {
- objectRecordsPermissions: computeObjectsPermissionsForRoles({
- principal: permissionsPrincipal,
- rolesPermissions: objectPermissionsByRoleId,
- flatObjectMetadataMaps,
- flatFieldMetadataMaps,
- flatApplicationMaps: roleMaps.flatApplicationMaps,
- }),
- shouldBypassPermissionChecks: false,
- permissionsPrincipal,
- };
-};
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 71b0307b2d2..a5514ae3798 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
@@ -78,7 +78,6 @@ const sumPetColumn = ({
featureFlagsMap: {},
} as unknown as WorkspaceInternalContext,
authContext: {} as WorkspaceAuthContext,
- objectPermissionsByRoleId: {},
})
.getRepositoryWithoutPermissionChecks('pet')
.sum(columnName);
diff --git a/packages/twenty-server/src/engine/twenty-orm/datasource/workspace-data-source.service.ts b/packages/twenty-server/src/engine/twenty-orm/datasource/workspace-data-source.service.ts
index 22d4c9641cb..2ed85e447e7 100644
--- a/packages/twenty-server/src/engine/twenty-orm/datasource/workspace-data-source.service.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/datasource/workspace-data-source.service.ts
@@ -101,7 +101,6 @@ export class WorkspaceDataSourceService
pool,
internalContext: this.buildInternalContext(workspaceContext),
authContext: workspaceContext.authContext,
- objectPermissionsByRoleId: workspaceContext.permissionsPerRoleId,
});
}
@@ -124,6 +123,7 @@ export class WorkspaceDataSourceService
billingEntitlements: workspaceContext.billingEntitlements,
userWorkspaceRoleMap: workspaceContext.userWorkspaceRoleMap,
apiKeyRoleMap: workspaceContext.apiKeyRoleMap,
+ rolesPermissions: workspaceContext.permissionsPerRoleId,
flatRoleTargetByAgentIdMaps: workspaceContext.flatRoleTargetByAgentIdMaps,
flatApplicationMaps: workspaceContext.flatApplicationMaps,
eventEmitterService: this.workspaceEventEmitter,
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 fefeeb15770..1687ef9c956 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
@@ -3,10 +3,7 @@ import { Logger } from '@nestjs/common';
import { type Pool } from 'pg';
import { isDefined } from 'twenty-shared/utils';
-import {
- type ObjectRecord,
- type ObjectsPermissionsByRoleId,
-} from 'twenty-shared/types';
+import { type ObjectRecord } from 'twenty-shared/types';
import { type ObjectLiteral } from 'typeorm';
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
@@ -28,46 +25,35 @@ 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 {
- 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';
+import { isSystemAuthContext } from 'src/engine/core-modules/auth/guards/is-system-auth-context.guard';
+import { type PermissionsPrincipalsWithRolesContext } from 'src/engine/permissions/principal/types/permissions-principals-with-roles-context.type';
+import { buildPermissionsPrincipalsRoleMaps } from 'src/engine/permissions/principal/utils/build-permissions-principals-role-maps.util';
+import { resolvePermissionsPrincipalsWithRoles } from 'src/engine/permissions/principal/utils/resolve-permissions-principals-with-roles.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;
+ private permissionsPrincipals?: PermissionsPrincipalsWithRolesContext | null;
constructor({
pool,
internalContext,
authContext,
- objectPermissionsByRoleId,
}: {
pool: Pool;
internalContext: WorkspaceInternalContext;
authContext: WorkspaceAuthContext;
- objectPermissionsByRoleId: ObjectsPermissionsByRoleId;
}) {
this.pool = pool;
this.internalContext = internalContext;
this.authContext = authContext;
- this.objectPermissionsByRoleId = objectPermissionsByRoleId;
}
getRepository<T extends ObjectLiteral = ObjectRecord>(
@@ -242,9 +228,8 @@ export class WorkspaceDataSource {
const flatObjectMetadata =
this.getFlatObjectMetadataOrThrow(objectMetadataId);
- const permissions = shouldBypassPermissionChecks
- ? SYSTEM_PERMISSIONS
- : this.resolveContextPermissions();
+ const shouldRepositoryBypassPermissionChecks =
+ shouldBypassPermissionChecks || isSystemAuthContext(this.authContext);
return new WorkspaceRepository<T>({
tableShape: this.getTableShape(objectMetadataId),
@@ -252,10 +237,10 @@ export class WorkspaceDataSource {
internalContext,
authContext: this.authContext,
executor,
- objectRecordsPermissions: permissions.objectRecordsPermissions,
- rolesPermissions: this.objectPermissionsByRoleId,
- permissionsPrincipal: permissions.permissionsPrincipal,
- shouldBypassPermissionChecks: permissions.shouldBypassPermissionChecks,
+ permissionsPrincipals: shouldRepositoryBypassPermissionChecks
+ ? undefined
+ : this.resolvePermissionsPrincipals(),
+ shouldBypassPermissionChecks: shouldRepositoryBypassPermissionChecks,
shouldSkipEventEmission: shouldSkipEventEmission ?? false,
tableShapeByObjectMetadataId: (targetObjectMetadataId) =>
this.getTableShape(targetObjectMetadataId),
@@ -292,14 +277,18 @@ export class WorkspaceDataSource {
});
}
- 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 resolvePermissionsPrincipals():
+ | PermissionsPrincipalsWithRolesContext
+ | undefined {
+ if (this.permissionsPrincipals === undefined) {
+ this.permissionsPrincipals =
+ resolvePermissionsPrincipalsWithRoles({
+ authContext: this.authContext,
+ roleMaps: buildPermissionsPrincipalsRoleMaps(this.internalContext),
+ }) ?? null;
+ }
+
+ return this.permissionsPrincipals ?? undefined;
}
private getTableShape(objectMetadataId: string): WorkspaceTableShape {
diff --git a/packages/twenty-server/src/engine/twenty-orm/interfaces/workspace-internal-context.interface.ts b/packages/twenty-server/src/engine/twenty-orm/interfaces/workspace-internal-context.interface.ts
index fa087ca9833..6df36c62c0b 100644
--- a/packages/twenty-server/src/engine/twenty-orm/interfaces/workspace-internal-context.interface.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/interfaces/workspace-internal-context.interface.ts
@@ -1,5 +1,8 @@
import { type DataSource } from 'typeorm';
-import { type FeatureFlagKey } from 'twenty-shared/types';
+import {
+ type FeatureFlagKey,
+ type ObjectsPermissionsByRoleId,
+} from 'twenty-shared/types';
import { type FlatApplicationCacheMaps } from 'src/engine/core-modules/application/types/flat-application-cache-maps.type';
import { type BillingEntitlements } from 'src/engine/core-modules/billing/types/billing-entitlements.type';
@@ -32,6 +35,7 @@ export interface WorkspaceInternalContext {
apiKeyRoleMap: Record<string, string>;
flatRoleTargetByAgentIdMaps: FlatRoleTargetByAgentIdMaps;
flatApplicationMaps: FlatApplicationCacheMaps;
+ rolesPermissions: ObjectsPermissionsByRoleId;
eventEmitterService: Pick<WorkspaceEventEmitter, 'emitDatabaseBatchEvent'>;
recordStock: Pick<
WorkspaceRecordStockService,
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 9be4f949f57..0adb5d2cdfc 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
@@ -109,6 +109,18 @@ const buildRepository = ({
userWorkspaceRoleMap: {},
apiKeyRoleMap: { [API_KEY_ID]: ROLE_ID },
roleIdsWithAllRecordsAccess: [ROLE_ID],
+ rolesPermissions: {
+ [ROLE_ID]: {
+ [OBJECT_METADATA_ID]: {
+ canReadObjectRecords: true,
+ canUpdateObjectRecords: true,
+ canSoftDeleteObjectRecords: true,
+ canDestroyObjectRecords: true,
+ restrictedFields: {},
+ },
+ },
+ },
+ flatApplicationMaps: { byId: {} },
flatRowLevelPermissionPredicateMaps: EMPTY_FLAT_ENTITY_MAPS,
flatRowLevelPermissionPredicateGroupMaps: EMPTY_FLAT_ENTITY_MAPS,
},
@@ -124,27 +136,7 @@ const buildRepository = ({
return [];
},
},
- objectRecordsPermissions: {
- [OBJECT_METADATA_ID]: {
- canReadObjectRecords: true,
- canUpdateObjectRecords: true,
- canSoftDeleteObjectRecords: true,
- canDestroyObjectRecords: true,
- restrictedFields: {},
- },
- },
- rolesPermissions: {
- [ROLE_ID]: {
- [OBJECT_METADATA_ID]: {
- canReadObjectRecords: true,
- canUpdateObjectRecords: true,
- canSoftDeleteObjectRecords: true,
- canDestroyObjectRecords: true,
- restrictedFields: {},
- },
- },
- },
- permissionsPrincipal: {
+ permissionsPrincipals: {
workspaceId: 'workspace-id',
mainPrincipal: {
type: 'apiKey',
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 61085e8f624..341a4cb4536 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
@@ -4,7 +4,6 @@ import { QUERY_MAX_RECORDS } from 'twenty-shared/constants';
import {
type ObjectRecord,
type ObjectsPermissions,
- type ObjectsPermissionsByRoleId,
type RecordShareAccessLevel,
} from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
@@ -36,15 +35,15 @@ import {
import { type WorkspaceInternalContext } from 'src/engine/twenty-orm/interfaces/workspace-internal-context.interface';
import {
type RowAccessEvaluationContext,
- type PermissionsMetadataMaps,
type RowAccessRecord,
type SqlCondition,
} from 'src/engine/permissions/combine/types/row-access-policy.type';
import { buildPermissionsCondition } from 'src/engine/permissions/combine/utils/build-permissions-condition.util';
import { type RecordShareGrant } from 'src/engine/permissions/record-share/types/record-share-grant.type';
import { findPermissionsAdmittedRecordIds } from 'src/engine/permissions/combine/utils/find-permissions-admitted-record-ids.util';
-import { isObjectOperationDeniedToPrincipal } from 'src/engine/permissions/role/utils/is-object-operation-denied-to-principal.util';
-import { isObjectOperationDisabledToPrincipal } from 'src/engine/permissions/role/utils/is-object-operation-disabled-to-principal.util';
+import { isObjectOperationDeniedToPrincipals } from 'src/engine/permissions/role/utils/is-object-operation-denied-to-principals.util';
+import { isObjectOperationDisabledToPrincipals } from 'src/engine/permissions/role/utils/is-object-operation-disabled-to-principals.util';
+import { getPermissionsPrincipalsObjectsPermissions } from 'src/engine/permissions/role/utils/get-permissions-principals-objects-permissions.util';
import { isObjectOperationPermitted } from 'src/engine/permissions/role/utils/is-object-operation-permitted.util';
import { formatData } from 'src/engine/twenty-orm/utils/format-data.util';
import { formatResult } from 'src/engine/twenty-orm/utils/format-result.util';
@@ -126,9 +125,7 @@ type WorkspaceRepositoryOptions<TEntity extends ObjectLiteral> = {
internalContext: WorkspaceInternalContext;
authContext: WorkspaceAuthContext;
executor: QueryExecutor;
- objectRecordsPermissions: ObjectsPermissions;
- rolesPermissions: ObjectsPermissionsByRoleId;
- permissionsPrincipal: PermissionsPrincipalsWithRolesContext | undefined;
+ permissionsPrincipals: 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
@@ -151,17 +148,26 @@ type WorkspaceRepositoryOptions<TEntity extends ObjectLiteral> = {
};
export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
- readonly objectRecordsPermissions: ObjectsPermissions;
-
private readonly options: WorkspaceRepositoryOptions<TEntity>;
private _filesFieldSync?: FilesFieldSync;
- private permissionsMetadataMaps?: PermissionsMetadataMaps;
-
constructor(options: WorkspaceRepositoryOptions<TEntity>) {
this.options = options;
- this.objectRecordsPermissions = options.objectRecordsPermissions;
+ }
+
+ get objectRecordsPermissions(): ObjectsPermissions {
+ const { permissionsPrincipals, shouldBypassPermissionChecks } =
+ this.options;
+
+ if (shouldBypassPermissionChecks || !isDefined(permissionsPrincipals)) {
+ return {};
+ }
+
+ return getPermissionsPrincipalsObjectsPermissions({
+ principals: permissionsPrincipals,
+ metadataMaps: this.options.internalContext,
+ });
}
private get filesFieldSync(): FilesFieldSync {
@@ -185,7 +191,7 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
{
tableShape: this.options.tableShape,
executor: this.options.executor,
- objectRecordsPermissions: this.options.objectRecordsPermissions,
+ objectRecordsPermissions: this.objectRecordsPermissions,
featureFlagsMap: this.options.internalContext.featureFlagsMap,
tableShapeByObjectMetadataId: this.options.tableShapeByObjectMetadataId,
onBeforeExecute: (queryBuilder) => this.onBeforeExecute(queryBuilder),
@@ -1058,8 +1064,8 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
validateRLSPredicatesForRecords({
records: this.formatResult<ObjectRecord[]>(formattedRecords),
objectMetadata: this.options.flatObjectMetadata,
- principal: this.resolvePermissionsPrincipalOrThrow(),
- metadataMaps: this.resolvePermissionsMetadataMaps(),
+ principals: this.resolvePermissionsPrincipalsOrThrow(),
+ metadataMaps: this.options.internalContext,
});
}
@@ -1437,7 +1443,7 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
return new WorkspaceSelectQueryBuilder(alias, {
tableShape: this.options.tableShape,
executor: this.options.executor,
- objectRecordsPermissions: this.options.objectRecordsPermissions,
+ objectRecordsPermissions: this.objectRecordsPermissions,
featureFlagsMap: this.options.internalContext.featureFlagsMap,
tableShapeByObjectMetadataId: this.options.tableShapeByObjectMetadataId,
onBeforeExecute: () => undefined,
@@ -1718,7 +1724,7 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
validateOperationIsPermittedOrThrow({
entityName: this.options.tableShape.nameSingular,
operationType,
- objectsPermissions: this.options.objectRecordsPermissions,
+ objectsPermissions: this.objectRecordsPermissions,
flatObjectMetadataMaps:
this.options.internalContext.flatObjectMetadataMaps,
flatFieldMetadataMaps: this.options.internalContext.flatFieldMetadataMaps,
@@ -1741,13 +1747,13 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
return;
}
- const principal = this.resolvePermissionsPrincipalOrThrow();
- const metadataMaps = this.resolvePermissionsMetadataMaps();
+ const principals = this.resolvePermissionsPrincipalsOrThrow();
+ const metadataMaps = this.options.internalContext;
if (
!isDefined(
resolveRowLevelPermissionRecordFilter({
- principal,
+ principals,
metadataMaps,
flatObjectMetadata: this.options.flatObjectMetadata,
}),
@@ -1761,7 +1767,7 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
);
const evaluate = (records: ObjectRecord[]) =>
findPermissionsAdmittedRecordIds({
- principal,
+ principals,
metadataMaps,
flatObjectMetadata: this.options.flatObjectMetadata,
operationType: 'update',
@@ -1947,7 +1953,7 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
validateOperationIsPermittedOrThrow({
entityName: tableShape.nameSingular,
operationType: 'select',
- objectsPermissions: this.options.objectRecordsPermissions,
+ objectsPermissions: this.objectRecordsPermissions,
flatObjectMetadataMaps:
this.options.internalContext.flatObjectMetadataMaps,
flatFieldMetadataMaps:
@@ -2052,8 +2058,8 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
}
return buildPermissionsCondition({
- principal: this.resolvePermissionsPrincipalOrThrow(),
- metadataMaps: this.resolvePermissionsMetadataMaps(),
+ principals: this.resolvePermissionsPrincipalsOrThrow(),
+ metadataMaps: this.options.internalContext,
recordShareTableExpression: this.getRecordShareTableExpression(),
flatObjectMetadata,
operationType,
@@ -2168,20 +2174,20 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
}
}
- async findPrincipalAdmittedRecordIds({
- principal,
+ async findPrincipalsAdmittedRecordIds({
+ principals,
recordIds,
operationType,
hypotheticalRecordShareAccessLevel,
}: {
- principal: PermissionsPrincipalsWithRolesContext;
+ principals: PermissionsPrincipalsWithRolesContext;
recordIds: string[];
operationType: OperationType;
hypotheticalRecordShareAccessLevel?: RecordShareAccessLevel;
}): Promise<Set<string>> {
const condition = buildPermissionsCondition({
- principal,
- metadataMaps: this.resolvePermissionsMetadataMaps(),
+ principals,
+ metadataMaps: this.options.internalContext,
recordShareTableExpression: this.getRecordShareTableExpression(),
flatObjectMetadata: this.options.flatObjectMetadata,
operationType,
@@ -2232,7 +2238,7 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
return isObjectOperationPermitted({
objectMetadata: flatObjectMetadata,
operationType,
- objectsPermissions: this.options.objectRecordsPermissions,
+ objectsPermissions: this.objectRecordsPermissions,
});
}
@@ -2245,9 +2251,9 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
}): void {
if (
!this.isOperationDisabled({ operationType, flatObjectMetadata }) &&
- isObjectOperationDeniedToPrincipal({
- principal: this.resolvePermissionsPrincipalOrThrow(),
- metadataMaps: this.resolvePermissionsMetadataMaps(),
+ isObjectOperationDeniedToPrincipals({
+ principals: this.resolvePermissionsPrincipalsOrThrow(),
+ metadataMaps: this.options.internalContext,
flatObjectMetadata,
operationType,
})
@@ -2274,42 +2280,25 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
return false;
}
- return isObjectOperationDisabledToPrincipal({
- principal: this.resolvePermissionsPrincipalOrThrow(),
- metadataMaps: this.resolvePermissionsMetadataMaps(),
+ return isObjectOperationDisabledToPrincipals({
+ principals: this.resolvePermissionsPrincipalsOrThrow(),
+ metadataMaps: this.options.internalContext,
flatObjectMetadata,
operationType,
});
}
- private resolvePermissionsPrincipalOrThrow(): PermissionsPrincipalsWithRolesContext {
- const { permissionsPrincipal } = this.options;
+ private resolvePermissionsPrincipalsOrThrow(): PermissionsPrincipalsWithRolesContext {
+ const { permissionsPrincipals } = this.options;
- if (!isDefined(permissionsPrincipal)) {
+ if (!isDefined(permissionsPrincipals)) {
throw new PermissionsException(
PermissionsExceptionMessage.PERMISSION_DENIED,
PermissionsExceptionCode.PERMISSION_DENIED,
);
}
- return permissionsPrincipal;
- }
-
- private resolvePermissionsMetadataMaps(): PermissionsMetadataMaps {
- return (this.permissionsMetadataMaps ??= {
- flatFieldMetadataMaps: this.options.internalContext.flatFieldMetadataMaps,
- flatObjectMetadataMaps:
- this.options.internalContext.flatObjectMetadataMaps,
- featureFlagsMap: this.options.internalContext.featureFlagsMap,
- rolesPermissions: this.options.rolesPermissions,
- flatApplicationMaps: this.options.internalContext.flatApplicationMaps,
- flatRowLevelPermissionPredicateMaps:
- this.options.internalContext.flatRowLevelPermissionPredicateMaps,
- flatRowLevelPermissionPredicateGroupMaps:
- this.options.internalContext.flatRowLevelPermissionPredicateGroupMaps,
- flatWorkspaceMemberMaps:
- this.options.internalContext.flatWorkspaceMemberMaps,
- });
+ return permissionsPrincipals;
}
private getRecordShareTableExpression(): string {
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 50f5ccbca8f..0a857da36d1 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
@@ -1,10 +1,6 @@
import { Injectable } from '@nestjs/common';
-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 { buildPermissionsPrincipalRoleMaps } from 'src/engine/permissions/principal/utils/build-permissions-principal-role-maps.util';
import {
PermissionsException,
PermissionsExceptionCode,
@@ -28,36 +24,18 @@ export class CallRecordingService {
calendarEventId: string,
): Promise<string | undefined> {
return this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const workspaceContext = getWorkspaceContext();
-
- const { objectRecordsPermissions, shouldBypassPermissionChecks } =
- resolveObjectRecordsPermissions({
- authContext: workspaceContext.authContext,
- roleMaps: buildPermissionsPrincipalRoleMaps(workspaceContext),
- objectPermissionsByRoleId: workspaceContext.permissionsPerRoleId,
- flatObjectMetadataMaps: workspaceContext.flatObjectMetadataMaps,
- flatFieldMetadataMaps: workspaceContext.flatFieldMetadataMaps,
- });
- const callRecordingObjectMetadataId =
- workspaceContext.objectIdByNameSingular.callRecording;
+ const callRecordingRepository =
+ this.workspaceOrmManager.getRepository<CallRecordingWorkspaceEntity>(
+ 'callRecording',
+ );
- if (
- !shouldBypassPermissionChecks &&
- (!isDefined(callRecordingObjectMetadataId) ||
- !objectRecordsPermissions[callRecordingObjectMetadataId]
- ?.canReadObjectRecords)
- ) {
+ if (!callRecordingRepository.isObjectOperationPermittedByRole('select')) {
throw new PermissionsException(
PermissionsExceptionMessage.PERMISSION_DENIED,
PermissionsExceptionCode.PERMISSION_DENIED,
);
}
- const callRecordingRepository =
- this.workspaceOrmManager.getRepository<CallRecordingWorkspaceEntity>(
- 'callRecording',
- );
-
const callRecordingsByCreation = await callRecordingRepository.find({
where: { calendarEventId },
select: { id: true, status: true },
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 1000553f968..2f75fe8c214 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
@@ -4,7 +4,6 @@ import { appendCopySuffix, isDefined } from 'twenty-shared/utils';
import { ActorFromAuthContextService } from 'src/engine/core-modules/actor/services/actor-from-auth-context.service';
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
-import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
import { PageLayoutDuplicationService } from 'src/engine/metadata-modules/page-layout/services/page-layout-duplication.service';
import { PageLayoutService } from 'src/engine/metadata-modules/page-layout/services/page-layout.service';
import {
@@ -14,13 +13,6 @@ import {
} from 'src/engine/permissions/permissions.exception';
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
import { WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace-repository';
-import {
- getWorkspaceContext,
- type ORMWorkspaceContext,
-} from 'src/engine/twenty-orm/storage/orm-workspace-context.storage';
-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 { 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,
@@ -63,8 +55,6 @@ export class DashboardDuplicationService {
const workspaceId = workspace.id;
return this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const workspaceContext = getWorkspaceContext();
-
const dashboardRepository =
this.workspaceOrmManager.getRepository<DashboardWorkspaceEntity>(
'dashboard',
@@ -96,9 +86,12 @@ export class DashboardDuplicationService {
}
// The layout copy lives outside the dashboard insert, so refuse before creating it
- this.assertCanCreateDashboardOrThrow({
- workspaceContext,
- });
+ if (!dashboardRepository.isObjectOperationPermittedByRole('insert')) {
+ throw new PermissionsException(
+ PermissionsExceptionMessage.PERMISSION_DENIED,
+ PermissionsExceptionCode.PERMISSION_DENIED,
+ );
+ }
try {
const newPageLayout = await this.pageLayoutDuplicationService.duplicate(
@@ -135,44 +128,6 @@ export class DashboardDuplicationService {
}, authContext);
}
- private assertCanCreateDashboardOrThrow({
- workspaceContext,
- }: {
- workspaceContext: ORMWorkspaceContext;
- }): void {
- const { objectRecordsPermissions, shouldBypassPermissionChecks } =
- resolveObjectRecordsPermissions({
- authContext: workspaceContext.authContext,
- roleMaps: buildPermissionsPrincipalRoleMaps(workspaceContext),
- objectPermissionsByRoleId: workspaceContext.permissionsPerRoleId,
- flatObjectMetadataMaps: workspaceContext.flatObjectMetadataMaps,
- flatFieldMetadataMaps: workspaceContext.flatFieldMetadataMaps,
- });
-
- if (shouldBypassPermissionChecks) {
- return;
- }
-
- const dashboardObjectMetadata = findFlatEntityByIdInFlatEntityMaps({
- flatEntityId: workspaceContext.objectIdByNameSingular.dashboard,
- flatEntityMaps: workspaceContext.flatObjectMetadataMaps,
- });
-
- if (
- !isDefined(dashboardObjectMetadata) ||
- !isObjectOperationPermitted({
- objectMetadata: dashboardObjectMetadata,
- operationType: 'insert',
- objectsPermissions: objectRecordsPermissions,
- })
- ) {
- throw new PermissionsException(
- PermissionsExceptionMessage.PERMISSION_DENIED,
- PermissionsExceptionCode.PERMISSION_DENIED,
- );
- }
- }
-
// The layout lives in the core schema, outside the insert, so a refused or failed insert must remove it
private async createDuplicatedDashboardOrRollback({
originalDashboard,