Skip to content

The open alternative to Salesforce, designed for AI.

Name the role grant on every record the allRecords grant path (#29602)

Charles Bochetd7a6ebc7e2b9
diff --git a/packages/twenty-server/src/engine/permissions/role/utils/build-permissions-object-condition.util.ts b/packages/twenty-server/src/engine/permissions/all-records/utils/build-permissions-all-records-condition.util.ts
similarity index 95%
rename from packages/twenty-server/src/engine/permissions/role/utils/build-permissions-object-condition.util.ts
rename to packages/twenty-server/src/engine/permissions/all-records/utils/build-permissions-all-records-condition.util.ts
index 9541e7ea4ed..c58102362b1 100644
--- a/packages/twenty-server/src/engine/permissions/role/utils/build-permissions-object-condition.util.ts
+++ b/packages/twenty-server/src/engine/permissions/all-records/utils/build-permissions-all-records-condition.util.ts
@@ -11,7 +11,7 @@ import { areRoleGrantsLimitedToPublicRecords } from 'src/engine/permissions/role
import { isRolePermittingOperation } from 'src/engine/permissions/role/utils/is-role-permitting-operation.util';
import { resolvePermissionsRowLevelPermissionFilter } from 'src/engine/permissions/rls/utils/resolve-permissions-row-level-permission-filter.util';
-export const buildPermissionsObjectCondition = (
+export const buildPermissionsAllRecordsCondition = (
request: PermissionsRowAccessSqlRequest,
): SqlCondition | boolean => {
if (
diff --git a/packages/twenty-server/src/engine/permissions/role/utils/find-permissions-object-admitted-record-ids.util.ts b/packages/twenty-server/src/engine/permissions/all-records/utils/find-permissions-all-records-admitted-record-ids.util.ts
similarity index 95%
rename from packages/twenty-server/src/engine/permissions/role/utils/find-permissions-object-admitted-record-ids.util.ts
rename to packages/twenty-server/src/engine/permissions/all-records/utils/find-permissions-all-records-admitted-record-ids.util.ts
index 8fe54a8da1f..4dad72b4958 100644
--- a/packages/twenty-server/src/engine/permissions/role/utils/find-permissions-object-admitted-record-ids.util.ts
+++ b/packages/twenty-server/src/engine/permissions/all-records/utils/find-permissions-all-records-admitted-record-ids.util.ts
@@ -8,7 +8,7 @@ import { areRoleGrantsLimitedToPublicRecords } from 'src/engine/permissions/role
import { isRolePermittingOperation } from 'src/engine/permissions/role/utils/is-role-permitting-operation.util';
import { resolvePermissionsRowLevelPermissionFilter } from 'src/engine/permissions/rls/utils/resolve-permissions-row-level-permission-filter.util';
-export const findPermissionsObjectAdmittedRecordIds = async ({
+export const findPermissionsAllRecordsAdmittedRecordIds = async ({
records,
context,
...request
diff --git a/packages/twenty-server/src/engine/permissions/combine/utils/build-permissions-condition.util.ts b/packages/twenty-server/src/engine/permissions/combine/utils/build-permissions-condition.util.ts
index bcded2dcddc..5e74776a590 100644
--- a/packages/twenty-server/src/engine/permissions/combine/utils/build-permissions-condition.util.ts
+++ b/packages/twenty-server/src/engine/permissions/combine/utils/build-permissions-condition.util.ts
@@ -13,7 +13,7 @@ import { buildPermissionsCreatorCondition } from 'src/engine/permissions/private
import { buildPermissionsShareCondition } from 'src/engine/permissions/record-share/utils/build-permissions-share-condition.util';
import { buildPermissionsRlsCondition } from 'src/engine/permissions/rls/utils/build-permissions-rls-condition.util';
import { resolvePermissionsRowLevelPermissionFilter } from 'src/engine/permissions/rls/utils/resolve-permissions-row-level-permission-filter.util';
-import { buildPermissionsObjectCondition } from 'src/engine/permissions/role/utils/build-permissions-object-condition.util';
+import { buildPermissionsAllRecordsCondition } from 'src/engine/permissions/all-records/utils/build-permissions-all-records-condition.util';
const combineWithOr = (conditions: SqlCondition[]): SqlCondition =>
conditions.length === 1
@@ -23,14 +23,14 @@ const combineWithOr = (conditions: SqlCondition[]): SqlCondition =>
const buildPermissionsRoleConditions = (
sqlRequest: PermissionsRowAccessSqlRequest,
): SqlCondition[] | true => {
- const objectCondition = buildPermissionsObjectCondition(sqlRequest);
+ const allRecordsCondition = buildPermissionsAllRecordsCondition(sqlRequest);
- if (objectCondition === true) {
+ if (allRecordsCondition === true) {
return true;
}
return [
- objectCondition === false ? undefined : objectCondition,
+ allRecordsCondition === false ? undefined : allRecordsCondition,
buildPermissionsRlsCondition(sqlRequest),
].filter(isDefined);
};
diff --git a/packages/twenty-server/src/engine/permissions/combine/utils/find-permissions-admitted-record-ids.util.ts b/packages/twenty-server/src/engine/permissions/combine/utils/find-permissions-admitted-record-ids.util.ts
index 2994101dfb2..41622e97ce8 100644
--- a/packages/twenty-server/src/engine/permissions/combine/utils/find-permissions-admitted-record-ids.util.ts
+++ b/packages/twenty-server/src/engine/permissions/combine/utils/find-permissions-admitted-record-ids.util.ts
@@ -9,7 +9,7 @@ import { findPermissionsCreatorAdmittedRecordIds } from 'src/engine/permissions/
import { findPermissionsShareAdmittedRecordIds } from 'src/engine/permissions/record-share/utils/find-permissions-share-admitted-record-ids.util';
import { findPermissionsRlsAdmittedRecordIds } from 'src/engine/permissions/rls/utils/find-permissions-rls-admitted-record-ids.util';
import { findRowLevelPermissionMatchingRecordIds } from 'src/engine/permissions/rls/utils/find-row-level-permission-matching-record-ids.util';
-import { findPermissionsObjectAdmittedRecordIds } from 'src/engine/permissions/role/utils/find-permissions-object-admitted-record-ids.util';
+import { findPermissionsAllRecordsAdmittedRecordIds } from 'src/engine/permissions/all-records/utils/find-permissions-all-records-admitted-record-ids.util';
export const findPermissionsAdmittedRecordIds = async (
request: PermissionsRowAccessEvaluationRequest,
@@ -26,7 +26,7 @@ export const findPermissionsAdmittedRecordIds = async (
}
const admittedRecordIds = new Set([
- ...(await findPermissionsObjectAdmittedRecordIds(request)),
+ ...(await findPermissionsAllRecordsAdmittedRecordIds(request)),
...(await findPermissionsRlsAdmittedRecordIds(request)),
]);
const rowLevelPermissionMatchingRecordIds =
diff --git a/packages/twenty-server/src/engine/permissions/role/utils/is-object-operation-disabled-to-principals.util.ts b/packages/twenty-server/src/engine/permissions/role/utils/is-object-operation-disabled-to-principals.util.ts
index 1567253b1ff..d2307ac9dda 100644
--- a/packages/twenty-server/src/engine/permissions/role/utils/is-object-operation-disabled-to-principals.util.ts
+++ b/packages/twenty-server/src/engine/permissions/role/utils/is-object-operation-disabled-to-principals.util.ts
@@ -6,7 +6,6 @@ import { isObjectOperationDisabled } from 'src/engine/permissions/role/utils/is-
export const isObjectOperationDisabledToPrincipals = ({
principals,
- metadataMaps,
flatObjectMetadata,
operationType,
}: PermissionsObjectAccessRequest): boolean =>