The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Resolve how an object is shared in one place (#27420)
Félix Malfait052852c046eb
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-create-many-query-runner/common-create-many-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-create-many-query-runner/common-create-many-query-runner.service.tsindex e10c95809e9..117118f1ae1 100644--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-create-many-query-runner/common-create-many-query-runner.service.ts+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-create-many-query-runner/common-create-many-query-runner.service.ts@@ -2,11 +2,7 @@ import { Injectable } from '@nestjs/common';import { msg } from '@lingui/core/macro';import { QUERY_MAX_RECORDS } from 'twenty-shared/constants';-import {- FeatureFlagKey,- MetadataReadability,- ObjectRecord,-} from 'twenty-shared/types';+import { MetadataReadability, ObjectRecord } from 'twenty-shared/types';import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';import {Brackets,@@ -53,7 +49,7 @@ import { assertMutationNotOnRemoteObject } from 'src/engine/metadata-modules/objimport { RecordSharingMode } from 'src/engine/core-modules/record-share/enums/record-sharing-mode.enum';import { ShareWithService } from 'src/engine/core-modules/record-share/services/share-with.service';import { type ShareWithInput } from 'src/engine/core-modules/record-share/types/share-with-input.type';-import { resolveRecordSharingMode } from 'src/engine/core-modules/record-share/utils/resolve-record-sharing-mode.util';+import { resolveObjectSharing } from 'src/engine/core-modules/record-share/utils/resolve-object-sharing.util';import { resolveShareWithToWrite } from 'src/engine/core-modules/record-share/utils/resolve-share-with-to-write.util';import { WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace-repository';import { RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';@@ -83,7 +79,7 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSerconst isPrivateObject =queryRunnerContext.flatObjectMetadata.readability ===MetadataReadability.PRIVATE;- const { sharingMode } = this.resolveRecordSharing(queryRunnerContext);+ const { sharingMode } = resolveObjectSharing(queryRunnerContext);const isGatedThroughRecordShares =sharingMode === RecordSharingMode.PRIVATE ||sharingMode === RecordSharingMode.INHERITED;@@ -617,10 +613,9 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSer}): Promise<void> {const { authContext, flatObjectMetadata, repository, transactionScope } =queryRunnerContext;- const { sharingMode, isRecordSharingEnabled } =- this.resolveRecordSharing(queryRunnerContext);+ const objectSharing = resolveObjectSharing(queryRunnerContext);const shareWithToWrite = resolveShareWithToWrite({- sharingMode,+ sharingMode: objectSharing.sharingMode,shareWith,});@@ -639,8 +634,7 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSerawait this.shareWithService.insertRecordSharesForCreatedRecords({authContext,flatObjectMetadata,- sharingMode,- isRecordSharingEnabled,+ objectSharing,recordIds: insertResult.generatedMaps.map((record) => record.id),apiKeyRoleMap: repository.internalContext.apiKeyRoleMap,shareWith: shareWithToWrite,@@ -648,25 +642,6 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSer});}- private resolveRecordSharing({- flatObjectMetadata,- featureFlagsMap,- }: CommonExtendedQueryRunnerContext): {- sharingMode: RecordSharingMode;- isRecordSharingEnabled: boolean;- } {- const isRecordSharingEnabled =- featureFlagsMap[FeatureFlagKey.IS_RECORD_LEVEL_SHARING_ENABLED] ?? false;-- return {- sharingMode: resolveRecordSharingMode({- flatObjectMetadata,- isRecordSharingEnabled,- }),- isRecordSharingEnabled,- };- }-private resolveNestedRelationsForCreate({records,shareWith,diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-filter/graphql-query-filter-field.parser.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-filter/graphql-query-filter-field.parser.tsindex 2f7e9d4a261..b38c252815b 100644--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-filter/graphql-query-filter-field.parser.ts+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-filter/graphql-query-filter-field.parser.ts@@ -10,7 +10,7 @@ import {GraphqlQueryRunnerExceptionCode,} from 'src/engine/api/graphql/graphql-query-runner/errors/graphql-query-runner.exception';import { addRelationJoinAliasToQueryBuilder } from 'src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/utils/add-relation-join-alias.util';-import { isRecordGrantBeyondRoleAllowed } from 'src/engine/core-modules/record-share/utils/is-record-grant-beyond-role-allowed.util';+import { resolveObjectSharing } from 'src/engine/core-modules/record-share/utils/resolve-object-sharing.util';import { assertFieldIsReadableOrThrow } from 'src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/utils/assert-field-is-readable-or-throw.util';import { resolveFilterKeyFieldMetadata } from 'src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/utils/resolve-filter-key-field-metadata.util';import { assertArrayOperatorValueIsNonEmptyArray } from 'src/engine/api/graphql/graphql-query-runner/utils/assert-array-operator-value-is-non-empty-array.util';@@ -91,11 +91,10 @@ export class GraphqlQueryFilterFieldParser {objectPermissions?.canReadObjectRecords === false &&!(this.depth === 0 &&- isRecordGrantBeyondRoleAllowed({+ resolveObjectSharing({flatObjectMetadata: this.flatObjectMetadata,- operationType: 'select',- isRecordSharingEnabled: outerQueryBuilder.isRecordSharingEnabled,- })+ featureFlagsMap: outerQueryBuilder.featureFlagsMap,+ }).operationTypesGrantedBeyondRole.includes('select'))) {throw new PermissionsException(diff --git a/packages/twenty-server/src/engine/core-modules/record-share/services/record-access-policy.service.ts b/packages/twenty-server/src/engine/core-modules/record-share/services/record-access-policy.service.tsindex d2d3b7c28ef..b0abab2a9bc 100644--- a/packages/twenty-server/src/engine/core-modules/record-share/services/record-access-policy.service.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/services/record-access-policy.service.ts@@ -16,7 +16,6 @@ import {evaluateRowAccessPolicy,type RowAccessEvaluationContext,} from 'src/engine/core-modules/record-share/utils/evaluate-row-access-policy.util';-import { resolveRecordShareFeatureFlags } from 'src/engine/core-modules/record-share/utils/resolve-record-share-feature-flags.util';import {type EventRecordSnapshot,resolveEventRecordSnapshots,@@ -177,7 +176,7 @@ export class RecordAccessPolicyService {environment: {flatObjectMetadataMaps,flatFieldMetadataMaps: flatFieldMetadataMapsOrm,- ...resolveRecordShareFeatureFlags(featureFlagsMap),+ featureFlagsMap,},tableAlias: objectMetadata.nameSingular,flatObjectMetadata: objectMetadata,diff --git a/packages/twenty-server/src/engine/core-modules/record-share/services/record-share-principal.service.ts b/packages/twenty-server/src/engine/core-modules/record-share/services/record-share-principal.service.tsindex fb30a95d808..4f60f999fdf 100644--- a/packages/twenty-server/src/engine/core-modules/record-share/services/record-share-principal.service.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/services/record-share-principal.service.ts@@ -12,7 +12,6 @@ import {} from 'src/engine/core-modules/record-share/record-share.exception';import { type RecordShareInput } from 'src/engine/core-modules/record-share/types/record-share-input.type';import { buildRoleRowAccessPolicySubject } from 'src/engine/core-modules/record-share/utils/build-role-row-access-policy-subject.util';-import { isRecordGrantBeyondRoleAllowed } from 'src/engine/core-modules/record-share/utils/is-record-grant-beyond-role-allowed.util';import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';import { type WorkspaceTransactionScope } from 'src/engine/twenty-orm/types/workspace-transaction-scope.type';import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';@@ -78,14 +77,14 @@ export class RecordSharePrincipalService {workspaceId,transactionScope,flatObjectMetadata,- isRecordSharingEnabled,+ canShareBeyondRole,principals,recordIds,}: {workspaceId: string;transactionScope: WorkspaceTransactionScope;flatObjectMetadata: FlatObjectMetadata;- isRecordSharingEnabled: boolean;+ canShareBeyondRole: boolean;principals: RecordSharePrincipal[];recordIds: string[];}): Promise<void> {@@ -97,11 +96,7 @@ export class RecordSharePrincipalService {if (namedPrincipals.length === 0 ||recordIds.length === 0 ||- isRecordGrantBeyondRoleAllowed({- flatObjectMetadata,- operationType: 'select',- isRecordSharingEnabled,- })+ canShareBeyondRole) {return;}diff --git a/packages/twenty-server/src/engine/core-modules/record-share/services/record-sharing.service.ts b/packages/twenty-server/src/engine/core-modules/record-share/services/record-sharing.service.tsindex 3bb1e4b398b..1605aef0e33 100644--- a/packages/twenty-server/src/engine/core-modules/record-share/services/record-sharing.service.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/services/record-sharing.service.ts@@ -5,7 +5,6 @@ import { Injectable } from '@nestjs/common';import { msg } from '@lingui/core/macro';import { EVERYONE_PRINCIPAL_ID } from 'twenty-shared/constants';import {- FeatureFlagKey,type ObjectRecord,RecordShareAccessLevel,RecordSharePrincipalType,@@ -33,8 +32,11 @@ import { type RecordShare } from 'src/engine/core-modules/record-share/types/recimport { canRolesAccessAllRecords } from 'src/engine/core-modules/record-share/utils/can-roles-access-all-records.util';import { resolveDefaultGeneralAccessLevel } from 'src/engine/core-modules/record-share/utils/resolve-default-general-access-level.util';import { resolveRecordGeneralAccessLevel } from 'src/engine/core-modules/record-share/utils/resolve-record-general-access-level.util';+import {+ type ObjectSharing,+ resolveObjectSharing,+} from 'src/engine/core-modules/record-share/utils/resolve-object-sharing.util';import { resolveRecordSharePrincipalOrThrow } from 'src/engine/core-modules/record-share/utils/resolve-record-share-principal-or-throw.util';-import { resolveRecordSharingMode } from 'src/engine/core-modules/record-share/utils/resolve-record-sharing-mode.util';import { resolveViewerRecordShareAccessLevel } from 'src/engine/core-modules/record-share/utils/resolve-viewer-record-share-access-level.util';import { validateShareWithPrincipalsOrThrow } from 'src/engine/core-modules/record-share/utils/validate-share-with-principals-or-throw.util';import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';@@ -57,10 +59,8 @@ type RecordSharingArgs = RecordTargetInput & {authContext: UserWorkspaceAuthContext;};-type RecordSharingObject = {+type RecordSharingObject = ObjectSharing & {flatObjectMetadata: FlatObjectMetadata;- isRecordSharingEnabled: boolean;- sharingMode: RecordSharingMode;};type RecordSharingChange = {@@ -146,7 +146,7 @@ export class RecordSharingService {workspaceId,transactionScope,flatObjectMetadata: sharingObject.flatObjectMetadata,- isRecordSharingEnabled: sharingObject.isRecordSharingEnabled,+ canShareBeyondRole: sharingObject.canShareBeyondRole,principals: [principal],recordIds: [args.recordId],},@@ -653,16 +653,9 @@ export class RecordSharingService {throw new NotFoundError('Record not found');}- const isRecordSharingEnabled =- featureFlagsMap[FeatureFlagKey.IS_RECORD_LEVEL_SHARING_ENABLED] ?? false;-return {flatObjectMetadata,- isRecordSharingEnabled,- sharingMode: resolveRecordSharingMode({- flatObjectMetadata,- isRecordSharingEnabled,- }),+ ...resolveObjectSharing({ flatObjectMetadata, featureFlagsMap }),};}}diff --git a/packages/twenty-server/src/engine/core-modules/record-share/services/share-with.service.ts b/packages/twenty-server/src/engine/core-modules/record-share/services/share-with.service.tsindex b8946000868..33804cc14c1 100644--- a/packages/twenty-server/src/engine/core-modules/record-share/services/share-with.service.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/services/share-with.service.ts@@ -10,6 +10,7 @@ import { RecordSharePrincipalService } from 'src/engine/core-modules/record-sharimport { RecordShareStorageService } from 'src/engine/core-modules/record-share/services/record-share-storage.service';import { type ShareWithInput } from 'src/engine/core-modules/record-share/types/share-with-input.type';import { buildRecordShareInputsForCreatedRecords } from 'src/engine/core-modules/record-share/utils/build-record-share-inputs-for-created-records.util';+import { type ObjectSharing } from 'src/engine/core-modules/record-share/utils/resolve-object-sharing.util';import { resolveShareWithPrincipalOrThrow } from 'src/engine/core-modules/record-share/utils/resolve-share-with-principal-or-throw.util';import { validateShareWithArgOrThrow } from 'src/engine/core-modules/record-share/utils/validate-share-with-arg-or-throw.util';import { validateShareWithPrincipalsOrThrow } from 'src/engine/core-modules/record-share/utils/validate-share-with-principals-or-throw.util';@@ -57,8 +58,7 @@ export class ShareWithService {async insertRecordSharesForCreatedRecords({authContext,flatObjectMetadata,- sharingMode,- isRecordSharingEnabled,+ objectSharing,recordIds,apiKeyRoleMap,shareWith,@@ -66,8 +66,7 @@ export class ShareWithService {}: {authContext: WorkspaceAuthContext;flatObjectMetadata: FlatObjectMetadata;- sharingMode: RecordSharingMode;- isRecordSharingEnabled: boolean;+ objectSharing: ObjectSharing;recordIds: string[];apiKeyRoleMap: Record<string, string>;shareWith: ShareWithInput[];@@ -91,7 +90,8 @@ export class ShareWithService {authContext,apiKeyRoleMap,shareWith,- isOpenByDefault: sharingMode === RecordSharingMode.OPEN_BY_DEFAULT,+ isOpenByDefault:+ objectSharing.sharingMode === RecordSharingMode.OPEN_BY_DEFAULT,}),transactionScope,});@@ -100,7 +100,7 @@ export class ShareWithService {workspaceId,transactionScope,flatObjectMetadata,- isRecordSharingEnabled,+ canShareBeyondRole: objectSharing.canShareBeyondRole,principals: shareWith.map(resolveShareWithPrincipalOrThrow),recordIds,});diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/evaluate-row-access-policy.util.spec.ts b/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/evaluate-row-access-policy.util.spec.tsindex 9617d91f9bf..9fd4cb74899 100644--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/evaluate-row-access-policy.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/evaluate-row-access-policy.util.spec.ts@@ -14,7 +14,6 @@ import {type RowAccessEvaluationContext,type RowAccessRecord,} from 'src/engine/core-modules/record-share/utils/evaluate-row-access-policy.util';-import { resolveRecordShareFeatureFlags } from 'src/engine/core-modules/record-share/utils/resolve-record-share-feature-flags.util';import { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/constant/create-empty-flat-entity-maps.constant';import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';import { addFlatEntityToFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/add-flat-entity-to-flat-entity-maps-or-throw.util';@@ -241,9 +240,9 @@ describe('evaluateRowAccessPolicy', () => {environment: {flatFieldMetadataMaps,flatObjectMetadataMaps: createEmptyFlatEntityMaps(),- ...resolveRecordShareFeatureFlags({+ featureFlagsMap: {[FeatureFlagKey.IS_RECORD_SHARE_VISIBILITY_GATING_ENABLED]: false,- }),+ },},tableAlias: 'company',flatObjectMetadata: privateObject,diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/is-record-grant-beyond-role-allowed.util.spec.ts b/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/is-record-grant-beyond-role-allowed.util.spec.tsdeleted file mode 100644index 783891b49ce..00000000000--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/is-record-grant-beyond-role-allowed.util.spec.ts+++ /dev/null@@ -1,94 +0,0 @@-/* @license Enterprise */--import { MetadataReadability, ObjectSharingReach } from 'twenty-shared/types';--import { isRecordGrantBeyondRoleAllowed } from 'src/engine/core-modules/record-share/utils/is-record-grant-beyond-role-allowed.util';--const OPEN_OBJECT = {- readability: MetadataReadability.OPEN,- isSystem: false,- sharingReach: ObjectSharingReach.WORKSPACE,-};--describe('isRecordGrantBeyondRoleAllowed', () => {- it.each(['select', 'update'] as const)(- 'should let a grant reach beyond the role to %s',- (operationType) => {- expect(- isRecordGrantBeyondRoleAllowed({- flatObjectMetadata: OPEN_OBJECT,- operationType,- isRecordSharingEnabled: true,- }),- ).toBe(true);- },- );-- it.each(['insert', 'delete', 'soft-delete', 'restore'] as const)(- 'should keep %s with the role',- (operationType) => {- expect(- isRecordGrantBeyondRoleAllowed({- flatObjectMetadata: OPEN_OBJECT,- operationType,- isRecordSharingEnabled: true,- }),- ).toBe(false);- },- );-- it('should stay within the role when the object limits sharing to it', () => {- expect(- isRecordGrantBeyondRoleAllowed({- flatObjectMetadata: {- ...OPEN_OBJECT,- sharingReach: ObjectSharingReach.ROLE_ACCESS,- },- operationType: 'select',- isRecordSharingEnabled: true,- }),- ).toBe(false);- });-- it('should stay within the role while record sharing is disabled', () => {- expect(- isRecordGrantBeyondRoleAllowed({- flatObjectMetadata: OPEN_OBJECT,- operationType: 'select',- isRecordSharingEnabled: false,- }),- ).toBe(false);- });-- it.each([- { readability: MetadataReadability.SYSTEM, isSystem: false },- { readability: MetadataReadability.APPLICATION, isSystem: false },- { readability: MetadataReadability.OPEN, isSystem: true },- { readability: MetadataReadability.PRIVATE, isSystem: true },- { readability: MetadataReadability.INHERITED, isSystem: true },- ])(- 'should never reach an object whose records cannot be shared (%o)',- (object) => {- expect(- isRecordGrantBeyondRoleAllowed({- flatObjectMetadata: { ...OPEN_OBJECT, ...object },- operationType: 'select',- isRecordSharingEnabled: true,- }),- ).toBe(false);- },- );-- it.each([MetadataReadability.PRIVATE, MetadataReadability.INHERITED])(- 'should reach a %s object',- (readability) => {- expect(- isRecordGrantBeyondRoleAllowed({- flatObjectMetadata: { ...OPEN_OBJECT, readability },- operationType: 'update',- isRecordSharingEnabled: true,- }),- ).toBe(true);- },- );-});diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/resolve-object-sharing.util.spec.ts b/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/resolve-object-sharing.util.spec.tsnew file mode 100644index 00000000000..9e7de8ebd72--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/resolve-object-sharing.util.spec.ts@@ -0,0 +1,110 @@+/* @license Enterprise */++import {+ FeatureFlagKey,+ MetadataReadability,+ ObjectSharingReach,+} from 'twenty-shared/types';++import { RecordSharingMode } from 'src/engine/core-modules/record-share/enums/record-sharing-mode.enum';+import { resolveObjectSharing } from 'src/engine/core-modules/record-share/utils/resolve-object-sharing.util';++const OPEN_OBJECT = {+ readability: MetadataReadability.OPEN,+ isSystem: false,+ sharingReach: ObjectSharingReach.WORKSPACE,+};+const RECORD_SHARING = {+ [FeatureFlagKey.IS_RECORD_LEVEL_SHARING_ENABLED]: true,+};++describe('resolveObjectSharing', () => {+ it.each([+ [MetadataReadability.PRIVATE, false, false, RecordSharingMode.PRIVATE],+ [MetadataReadability.PRIVATE, true, false, RecordSharingMode.PRIVATE],+ [MetadataReadability.INHERITED, false, false, RecordSharingMode.INHERITED],+ [MetadataReadability.OPEN, false, true, RecordSharingMode.OPEN_BY_DEFAULT],+ [MetadataReadability.OPEN, false, false, RecordSharingMode.ROLE_ONLY],+ [MetadataReadability.OPEN, true, true, RecordSharingMode.ROLE_ONLY],+ [MetadataReadability.SYSTEM, false, true, RecordSharingMode.ROLE_ONLY],+ [MetadataReadability.APPLICATION, false, true, RecordSharingMode.ROLE_ONLY],+ ])(+ 'should resolve a %s object (system: %s) with record sharing %s to %s',+ (readability, isSystem, isRecordSharingEnabled, sharingMode) => {+ expect(+ resolveObjectSharing({+ flatObjectMetadata: { ...OPEN_OBJECT, readability, isSystem },+ featureFlagsMap: isRecordSharingEnabled ? RECORD_SHARING : {},+ }).sharingMode,+ ).toBe(sharingMode);+ },+ );++ it('should keep visibility gating on for a workspace without flag rows', () => {+ expect(+ resolveObjectSharing({+ flatObjectMetadata: OPEN_OBJECT,+ featureFlagsMap: {},+ }),+ ).toEqual({+ sharingMode: RecordSharingMode.ROLE_ONLY,+ isVisibilityGatingEnabled: true,+ canShareBeyondRole: false,+ operationTypesGrantedBeyondRole: [],+ });+ });++ it.each([+ MetadataReadability.OPEN,+ MetadataReadability.PRIVATE,+ MetadataReadability.INHERITED,+ ])(+ 'should let a grant on a %s object view or edit beyond the role',+ (readability) => {+ expect(+ resolveObjectSharing({+ flatObjectMetadata: { ...OPEN_OBJECT, readability },+ featureFlagsMap: RECORD_SHARING,+ }),+ ).toMatchObject({+ canShareBeyondRole: true,+ operationTypesGrantedBeyondRole: ['select', 'update'],+ });+ },+ );++ it.each([+ { sharingReach: ObjectSharingReach.ROLE_ACCESS },+ { readability: MetadataReadability.SYSTEM },+ { readability: MetadataReadability.APPLICATION },+ { isSystem: true },+ { readability: MetadataReadability.PRIVATE, isSystem: true },+ ])('should keep grants within the role on %o', (object) => {+ expect(+ resolveObjectSharing({+ flatObjectMetadata: { ...OPEN_OBJECT, ...object },+ featureFlagsMap: RECORD_SHARING,+ }),+ ).toMatchObject({+ canShareBeyondRole: false,+ operationTypesGrantedBeyondRole: [],+ });+ });++ it('should keep sharing but grant nothing beyond the role once gating is turned off', () => {+ expect(+ resolveObjectSharing({+ flatObjectMetadata: OPEN_OBJECT,+ featureFlagsMap: {+ ...RECORD_SHARING,+ [FeatureFlagKey.IS_RECORD_SHARE_VISIBILITY_GATING_ENABLED]: false,+ },+ }),+ ).toEqual({+ sharingMode: RecordSharingMode.OPEN_BY_DEFAULT,+ isVisibilityGatingEnabled: false,+ canShareBeyondRole: true,+ operationTypesGrantedBeyondRole: [],+ });+ });+});diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/resolve-record-share-feature-flags.util.spec.ts b/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/resolve-record-share-feature-flags.util.spec.tsdeleted file mode 100644index 6cde2313d62..00000000000--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/resolve-record-share-feature-flags.util.spec.ts+++ /dev/null@@ -1,36 +0,0 @@-import { FeatureFlagKey } from 'twenty-shared/types';--import { resolveRecordShareFeatureFlags } from 'src/engine/core-modules/record-share/utils/resolve-record-share-feature-flags.util';--describe('resolveRecordShareFeatureFlags', () => {- it('keeps visibility gating on for a workspace without flag rows', () => {- expect(resolveRecordShareFeatureFlags({})).toEqual({- isRecordShareVisibilityGatingEnabled: true,- isRecordSharingEnabled: false,- });- });-- it('keeps record sharing when visibility gating is explicitly on', () => {- expect(- resolveRecordShareFeatureFlags({- [FeatureFlagKey.IS_RECORD_SHARE_VISIBILITY_GATING_ENABLED]: true,- [FeatureFlagKey.IS_RECORD_LEVEL_SHARING_ENABLED]: true,- }),- ).toEqual({- isRecordShareVisibilityGatingEnabled: true,- isRecordSharingEnabled: true,- });- });-- it('turns gating and record sharing off when the flag is explicitly false', () => {- expect(- resolveRecordShareFeatureFlags({- [FeatureFlagKey.IS_RECORD_SHARE_VISIBILITY_GATING_ENABLED]: false,- [FeatureFlagKey.IS_RECORD_LEVEL_SHARING_ENABLED]: true,- }),- ).toEqual({- isRecordShareVisibilityGatingEnabled: false,- isRecordSharingEnabled: false,- });- });-});diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/resolve-record-sharing-mode.util.spec.ts b/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/resolve-record-sharing-mode.util.spec.tsdeleted file mode 100644index 672ccc3ac9c..00000000000--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/resolve-record-sharing-mode.util.spec.ts+++ /dev/null@@ -1,29 +0,0 @@-/* @license Enterprise */--import { MetadataReadability } from 'twenty-shared/types';--import { RecordSharingMode } from 'src/engine/core-modules/record-share/enums/record-sharing-mode.enum';-import { resolveRecordSharingMode } from 'src/engine/core-modules/record-share/utils/resolve-record-sharing-mode.util';--describe('resolveRecordSharingMode', () => {- it.each([- [MetadataReadability.PRIVATE, false, false, RecordSharingMode.PRIVATE],- [MetadataReadability.PRIVATE, true, false, RecordSharingMode.PRIVATE],- [MetadataReadability.INHERITED, false, false, RecordSharingMode.INHERITED],- [MetadataReadability.OPEN, false, true, RecordSharingMode.OPEN_BY_DEFAULT],- [MetadataReadability.OPEN, false, false, RecordSharingMode.ROLE_ONLY],- [MetadataReadability.OPEN, true, true, RecordSharingMode.ROLE_ONLY],- [MetadataReadability.SYSTEM, false, true, RecordSharingMode.ROLE_ONLY],- [MetadataReadability.APPLICATION, false, true, RecordSharingMode.ROLE_ONLY],- ])(- 'should resolve a %s object (system: %s) with the flag %s to %s',- (readability, isSystem, isRecordSharingEnabled, sharingMode) => {- expect(- resolveRecordSharingMode({- flatObjectMetadata: { readability, isSystem },- isRecordSharingEnabled,- }),- ).toBe(sharingMode);- },- );-});diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/build-record-share-gate.util.ts b/packages/twenty-server/src/engine/core-modules/record-share/utils/build-record-share-gate.util.tsindex b2b841233d6..5057f1e7207 100644--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/build-record-share-gate.util.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/utils/build-record-share-gate.util.ts@@ -5,10 +5,11 @@ import { type RecordShareAccessLevel } from 'twenty-shared/types';import { assertUnreachable, isDefined } from 'twenty-shared/utils';import { MAX_INHERITED_READABILITY_DEPTH } from 'src/engine/core-modules/record-share/constants/max-inherited-readability-depth.constant';+import { RecordSharingMode } from 'src/engine/core-modules/record-share/enums/record-sharing-mode.enum';import { type InheritedReadabilityParent } from 'src/engine/core-modules/record-share/types/inherited-readability-parent.type';import { isOpenWhenDetachedObject } from 'src/engine/core-modules/record-share/utils/is-open-when-detached-object.util';import { resolveInheritedReadabilityParents } from 'src/engine/core-modules/record-share/utils/resolve-inherited-readability-parents.util';-import { shouldEnforceRecordShareExceptions } from 'src/engine/core-modules/record-share/utils/should-enforce-record-share-exceptions.util';+import { resolveObjectSharing } from 'src/engine/core-modules/record-share/utils/resolve-object-sharing.util';import { resolveRequiredRecordShareAccessLevels } from 'src/engine/core-modules/record-share/utils/resolve-required-record-share-access-levels.util';import {type InheritedReadabilityParentExpression,@@ -38,17 +39,16 @@ export const buildRecordShareGate = ({readability: target.flatObjectMetadata.readability,isOwningApplication,});- const isGatingEnabled =- context.environment.isRecordShareVisibilityGatingEnabled;+ const { sharingMode, isVisibilityGatingEnabled } = resolveObjectSharing({+ flatObjectMetadata: target.flatObjectMetadata,+ featureFlagsMap: context.environment.featureFlagsMap,+ });switch (gateKind) {case 'open':- return isGatingEnabled &&- shouldEnforceRecordShareExceptions({- flatObjectMetadata: target.flatObjectMetadata,- isRecordSharingEnabled: context.environment.isRecordSharingEnabled,- canAccessAllRecords: context.subject.canAccessAllRecords,- })+ return isVisibilityGatingEnabled &&+ sharingMode === RecordSharingMode.OPEN_BY_DEFAULT &&+ !context.subject.canAccessAllRecords? buildRecordShareExceptionGate(context, target): { kind: 'open' };case 'deny':@@ -58,9 +58,10 @@ export const buildRecordShareGate = ({context,target,buildParentPolicy,+ isVisibilityGatingEnabled,});case 'private':- return isGatingEnabled+ return isVisibilityGatingEnabled? buildOwnRecordShareGate(context, target): { kind: 'open' };default:@@ -133,9 +134,10 @@ const buildInheritedReadabilityGate = ({context,target,buildParentPolicy,-}: RecordShareGateArgs): RowAccessPolicy => {- const isGatingEnabled =- context.environment.isRecordShareVisibilityGatingEnabled;+ isVisibilityGatingEnabled,+}: RecordShareGateArgs & {+ isVisibilityGatingEnabled: boolean;+}): RowAccessPolicy => {const { tableAlias, flatObjectMetadata, depth, joinParentRelationShape } =target;@@ -164,7 +166,7 @@ const buildInheritedReadabilityGate = ({const isOpenWhenDetached = isOpenWhenDetachedObject(flatObjectMetadata);if (parents.length === 0) {- return isOpenWhenDetached || !isGatingEnabled+ return isOpenWhenDetached || !isVisibilityGatingEnabled? { kind: 'open' }: buildOwnRecordShareGate(context, target);}@@ -185,7 +187,7 @@ const buildInheritedReadabilityGate = ({);if (- !isGatingEnabled &&+ !isVisibilityGatingEnabled &&parentExpressions.every((parentExpression) => parentExpression.policy.kind === 'open',)diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/is-record-grant-beyond-role-allowed.util.ts b/packages/twenty-server/src/engine/core-modules/record-share/utils/is-record-grant-beyond-role-allowed.util.tsdeleted file mode 100644index e9a8e625d40..00000000000--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/is-record-grant-beyond-role-allowed.util.ts+++ /dev/null@@ -1,33 +0,0 @@-/* @license Enterprise */--import { ObjectSharingReach } from 'twenty-shared/types';--import { isRecordShareableObject } from 'src/engine/core-modules/record-share/utils/is-record-shareable-object.util';-import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';-import { type OperationType } from 'src/engine/twenty-orm/repository/permissions.utils';--// A record shared by name reaches people whose role cannot otherwise access-// its object, but only to view or edit it: deleting it, creating siblings or-// managing its access stay with the roles that can access the object-const OPERATION_TYPES_GRANTABLE_BEYOND_ROLE: OperationType[] = [- 'select',- 'update',-];--export const isRecordGrantBeyondRoleAllowed = ({- flatObjectMetadata,- operationType,- isRecordSharingEnabled,-}: {- flatObjectMetadata: Pick<- FlatObjectMetadata,- 'readability' | 'isSystem' | 'sharingReach'- >;- operationType: OperationType;- isRecordSharingEnabled: boolean;-}): boolean =>- isRecordSharingEnabled &&- !flatObjectMetadata.isSystem &&- flatObjectMetadata.sharingReach === ObjectSharingReach.WORKSPACE &&- OPERATION_TYPES_GRANTABLE_BEYOND_ROLE.includes(operationType) &&- isRecordShareableObject({ flatObjectMetadata, isRecordSharingEnabled });diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/is-record-shareable-object.util.ts b/packages/twenty-server/src/engine/core-modules/record-share/utils/is-record-shareable-object.util.tsdeleted file mode 100644index 36390eb6355..00000000000--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/is-record-shareable-object.util.ts+++ /dev/null@@ -1,17 +0,0 @@-/* @license Enterprise */--import { MetadataReadability } from 'twenty-shared/types';--import { isRecordShareExceptionObject } from 'src/engine/core-modules/record-share/utils/is-record-share-exception-object.util';-import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';--export const isRecordShareableObject = ({- flatObjectMetadata,- isRecordSharingEnabled,-}: {- flatObjectMetadata: Pick<FlatObjectMetadata, 'readability' | 'isSystem'>;- isRecordSharingEnabled: boolean;-}): boolean =>- flatObjectMetadata.readability === MetadataReadability.PRIVATE ||- flatObjectMetadata.readability === MetadataReadability.INHERITED ||- (isRecordSharingEnabled && isRecordShareExceptionObject(flatObjectMetadata));diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-object-sharing.util.ts b/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-object-sharing.util.tsnew file mode 100644index 00000000000..7cdaeae0dd9--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-object-sharing.util.ts@@ -0,0 +1,89 @@+/* @license Enterprise */++import {+ FeatureFlagKey,+ MetadataReadability,+ ObjectSharingReach,+} from 'twenty-shared/types';++import { RecordSharingMode } from 'src/engine/core-modules/record-share/enums/record-sharing-mode.enum';+import { isRecordShareExceptionObject } from 'src/engine/core-modules/record-share/utils/is-record-share-exception-object.util';+import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';+import { type OperationType } from 'src/engine/twenty-orm/repository/permissions.utils';++// A record shared by name reaches people whose role cannot otherwise access+// its object, but only to view or edit it: deleting it, creating siblings or+// managing its access stay with the roles that can access the object+const OPERATION_TYPES_GRANTABLE_BEYOND_ROLE: OperationType[] = [+ 'select',+ 'update',+];++// Visibility gating is an operator switch on reads only: with it off, shares+// keep being written but grant nothing, so sharingMode and canShareBeyondRole+// ignore it while isVisibilityGatingEnabled and+// operationTypesGrantedBeyondRole follow it+export type ObjectSharing = {+ sharingMode: RecordSharingMode;+ isVisibilityGatingEnabled: boolean;+ canShareBeyondRole: boolean;+ operationTypesGrantedBeyondRole: OperationType[];+};++const resolveSharingMode = ({+ flatObjectMetadata,+ isRecordSharingEnabled,+}: {+ flatObjectMetadata: Pick<FlatObjectMetadata, 'readability' | 'isSystem'>;+ isRecordSharingEnabled: boolean;+}): RecordSharingMode => {+ switch (flatObjectMetadata.readability) {+ case MetadataReadability.PRIVATE:+ return RecordSharingMode.PRIVATE;+ case MetadataReadability.INHERITED:+ return RecordSharingMode.INHERITED;+ default:+ return isRecordSharingEnabled &&+ isRecordShareExceptionObject(flatObjectMetadata)+ ? RecordSharingMode.OPEN_BY_DEFAULT+ : RecordSharingMode.ROLE_ONLY;+ }+};++export const resolveObjectSharing = ({+ flatObjectMetadata,+ featureFlagsMap,+}: {+ flatObjectMetadata: Pick<+ FlatObjectMetadata,+ 'readability' | 'isSystem' | 'sharingReach'+ >;+ featureFlagsMap: Partial<Record<FeatureFlagKey, boolean>>;+}): ObjectSharing => {+ const isRecordSharingEnabled =+ featureFlagsMap[FeatureFlagKey.IS_RECORD_LEVEL_SHARING_ENABLED] ?? false;+ // A workspace without a row for this flag keeps gating on+ const isVisibilityGatingEnabled =+ featureFlagsMap[+ FeatureFlagKey.IS_RECORD_SHARE_VISIBILITY_GATING_ENABLED+ ] !== false;+ const sharingMode = resolveSharingMode({+ flatObjectMetadata,+ isRecordSharingEnabled,+ });+ const canShareBeyondRole =+ isRecordSharingEnabled &&+ sharingMode !== RecordSharingMode.ROLE_ONLY &&+ !flatObjectMetadata.isSystem &&+ flatObjectMetadata.sharingReach === ObjectSharingReach.WORKSPACE;++ return {+ sharingMode,+ isVisibilityGatingEnabled,+ canShareBeyondRole,+ operationTypesGrantedBeyondRole:+ isVisibilityGatingEnabled && canShareBeyondRole+ ? OPERATION_TYPES_GRANTABLE_BEYOND_ROLE+ : [],+ };+};diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-record-share-feature-flags.util.ts b/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-record-share-feature-flags.util.tsdeleted file mode 100644index 2ec9d3fe12f..00000000000--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-record-share-feature-flags.util.ts+++ /dev/null@@ -1,25 +0,0 @@-/* @license Enterprise */--import { FeatureFlagKey } from 'twenty-shared/types';--import { type RowAccessPolicyEnvironment } from 'src/engine/twenty-orm/types/row-access-policy.type';--export const resolveRecordShareFeatureFlags = (- featureFlagsMap: Partial<Record<FeatureFlagKey, boolean>>,-): Pick<- RowAccessPolicyEnvironment,- 'isRecordSharingEnabled' | 'isRecordShareVisibilityGatingEnabled'-> => {- const isRecordShareVisibilityGatingEnabled =- featureFlagsMap[- FeatureFlagKey.IS_RECORD_SHARE_VISIBILITY_GATING_ENABLED- ] !== false;-- return {- isRecordShareVisibilityGatingEnabled,- isRecordSharingEnabled:- isRecordShareVisibilityGatingEnabled &&- (featureFlagsMap[FeatureFlagKey.IS_RECORD_LEVEL_SHARING_ENABLED] ??- false),- };-};diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-record-sharing-mode.util.ts b/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-record-sharing-mode.util.tsdeleted file mode 100644index 32db2a1eb5f..00000000000--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-record-sharing-mode.util.ts+++ /dev/null@@ -1,27 +0,0 @@-/* @license Enterprise */--import { MetadataReadability } from 'twenty-shared/types';--import { RecordSharingMode } from 'src/engine/core-modules/record-share/enums/record-sharing-mode.enum';-import { isRecordShareExceptionObject } from 'src/engine/core-modules/record-share/utils/is-record-share-exception-object.util';-import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';--export const resolveRecordSharingMode = ({- flatObjectMetadata,- isRecordSharingEnabled,-}: {- flatObjectMetadata: Pick<FlatObjectMetadata, 'readability' | 'isSystem'>;- isRecordSharingEnabled: boolean;-}): RecordSharingMode => {- switch (flatObjectMetadata.readability) {- case MetadataReadability.PRIVATE:- return RecordSharingMode.PRIVATE;- case MetadataReadability.INHERITED:- return RecordSharingMode.INHERITED;- default:- return isRecordSharingEnabled &&- isRecordShareExceptionObject(flatObjectMetadata)- ? RecordSharingMode.OPEN_BY_DEFAULT- : RecordSharingMode.ROLE_ONLY;- }-};diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/should-enforce-record-share-exceptions.util.ts b/packages/twenty-server/src/engine/core-modules/record-share/utils/should-enforce-record-share-exceptions.util.tsdeleted file mode 100644index aeefc4efc42..00000000000--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/should-enforce-record-share-exceptions.util.ts+++ /dev/null@@ -1,17 +0,0 @@-/* @license Enterprise */--import { isRecordShareExceptionObject } from 'src/engine/core-modules/record-share/utils/is-record-share-exception-object.util';-import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';--export const shouldEnforceRecordShareExceptions = ({- flatObjectMetadata,- isRecordSharingEnabled,- canAccessAllRecords,-}: {- flatObjectMetadata: Pick<FlatObjectMetadata, 'readability' | 'isSystem'>;- isRecordSharingEnabled: boolean;- canAccessAllRecords: boolean;-}): boolean =>- isRecordSharingEnabled &&- !canAccessAllRecords &&- isRecordShareExceptionObject(flatObjectMetadata);diff --git a/packages/twenty-server/src/engine/twenty-orm/query-builder/workspace-select-query-builder.ts b/packages/twenty-server/src/engine/twenty-orm/query-builder/workspace-select-query-builder.tsindex ab5f630a482..4824de394f5 100644--- a/packages/twenty-server/src/engine/twenty-orm/query-builder/workspace-select-query-builder.ts+++ b/packages/twenty-server/src/engine/twenty-orm/query-builder/workspace-select-query-builder.ts@@ -1,4 +1,7 @@-import { type ObjectsPermissions } from 'twenty-shared/types';+import {+ type FeatureFlagKey,+ type ObjectsPermissions,+} from 'twenty-shared/types';import { isDefined, pascalCase } from 'twenty-shared/utils';import { type ObjectLiteral } from 'typeorm';import { InstanceChecker } from 'typeorm/util/InstanceChecker';@@ -67,7 +70,7 @@ export type QueryBuilderContext = {tableShape: WorkspaceTableShape;executor: QueryExecutor;objectRecordsPermissions: ObjectsPermissions;- isRecordSharingEnabled?: boolean;+ featureFlagsMap?: Partial<Record<FeatureFlagKey, boolean>>;tableShapeByObjectMetadataId: (objectMetadataId: string,) => WorkspaceTableShape;@@ -79,7 +82,7 @@ export class WorkspaceSelectQueryBuilder implements WhereExpressionLike {readonly alias: string;readonly tableShape: WorkspaceTableShape;readonly objectRecordsPermissions: ObjectsPermissions;- readonly isRecordSharingEnabled: boolean;+ readonly featureFlagsMap: Partial<Record<FeatureFlagKey, boolean>>;private readonly context: QueryBuilderContext;private readonly whereClauses: WhereClause[] = [];@@ -103,7 +106,7 @@ export class WorkspaceSelectQueryBuilder implements WhereExpressionLike {this.alias = alias;this.tableShape = context.tableShape;this.objectRecordsPermissions = context.objectRecordsPermissions;- this.isRecordSharingEnabled = context.isRecordSharingEnabled ?? false;+ this.featureFlagsMap = context.featureFlagsMap ?? {};this.context = context;}diff --git a/packages/twenty-server/src/engine/twenty-orm/repository/permissions.utils.ts b/packages/twenty-server/src/engine/twenty-orm/repository/permissions.utils.tsindex 9b6924fa8a7..6112bec895e 100644--- a/packages/twenty-server/src/engine/twenty-orm/repository/permissions.utils.ts+++ b/packages/twenty-server/src/engine/twenty-orm/repository/permissions.utils.ts@@ -1,6 +1,7 @@import { isNonEmptyString } from '@sniptt/guards';import isEmpty from 'lodash.isempty';import {+ type FeatureFlagKey,type ObjectsPermissions,type RestrictedFieldsPermissions,} from 'twenty-shared/types';@@ -19,7 +20,7 @@ import {import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';import { validateWritabilityOrThrow } from 'src/engine/twenty-orm/repository/validate-writability-or-throw.util';import { isObjectOperationPermitted } from 'src/engine/twenty-orm/utils/is-object-operation-permitted.util';-import { isRecordGrantBeyondRoleAllowed } from 'src/engine/core-modules/record-share/utils/is-record-grant-beyond-role-allowed.util';+import { resolveObjectSharing } from 'src/engine/core-modules/record-share/utils/resolve-object-sharing.util';import { getColumnNameToFieldMetadataIdMap } from 'src/engine/twenty-orm/utils/get-column-name-to-field-metadata-id.util';export type OperationType =@@ -40,7 +41,7 @@ type ValidateOperationIsPermittedOrThrowArgs = {selectedColumns: string[];updatedColumns: string[];authContext?: WorkspaceAuthContext;- isRecordSharingEnabled?: boolean;+ featureFlagsMap?: Partial<Record<FeatureFlagKey, boolean>>;};export const validateOperationIsPermittedOrThrow = ({@@ -53,7 +54,7 @@ export const validateOperationIsPermittedOrThrow = ({selectedColumns,updatedColumns,authContext,- isRecordSharingEnabled = false,+ featureFlagsMap = {},}: ValidateOperationIsPermittedOrThrowArgs) => {const objectMetadataIdForEntity = objectIdByNameSingular[entityName];@@ -101,11 +102,10 @@ export const validateOperationIsPermittedOrThrow = ({operationType,objectsPermissions,})) &&- !isRecordGrantBeyondRoleAllowed({+ !resolveObjectSharing({flatObjectMetadata: objectMetadata,- operationType,- isRecordSharingEnabled,- })+ featureFlagsMap,+ }).operationTypesGrantedBeyondRole.includes(operationType)) {throw new PermissionsException(PermissionsExceptionMessage.PERMISSION_DENIED,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.tsindex 78ba36243a0..2a656c0a7e8 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@@ -45,7 +45,6 @@ import {type SqlCondition,} from 'src/engine/twenty-orm/types/row-access-policy.type';import { compileRowAccessExpression } from 'src/engine/twenty-orm/utils/compile-row-access-policy.util';-import { resolveRecordShareFeatureFlags } from 'src/engine/core-modules/record-share/utils/resolve-record-share-feature-flags.util';import { resolveRecordShareGateKind } from 'src/engine/core-modules/record-share/utils/resolve-record-share-gate-kind.util';import { buildRowAccessPolicy } from 'src/engine/twenty-orm/utils/build-row-access-policy.util';import { type RecordShareGrant } from 'src/engine/core-modules/record-share/types/record-share-grant.type';@@ -55,7 +54,7 @@ import {type RowAccessRecord,} from 'src/engine/core-modules/record-share/utils/evaluate-row-access-policy.util';import { isRowAccessExpressionReadingRoleFilter } from 'src/engine/twenty-orm/utils/is-row-access-expression-reading-role-filter.util';-import { isRecordGrantBeyondRoleAllowed } from 'src/engine/core-modules/record-share/utils/is-record-grant-beyond-role-allowed.util';+import { resolveObjectSharing } from 'src/engine/core-modules/record-share/utils/resolve-object-sharing.util';import { isObjectOperationPermitted } from 'src/engine/twenty-orm/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';@@ -198,7 +197,7 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {tableShape: this.options.tableShape,executor: this.options.executor,objectRecordsPermissions: this.options.objectRecordsPermissions,- isRecordSharingEnabled: this.isRecordSharingEnabled,+ featureFlagsMap: this.options.internalContext.featureFlagsMap,tableShapeByObjectMetadataId: this.options.tableShapeByObjectMetadataId,onBeforeExecute: (queryBuilder) => this.onBeforeExecute(queryBuilder),formatResult: (records) => this.formatResult(records),@@ -1461,7 +1460,7 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {tableShape: this.options.tableShape,executor: this.options.executor,objectRecordsPermissions: this.options.objectRecordsPermissions,- isRecordSharingEnabled: this.isRecordSharingEnabled,+ featureFlagsMap: this.options.internalContext.featureFlagsMap,tableShapeByObjectMetadataId: this.options.tableShapeByObjectMetadataId,onBeforeExecute: () => undefined,formatResult: (records) => this.formatResult(records),@@ -1926,7 +1925,7 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {selectedColumns: columnsToReturn,updatedColumns,authContext: this.options.authContext,- isRecordSharingEnabled: this.isRecordSharingEnabled,+ featureFlagsMap: this.options.internalContext.featureFlagsMap,});}@@ -2127,7 +2126,7 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {this.options.internalContext.flatFieldMetadataMaps,objectIdByNameSingular:this.options.internalContext.objectIdByNameSingular,- isRecordSharingEnabled: this.isRecordSharingEnabled,+ featureFlagsMap: this.options.internalContext.featureFlagsMap,selectedColumns: columnNames,updatedColumns: [],});@@ -2231,11 +2230,10 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {if (isMainAlias &&!this.isObjectOperationPermitted({ flatObjectMetadata, operationType }) &&- !isRecordGrantBeyondRoleAllowed({+ !resolveObjectSharing({flatObjectMetadata,- operationType,- isRecordSharingEnabled: this.isRecordSharingEnabled,- })+ featureFlagsMap: this.options.internalContext.featureFlagsMap,+ }).operationTypesGrantedBeyondRole.includes(operationType)) {throw new PermissionsException(PermissionsExceptionMessage.PERMISSION_DENIED,@@ -2513,22 +2511,10 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {),resolveTableExpression: (objectMetadataId) =>this.getTableExpression(objectMetadataId),- ...this.recordShareFeatureFlags,+ featureFlagsMap: this.options.internalContext.featureFlagsMap,};}- private get recordShareFeatureFlags(): ReturnType<- typeof resolveRecordShareFeatureFlags- > {- return resolveRecordShareFeatureFlags(- this.options.internalContext.featureFlagsMap,- );- }-- private get isRecordSharingEnabled(): boolean {- return this.recordShareFeatureFlags.isRecordSharingEnabled;- }-private resolveInheritedReadabilityParents(flatObjectMetadata: FlatObjectMetadata,): InheritedReadabilityParent[] {diff --git a/packages/twenty-server/src/engine/twenty-orm/types/row-access-policy.type.ts b/packages/twenty-server/src/engine/twenty-orm/types/row-access-policy.type.tsindex 620673efc11..625dde0ec69 100644--- a/packages/twenty-server/src/engine/twenty-orm/types/row-access-policy.type.ts+++ b/packages/twenty-server/src/engine/twenty-orm/types/row-access-policy.type.ts@@ -1,6 +1,7 @@import { type ObjectLiteral } from 'typeorm';import {+ type FeatureFlagKey,type ObjectsPermissions,type RecordGqlOperationFilter,type RecordShareAccessLevel,@@ -86,8 +87,7 @@ export type RowAccessPolicySubject = {export type RowAccessPolicyEnvironment = {flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;- isRecordSharingEnabled: boolean;- isRecordShareVisibilityGatingEnabled: boolean;+ featureFlagsMap: Partial<Record<FeatureFlagKey, boolean>>;};export type RowAccessCompilationEnvironment = {diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/build-row-access-policy.util.spec.ts b/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/build-row-access-policy.util.spec.tsindex 35200bb6b2f..ce6fa22eb65 100644--- a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/build-row-access-policy.util.spec.ts+++ b/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/build-row-access-policy.util.spec.ts@@ -1,5 +1,6 @@import { EVERYONE_PRINCIPAL_ID } from 'twenty-shared/constants';import {+ FeatureFlagKey,MetadataReadability,MetadataWritability,ObjectSharingReach,@@ -64,8 +65,11 @@ const environment: RowAccessPolicyEnvironment &recordShareTableExpression: '"workspace"."recordShare"',resolveTableExpression: (objectMetadataId) =>`"workspace"."${objectMetadataId}"`,- isRecordSharingEnabled: false,- isRecordShareVisibilityGatingEnabled: true,+ featureFlagsMap: {},+};+const sharingEnvironment = {+ ...environment,+ featureFlagsMap: { [FeatureFlagKey.IS_RECORD_LEVEL_SHARING_ENABLED]: true },};const buildCompiledRowAccessPolicy = (@@ -180,7 +184,7 @@ describe('buildRowAccessPolicy', () => {});const policy = buildCompiledRowAccessPolicy({subject: readEverything,- environment: { ...environment, isRecordSharingEnabled: true },+ environment: sharingEnvironment,tableAlias: 'company',flatObjectMetadata: company,operationType: 'select',@@ -198,7 +202,7 @@ describe('buildRowAccessPolicy', () => {expect(buildCompiledRowAccessPolicy({subject: { ...readEverything, canAccessAllRecords: true },- environment: { ...environment, isRecordSharingEnabled: true },+ environment: sharingEnvironment,tableAlias: 'note',flatObjectMetadata: note,operationType: 'select',@@ -217,7 +221,7 @@ describe('buildRowAccessPolicy', () => {expect(buildCompiledRowAccessPolicy({subject: readEverything,- environment: { ...environment, isRecordSharingEnabled: true },+ environment: sharingEnvironment,tableAlias: 'note',flatObjectMetadata: { ...note, isSystem: true },operationType: 'select',@@ -230,7 +234,7 @@ describe('buildRowAccessPolicy', () => {expect(buildCompiledRowAccessPolicy({subject: readEverything,- environment: { ...environment, isRecordSharingEnabled: true },+ environment: sharingEnvironment,tableAlias: 'note',flatObjectMetadata: note,operationType: 'insert',@@ -240,7 +244,6 @@ describe('buildRowAccessPolicy', () => {});describe('with a record shared beyond the role', () => {- const sharingEnvironment = { ...environment, isRecordSharingEnabled: true };const company = buildObject({id: 'company',readability: MetadataReadability.OPEN,@@ -445,8 +448,10 @@ describe('buildRowAccessPolicy', () => {describe('with record share visibility gating off', () => {const ungatedEnvironment = {...environment,- isRecordSharingEnabled: true,- isRecordShareVisibilityGatingEnabled: false,+ featureFlagsMap: {+ [FeatureFlagKey.IS_RECORD_LEVEL_SHARING_ENABLED]: true,+ [FeatureFlagKey.IS_RECORD_SHARE_VISIBILITY_GATING_ENABLED]: false,+ },};const buildBypassed = (subject: RowAccessPolicySubject,diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/build-row-access-policy.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/build-row-access-policy.util.tsindex 524ff909ea1..95061dad2ba 100644--- a/packages/twenty-server/src/engine/twenty-orm/utils/build-row-access-policy.util.ts+++ b/packages/twenty-server/src/engine/twenty-orm/utils/build-row-access-policy.util.ts@@ -3,7 +3,7 @@ import { isDefined } from 'twenty-shared/utils';import { buildNamedRecordGrantExpression } from 'src/engine/core-modules/record-share/utils/build-named-record-grant-expression.util';import { buildRecordShareGate } from 'src/engine/core-modules/record-share/utils/build-record-share-gate.util';-import { isRecordGrantBeyondRoleAllowed } from 'src/engine/core-modules/record-share/utils/is-record-grant-beyond-role-allowed.util';+import { resolveObjectSharing } from 'src/engine/core-modules/record-share/utils/resolve-object-sharing.util';import {type RowAccessExpression,type RowAccessPolicy,@@ -37,15 +37,12 @@ export const buildRowAccessPolicy = ({return { kind: 'denied' };}- const namedRecordGrant =- environment.isRecordShareVisibilityGatingEnabled &&- isRecordGrantBeyondRoleAllowed({- flatObjectMetadata: target.flatObjectMetadata,- operationType: target.operationType,- isRecordSharingEnabled: environment.isRecordSharingEnabled,- })- ? buildNamedRecordGrantExpression(context, target)- : undefined;+ const namedRecordGrant = resolveObjectSharing({+ flatObjectMetadata: target.flatObjectMetadata,+ featureFlagsMap: environment.featureFlagsMap,+ }).operationTypesGrantedBeyondRole.includes(target.operationType)+ ? buildNamedRecordGrantExpression(context, target)+ : undefined;if (isDefined(subject.objectsPermissions) &&