Skip to content

The open alternative to Salesforce, designed for AI.

Keep chats share-only until private records are enabled (#29464)

Charles Bochetb46d9e25d87a
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 2129c655df7..f052aaf657e 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
@@ -473,12 +473,14 @@ describe('buildPermissionsCondition', () => {
const policy = buildConditionOutcome({
...prospectiveShareArguments,
metadataMaps,
+ tableAlias: note.nameSingular,
+ flatObjectMetadata: note,
});
expect(policy).toMatchObject({
kind: 'gated',
condition: {
- sql: expect.stringContaining('"person"."title" = :restricted'),
+ sql: expect.stringContaining('"note"."title" = :restricted'),
},
});
expect(policy).toMatchObject({
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 beae7ccbbbc..2f1e4a8e1e7 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
@@ -10,6 +10,7 @@ import { areRecordGrantsHeldToRowLevelPermissions } from 'src/engine/permissions
import { combineSqlConditions } from 'src/engine/permissions/combine/utils/combine-sql-conditions.util';
import { resolvePermissionsRowAccessOutcome } from 'src/engine/permissions/combine/utils/resolve-permissions-row-access-outcome.util';
import { buildPermissionsCreatorCondition } from 'src/engine/permissions/private-record/utils/build-permissions-creator-condition.util';
+import { isShareOnlyWhilePrivateRecordFlagDisabled } from 'src/engine/permissions/private-record/utils/is-share-only-while-private-record-flag-disabled.util';
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';
@@ -20,6 +21,21 @@ const combineWithOr = (conditions: SqlCondition[]): SqlCondition =>
? conditions[0]
: combineSqlConditions(conditions, 'OR');
+const buildPermissionsRoleConditions = (
+ sqlRequest: PermissionsRowAccessSqlRequest,
+): SqlCondition[] | true => {
+ const objectCondition = buildPermissionsObjectCondition(sqlRequest);
+
+ if (objectCondition === true) {
+ return true;
+ }
+
+ return [
+ objectCondition === false ? undefined : objectCondition,
+ buildPermissionsRlsCondition(sqlRequest),
+ ].filter(isDefined);
+};
+
export const buildPermissionsCondition = ({
tableAlias,
...request
@@ -36,16 +52,15 @@ export const buildPermissionsCondition = ({
return outcome;
}
- const objectCondition = buildPermissionsObjectCondition(sqlRequest);
+ // TODO(@charlesBochet): remove with isShareOnlyWhilePrivateRecordFlagDisabled after 2.55
+ const roleConditions = isShareOnlyWhilePrivateRecordFlagDisabled(sqlRequest)
+ ? []
+ : buildPermissionsRoleConditions(sqlRequest);
- if (objectCondition === true) {
+ if (roleConditions === true) {
return true;
}
- const roleConditions = [
- objectCondition === false ? undefined : objectCondition,
- buildPermissionsRlsCondition(sqlRequest),
- ].filter(isDefined);
const recordConditions = [
buildPermissionsShareCondition(sqlRequest),
buildPermissionsCreatorCondition(sqlRequest),
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..6cc3ccf6c21 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
@@ -6,6 +6,7 @@ import { type PermissionsRowAccessEvaluationRequest } from 'src/engine/permissio
import { areRecordGrantsHeldToRowLevelPermissions } from 'src/engine/permissions/combine/utils/are-record-grants-held-to-row-level-permissions.util';
import { resolvePermissionsRowAccessOutcome } from 'src/engine/permissions/combine/utils/resolve-permissions-row-access-outcome.util';
import { findPermissionsCreatorAdmittedRecordIds } from 'src/engine/permissions/private-record/utils/find-permissions-creator-admitted-record-ids.util';
+import { isShareOnlyWhilePrivateRecordFlagDisabled } from 'src/engine/permissions/private-record/utils/is-share-only-while-private-record-flag-disabled.util';
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';
@@ -25,10 +26,13 @@ export const findPermissionsAdmittedRecordIds = async (
return new Set(records.map((record) => record.id));
}
- const admittedRecordIds = new Set([
- ...(await findPermissionsObjectAdmittedRecordIds(request)),
- ...(await findPermissionsRlsAdmittedRecordIds(request)),
- ]);
+ // TODO(@charlesBochet): remove with isShareOnlyWhilePrivateRecordFlagDisabled after 2.55
+ const admittedRecordIds = isShareOnlyWhilePrivateRecordFlagDisabled(request)
+ ? new Set<string>()
+ : new Set([
+ ...(await findPermissionsObjectAdmittedRecordIds(request)),
+ ...(await findPermissionsRlsAdmittedRecordIds(request)),
+ ]);
const rowLevelPermissionMatchingRecordIds =
areRecordGrantsHeldToRowLevelPermissions(request)
? findRowLevelPermissionMatchingRecordIds(request)
diff --git a/packages/twenty-server/src/engine/permissions/private-record/utils/is-share-only-while-private-record-flag-disabled.util.ts b/packages/twenty-server/src/engine/permissions/private-record/utils/is-share-only-while-private-record-flag-disabled.util.ts
new file mode 100644
index 00000000000..98727d9550f
--- /dev/null
+++ b/packages/twenty-server/src/engine/permissions/private-record/utils/is-share-only-while-private-record-flag-disabled.util.ts
@@ -0,0 +1,21 @@
+/* @license Enterprise */
+
+import { isNonEmptyArray } from 'twenty-shared/utils';
+
+import { type PermissionsRowAccessRequest } from 'src/engine/permissions/combine/types/row-access-policy.type';
+import { isPrivateByDefaultObject } from 'src/engine/permissions/private-record/utils/is-private-by-default-object.util';
+import { isPrivateRecordEnabled } from 'src/engine/permissions/private-record/utils/is-private-record-enabled.util';
+import { resolveRequiredRecordShareAccessLevels } from 'src/engine/permissions/record-share/utils/resolve-required-record-share-access-levels.util';
+
+// TODO(@charlesBochet): remove after 2.55; chats reach only their shares while IS_PRIVATE_RECORD_ENABLED is off
+export const isShareOnlyWhilePrivateRecordFlagDisabled = ({
+ metadataMaps,
+ flatObjectMetadata,
+ operationType,
+}: Pick<
+ PermissionsRowAccessRequest,
+ 'metadataMaps' | 'flatObjectMetadata' | 'operationType'
+>): boolean =>
+ isNonEmptyArray(resolveRequiredRecordShareAccessLevels(operationType)) &&
+ isPrivateByDefaultObject(flatObjectMetadata) &&
+ !isPrivateRecordEnabled(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 81ac9b6d092..f0d70402dfe 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
@@ -5,6 +5,7 @@ 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 { isShareOnlyWhilePrivateRecordFlagDisabled } from 'src/engine/permissions/private-record/utils/is-share-only-while-private-record-flag-disabled.util';
import { isRecordPrivacyApplicable } from 'src/engine/permissions/private-record/utils/is-record-privacy-applicable.util';
import { isOperationGrantedBeyondRole } from 'src/engine/permissions/record-share/utils/is-operation-granted-beyond-role.util';
import { resolveRequiredRecordShareAccessLevels } from 'src/engine/permissions/record-share/utils/resolve-required-record-share-access-levels.util';
@@ -27,11 +28,15 @@ export const resolvePermissionsShareGrant = (
featureFlagsMap: request.metadataMaps.featureFlagsMap,
operationType: request.operationType,
});
+ // TODO(@charlesBochet): remove with isShareOnlyWhilePrivateRecordFlagDisabled after 2.55
+ const isShareOnly = isShareOnlyWhilePrivateRecordFlagDisabled(request);
if (
!isNonEmptyArray(principalIds) ||
!isNonEmptyArray(accessLevels) ||
- (!isGrantedBeyondRole && !isRecordPrivacyApplicable(request))
+ (!isGrantedBeyondRole &&
+ !isShareOnly &&
+ !isRecordPrivacyApplicable(request))
) {
return undefined;
}
@@ -39,6 +44,6 @@ export const resolvePermissionsShareGrant = (
return {
principalIds,
accessLevels,
- isLimitedToPrivateRecords: !isGrantedBeyondRole,
+ isLimitedToPrivateRecords: !isGrantedBeyondRole && !isShareOnly,
};
};