The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Make record sharing an enterprise feature (#26070)
martmulleb8a96bdea43
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql b/packages/twenty-client-sdk/src/metadata/generated/schema.graphqlindex be4560587bc..684b838bd32 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql@@ -2628,6 +2628,7 @@ enum BillingEntitlementKey {SSOCUSTOM_DOMAINRLS+ RECORD_SHARINGAUDIT_LOGSUSAGE_LIMIT}diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.ts b/packages/twenty-client-sdk/src/metadata/generated/schema.tsindex 30e7fec223d..372c1948a1d 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.ts+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.ts@@ -2229,7 +2229,7 @@ export interface BillingEntitlement {__typename: 'BillingEntitlement'}-export type BillingEntitlementKey = 'SSO' | 'CUSTOM_DOMAIN' | 'RLS' | 'AUDIT_LOGS' | 'USAGE_LIMIT'+export type BillingEntitlementKey = 'SSO' | 'CUSTOM_DOMAIN' | 'RLS' | 'RECORD_SHARING' | 'AUDIT_LOGS' | 'USAGE_LIMIT'export interface DomainRecord {validationType: Scalars['String']@@ -10845,6 +10845,7 @@ export const enumBillingEntitlementKey = {SSO: 'SSO' as const,CUSTOM_DOMAIN: 'CUSTOM_DOMAIN' as const,RLS: 'RLS' as const,+ RECORD_SHARING: 'RECORD_SHARING' as const,AUDIT_LOGS: 'AUDIT_LOGS' as const,USAGE_LIMIT: 'USAGE_LIMIT' as const}diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.tsindex 6e7105964b4..51b750dd1d1 100644--- a/packages/twenty-front/src/generated-metadata/graphql.ts+++ b/packages/twenty-front/src/generated-metadata/graphql.ts@@ -752,6 +752,7 @@ export type BillingEntitlement = {export enum BillingEntitlementKey {AUDIT_LOGS = 'AUDIT_LOGS',CUSTOM_DOMAIN = 'CUSTOM_DOMAIN',+ RECORD_SHARING = 'RECORD_SHARING',RLS = 'RLS',SSO = 'SSO',USAGE_LIMIT = 'USAGE_LIMIT'diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-base-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-base-query-runner.service.tsindex c24da9049f4..1c636285fa8 100644--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-base-query-runner.service.ts+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-base-query-runner.service.ts@@ -392,6 +392,7 @@ export abstract class CommonBaseQueryRunnerService<rolePermissionConfig,repository,featureFlagsMap: context.featureFlagsMap,+ isRecordSharingEnabled: context.isRecordSharingEnabled,};}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 78b15cd4fde..2c30fcd917f 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,@@ -50,8 +46,8 @@ import { buildFieldMapsFromFlatObjectMetadata } from 'src/engine/metadata-moduleimport { type FlatIndexMetadata } from 'src/engine/metadata-modules/flat-index-metadata/types/flat-index-metadata.type';import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';import { assertMutationNotOnRemoteObject } from 'src/engine/metadata-modules/object-metadata/utils/assert-mutation-not-on-remote-object.util';-import { ShareWithService } from 'src/engine/record-share/services/share-with.service';-import { type ShareWithInput } from 'src/engine/record-share/types/share-with-input.type';+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 { WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace-repository';import { RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config';import { containsNestedRelationCreate } from 'src/engine/twenty-orm/utils/contains-nested-relation-create.util';@@ -649,11 +645,7 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSerprivate isRecordSharingEnabled(queryRunnerContext: CommonExtendedQueryRunnerContext,): boolean {- return (- queryRunnerContext.featureFlagsMap[- FeatureFlagKey.IS_RECORD_SHARING_ENABLED- ] ?? false- );+ return queryRunnerContext.isRecordSharingEnabled;}private resolveNestedRelationsForCreate({diff --git a/packages/twenty-server/src/engine/api/common/core-common-api.module.ts b/packages/twenty-server/src/engine/api/common/core-common-api.module.tsindex c1f2eb937a0..26f3398db83 100644--- a/packages/twenty-server/src/engine/api/common/core-common-api.module.ts+++ b/packages/twenty-server/src/engine/api/common/core-common-api.module.ts@@ -26,7 +26,7 @@ import { UserRoleModule } from 'src/engine/metadata-modules/user-role/user-role.import { ViewFilterGroupModule } from 'src/engine/metadata-modules/view-filter-group/view-filter-group.module';import { ViewFilterModule } from 'src/engine/metadata-modules/view-filter/view-filter.module';import { ViewModule } from 'src/engine/metadata-modules/view/view.module';-import { RecordShareModule } from 'src/engine/record-share/record-share.module';+import { RecordShareModule } from 'src/engine/core-modules/record-share/record-share.module';import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';@Module({diff --git a/packages/twenty-server/src/engine/api/common/types/common-extended-query-runner-context.type.ts b/packages/twenty-server/src/engine/api/common/types/common-extended-query-runner-context.type.tsindex bf11e437dde..dfe1abb46dd 100644--- a/packages/twenty-server/src/engine/api/common/types/common-extended-query-runner-context.type.ts+++ b/packages/twenty-server/src/engine/api/common/types/common-extended-query-runner-context.type.ts@@ -15,4 +15,5 @@ export type CommonExtendedQueryRunnerContext = Omit<repository: WorkspaceRepository<ObjectRecord>;commonQueryParser: GraphqlQueryParser;featureFlagsMap: Record<FeatureFlagKey, boolean>;+ isRecordSharingEnabled: boolean;};diff --git a/packages/twenty-server/src/engine/api/common/types/common-query-args.type.ts b/packages/twenty-server/src/engine/api/common/types/common-query-args.type.tsindex 77c24514cc9..5067164a9ff 100644--- a/packages/twenty-server/src/engine/api/common/types/common-query-args.type.ts+++ b/packages/twenty-server/src/engine/api/common/types/common-query-args.type.ts@@ -13,7 +13,7 @@ import {type CommonSelectedFields,type CommonSelectedFieldsResult,} from 'src/engine/api/common/types/common-selected-fields-result.type';-import { type ShareWithInput } from 'src/engine/record-share/types/share-with-input.type';+import { type ShareWithInput } from 'src/engine/core-modules/record-share/types/share-with-input.type';export enum CommonQueryNames {FIND_ONE = 'findOne',diff --git a/packages/twenty-server/src/engine/api/graphql/direct-execution/utils/assert-share-with-arg.util.ts b/packages/twenty-server/src/engine/api/graphql/direct-execution/utils/assert-share-with-arg.util.tsindex 1518379c342..d49960882d3 100644--- a/packages/twenty-server/src/engine/api/graphql/direct-execution/utils/assert-share-with-arg.util.ts+++ b/packages/twenty-server/src/engine/api/graphql/direct-execution/utils/assert-share-with-arg.util.ts@@ -4,7 +4,7 @@ import { RecordShareAccessLevel } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import { STANDARD_ERROR_MESSAGE } from 'src/engine/api/common/common-query-runners/errors/standard-error-message.constant';-import { type ShareWithInput } from 'src/engine/record-share/types/share-with-input.type';+import { type ShareWithInput } from 'src/engine/core-modules/record-share/types/share-with-input.type';import {GraphqlDirectExecutionException,GraphqlDirectExecutionExceptionCode,diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/utils/workspace-query-runner-graphql-api-exception-handler.util.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/utils/workspace-query-runner-graphql-api-exception-handler.util.tsindex dc5240856b2..2e0c05d9367 100644--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/utils/workspace-query-runner-graphql-api-exception-handler.util.ts+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/utils/workspace-query-runner-graphql-api-exception-handler.util.ts@@ -20,8 +20,8 @@ import { UsageLimitException } from 'src/engine/core-modules/usage-limit/exceptiimport { usageLimitToGraphqlApiExceptionHandler } from 'src/engine/core-modules/usage-limit/utils/usage-limit-to-graphql-api-exception-handler.util';import { PermissionsException } from 'src/engine/metadata-modules/permissions/permissions.exception';import { permissionGraphqlApiExceptionHandler } from 'src/engine/metadata-modules/permissions/utils/permission-graphql-api-exception-handler.util';-import { RecordShareException } from 'src/engine/record-share/record-share.exception';-import { recordShareGraphqlApiExceptionHandler } from 'src/engine/record-share/utils/record-share-graphql-api-exception-handler.util';+import { RecordShareException } from 'src/engine/core-modules/record-share/record-share.exception';+import { recordShareGraphqlApiExceptionHandler } from 'src/engine/core-modules/record-share/utils/record-share-graphql-api-exception-handler.util';import { TwentyOrmException } from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';import { twentyOrmGraphqlApiExceptionHandler } from 'src/engine/twenty-orm/utils/twenty-orm-graphql-api-exception-handler.util';import { WorkflowQueryValidationException } from 'src/modules/workflow/common/exceptions/workflow-query-validation.exception';diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface.ts b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface.tsindex a06c5c44794..24461cf2611 100644--- a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface.ts+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface.ts@@ -10,7 +10,7 @@ import {type ObjectRecordOrderBy,} from 'src/engine/api/graphql/workspace-query-builder/interfaces/object-record.interface';-import { type ShareWithInput } from 'src/engine/record-share/types/share-with-input.type';+import { type ShareWithInput } from 'src/engine/core-modules/record-share/types/share-with-input.type';import { RESOLVER_METHOD_NAMES } from 'src/engine/api/graphql/workspace-resolver-builder/constants/resolver-method-names';import { type workspaceResolverBuilderMethodNames } from 'src/engine/api/graphql/workspace-resolver-builder/factories/factories';diff --git a/packages/twenty-server/src/engine/api/rest/utils/workspace-query-runner-rest-api-exception-handler.util.ts b/packages/twenty-server/src/engine/api/rest/utils/workspace-query-runner-rest-api-exception-handler.util.tsindex 94989a96598..468edbcef1e 100644--- a/packages/twenty-server/src/engine/api/rest/utils/workspace-query-runner-rest-api-exception-handler.util.ts+++ b/packages/twenty-server/src/engine/api/rest/utils/workspace-query-runner-rest-api-exception-handler.util.ts@@ -6,8 +6,8 @@ import { CommonQueryRunnerException } from 'src/engine/api/common/common-query-rimport { commonQueryRunnerToRestApiExceptionHandler } from 'src/engine/api/common/common-query-runners/utils/common-query-runner-to-rest-api-exception-handler.util';import { RestInputRequestParserException } from 'src/engine/api/rest/input-request-parsers/rest-input-request-parser.exception';import { ThrottlerException } from 'src/engine/core-modules/throttler/throttler.exception';-import { RecordShareException } from 'src/engine/record-share/record-share.exception';-import { recordShareRestApiExceptionHandler } from 'src/engine/record-share/utils/record-share-rest-api-exception-handler.util';+import { RecordShareException } from 'src/engine/core-modules/record-share/record-share.exception';+import { recordShareRestApiExceptionHandler } from 'src/engine/core-modules/record-share/utils/record-share-rest-api-exception-handler.util';import { throttlerToRestApiExceptionHandler } from 'src/engine/core-modules/throttler/utils/throttler-to-rest-api-exception-handler.util';import { UsageLimitException } from 'src/engine/core-modules/usage-limit/exceptions/usage-limit.exception';import { usageLimitToRestApiExceptionHandler } from 'src/engine/core-modules/usage-limit/utils/usage-limit-to-rest-api-exception-handler.util';diff --git a/packages/twenty-server/src/engine/core-modules/billing/billing.module.ts b/packages/twenty-server/src/engine/core-modules/billing/billing.module.tsindex 5fe0be4d622..81131a21efb 100644--- a/packages/twenty-server/src/engine/core-modules/billing/billing.module.ts+++ b/packages/twenty-server/src/engine/core-modules/billing/billing.module.ts@@ -32,6 +32,7 @@ import { BillingProductService } from 'src/engine/core-modules/billing/services/import { BillingSubscriptionItemService } from 'src/engine/core-modules/billing/services/billing-subscription-item.service';import { BillingSubscriptionPhaseService } from 'src/engine/core-modules/billing/services/billing-subscription-phase.service';import { BillingCreditAllowanceProvider } from 'src/engine/core-modules/billing/services/billing-credit-allowance-provider.service';+import { BillingRecordSharingEntitlementProvider } from 'src/engine/core-modules/billing/services/billing-record-sharing-entitlement-provider.service';import { BillingUsageLimitEntitlementProvider } from 'src/engine/core-modules/billing/services/billing-usage-limit-entitlement-provider.service';import { BillingSubscriptionUpdateService } from 'src/engine/core-modules/billing/services/billing-subscription-update.service';import { BillingSubscriptionService } from 'src/engine/core-modules/billing/services/billing-subscription.service';@@ -103,6 +104,7 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cacheBillingUsageService,BillingUsageCacheService,BillingCreditAllowanceProvider,+ BillingRecordSharingEntitlementProvider,BillingUsageLimitEntitlementProvider,BillingPriceService,BillingCreditRolloverService,diff --git a/packages/twenty-server/src/engine/core-modules/billing/enums/billing-entitlement-key.enum.ts b/packages/twenty-server/src/engine/core-modules/billing/enums/billing-entitlement-key.enum.tsindex 7618bfbb73e..ece8688e26d 100644--- a/packages/twenty-server/src/engine/core-modules/billing/enums/billing-entitlement-key.enum.ts+++ b/packages/twenty-server/src/engine/core-modules/billing/enums/billing-entitlement-key.enum.ts@@ -4,6 +4,7 @@ export enum BillingEntitlementKey {SSO = 'SSO',CUSTOM_DOMAIN = 'CUSTOM_DOMAIN',RLS = 'RLS',+ RECORD_SHARING = 'RECORD_SHARING',AUDIT_LOGS = 'AUDIT_LOGS',USAGE_LIMIT = 'USAGE_LIMIT',}diff --git a/packages/twenty-server/src/engine/core-modules/billing/services/billing-record-sharing-entitlement-provider.service.ts b/packages/twenty-server/src/engine/core-modules/billing/services/billing-record-sharing-entitlement-provider.service.tsnew file mode 100644index 00000000000..4095ddfc65d--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/billing/services/billing-record-sharing-entitlement-provider.service.ts@@ -0,0 +1,23 @@+/* @license Enterprise */++import { Injectable } from '@nestjs/common';++import { BillingEntitlementKey } from 'src/engine/core-modules/billing/enums/billing-entitlement-key.enum';+import { BillingSubscriptionService } from 'src/engine/core-modules/billing/services/billing-subscription.service';+import { RecordSharingEntitlementProvider } from 'src/engine/core-modules/record-share/interfaces/record-sharing-entitlement-provider.service';++@Injectable()+export class BillingRecordSharingEntitlementProvider extends RecordSharingEntitlementProvider {+ constructor(+ private readonly billingSubscriptionService: BillingSubscriptionService,+ ) {+ super();+ }++ async hasRecordSharingEntitlement(workspaceId: string): Promise<boolean> {+ return this.billingSubscriptionService.getWorkspaceEntitlementValue(+ workspaceId,+ BillingEntitlementKey.RECORD_SHARING,+ );+ }+}diff --git a/packages/twenty-server/src/engine/core-modules/core-engine.module.ts b/packages/twenty-server/src/engine/core-modules/core-engine.module.tsindex 97d64557aa3..d995e807a53 100644--- a/packages/twenty-server/src/engine/core-modules/core-engine.module.ts+++ b/packages/twenty-server/src/engine/core-modules/core-engine.module.ts@@ -74,7 +74,7 @@ import { AiModelsModule } from 'src/engine/metadata-modules/ai/ai-models/ai-modeimport { PageLayoutModule } from 'src/engine/metadata-modules/page-layout/page-layout.module';import { RoleModule } from 'src/engine/metadata-modules/role/role.module';import { RowLevelPermissionModule } from 'src/engine/metadata-modules/row-level-permission-predicate/row-level-permission.module';-import { RecordShareModule } from 'src/engine/record-share/record-share.module';+import { RecordShareModule } from 'src/engine/core-modules/record-share/record-share.module';import { SubscriptionsModule } from 'src/engine/subscriptions/subscriptions.module';import { CodeInterpreterSessionCleanupModule } from 'src/engine/core-modules/code-interpreter/crons/code-interpreter-session-cleanup.module';import { TrashCleanupModule } from 'src/engine/trash-cleanup/trash-cleanup.module';diff --git a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/logic-function-trigger.module.ts b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/logic-function-trigger.module.tsindex 225bf2129a9..10dc556c591 100644--- a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/logic-function-trigger.module.ts+++ b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/logic-function-trigger.module.ts@@ -12,7 +12,7 @@ import { LogicFunctionTriggerService } from 'src/engine/core-modules/logic-functimport { RouteTriggerService } from 'src/engine/core-modules/logic-function/logic-function-trigger/triggers/route/route-trigger.service';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { LogicFunctionEntity } from 'src/engine/metadata-modules/logic-function/logic-function.entity';-import { RecordShareModule } from 'src/engine/record-share/record-share.module';+import { RecordShareModule } from 'src/engine/core-modules/record-share/record-share.module';import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';@Module({diff --git a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/triggers/database-event/__tests__/call-database-event-trigger-jobs.job.spec.ts b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/triggers/database-event/__tests__/call-database-event-trigger-jobs.job.spec.tsindex 4aabf57f8d8..e5b3012423b 100644--- a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/triggers/database-event/__tests__/call-database-event-trigger-jobs.job.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/triggers/database-event/__tests__/call-database-event-trigger-jobs.job.spec.ts@@ -2,7 +2,6 @@ import { Test, type TestingModule } from '@nestjs/testing';import { type ObjectRecordUpdateEvent } from 'twenty-shared/database-events';import {- FeatureFlagKey,FieldMetadataType,MetadataReadability,type ObjectsPermissionsByRoleId,@@ -20,8 +19,9 @@ import { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-entiimport { addFlatEntityToFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/add-flat-entity-to-flat-entity-maps-or-throw.util';import { getFlatFieldMetadataMock } from 'src/engine/metadata-modules/flat-field-metadata/__mocks__/get-flat-field-metadata.mock';import { getFlatObjectMetadataMock } from 'src/engine/metadata-modules/flat-object-metadata/__mocks__/get-flat-object-metadata.mock';-import { RecordAccessPolicyService } from 'src/engine/record-share/services/record-access-policy.service';-import { RecordShareService } from 'src/engine/record-share/services/record-share.service';+import { RecordAccessPolicyService } from 'src/engine/core-modules/record-share/services/record-access-policy.service';+import { RecordShareService } from 'src/engine/core-modules/record-share/services/record-share.service';+import { RecordSharingFeatureService } from 'src/engine/core-modules/record-share/services/record-sharing-feature.service';import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';import { type WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/workspace-event-batch.type';@@ -130,6 +130,7 @@ describe('CallDatabaseEventTriggerJobsJob', () => {let job: CallDatabaseEventTriggerJobsJob;let messageQueueService: { bulkAdd: jest.Mock };let recordShareService: { findByRecordIds: jest.Mock };+ let recordSharingFeatureService: { isRecordSharingEnabled: jest.Mock };let cacheData: Record<string, unknown>;const buildBatch = (@@ -182,6 +183,9 @@ describe('CallDatabaseEventTriggerJobsJob', () => {messageQueueService = { bulkAdd: jest.fn().mockResolvedValue(undefined) };recordShareService = { findByRecordIds: jest.fn().mockResolvedValue([]) };+ recordSharingFeatureService = {+ isRecordSharingEnabled: jest.fn().mockResolvedValue(false),+ };const module: TestingModule = await Test.createTestingModule({providers: [@@ -202,6 +206,10 @@ describe('CallDatabaseEventTriggerJobsJob', () => {useValue: { throttleOrThrow: jest.fn().mockResolvedValue(undefined) },},{ provide: RecordShareService, useValue: recordShareService },+ {+ provide: RecordSharingFeatureService,+ useValue: recordSharingFeatureService,+ },{provide: WorkspaceOrmManager,useValue: {@@ -342,9 +350,7 @@ describe('CallDatabaseEventTriggerJobsJob', () => {});it('should only enqueue the events of a private object shared with the application role', async () => {- cacheData.featureFlagsMap = {- [FeatureFlagKey.IS_RECORD_SHARING_ENABLED]: true,- };+ recordSharingFeatureService.isRecordSharingEnabled.mockResolvedValue(true);recordShareService.findByRecordIds.mockResolvedValue([{id: 'record-share-1',diff --git a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/triggers/database-event/call-database-event-trigger-jobs.job.ts b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/triggers/database-event/call-database-event-trigger-jobs.job.tsindex 226dadb6e7f..4953fe08537 100644--- a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/triggers/database-event/call-database-event-trigger-jobs.job.ts+++ b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/triggers/database-event/call-database-event-trigger-jobs.job.ts@@ -18,9 +18,9 @@ import {LogicFunctionTriggerJob,LogicFunctionTriggerJobData,} from 'src/engine/core-modules/logic-function/logic-function-trigger/jobs/logic-function-trigger.job';-import { RecordAccessPolicyService } from 'src/engine/record-share/services/record-access-policy.service';-import { buildRoleRowAccessPolicySubject } from 'src/engine/record-share/utils/build-role-row-access-policy-subject.util';-import { omitRestrictedFieldsFromEvent } from 'src/engine/record-share/utils/omit-restricted-fields-from-event.util';+import { RecordAccessPolicyService } from 'src/engine/core-modules/record-share/services/record-access-policy.service';+import { buildRoleRowAccessPolicySubject } from 'src/engine/core-modules/record-share/utils/build-role-row-access-policy-subject.util';+import { omitRestrictedFieldsFromEvent } from 'src/engine/core-modules/record-share/utils/omit-restricted-fields-from-event.util';import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/workspace-event-batch.type';diff --git a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/triggers/database-event/utils/transform-event-batch-to-event-payloads.ts b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/triggers/database-event/utils/transform-event-batch-to-event-payloads.tsindex 9a7185d6b7b..887d12241b3 100644--- a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/triggers/database-event/utils/transform-event-batch-to-event-payloads.ts+++ b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/triggers/database-event/utils/transform-event-batch-to-event-payloads.ts@@ -7,7 +7,7 @@ import type { ObjectRecordEvent } from 'twenty-shared/database-events';import { type LogicFunctionTriggerJobData } from 'src/engine/core-modules/logic-function/logic-function-trigger/jobs/logic-function-trigger.job';import { MAX_EVENTS_PER_TRIGGER_JOB } from 'src/engine/core-modules/logic-function/logic-function-trigger/triggers/database-event/constants/max-events-per-trigger-job.constant';import { type LogicFunctionEntity } from 'src/engine/metadata-modules/logic-function/logic-function.entity';-import { omitInheritedReadabilityChildRecords } from 'src/engine/record-share/utils/omit-inherited-readability-child-records.util';+import { omitInheritedReadabilityChildRecords } from 'src/engine/core-modules/record-share/utils/omit-inherited-readability-child-records.util';import type { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/workspace-event-batch.type';export const transformEventBatchToEventPayloads = ({diff --git a/packages/twenty-server/src/engine/core-modules/record-crud/types/create-many-records-params.type.ts b/packages/twenty-server/src/engine/core-modules/record-crud/types/create-many-records-params.type.tsindex 4f695c05d57..d309b20757e 100644--- a/packages/twenty-server/src/engine/core-modules/record-crud/types/create-many-records-params.type.ts+++ b/packages/twenty-server/src/engine/core-modules/record-crud/types/create-many-records-params.type.ts@@ -1,6 +1,6 @@import { type ActorMetadata } from 'twenty-shared/types';-import { type ShareWithInput } from 'src/engine/record-share/types/share-with-input.type';+import { type ShareWithInput } from 'src/engine/core-modules/record-share/types/share-with-input.type';import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';import { type ObjectRecordProperties } from 'src/engine/core-modules/record-crud/types/object-record-properties.type';import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config';diff --git a/packages/twenty-server/src/engine/core-modules/record-crud/types/record-crud-input.type.ts b/packages/twenty-server/src/engine/core-modules/record-crud/types/record-crud-input.type.tsindex 73678a0f190..67d1b9abdfc 100644--- a/packages/twenty-server/src/engine/core-modules/record-crud/types/record-crud-input.type.ts+++ b/packages/twenty-server/src/engine/core-modules/record-crud/types/record-crud-input.type.ts@@ -1,4 +1,4 @@-import { type ShareWithInput } from 'src/engine/record-share/types/share-with-input.type';+import { type ShareWithInput } from 'src/engine/core-modules/record-share/types/share-with-input.type';import { type ObjectRecordOrderBy } from 'src/engine/api/graphql/workspace-query-builder/interfaces/object-record.interface';import { type ObjectRecordProperties } from './object-record-properties.type';diff --git a/packages/twenty-server/src/engine/record-share/constants/everyone-row-access-policy-subject.constant.ts b/packages/twenty-server/src/engine/core-modules/record-share/constants/everyone-row-access-policy-subject.constant.tssimilarity index 85%rename from packages/twenty-server/src/engine/record-share/constants/everyone-row-access-policy-subject.constant.tsrename to packages/twenty-server/src/engine/core-modules/record-share/constants/everyone-row-access-policy-subject.constant.tsindex 4f5622e0f6a..5a602854f5f 100644--- a/packages/twenty-server/src/engine/record-share/constants/everyone-row-access-policy-subject.constant.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/constants/everyone-row-access-policy-subject.constant.ts@@ -1,6 +1,8 @@+/* @license Enterprise */+import { EVERYONE_PRINCIPAL_ID } from 'twenty-shared/constants';-import { type RowAccessPolicySubject } from 'src/engine/twenty-orm/utils/build-row-access-policy.util';+import { type RowAccessPolicySubject } from 'src/engine/twenty-orm/types/row-access-policy.type';export const EVERYONE_ROW_ACCESS_POLICY_SUBJECT: RowAccessPolicySubject = {objectsPermissions: undefined,diff --git a/packages/twenty-server/src/engine/twenty-orm/constants/max-inherited-readability-depth.constant.ts b/packages/twenty-server/src/engine/core-modules/record-share/constants/max-inherited-readability-depth.constant.tssimilarity index 64%rename from packages/twenty-server/src/engine/twenty-orm/constants/max-inherited-readability-depth.constant.tsrename to packages/twenty-server/src/engine/core-modules/record-share/constants/max-inherited-readability-depth.constant.tsindex 2cd0c054c01..f96c075ea9c 100644--- a/packages/twenty-server/src/engine/twenty-orm/constants/max-inherited-readability-depth.constant.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/constants/max-inherited-readability-depth.constant.ts@@ -1 +1,3 @@+/* @license Enterprise */+export const MAX_INHERITED_READABILITY_DEPTH = 3;diff --git a/packages/twenty-server/src/engine/core-modules/record-share/interfaces/record-sharing-entitlement-provider.service.ts b/packages/twenty-server/src/engine/core-modules/record-share/interfaces/record-sharing-entitlement-provider.service.tsnew file mode 100644index 00000000000..1f8dbdf8a60--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/record-share/interfaces/record-sharing-entitlement-provider.service.ts@@ -0,0 +1,6 @@+import { Injectable } from '@nestjs/common';++@Injectable()+export abstract class RecordSharingEntitlementProvider {+ abstract hasRecordSharingEntitlement(workspaceId: string): Promise<boolean>;+}diff --git a/packages/twenty-server/src/engine/record-share/record-share.exception.ts b/packages/twenty-server/src/engine/core-modules/record-share/record-share.exception.tssimilarity index 96%rename from packages/twenty-server/src/engine/record-share/record-share.exception.tsrename to packages/twenty-server/src/engine/core-modules/record-share/record-share.exception.tsindex ae05adad3ae..0d31f2fe6c5 100644--- a/packages/twenty-server/src/engine/record-share/record-share.exception.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/record-share.exception.ts@@ -1,3 +1,5 @@+/* @license Enterprise */+import { type MessageDescriptor } from '@lingui/core';import { STANDARD_ERROR_MESSAGE } from 'src/engine/api/common/common-query-runners/errors/standard-error-message.constant';diff --git a/packages/twenty-server/src/engine/core-modules/record-share/record-share.module.ts b/packages/twenty-server/src/engine/core-modules/record-share/record-share.module.tsnew file mode 100644index 00000000000..e031c7762db--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/record-share/record-share.module.ts@@ -0,0 +1,17 @@+/* @license Enterprise */++import { Module } from '@nestjs/common';++import { RecordSharingFeatureModule } from 'src/engine/core-modules/record-share/record-sharing-feature.module';+import { RecordAccessPolicyService } from 'src/engine/core-modules/record-share/services/record-access-policy.service';+import { RecordShareService } from 'src/engine/core-modules/record-share/services/record-share.service';+import { ShareWithService } from 'src/engine/core-modules/record-share/services/share-with.service';+import { TwentyOrmModule } from 'src/engine/twenty-orm/twenty-orm.module';+import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';++@Module({+ imports: [TwentyOrmModule, WorkspaceCacheModule, RecordSharingFeatureModule],+ providers: [RecordShareService, ShareWithService, RecordAccessPolicyService],+ exports: [RecordShareService, ShareWithService, RecordAccessPolicyService],+})+export class RecordShareModule {}diff --git a/packages/twenty-server/src/engine/core-modules/record-share/record-sharing-feature.module.ts b/packages/twenty-server/src/engine/core-modules/record-share/record-sharing-feature.module.tsnew file mode 100644index 00000000000..9bce9393382--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/record-share/record-sharing-feature.module.ts@@ -0,0 +1,14 @@+/* @license Enterprise */++import { Module } from '@nestjs/common';+import { DiscoveryModule } from '@nestjs/core';++import { RecordSharingFeatureService } from 'src/engine/core-modules/record-share/services/record-sharing-feature.service';+import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';++@Module({+ imports: [DiscoveryModule, WorkspaceCacheModule],+ providers: [RecordSharingFeatureService],+ exports: [RecordSharingFeatureService],+})+export class RecordSharingFeatureModule {}diff --git a/packages/twenty-server/src/engine/core-modules/record-share/services/__tests__/record-sharing-feature.service.spec.ts b/packages/twenty-server/src/engine/core-modules/record-share/services/__tests__/record-sharing-feature.service.spec.tsnew file mode 100644index 00000000000..fea18cfdeac--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/record-share/services/__tests__/record-sharing-feature.service.spec.ts@@ -0,0 +1,89 @@+/* @license Enterprise */++import { Test, type TestingModule } from '@nestjs/testing';+import { DiscoveryService } from '@nestjs/core';++import { FeatureFlagKey } from 'twenty-shared/types';++import { RecordSharingEntitlementProvider } from 'src/engine/core-modules/record-share/interfaces/record-sharing-entitlement-provider.service';+import { RecordSharingFeatureService } from 'src/engine/core-modules/record-share/services/record-sharing-feature.service';+import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';++const WORKSPACE_ID = 'workspace-id';++class TestRecordSharingEntitlementProvider extends RecordSharingEntitlementProvider {+ hasRecordSharingEntitlement = jest.fn();+}++describe('RecordSharingFeatureService', () => {+ let service: RecordSharingFeatureService;++ const entitlementProvider = new TestRecordSharingEntitlementProvider();+ const workspaceCacheService = { getOrRecompute: jest.fn() };+ const discoveryService = { getProviders: jest.fn() };++ const givenFeatureFlag = (value: boolean) =>+ workspaceCacheService.getOrRecompute.mockResolvedValue({+ featureFlagsMap: { [FeatureFlagKey.IS_RECORD_SHARING_ENABLED]: value },+ });++ const givenRegisteredProviders = (+ instances: (RecordSharingEntitlementProvider | undefined)[],+ ) =>+ discoveryService.getProviders.mockReturnValue(+ instances.map((instance) => ({ instance })),+ );++ const buildService = async () => {+ const module: TestingModule = await Test.createTestingModule({+ providers: [+ RecordSharingFeatureService,+ { provide: DiscoveryService, useValue: discoveryService },+ { provide: WorkspaceCacheService, useValue: workspaceCacheService },+ ],+ }).compile();++ const builtService = module.get(RecordSharingFeatureService);++ builtService.onModuleInit();++ return builtService;+ };++ beforeEach(async () => {+ jest.clearAllMocks();+ givenRegisteredProviders([entitlementProvider]);+ entitlementProvider.hasRecordSharingEntitlement.mockResolvedValue(true);+ givenFeatureFlag(true);+ service = await buildService();+ });++ it('enables record sharing when the flag is on and the workspace is entitled', async () => {+ expect(await service.isRecordSharingEnabled(WORKSPACE_ID)).toBe(true);+ expect(+ entitlementProvider.hasRecordSharingEntitlement,+ ).toHaveBeenCalledWith(WORKSPACE_ID);+ });++ it('disables record sharing when the workspace is not entitled', async () => {+ entitlementProvider.hasRecordSharingEntitlement.mockResolvedValue(false);++ expect(await service.isRecordSharingEnabled(WORKSPACE_ID)).toBe(false);+ });++ it('disables record sharing when the flag is off, without asking for the entitlement', async () => {+ givenFeatureFlag(false);++ expect(await service.isRecordSharingEnabled(WORKSPACE_ID)).toBe(false);+ expect(+ entitlementProvider.hasRecordSharingEntitlement,+ ).not.toHaveBeenCalled();+ });++ it('stays off when no entitlement provider is registered', async () => {+ givenRegisteredProviders([undefined]);+ service = await buildService();++ expect(await service.isRecordSharingEnabled(WORKSPACE_ID)).toBe(false);+ });+});diff --git a/packages/twenty-server/src/engine/core-modules/record-share/services/no-record-sharing-entitlement-provider.service.ts b/packages/twenty-server/src/engine/core-modules/record-share/services/no-record-sharing-entitlement-provider.service.tsnew file mode 100644index 00000000000..292d7e4c6da--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/record-share/services/no-record-sharing-entitlement-provider.service.ts@@ -0,0 +1,7 @@+import { RecordSharingEntitlementProvider } from 'src/engine/core-modules/record-share/interfaces/record-sharing-entitlement-provider.service';++export class NoRecordSharingEntitlementProvider extends RecordSharingEntitlementProvider {+ async hasRecordSharingEntitlement(): Promise<boolean> {+ return false;+ }+}diff --git a/packages/twenty-server/src/engine/record-share/services/record-access-policy.service.ts b/packages/twenty-server/src/engine/core-modules/record-share/services/record-access-policy.service.tssimilarity index 88%rename from packages/twenty-server/src/engine/record-share/services/record-access-policy.service.tsrename to packages/twenty-server/src/engine/core-modules/record-share/services/record-access-policy.service.tsindex c6ea656012a..4e150964bbc 100644--- a/packages/twenty-server/src/engine/record-share/services/record-access-policy.service.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/services/record-access-policy.service.ts@@ -1,7 +1,9 @@+/* @license Enterprise */+import { Injectable } from '@nestjs/common';import { type ObjectRecordEvent } from 'twenty-shared/database-events';-import { FeatureFlagKey, type ObjectRecord } from 'twenty-shared/types';+import { type ObjectRecord } from 'twenty-shared/types';import { assertUnreachable, isDefined } from 'twenty-shared/utils';import { isNonEmptyString } from '@sniptt/guards';import { In } from 'typeorm';@@ -9,24 +11,25 @@ import { In } from 'typeorm';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 { RecordShareService } from 'src/engine/record-share/services/record-share.service';-import { type EventRecordAccessGate } from 'src/engine/record-share/types/event-record-access-gate.type';-import { type RecordShare } from 'src/engine/record-share/types/record-share.type';+import { RecordShareService } from 'src/engine/core-modules/record-share/services/record-share.service';+import { RecordSharingFeatureService } from 'src/engine/core-modules/record-share/services/record-sharing-feature.service';+import { type EventRecordAccessGate } from 'src/engine/core-modules/record-share/types/event-record-access-gate.type';+import { type RecordShare } from 'src/engine/core-modules/record-share/types/record-share.type';import {type EventRecordSnapshot,resolveEventRecordSnapshots,-} from 'src/engine/record-share/utils/resolve-event-record-snapshots.util';-import { resolveRecordIdsSharedWithPrincipals } from 'src/engine/record-share/utils/resolve-record-ids-shared-with-principals.util';-import { resolveRecordShareGateKind } from 'src/engine/record-share/utils/resolve-record-share-gate-kind.util';-import { MAX_INHERITED_READABILITY_DEPTH } from 'src/engine/twenty-orm/constants/max-inherited-readability-depth.constant';-import { resolveRequiredRecordShareAccessLevels } from 'src/engine/twenty-orm/repository/resolve-required-record-share-access-levels.util';-import { type InheritedReadabilityChildrenParent } from 'src/engine/twenty-orm/types/inherited-readability-children-parent.type';-import { type InheritedReadabilityColumnParent } from 'src/engine/twenty-orm/types/inherited-readability-column-parent.type';-import { type RowAccessPolicySubject } from 'src/engine/twenty-orm/utils/build-row-access-policy.util';+} from 'src/engine/core-modules/record-share/utils/resolve-event-record-snapshots.util';+import { resolveRecordIdsSharedWithPrincipals } from 'src/engine/core-modules/record-share/utils/resolve-record-ids-shared-with-principals.util';+import { resolveRecordShareGateKind } from 'src/engine/core-modules/record-share/utils/resolve-record-share-gate-kind.util';+import { MAX_INHERITED_READABILITY_DEPTH } from 'src/engine/core-modules/record-share/constants/max-inherited-readability-depth.constant';+import { resolveRequiredRecordShareAccessLevels } from 'src/engine/core-modules/record-share/utils/resolve-required-record-share-access-levels.util';+import { type InheritedReadabilityChildrenParent } from 'src/engine/core-modules/record-share/types/inherited-readability-children-parent.type';+import { type InheritedReadabilityColumnParent } from 'src/engine/core-modules/record-share/types/inherited-readability-column-parent.type';+import { type RowAccessPolicySubject } from 'src/engine/twenty-orm/types/row-access-policy.type';import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';import { isObjectOperationPermitted } from 'src/engine/twenty-orm/utils/is-object-operation-permitted.util';import { isRecordMatchingRLSRowLevelPermissionPredicate } from 'src/engine/twenty-orm/utils/is-record-matching-rls-row-level-permission-predicate.util';-import { resolveInheritedReadabilityParents } from 'src/engine/twenty-orm/utils/resolve-inherited-readability-parents.util';+import { resolveInheritedReadabilityParents } from 'src/engine/core-modules/record-share/utils/resolve-inherited-readability-parents.util';import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';import { type WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/workspace-event-batch.type';@@ -57,6 +60,7 @@ export class RecordAccessPolicyService {private readonly workspaceOrmManager: WorkspaceOrmManager,private readonly workspaceCacheService: WorkspaceCacheService,private readonly recordShareService: RecordShareService,+ private readonly recordSharingFeatureService: RecordSharingFeatureService,) {}// A subject receives the records a query would return it: its role must read@@ -75,6 +79,11 @@ export class RecordAccessPolicyService {recordIds: events.map((event) => event.recordId),}));+ let isRecordSharingEnabledPromise: Promise<boolean> | undefined;+ const fetchIsRecordSharingEnabled = () =>+ (isRecordSharingEnabledPromise ??=+ this.recordSharingFeatureService.isRecordSharingEnabled(workspaceId));+return {resolveAdmittedRecordIds: async (subject) => {const snapshots = await this.resolveSnapshotsReadableByRole({@@ -89,12 +98,7 @@ export class RecordAccessPolicyService {return new Set();}- const { featureFlagsMap } =- await this.workspaceCacheService.getOrRecompute(workspaceId, [- 'featureFlagsMap',- ]);-- if (!featureFlagsMap[FeatureFlagKey.IS_RECORD_SHARING_ENABLED]) {+ if (!(await fetchIsRecordSharingEnabled())) {return new Set(snapshots.map((snapshot) => snapshot.id));}diff --git a/packages/twenty-server/src/engine/record-share/services/record-share.service.ts b/packages/twenty-server/src/engine/core-modules/record-share/services/record-share.service.tssimilarity index 92%rename from packages/twenty-server/src/engine/record-share/services/record-share.service.tsrename to packages/twenty-server/src/engine/core-modules/record-share/services/record-share.service.tsindex b5612756d45..80702b8b98c 100644--- a/packages/twenty-server/src/engine/record-share/services/record-share.service.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/services/record-share.service.ts@@ -1,3 +1,5 @@+/* @license Enterprise */+import { Injectable } from '@nestjs/common';import { isDefined } from 'twenty-shared/utils';@@ -6,9 +8,9 @@ import { In } from 'typeorm';import {RecordShareException,RecordShareExceptionCode,-} from 'src/engine/record-share/record-share.exception';-import { type RecordShareInput } from 'src/engine/record-share/types/record-share-input.type';-import { type RecordShare } from 'src/engine/record-share/types/record-share.type';+} 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 { type RecordShare } from 'src/engine/core-modules/record-share/types/record-share.type';import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace-repository';import { type WorkspaceTransactionScope } from 'src/engine/twenty-orm/types/workspace-transaction-scope.type';import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';diff --git a/packages/twenty-server/src/engine/core-modules/record-share/services/record-sharing-feature.service.ts b/packages/twenty-server/src/engine/core-modules/record-share/services/record-sharing-feature.service.tsnew file mode 100644index 00000000000..b83207a5054--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/record-share/services/record-sharing-feature.service.ts@@ -0,0 +1,52 @@+/* @license Enterprise */++import { Injectable, Logger, type OnModuleInit } from '@nestjs/common';+import { DiscoveryService } from '@nestjs/core';++import { FeatureFlagKey } from 'twenty-shared/types';+import { isDefined } from 'twenty-shared/utils';++import { type RecordSharingEntitlementProvider } from 'src/engine/core-modules/record-share/interfaces/record-sharing-entitlement-provider.service';+import { NoRecordSharingEntitlementProvider } from 'src/engine/core-modules/record-share/services/no-record-sharing-entitlement-provider.service';+import { findRecordSharingEntitlementProvider } from 'src/engine/core-modules/record-share/utils/find-record-sharing-entitlement-provider.util';+import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';++@Injectable()+export class RecordSharingFeatureService implements OnModuleInit {+ private readonly logger = new Logger(RecordSharingFeatureService.name);++ private entitlementProvider: RecordSharingEntitlementProvider;++ constructor(+ private readonly discoveryService: DiscoveryService,+ private readonly workspaceCacheService: WorkspaceCacheService,+ ) {}++ onModuleInit() {+ const discoveredProvider = findRecordSharingEntitlementProvider(+ this.discoveryService,+ );++ if (!isDefined(discoveredProvider)) {+ this.logger.warn(+ 'No record sharing entitlement provider is registered, record sharing stays off for every workspace on this instance.',+ );+ }++ this.entitlementProvider =+ discoveredProvider ?? new NoRecordSharingEntitlementProvider();+ }++ async isRecordSharingEnabled(workspaceId: string): Promise<boolean> {+ const { featureFlagsMap } = await this.workspaceCacheService.getOrRecompute(+ workspaceId,+ ['featureFlagsMap'],+ );++ if (!featureFlagsMap[FeatureFlagKey.IS_RECORD_SHARING_ENABLED]) {+ return false;+ }++ return this.entitlementProvider.hasRecordSharingEntitlement(workspaceId);+ }+}diff --git a/packages/twenty-server/src/engine/record-share/services/share-with.service.ts b/packages/twenty-server/src/engine/core-modules/record-share/services/share-with.service.tssimilarity index 80%rename from packages/twenty-server/src/engine/record-share/services/share-with.service.tsrename to packages/twenty-server/src/engine/core-modules/record-share/services/share-with.service.tsindex db22ff4e22d..5d0d1e62df5 100644--- a/packages/twenty-server/src/engine/record-share/services/share-with.service.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/services/share-with.service.ts@@ -1,13 +1,15 @@+/* @license Enterprise */+import { Injectable } from '@nestjs/common';import { isNonEmptyArray } from 'twenty-shared/utils';import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';-import { RecordShareService } from 'src/engine/record-share/services/record-share.service';-import { type ShareWithInput } from 'src/engine/record-share/types/share-with-input.type';-import { buildRecordShareInputsForCreatedRecords } from 'src/engine/record-share/utils/build-record-share-inputs-for-created-records.util';-import { validateShareWithArgOrThrow } from 'src/engine/record-share/utils/validate-share-with-arg-or-throw.util';-import { validateShareWithPrincipalsOrThrow } from 'src/engine/record-share/utils/validate-share-with-principals-or-throw.util';+import { RecordShareService } from 'src/engine/core-modules/record-share/services/record-share.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 { 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';import { type WorkspaceTransactionScope } from 'src/engine/twenty-orm/types/workspace-transaction-scope.type';import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';diff --git a/packages/twenty-server/src/engine/record-share/types/event-record-access-gate.type.ts b/packages/twenty-server/src/engine/core-modules/record-share/types/event-record-access-gate.type.tssimilarity index 76%rename from packages/twenty-server/src/engine/record-share/types/event-record-access-gate.type.tsrename to packages/twenty-server/src/engine/core-modules/record-share/types/event-record-access-gate.type.tsindex 61e18f90f14..e13e9dd713c 100644--- a/packages/twenty-server/src/engine/record-share/types/event-record-access-gate.type.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/types/event-record-access-gate.type.ts@@ -1,4 +1,6 @@-import { type RowAccessPolicySubject } from 'src/engine/twenty-orm/utils/build-row-access-policy.util';+/* @license Enterprise */++import { type RowAccessPolicySubject } from 'src/engine/twenty-orm/types/row-access-policy.type';export type EventRecordAccessGate = {resolveAdmittedRecordIds: (diff --git a/packages/twenty-server/src/engine/twenty-orm/types/inherited-readability-child-records.type.ts b/packages/twenty-server/src/engine/core-modules/record-share/types/inherited-readability-child-records.type.tssimilarity index 89%rename from packages/twenty-server/src/engine/twenty-orm/types/inherited-readability-child-records.type.tsrename to packages/twenty-server/src/engine/core-modules/record-share/types/inherited-readability-child-records.type.tsindex f025cec77f1..b828e155d90 100644--- a/packages/twenty-server/src/engine/twenty-orm/types/inherited-readability-child-records.type.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/types/inherited-readability-child-records.type.ts@@ -1,3 +1,5 @@+/* @license Enterprise */+export type InheritedReadabilityChildRecords = Record<string,Record<string, unknown>[]diff --git a/packages/twenty-server/src/engine/twenty-orm/types/inherited-readability-children-parent.type.ts b/packages/twenty-server/src/engine/core-modules/record-share/types/inherited-readability-children-parent.type.tssimilarity index 91%rename from packages/twenty-server/src/engine/twenty-orm/types/inherited-readability-children-parent.type.tsrename to packages/twenty-server/src/engine/core-modules/record-share/types/inherited-readability-children-parent.type.tsindex 9a306fb1cc9..bd75a04f692 100644--- a/packages/twenty-server/src/engine/twenty-orm/types/inherited-readability-children-parent.type.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/types/inherited-readability-children-parent.type.ts@@ -1,3 +1,5 @@+/* @license Enterprise */+import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';export type InheritedReadabilityChildrenParent = {diff --git a/packages/twenty-server/src/engine/twenty-orm/types/inherited-readability-column-parent.type.ts b/packages/twenty-server/src/engine/core-modules/record-share/types/inherited-readability-column-parent.type.tssimilarity index 91%rename from packages/twenty-server/src/engine/twenty-orm/types/inherited-readability-column-parent.type.tsrename to packages/twenty-server/src/engine/core-modules/record-share/types/inherited-readability-column-parent.type.tsindex 3418bc1b986..816496af0bc 100644--- a/packages/twenty-server/src/engine/twenty-orm/types/inherited-readability-column-parent.type.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/types/inherited-readability-column-parent.type.ts@@ -1,3 +1,5 @@+/* @license Enterprise */+import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';export type InheritedReadabilityColumnParent = {diff --git a/packages/twenty-server/src/engine/twenty-orm/types/inherited-readability-parent-link.type.ts b/packages/twenty-server/src/engine/core-modules/record-share/types/inherited-readability-parent-link.type.tssimilarity index 66%rename from packages/twenty-server/src/engine/twenty-orm/types/inherited-readability-parent-link.type.tsrename to packages/twenty-server/src/engine/core-modules/record-share/types/inherited-readability-parent-link.type.tsindex d7a084615b9..20846a7bfd5 100644--- a/packages/twenty-server/src/engine/twenty-orm/types/inherited-readability-parent-link.type.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/types/inherited-readability-parent-link.type.ts@@ -1,4 +1,6 @@-import { type InheritedReadabilityColumnParent } from 'src/engine/twenty-orm/types/inherited-readability-column-parent.type';+/* @license Enterprise */++import { type InheritedReadabilityColumnParent } from 'src/engine/core-modules/record-share/types/inherited-readability-column-parent.type';export type InheritedReadabilityParentLink = Pick<InheritedReadabilityColumnParent,diff --git a/packages/twenty-server/src/engine/twenty-orm/types/inherited-readability-parent.type.ts b/packages/twenty-server/src/engine/core-modules/record-share/types/inherited-readability-parent.type.tssimilarity index 57%rename from packages/twenty-server/src/engine/twenty-orm/types/inherited-readability-parent.type.tsrename to packages/twenty-server/src/engine/core-modules/record-share/types/inherited-readability-parent.type.tsindex 5e13e7541fc..5361fbfacf0 100644--- a/packages/twenty-server/src/engine/twenty-orm/types/inherited-readability-parent.type.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/types/inherited-readability-parent.type.ts@@ -1,5 +1,7 @@-import { type InheritedReadabilityChildrenParent } from 'src/engine/twenty-orm/types/inherited-readability-children-parent.type';-import { type InheritedReadabilityColumnParent } from 'src/engine/twenty-orm/types/inherited-readability-column-parent.type';+/* @license Enterprise */++import { type InheritedReadabilityChildrenParent } from 'src/engine/core-modules/record-share/types/inherited-readability-children-parent.type';+import { type InheritedReadabilityColumnParent } from 'src/engine/core-modules/record-share/types/inherited-readability-column-parent.type';export type InheritedReadabilityParent =| InheritedReadabilityColumnParentdiff --git a/packages/twenty-server/src/engine/record-share/types/record-share-input.type.ts b/packages/twenty-server/src/engine/core-modules/record-share/types/record-share-input.type.tssimilarity index 93%rename from packages/twenty-server/src/engine/record-share/types/record-share-input.type.tsrename to packages/twenty-server/src/engine/core-modules/record-share/types/record-share-input.type.tsindex 41405a7fe0a..d645cbdbe4b 100644--- a/packages/twenty-server/src/engine/record-share/types/record-share-input.type.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/types/record-share-input.type.ts@@ -1,3 +1,5 @@+/* @license Enterprise */+import {type RecordShareAccessLevel,type RecordSharePrincipalType,diff --git a/packages/twenty-server/src/engine/core-modules/record-share/types/record-share.type.ts b/packages/twenty-server/src/engine/core-modules/record-share/types/record-share.type.tsnew file mode 100644index 00000000000..ca7005d4143--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/record-share/types/record-share.type.ts@@ -0,0 +1,7 @@+/* @license Enterprise */++import { type RecordShareInput } from 'src/engine/core-modules/record-share/types/record-share-input.type';++export type RecordShare = RecordShareInput & {+ id: string;+};diff --git a/packages/twenty-server/src/engine/record-share/types/share-with-input.type.ts b/packages/twenty-server/src/engine/core-modules/record-share/types/share-with-input.type.tssimilarity index 88%rename from packages/twenty-server/src/engine/record-share/types/share-with-input.type.tsrename to packages/twenty-server/src/engine/core-modules/record-share/types/share-with-input.type.tsindex 850b841565a..484d66f5d57 100644--- a/packages/twenty-server/src/engine/record-share/types/share-with-input.type.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/types/share-with-input.type.ts@@ -1,3 +1,5 @@+/* @license Enterprise */+import { type RecordShareAccessLevel } from 'twenty-shared/types';export type ShareWithInput = {diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/build-inherited-readability-condition.util.spec.ts b/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/build-inherited-readability-condition.util.spec.tssimilarity index 97%rename from packages/twenty-server/src/engine/twenty-orm/utils/__tests__/build-inherited-readability-condition.util.spec.tsrename to packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/build-inherited-readability-condition.util.spec.tsindex bb0673fe6dc..2ebcededaa8 100644--- a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/build-inherited-readability-condition.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/build-inherited-readability-condition.util.spec.ts@@ -1,9 +1,11 @@+/* @license Enterprise */+import { RecordShareAccessLevel } from 'twenty-shared/types';import {buildInheritedReadabilityCondition,type InheritedReadabilityParentCondition,-} from 'src/engine/twenty-orm/utils/build-inherited-readability-condition.util';+} from 'src/engine/core-modules/record-share/utils/build-inherited-readability-condition.util';const RECORD_SHARE_TABLE_EXPRESSION = '"workspace_abc"."recordShare"';const ATTACHMENT_OBJECT_METADATA_ID = 'attachment-object-metadata-id';diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/build-record-share-condition.util.spec.ts b/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/build-record-share-condition.util.spec.tssimilarity index 95%rename from packages/twenty-server/src/engine/twenty-orm/utils/__tests__/build-record-share-condition.util.spec.tsrename to packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/build-record-share-condition.util.spec.tsindex 9d69567463b..f343cdb2ef7 100644--- a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/build-record-share-condition.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/build-record-share-condition.util.spec.ts@@ -1,7 +1,9 @@+/* @license Enterprise */+import { RecordShareAccessLevel } from 'twenty-shared/types';import { compileNamedParameters } from 'src/engine/twenty-orm/sql/utils/compile-named-parameters.util';-import { buildRecordShareCondition } from 'src/engine/twenty-orm/utils/build-record-share-condition.util';+import { buildRecordShareCondition } from 'src/engine/core-modules/record-share/utils/build-record-share-condition.util';const OBJECT_METADATA_ID = 'object-metadata-1';const PRINCIPAL_IDS = ['principal-1', 'principal-2'];diff --git a/packages/twenty-server/src/engine/record-share/utils/__tests__/build-record-share-inputs-for-created-records.util.spec.ts b/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/build-record-share-inputs-for-created-records.util.spec.tssimilarity index 99%rename from packages/twenty-server/src/engine/record-share/utils/__tests__/build-record-share-inputs-for-created-records.util.spec.tsrename to packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/build-record-share-inputs-for-created-records.util.spec.tsindex 6a7dea58a5d..5dafc867b09 100644--- a/packages/twenty-server/src/engine/record-share/utils/__tests__/build-record-share-inputs-for-created-records.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/build-record-share-inputs-for-created-records.util.spec.ts@@ -1,3 +1,5 @@+/* @license Enterprise */+import { EVERYONE_PRINCIPAL_ID } from 'twenty-shared/constants';import {RecordShareAccessLevel,@@ -5,7 +7,7 @@ import {RecordShareRowCause,} from 'twenty-shared/types';-import { buildRecordShareInputsForCreatedRecords } from 'src/engine/record-share/utils/build-record-share-inputs-for-created-records.util';+import { buildRecordShareInputsForCreatedRecords } from 'src/engine/core-modules/record-share/utils/build-record-share-inputs-for-created-records.util';import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';const OBJECT_METADATA_ID = 'object-metadata-1';diff --git a/packages/twenty-server/src/engine/record-share/utils/__tests__/omit-restricted-fields-from-event.util.spec.ts b/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/omit-restricted-fields-from-event.util.spec.tssimilarity index 98%rename from packages/twenty-server/src/engine/record-share/utils/__tests__/omit-restricted-fields-from-event.util.spec.tsrename to packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/omit-restricted-fields-from-event.util.spec.tsindex 648a7014444..c1cde27ba3f 100644--- a/packages/twenty-server/src/engine/record-share/utils/__tests__/omit-restricted-fields-from-event.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/omit-restricted-fields-from-event.util.spec.ts@@ -4,7 +4,7 @@ import { FieldMetadataType, RelationType } from 'twenty-shared/types';import { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/constant/create-empty-flat-entity-maps.constant';import { addFlatEntityToFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/add-flat-entity-to-flat-entity-maps-or-throw.util';import { getFlatFieldMetadataMock } from 'src/engine/metadata-modules/flat-field-metadata/__mocks__/get-flat-field-metadata.mock';-import { omitRestrictedFieldsFromEvent } from 'src/engine/record-share/utils/omit-restricted-fields-from-event.util';+import { omitRestrictedFieldsFromEvent } from 'src/engine/core-modules/record-share/utils/omit-restricted-fields-from-event.util';const OBJECT_METADATA_ID = 'company-object-id';const SALARY_FIELD_ID = 'salary-field-id';diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/resolve-inherited-readability-child-links.util.spec.ts b/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/resolve-inherited-readability-child-links.util.spec.tssimilarity index 97%rename from packages/twenty-server/src/engine/twenty-orm/utils/__tests__/resolve-inherited-readability-child-links.util.spec.tsrename to packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/resolve-inherited-readability-child-links.util.spec.tsindex 0e5a96047a4..ba83e59c05a 100644--- a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/resolve-inherited-readability-child-links.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/resolve-inherited-readability-child-links.util.spec.ts@@ -1,3 +1,5 @@+/* @license Enterprise */+import { FieldMetadataType, MetadataReadability } from 'twenty-shared/types';import { RelationType } from 'src/engine/metadata-modules/field-metadata/interfaces/relation-type.interface';@@ -7,7 +9,7 @@ import { getFlatFieldMetadataMock } from 'src/engine/metadata-modules/flat-fieldimport { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';import { getFlatObjectMetadataMock } from 'src/engine/metadata-modules/flat-object-metadata/__mocks__/get-flat-object-metadata.mock';import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';-import { resolveInheritedReadabilityChildLinks } from 'src/engine/twenty-orm/utils/resolve-inherited-readability-child-links.util';+import { resolveInheritedReadabilityChildLinks } from 'src/engine/core-modules/record-share/utils/resolve-inherited-readability-child-links.util';const ATTACHMENT_OBJECT_ID = 'attachment-object-id';const NOTE_OBJECT_ID = 'note-object-id';diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/resolve-inherited-readability-parents.util.spec.ts b/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/resolve-inherited-readability-parents.util.spec.tssimilarity index 98%rename from packages/twenty-server/src/engine/twenty-orm/utils/__tests__/resolve-inherited-readability-parents.util.spec.tsrename to packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/resolve-inherited-readability-parents.util.spec.tsindex a2dd02ba1b8..f060964c11b 100644--- a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/resolve-inherited-readability-parents.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/resolve-inherited-readability-parents.util.spec.ts@@ -1,3 +1,5 @@+/* @license Enterprise */+import { FieldMetadataType, MetadataReadability } from 'twenty-shared/types';import { RelationType } from 'src/engine/metadata-modules/field-metadata/interfaces/relation-type.interface';@@ -7,7 +9,7 @@ import { getFlatFieldMetadataMock } from 'src/engine/metadata-modules/flat-fieldimport { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';import { getFlatObjectMetadataMock } from 'src/engine/metadata-modules/flat-object-metadata/__mocks__/get-flat-object-metadata.mock';import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';-import { resolveInheritedReadabilityParents } from 'src/engine/twenty-orm/utils/resolve-inherited-readability-parents.util';+import { resolveInheritedReadabilityParents } from 'src/engine/core-modules/record-share/utils/resolve-inherited-readability-parents.util';const ATTACHMENT_OBJECT_ID = 'attachment-object-id';const NOTE_OBJECT_ID = 'note-object-id';diff --git a/packages/twenty-server/src/engine/record-share/utils/__tests__/resolve-record-ids-shared-with-principals.util.spec.ts b/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/resolve-record-ids-shared-with-principals.util.spec.tssimilarity index 90%rename from packages/twenty-server/src/engine/record-share/utils/__tests__/resolve-record-ids-shared-with-principals.util.spec.tsrename to packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/resolve-record-ids-shared-with-principals.util.spec.tsindex 84dd1417aa8..135ff31012a 100644--- a/packages/twenty-server/src/engine/record-share/utils/__tests__/resolve-record-ids-shared-with-principals.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/resolve-record-ids-shared-with-principals.util.spec.ts@@ -1,11 +1,13 @@+/* @license Enterprise */+import {RecordShareAccessLevel,RecordSharePrincipalType,RecordShareRowCause,} from 'twenty-shared/types';-import { type RecordShare } from 'src/engine/record-share/types/record-share.type';-import { resolveRecordIdsSharedWithPrincipals } from 'src/engine/record-share/utils/resolve-record-ids-shared-with-principals.util';+import { type RecordShare } from 'src/engine/core-modules/record-share/types/record-share.type';+import { resolveRecordIdsSharedWithPrincipals } from 'src/engine/core-modules/record-share/utils/resolve-record-ids-shared-with-principals.util';const buildRecordShare = (recordId: string,diff --git a/packages/twenty-server/src/engine/record-share/utils/__tests__/resolve-record-share-gate-kind.util.spec.ts b/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/resolve-record-share-gate-kind.util.spec.tssimilarity index 91%rename from packages/twenty-server/src/engine/record-share/utils/__tests__/resolve-record-share-gate-kind.util.spec.tsrename to packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/resolve-record-share-gate-kind.util.spec.tsindex 6246ea33653..f6fb0a6e267 100644--- a/packages/twenty-server/src/engine/record-share/utils/__tests__/resolve-record-share-gate-kind.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/resolve-record-share-gate-kind.util.spec.ts@@ -1,6 +1,8 @@+/* @license Enterprise */+import { MetadataReadability } from 'twenty-shared/types';-import { resolveRecordShareGateKind } from 'src/engine/record-share/utils/resolve-record-share-gate-kind.util';+import { resolveRecordShareGateKind } from 'src/engine/core-modules/record-share/utils/resolve-record-share-gate-kind.util';describe('resolveRecordShareGateKind', () => {it.each([diff --git a/packages/twenty-server/src/engine/record-share/utils/__tests__/validate-share-with-arg-or-throw.util.spec.ts b/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/validate-share-with-arg-or-throw.util.spec.tssimilarity index 97%rename from packages/twenty-server/src/engine/record-share/utils/__tests__/validate-share-with-arg-or-throw.util.spec.tsrename to packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/validate-share-with-arg-or-throw.util.spec.tsindex e95f651f298..381b443a41c 100644--- a/packages/twenty-server/src/engine/record-share/utils/__tests__/validate-share-with-arg-or-throw.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/validate-share-with-arg-or-throw.util.spec.ts@@ -1,6 +1,8 @@+/* @license Enterprise */+import { RecordShareAccessLevel } from 'twenty-shared/types';-import { validateShareWithArgOrThrow } from 'src/engine/record-share/utils/validate-share-with-arg-or-throw.util';+import { validateShareWithArgOrThrow } from 'src/engine/core-modules/record-share/utils/validate-share-with-arg-or-throw.util';import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';const userAuthContext = {diff --git a/packages/twenty-server/src/engine/record-share/utils/__tests__/validate-share-with-principals-or-throw.util.spec.ts b/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/validate-share-with-principals-or-throw.util.spec.tssimilarity index 94%rename from packages/twenty-server/src/engine/record-share/utils/__tests__/validate-share-with-principals-or-throw.util.spec.tsrename to packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/validate-share-with-principals-or-throw.util.spec.tsindex 1b651a9f69a..3fc39fe4a30 100644--- a/packages/twenty-server/src/engine/record-share/utils/__tests__/validate-share-with-principals-or-throw.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/validate-share-with-principals-or-throw.util.spec.ts@@ -1,6 +1,8 @@+/* @license Enterprise */+import { RecordShareAccessLevel } from 'twenty-shared/types';-import { validateShareWithPrincipalsOrThrow } from 'src/engine/record-share/utils/validate-share-with-principals-or-throw.util';+import { validateShareWithPrincipalsOrThrow } from 'src/engine/core-modules/record-share/utils/validate-share-with-principals-or-throw.util';import { type FlatWorkspaceMemberMaps } from 'src/engine/core-modules/user/types/flat-workspace-member-maps.type';import { type FlatRoleMaps } from 'src/engine/metadata-modules/flat-role/types/flat-role-maps.type';diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/build-inherited-readability-condition.util.ts b/packages/twenty-server/src/engine/core-modules/record-share/utils/build-inherited-readability-condition.util.tssimilarity index 95%rename from packages/twenty-server/src/engine/twenty-orm/utils/build-inherited-readability-condition.util.tsrename to packages/twenty-server/src/engine/core-modules/record-share/utils/build-inherited-readability-condition.util.tsindex 8ea7f51a536..0760914b00f 100644--- a/packages/twenty-server/src/engine/twenty-orm/utils/build-inherited-readability-condition.util.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/utils/build-inherited-readability-condition.util.ts@@ -1,3 +1,5 @@+/* @license Enterprise */+import { type RecordShareAccessLevel } from 'twenty-shared/types';import { type ObjectLiteral } from 'typeorm';@@ -5,7 +7,7 @@ import {type RowAccessPolicy,type SqlCondition,} from 'src/engine/twenty-orm/types/row-access-policy.type';-import { buildRecordShareCondition } from 'src/engine/twenty-orm/utils/build-record-share-condition.util';+import { buildRecordShareCondition } from 'src/engine/core-modules/record-share/utils/build-record-share-condition.util';import { escapeIdentifier } from 'src/engine/workspace-manager/workspace-migration/utils/remove-sql-injection.util';export type InheritedReadabilityParentCondition =diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/build-record-share-condition.util.ts b/packages/twenty-server/src/engine/core-modules/record-share/utils/build-record-share-condition.util.tssimilarity index 98%rename from packages/twenty-server/src/engine/twenty-orm/utils/build-record-share-condition.util.tsrename to packages/twenty-server/src/engine/core-modules/record-share/utils/build-record-share-condition.util.tsindex cd8882f6324..485428bf91d 100644--- a/packages/twenty-server/src/engine/twenty-orm/utils/build-record-share-condition.util.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/utils/build-record-share-condition.util.ts@@ -1,3 +1,5 @@+/* @license Enterprise */+import { randomBytes } from 'node:crypto';import { type RecordShareAccessLevel } from 'twenty-shared/types';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.tsnew file mode 100644index 00000000000..029e1f2e9bd--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/record-share/utils/build-record-share-gate.util.ts@@ -0,0 +1,216 @@+/* @license Enterprise */++import {+ MetadataReadability,+ 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 { type InheritedReadabilityParent } from 'src/engine/core-modules/record-share/types/inherited-readability-parent.type';+import {+ buildInheritedReadabilityCondition,+ type InheritedReadabilityParentCondition,+} from 'src/engine/core-modules/record-share/utils/build-inherited-readability-condition.util';+import { buildRecordShareCondition } from 'src/engine/core-modules/record-share/utils/build-record-share-condition.util';+import { resolveInheritedReadabilityParents } from 'src/engine/core-modules/record-share/utils/resolve-inherited-readability-parents.util';+import { resolveRequiredRecordShareAccessLevels } from 'src/engine/core-modules/record-share/utils/resolve-required-record-share-access-levels.util';+import {+ type RowAccessPolicy,+ type RowAccessPolicyContext,+ type RowAccessPolicyTarget,+} from 'src/engine/twenty-orm/types/row-access-policy.type';++type BuildParentPolicy = (target: RowAccessPolicyTarget) => RowAccessPolicy;++type RecordShareGateArgs = {+ context: RowAccessPolicyContext;+ target: RowAccessPolicyTarget;+ buildParentPolicy: BuildParentPolicy;+};++export const buildRecordShareGate = ({+ context,+ target,+ buildParentPolicy,+}: RecordShareGateArgs): RowAccessPolicy => {+ const { isRecordSharingEnabled } = context.environment;+ const isOwningApplication = context.subject.isOwningApplication(+ target.flatObjectMetadata,+ );++ switch (target.flatObjectMetadata.readability) {+ case MetadataReadability.OPEN:+ return { kind: 'open' };+ case MetadataReadability.INHERITED:+ if (!isRecordSharingEnabled || isOwningApplication) {+ return { kind: 'open' };+ }++ return buildInheritedReadabilityGate({+ context,+ target,+ buildParentPolicy,+ });+ case MetadataReadability.SYSTEM:+ return { kind: 'denied' };+ case MetadataReadability.APPLICATION:+ return isRecordSharingEnabled && !isOwningApplication+ ? { kind: 'denied' }+ : { kind: 'open' };+ case MetadataReadability.PRIVATE:+ if (!isRecordSharingEnabled || isOwningApplication) {+ return { kind: 'open' };+ }++ return buildOwnRecordShareGate(context, target);+ default:+ return assertUnreachable(target.flatObjectMetadata.readability);+ }+};++const resolveRecordSharePrincipals = (+ { subject }: RowAccessPolicyContext,+ { operationType }: RowAccessPolicyTarget,+):+ | { principalIds: string[]; accessLevels: RecordShareAccessLevel[] }+ | undefined => {+ if (!isDefined(subject.principalIds)) {+ return undefined;+ }++ const accessLevels = resolveRequiredRecordShareAccessLevels(operationType);++ if (accessLevels.length === 0) {+ return undefined;+ }++ return { principalIds: subject.principalIds, accessLevels };+};++const buildOwnRecordShareGate = (+ context: RowAccessPolicyContext,+ target: RowAccessPolicyTarget,+): RowAccessPolicy => {+ const principals = resolveRecordSharePrincipals(context, target);++ if (!isDefined(principals)) {+ return { kind: 'open' };+ }++ return {+ kind: 'gated',+ condition: buildRecordShareCondition({+ tableAlias: target.tableAlias,+ recordShareTableExpression:+ context.environment.recordShareTableExpression,+ objectMetadataId: target.flatObjectMetadata.id,+ ...principals,+ }),+ };+};++const buildInheritedReadabilityGate = ({+ context,+ target,+ buildParentPolicy,+}: RecordShareGateArgs): RowAccessPolicy => {+ const { tableAlias, flatObjectMetadata, depth, joinParentRelationShape } =+ target;++ if (depth > MAX_INHERITED_READABILITY_DEPTH) {+ return { kind: 'denied' };+ }++ const parents = resolveInheritedReadabilityParents({+ flatObjectMetadata,+ flatFieldMetadataMaps: context.environment.flatFieldMetadataMaps,+ flatObjectMetadataMaps: context.environment.flatObjectMetadataMaps,+ });++ if (+ isDefined(joinParentRelationShape) &&+ parents.some(+ (parent) =>+ parent.kind === 'column' &&+ parent.fieldMetadataId ===+ joinParentRelationShape.targetFieldMetadataId,+ )+ ) {+ return { kind: 'open' };+ }++ if (parents.length === 0) {+ return buildOwnRecordShareGate(context, target);+ }++ const principals = resolveRecordSharePrincipals(context, target);++ if (!isDefined(principals)) {+ return { kind: 'open' };+ }++ return {+ kind: 'gated',+ condition: buildInheritedReadabilityCondition({+ tableAlias,+ objectMetadataId: flatObjectMetadata.id,+ parents: parents.map((parent) =>+ buildInheritedReadabilityParentCondition({+ context,+ target,+ parent,+ buildParentPolicy,+ }),+ ),+ recordShareTableExpression:+ context.environment.recordShareTableExpression,+ ...principals,+ }),+ };+};++const buildInheritedReadabilityParentCondition = ({+ context,+ target: { tableAlias, operationType, depth },+ parent,+ buildParentPolicy,+}: RecordShareGateArgs & {+ parent: InheritedReadabilityParent;+}): InheritedReadabilityParentCondition => {+ if (parent.kind === 'column') {+ const parentTableAlias = `${tableAlias}_${parent.joinColumnName}`;++ return {+ kind: 'column',+ joinColumnName: parent.joinColumnName,+ parentTableAlias,+ parentTableExpression: context.environment.resolveTableExpression(+ parent.parentFlatObjectMetadata.id,+ ),+ policy: buildParentPolicy({+ tableAlias: parentTableAlias,+ flatObjectMetadata: parent.parentFlatObjectMetadata,+ operationType,+ depth: depth + 1,+ }),+ };+ }++ const childTableAlias = `${tableAlias}_${parent.childFlatObjectMetadata.nameSingular}`;++ return {+ kind: 'children',+ childTableAlias,+ childTableExpression: context.environment.resolveTableExpression(+ parent.childFlatObjectMetadata.id,+ ),+ childJoinColumnName: parent.childJoinColumnName,+ policy: buildParentPolicy({+ tableAlias: childTableAlias,+ flatObjectMetadata: parent.childFlatObjectMetadata,+ operationType,+ depth: depth + 1,+ }),+ };+};diff --git a/packages/twenty-server/src/engine/record-share/utils/build-record-share-inputs-for-created-records.util.ts b/packages/twenty-server/src/engine/core-modules/record-share/utils/build-record-share-inputs-for-created-records.util.tssimilarity index 92%rename from packages/twenty-server/src/engine/record-share/utils/build-record-share-inputs-for-created-records.util.tsrename to packages/twenty-server/src/engine/core-modules/record-share/utils/build-record-share-inputs-for-created-records.util.tsindex 2dd6407cbb7..1067ea2bad6 100644--- a/packages/twenty-server/src/engine/record-share/utils/build-record-share-inputs-for-created-records.util.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/utils/build-record-share-inputs-for-created-records.util.ts@@ -1,3 +1,5 @@+/* @license Enterprise */+import { EVERYONE_PRINCIPAL_ID } from 'twenty-shared/constants';import {RecordShareAccessLevel,@@ -10,9 +12,9 @@ import { isApiKeyAuthContext } from 'src/engine/core-modules/auth/guards/is-api-import { isApplicationAuthContext } from 'src/engine/core-modules/auth/guards/is-application-auth-context.guard';import { isUserAuthContext } from 'src/engine/core-modules/auth/guards/is-user-auth-context.guard';import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';-import { type RecordShareInput } from 'src/engine/record-share/types/record-share-input.type';-import { type ShareWithInput } from 'src/engine/record-share/types/share-with-input.type';-import { resolveShareWithPrincipalOrThrow } from 'src/engine/record-share/utils/resolve-share-with-principal-or-throw.util';+import { type RecordShareInput } from 'src/engine/core-modules/record-share/types/record-share-input.type';+import { type ShareWithInput } from 'src/engine/core-modules/record-share/types/share-with-input.type';+import { resolveShareWithPrincipalOrThrow } from 'src/engine/core-modules/record-share/utils/resolve-share-with-principal-or-throw.util';type RecordShareInputForRecord = Omit<RecordShareInput,diff --git a/packages/twenty-server/src/engine/record-share/utils/build-role-row-access-policy-subject.util.ts b/packages/twenty-server/src/engine/core-modules/record-share/utils/build-role-row-access-policy-subject.util.tssimilarity index 97%rename from packages/twenty-server/src/engine/record-share/utils/build-role-row-access-policy-subject.util.tsrename to packages/twenty-server/src/engine/core-modules/record-share/utils/build-role-row-access-policy-subject.util.tsindex b6ddc7a5821..eed655c889d 100644--- a/packages/twenty-server/src/engine/record-share/utils/build-role-row-access-policy-subject.util.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/utils/build-role-row-access-policy-subject.util.ts@@ -1,3 +1,5 @@+/* @license Enterprise */+import { EVERYONE_PRINCIPAL_ID } from 'twenty-shared/constants';import { type ObjectsPermissionsByRoleId } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';@@ -6,7 +8,7 @@ import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/typimport { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';import { type FlatRowLevelPermissionPredicateMaps } from 'src/engine/metadata-modules/row-level-permission-predicate/types/flat-row-level-permission-predicate-maps.type';import { type FlatRowLevelPermissionPredicateGroupMaps } from 'src/engine/metadata-modules/row-level-permission-predicate/types/flat-row-level-permission-predicate-group-maps.type';-import { type RowAccessPolicySubject } from 'src/engine/twenty-orm/utils/build-row-access-policy.util';+import { type RowAccessPolicySubject } from 'src/engine/twenty-orm/types/row-access-policy.type';import { buildRowLevelPermissionRecordFilter } from 'src/engine/twenty-orm/utils/build-row-level-permission-record-filter.util';export const buildRoleRowAccessPolicySubject = ({diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/find-record-sharing-entitlement-provider.util.ts b/packages/twenty-server/src/engine/core-modules/record-share/utils/find-record-sharing-entitlement-provider.util.tsnew file mode 100644index 00000000000..db7e6fca075--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/record-share/utils/find-record-sharing-entitlement-provider.util.ts@@ -0,0 +1,12 @@+import { type DiscoveryService } from '@nestjs/core';++import { RecordSharingEntitlementProvider } from 'src/engine/core-modules/record-share/interfaces/record-sharing-entitlement-provider.service';+import { findProviderInstance } from 'src/engine/core-modules/usage-limit/utils/find-provider-instance.util';++export const findRecordSharingEntitlementProvider = (+ discoveryService: DiscoveryService,+): RecordSharingEntitlementProvider | null =>+ findProviderInstance({+ discoveryService,+ providerClass: RecordSharingEntitlementProvider,+ });diff --git a/packages/twenty-server/src/engine/record-share/utils/omit-inherited-readability-child-records.util.ts b/packages/twenty-server/src/engine/core-modules/record-share/utils/omit-inherited-readability-child-records.util.tssimilarity index 83%rename from packages/twenty-server/src/engine/record-share/utils/omit-inherited-readability-child-records.util.tsrename to packages/twenty-server/src/engine/core-modules/record-share/utils/omit-inherited-readability-child-records.util.tsindex 1609c1a15d2..8086bf7f60b 100644--- a/packages/twenty-server/src/engine/record-share/utils/omit-inherited-readability-child-records.util.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/utils/omit-inherited-readability-child-records.util.ts@@ -1,7 +1,9 @@+/* @license Enterprise */+import { type ObjectRecordEvent } from 'twenty-shared/database-events';import { isDefined } from 'twenty-shared/utils';-import { type InheritedReadabilityChildRecordsCarrier } from 'src/engine/twenty-orm/types/inherited-readability-child-records.type';+import { type InheritedReadabilityChildRecordsCarrier } from 'src/engine/core-modules/record-share/types/inherited-readability-child-records.type';export const omitInheritedReadabilityChildRecords = <TEvent extends ObjectRecordEvent,diff --git a/packages/twenty-server/src/engine/record-share/utils/omit-restricted-fields-from-event.util.ts b/packages/twenty-server/src/engine/core-modules/record-share/utils/omit-restricted-fields-from-event.util.tssimilarity index 100%rename from packages/twenty-server/src/engine/record-share/utils/omit-restricted-fields-from-event.util.tsrename to packages/twenty-server/src/engine/core-modules/record-share/utils/omit-restricted-fields-from-event.util.tsdiff --git a/packages/twenty-server/src/engine/record-share/utils/record-share-graphql-api-exception-handler.util.ts b/packages/twenty-server/src/engine/core-modules/record-share/utils/record-share-graphql-api-exception-handler.util.tssimilarity index 86%rename from packages/twenty-server/src/engine/record-share/utils/record-share-graphql-api-exception-handler.util.tsrename to packages/twenty-server/src/engine/core-modules/record-share/utils/record-share-graphql-api-exception-handler.util.tsindex 79da7fb5953..6fb998fb681 100644--- a/packages/twenty-server/src/engine/record-share/utils/record-share-graphql-api-exception-handler.util.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/utils/record-share-graphql-api-exception-handler.util.ts@@ -1,3 +1,5 @@+/* @license Enterprise */+import { assertUnreachable } from 'twenty-shared/utils';import {@@ -7,7 +9,7 @@ import {import {type RecordShareException,RecordShareExceptionCode,-} from 'src/engine/record-share/record-share.exception';+} from 'src/engine/core-modules/record-share/record-share.exception';export const recordShareGraphqlApiExceptionHandler = (error: RecordShareException,diff --git a/packages/twenty-server/src/engine/record-share/utils/record-share-rest-api-exception-handler.util.ts b/packages/twenty-server/src/engine/core-modules/record-share/utils/record-share-rest-api-exception-handler.util.tssimilarity index 86%rename from packages/twenty-server/src/engine/record-share/utils/record-share-rest-api-exception-handler.util.tsrename to packages/twenty-server/src/engine/core-modules/record-share/utils/record-share-rest-api-exception-handler.util.tsindex 35e1cfb2f9a..2eb8295f262 100644--- a/packages/twenty-server/src/engine/record-share/utils/record-share-rest-api-exception-handler.util.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/utils/record-share-rest-api-exception-handler.util.ts@@ -1,3 +1,5 @@+/* @license Enterprise */+import {BadRequestException,InternalServerErrorException,@@ -8,7 +10,7 @@ import { assertUnreachable } from 'twenty-shared/utils';import {type RecordShareException,RecordShareExceptionCode,-} from 'src/engine/record-share/record-share.exception';+} from 'src/engine/core-modules/record-share/record-share.exception';export const recordShareRestApiExceptionHandler = (error: RecordShareException,diff --git a/packages/twenty-server/src/engine/record-share/utils/resolve-event-record-snapshots.util.ts b/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-event-record-snapshots.util.tssimilarity index 87%rename from packages/twenty-server/src/engine/record-share/utils/resolve-event-record-snapshots.util.tsrename to packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-event-record-snapshots.util.tsindex bd4eddf1991..339c494c272 100644--- a/packages/twenty-server/src/engine/record-share/utils/resolve-event-record-snapshots.util.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-event-record-snapshots.util.ts@@ -1,3 +1,5 @@+/* @license Enterprise */+import {type ObjectRecordBaseEvent,type ObjectRecordEvent,@@ -6,7 +8,7 @@ import {import {type InheritedReadabilityChildRecords,type InheritedReadabilityChildRecordsCarrier,-} from 'src/engine/twenty-orm/types/inherited-readability-child-records.type';+} from 'src/engine/core-modules/record-share/types/inherited-readability-child-records.type';export type EventRecordSnapshot = {id: string;diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/resolve-inherited-readability-child-links.util.ts b/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-inherited-readability-child-links.util.tssimilarity index 96%rename from packages/twenty-server/src/engine/twenty-orm/utils/resolve-inherited-readability-child-links.util.tsrename to packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-inherited-readability-child-links.util.tsindex c56f450f9f4..0771feae269 100644--- a/packages/twenty-server/src/engine/twenty-orm/utils/resolve-inherited-readability-child-links.util.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-inherited-readability-child-links.util.ts@@ -1,3 +1,5 @@+/* @license Enterprise */+import { MetadataReadability } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';@@ -6,7 +8,7 @@ import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/typimport { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';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 InheritedReadabilityParentLink } from 'src/engine/twenty-orm/types/inherited-readability-parent-link.type';+import { type InheritedReadabilityParentLink } from 'src/engine/core-modules/record-share/types/inherited-readability-parent-link.type';import { getRelationFlatFieldMetadatasOfObject } from 'src/engine/twenty-orm/utils/get-relation-flat-field-metadatas-of-object.util';import { isManyToOneFlatFieldMetadata } from 'src/engine/twenty-orm/utils/is-many-to-one-flat-field-metadata.util';diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/resolve-inherited-readability-parents.util.ts b/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-inherited-readability-parents.util.tssimilarity index 95%rename from packages/twenty-server/src/engine/twenty-orm/utils/resolve-inherited-readability-parents.util.tsrename to packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-inherited-readability-parents.util.tsindex 343768109a4..198c48aca7f 100644--- a/packages/twenty-server/src/engine/twenty-orm/utils/resolve-inherited-readability-parents.util.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-inherited-readability-parents.util.ts@@ -1,3 +1,5 @@+/* @license Enterprise */+import { FieldMetadataType } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';@@ -10,9 +12,9 @@ import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';import { isMorphOrRelationFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-morph-or-relation-flat-field-metadata.util';import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';-import { type InheritedReadabilityChildrenParent } from 'src/engine/twenty-orm/types/inherited-readability-children-parent.type';-import { type InheritedReadabilityColumnParent } from 'src/engine/twenty-orm/types/inherited-readability-column-parent.type';-import { type InheritedReadabilityParent } from 'src/engine/twenty-orm/types/inherited-readability-parent.type';+import { type InheritedReadabilityChildrenParent } from 'src/engine/core-modules/record-share/types/inherited-readability-children-parent.type';+import { type InheritedReadabilityColumnParent } from 'src/engine/core-modules/record-share/types/inherited-readability-column-parent.type';+import { type InheritedReadabilityParent } from 'src/engine/core-modules/record-share/types/inherited-readability-parent.type';import { getRelationFlatFieldMetadatasOfObject } from 'src/engine/twenty-orm/utils/get-relation-flat-field-metadatas-of-object.util';import { isManyToOneFlatFieldMetadata } from 'src/engine/twenty-orm/utils/is-many-to-one-flat-field-metadata.util';diff --git a/packages/twenty-server/src/engine/record-share/utils/resolve-record-ids-shared-with-principals.util.ts b/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-record-ids-shared-with-principals.util.tssimilarity index 81%rename from packages/twenty-server/src/engine/record-share/utils/resolve-record-ids-shared-with-principals.util.tsrename to packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-record-ids-shared-with-principals.util.tsindex 5d6b6d11930..eff44f61040 100644--- a/packages/twenty-server/src/engine/record-share/utils/resolve-record-ids-shared-with-principals.util.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-record-ids-shared-with-principals.util.ts@@ -1,6 +1,8 @@+/* @license Enterprise */+import { type RecordShareAccessLevel } from 'twenty-shared/types';-import { type RecordShare } from 'src/engine/record-share/types/record-share.type';+import { type RecordShare } from 'src/engine/core-modules/record-share/types/record-share.type';export const resolveRecordIdsSharedWithPrincipals = ({recordShares,diff --git a/packages/twenty-server/src/engine/record-share/utils/resolve-record-share-gate-kind.util.ts b/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-record-share-gate-kind.util.tssimilarity index 96%rename from packages/twenty-server/src/engine/record-share/utils/resolve-record-share-gate-kind.util.tsrename to packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-record-share-gate-kind.util.tsindex 65782de852f..3d29186a9c1 100644--- a/packages/twenty-server/src/engine/record-share/utils/resolve-record-share-gate-kind.util.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-record-share-gate-kind.util.ts@@ -1,3 +1,5 @@+/* @license Enterprise */+import { MetadataReadability } from 'twenty-shared/types';import { assertUnreachable } from 'twenty-shared/utils';diff --git a/packages/twenty-server/src/engine/twenty-orm/repository/resolve-required-record-share-access-levels.util.ts b/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-required-record-share-access-levels.util.tssimilarity index 97%rename from packages/twenty-server/src/engine/twenty-orm/repository/resolve-required-record-share-access-levels.util.tsrename to packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-required-record-share-access-levels.util.tsindex bdc40f04160..54610b4c10c 100644--- a/packages/twenty-server/src/engine/twenty-orm/repository/resolve-required-record-share-access-levels.util.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-required-record-share-access-levels.util.ts@@ -1,3 +1,5 @@+/* @license Enterprise */+import { RecordShareAccessLevel } from 'twenty-shared/types';import { type OperationType } from 'src/engine/twenty-orm/repository/permissions.utils';diff --git a/packages/twenty-server/src/engine/record-share/utils/resolve-share-with-principal-or-throw.util.ts b/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-share-with-principal-or-throw.util.tssimilarity index 86%rename from packages/twenty-server/src/engine/record-share/utils/resolve-share-with-principal-or-throw.util.tsrename to packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-share-with-principal-or-throw.util.tsindex 5b169612b02..6120e4ded0f 100644--- a/packages/twenty-server/src/engine/record-share/utils/resolve-share-with-principal-or-throw.util.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-share-with-principal-or-throw.util.ts@@ -1,3 +1,5 @@+/* @license Enterprise */+import { msg } from '@lingui/core/macro';import { EVERYONE_PRINCIPAL_ID } from 'twenty-shared/constants';import { RecordSharePrincipalType } from 'twenty-shared/types';@@ -6,9 +8,9 @@ import { isDefined, isValidUuid } from 'twenty-shared/utils';import {RecordShareException,RecordShareExceptionCode,-} from 'src/engine/record-share/record-share.exception';-import { type RecordShareInput } from 'src/engine/record-share/types/record-share-input.type';-import { type ShareWithInput } from 'src/engine/record-share/types/share-with-input.type';+} 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 { type ShareWithInput } from 'src/engine/core-modules/record-share/types/share-with-input.type';const buildSingleTargetException = () =>new RecordShareException(diff --git a/packages/twenty-server/src/engine/record-share/utils/validate-share-with-arg-or-throw.util.ts b/packages/twenty-server/src/engine/core-modules/record-share/utils/validate-share-with-arg-or-throw.util.tssimilarity index 81%rename from packages/twenty-server/src/engine/record-share/utils/validate-share-with-arg-or-throw.util.tsrename to packages/twenty-server/src/engine/core-modules/record-share/utils/validate-share-with-arg-or-throw.util.tsindex ffbac1a688a..8c12aa3fb83 100644--- a/packages/twenty-server/src/engine/record-share/utils/validate-share-with-arg-or-throw.util.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/utils/validate-share-with-arg-or-throw.util.ts@@ -1,3 +1,5 @@+/* @license Enterprise */+import { msg } from '@lingui/core/macro';import { isNonEmptyArray } from 'twenty-shared/utils';@@ -6,9 +8,9 @@ import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/woimport {RecordShareException,RecordShareExceptionCode,-} from 'src/engine/record-share/record-share.exception';-import { type ShareWithInput } from 'src/engine/record-share/types/share-with-input.type';-import { resolveShareWithPrincipalOrThrow } from 'src/engine/record-share/utils/resolve-share-with-principal-or-throw.util';+} from 'src/engine/core-modules/record-share/record-share.exception';+import { type ShareWithInput } from 'src/engine/core-modules/record-share/types/share-with-input.type';+import { resolveShareWithPrincipalOrThrow } from 'src/engine/core-modules/record-share/utils/resolve-share-with-principal-or-throw.util';export const validateShareWithArgOrThrow = ({authContext,diff --git a/packages/twenty-server/src/engine/record-share/utils/validate-share-with-principals-or-throw.util.ts b/packages/twenty-server/src/engine/core-modules/record-share/utils/validate-share-with-principals-or-throw.util.tssimilarity index 84%rename from packages/twenty-server/src/engine/record-share/utils/validate-share-with-principals-or-throw.util.tsrename to packages/twenty-server/src/engine/core-modules/record-share/utils/validate-share-with-principals-or-throw.util.tsindex 385b1c00ba5..175e47fda92 100644--- a/packages/twenty-server/src/engine/record-share/utils/validate-share-with-principals-or-throw.util.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/utils/validate-share-with-principals-or-throw.util.ts@@ -1,3 +1,5 @@+/* @license Enterprise */+import { msg } from '@lingui/core/macro';import { RecordSharePrincipalType } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';@@ -7,9 +9,9 @@ import { type FlatRoleMaps } from 'src/engine/metadata-modules/flat-role/types/fimport {RecordShareException,RecordShareExceptionCode,-} from 'src/engine/record-share/record-share.exception';-import { type ShareWithInput } from 'src/engine/record-share/types/share-with-input.type';-import { resolveShareWithPrincipalOrThrow } from 'src/engine/record-share/utils/resolve-share-with-principal-or-throw.util';+} from 'src/engine/core-modules/record-share/record-share.exception';+import { type ShareWithInput } from 'src/engine/core-modules/record-share/types/share-with-input.type';+import { resolveShareWithPrincipalOrThrow } from 'src/engine/core-modules/record-share/utils/resolve-share-with-principal-or-throw.util';export const validateShareWithPrincipalsOrThrow = ({shareWith,diff --git a/packages/twenty-server/src/engine/metadata-modules/webhook/jobs/call-webhook-jobs.job.ts b/packages/twenty-server/src/engine/metadata-modules/webhook/jobs/call-webhook-jobs.job.tsindex 93fce80c69e..126deb13b55 100644--- a/packages/twenty-server/src/engine/metadata-modules/webhook/jobs/call-webhook-jobs.job.ts+++ b/packages/twenty-server/src/engine/metadata-modules/webhook/jobs/call-webhook-jobs.job.ts@@ -1,7 +1,6 @@import { Logger } from '@nestjs/common';import chunk from 'lodash.chunk';-import { FeatureFlagKey } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import type { ObjectRecordEvent } from 'twenty-shared/database-events';@@ -18,8 +17,9 @@ import { type CallWebhookJobData } from 'src/engine/metadata-modules/webhook/typimport { type WorkspaceEventBatchForWebhook } from 'src/engine/metadata-modules/webhook/types/workspace-event-batch-for-webhook.type';import { computeWebhookOperationsToMatch } from 'src/engine/metadata-modules/webhook/utils/compute-webhook-operations-to-match.util';import { transformEventBatchToWebhookEvents } from 'src/engine/metadata-modules/webhook/utils/transform-event-batch-to-webhook-events';-import { EVERYONE_ROW_ACCESS_POLICY_SUBJECT } from 'src/engine/record-share/constants/everyone-row-access-policy-subject.constant';-import { RecordAccessPolicyService } from 'src/engine/record-share/services/record-access-policy.service';+import { EVERYONE_ROW_ACCESS_POLICY_SUBJECT } from 'src/engine/core-modules/record-share/constants/everyone-row-access-policy-subject.constant';+import { RecordAccessPolicyService } from 'src/engine/core-modules/record-share/services/record-access-policy.service';+import { RecordSharingFeatureService } from 'src/engine/core-modules/record-share/services/record-sharing-feature.service';import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';const WEBHOOK_JOBS_CHUNK_SIZE = 20;@@ -32,6 +32,7 @@ export class CallWebhookJobsJob {private readonly messageQueueService: MessageQueueService,private readonly workspaceCacheService: WorkspaceCacheService,private readonly recordAccessPolicyService: RecordAccessPolicyService,+ private readonly recordSharingFeatureService: RecordSharingFeatureService,private readonly webhookRateLimitService: WebhookRateLimitService,) {}@@ -51,10 +52,10 @@ export class CallWebhookJobsJob {operation,});- const { flatWebhookMaps, flatObjectMetadataMaps, featureFlagsMap } =+ const { flatWebhookMaps, flatObjectMetadataMaps } =await this.workspaceCacheService.getOrRecompute(workspaceEventBatch.workspaceId,- ['flatWebhookMaps', 'flatObjectMetadataMaps', 'featureFlagsMap'],+ ['flatWebhookMaps', 'flatObjectMetadataMaps'],);const webhooks = Object.values(flatWebhookMaps.byUniversalIdentifier)@@ -75,7 +76,9 @@ export class CallWebhookJobsJob {});const isRecordSharingEnabled =- featureFlagsMap[FeatureFlagKey.IS_RECORD_SHARING_ENABLED] ?? false;+ await this.recordSharingFeatureService.isRecordSharingEnabled(+ workspaceEventBatch.workspaceId,+ );// Without the readability the batch cannot be gated, so nothing may leaveif (isRecordSharingEnabled && !isDefined(flatObjectMetadata)) {diff --git a/packages/twenty-server/src/engine/metadata-modules/webhook/jobs/webhook-job.module.ts b/packages/twenty-server/src/engine/metadata-modules/webhook/jobs/webhook-job.module.tsindex e9092e7e917..f98fc268daa 100644--- a/packages/twenty-server/src/engine/metadata-modules/webhook/jobs/webhook-job.module.ts+++ b/packages/twenty-server/src/engine/metadata-modules/webhook/jobs/webhook-job.module.ts@@ -10,7 +10,8 @@ import { CallWebhookJobsForMetadataJob } from 'src/engine/metadata-modules/webhoimport { CallWebhookJobsJob } from 'src/engine/metadata-modules/webhook/jobs/call-webhook-jobs.job';import { CallWebhookJob } from 'src/engine/metadata-modules/webhook/jobs/call-webhook.job';import { WebhookRateLimitService } from 'src/engine/metadata-modules/webhook/jobs/webhook-rate-limit.service';-import { RecordShareModule } from 'src/engine/record-share/record-share.module';+import { RecordShareModule } from 'src/engine/core-modules/record-share/record-share.module';+import { RecordSharingFeatureModule } from 'src/engine/core-modules/record-share/record-sharing-feature.module';import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';@Module({@@ -20,6 +21,7 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cacheFlatWebhookModule,MetricsModule,RecordShareModule,+ RecordSharingFeatureModule,SecureHttpClientModule,UsageLimitModule,WorkspaceCacheModule,diff --git a/packages/twenty-server/src/engine/record-share/record-share.module.ts b/packages/twenty-server/src/engine/record-share/record-share.module.tsdeleted file mode 100644index 60aa168db08..00000000000--- a/packages/twenty-server/src/engine/record-share/record-share.module.ts+++ /dev/null@@ -1,14 +0,0 @@-import { Module } from '@nestjs/common';--import { RecordAccessPolicyService } from 'src/engine/record-share/services/record-access-policy.service';-import { RecordShareService } from 'src/engine/record-share/services/record-share.service';-import { ShareWithService } from 'src/engine/record-share/services/share-with.service';-import { TwentyOrmModule } from 'src/engine/twenty-orm/twenty-orm.module';-import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';--@Module({- imports: [TwentyOrmModule, WorkspaceCacheModule],- providers: [RecordShareService, ShareWithService, RecordAccessPolicyService],- exports: [RecordShareService, ShareWithService, RecordAccessPolicyService],-})-export class RecordShareModule {}diff --git a/packages/twenty-server/src/engine/record-share/types/record-share.type.ts b/packages/twenty-server/src/engine/record-share/types/record-share.type.tsdeleted file mode 100644index a9d7f8fbee8..00000000000--- a/packages/twenty-server/src/engine/record-share/types/record-share.type.ts+++ /dev/null@@ -1,5 +0,0 @@-import { type RecordShareInput } from 'src/engine/record-share/types/record-share-input.type';--export type RecordShare = RecordShareInput & {- id: string;-};diff --git a/packages/twenty-server/src/engine/subscriptions/object-record-event/__tests__/object-record-event-publisher.spec.ts b/packages/twenty-server/src/engine/subscriptions/object-record-event/__tests__/object-record-event-publisher.spec.tsindex bea8120e7dc..1d49d06f11f 100644--- a/packages/twenty-server/src/engine/subscriptions/object-record-event/__tests__/object-record-event-publisher.spec.ts+++ b/packages/twenty-server/src/engine/subscriptions/object-record-event/__tests__/object-record-event-publisher.spec.ts@@ -24,10 +24,11 @@ import { getFlatFieldMetadataMock } from 'src/engine/metadata-modules/flat-fieldimport { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';import { COMPANY_FLAT_OBJECT_MOCK } from 'src/engine/metadata-modules/flat-object-metadata/__mocks__/company-flat-object.mock';import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';-import { RecordAccessPolicyService } from 'src/engine/record-share/services/record-access-policy.service';-import { RecordShareService } from 'src/engine/record-share/services/record-share.service';+import { RecordAccessPolicyService } from 'src/engine/core-modules/record-share/services/record-access-policy.service';+import { RecordShareService } from 'src/engine/core-modules/record-share/services/record-share.service';+import { RecordSharingFeatureService } from 'src/engine/core-modules/record-share/services/record-sharing-feature.service';import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';-import { type RecordShare } from 'src/engine/record-share/types/record-share.type';+import { type RecordShare } from 'src/engine/core-modules/record-share/types/record-share.type';import { EventStreamService } from 'src/engine/subscriptions/event-stream.service';import { SubscriptionService } from 'src/engine/subscriptions/subscription.service';import { type EventStreamData } from 'src/engine/subscriptions/types/event-stream-data.type';@@ -104,6 +105,9 @@ describe('ObjectRecordEventPublisher', () => {'getOrRecomputeManyOrAllFlatEntityMaps'>>;+ let mockRecordSharingFeatureService: jest.Mocked<+ Pick<RecordSharingFeatureService, 'isRecordSharingEnabled'>+ >;let mockRecordShareService: jest.Mocked<Pick<RecordShareService, 'findByRecordIds'>>;@@ -278,6 +282,10 @@ describe('ObjectRecordEventPublisher', () => {findByRecordIds: jest.fn().mockResolvedValue([]),};+ mockRecordSharingFeatureService = {+ isRecordSharingEnabled: jest.fn().mockResolvedValue(false),+ };+mockWorkspaceOrmManager = {executeInWorkspaceContext: jest.fn(),getRepository: jest.fn(),@@ -332,6 +340,10 @@ describe('ObjectRecordEventPublisher', () => {provide: RecordShareService,useValue: mockRecordShareService,},+ {+ provide: RecordSharingFeatureService,+ useValue: mockRecordSharingFeatureService,+ },RecordAccessPolicyService,{provide: WorkspaceOrmManager,@@ -467,10 +479,8 @@ describe('ObjectRecordEventPublisher', () => {readability: MetadataReadability.INHERITED,};- mockWorkspaceCacheService.getOrRecompute.mockImplementation(- createCacheMock({- featureFlagsMap: { [FeatureFlagKey.IS_RECORD_SHARING_ENABLED]: true },- }),+ mockRecordSharingFeatureService.isRecordSharingEnabled.mockResolvedValue(+ true,);mockEventStreamService.getStreamsData.mockResolvedValue(new Map([@@ -548,10 +558,8 @@ describe('ObjectRecordEventPublisher', () => {readability: MetadataReadability.PRIVATE,};- mockWorkspaceCacheService.getOrRecompute.mockImplementation(- createCacheMock({- featureFlagsMap: { [FeatureFlagKey.IS_RECORD_SHARING_ENABLED]: true },- }),+ mockRecordSharingFeatureService.isRecordSharingEnabled.mockResolvedValue(+ true,);mockRecordShareService.findByRecordIds.mockResolvedValue([@@ -600,6 +608,34 @@ describe('ObjectRecordEventPublisher', () => {).toEqual(['record-1']);});+ it('should read the record sharing entitlement once for a batch whatever the subscriber count', async () => {+ mockRecordSharingFeatureService.isRecordSharingEnabled.mockResolvedValue(+ true,+ );++ mockEventStreamService.getStreamsData.mockResolvedValue(+ new Map([+ [streamChannelId, mockStreamData],+ ['second-stream-channel-id', mockStreamData],+ ['third-stream-channel-id', mockStreamData],+ ]) as Map<string, EventStreamData | undefined>,+ );++ await service.publish({+ name: 'company.created',+ workspaceId,+ objectMetadata: companyObjectMetadata,+ events: [createMockEvent()],+ } as WorkspaceEventBatch<never>);++ expect(+ mockSubscriptionService.publishToEventStream,+ ).toHaveBeenCalledTimes(3);+ expect(+ mockRecordSharingFeatureService.isRecordSharingEnabled,+ ).toHaveBeenCalledTimes(1);+ });+it('should not publish events when record does not match RLS filter', async () => {(isRecordMatchingRLSRowLevelPermissionPredicate as jest.Mockdiff --git a/packages/twenty-server/src/engine/subscriptions/object-record-event/object-record-event-publisher.ts b/packages/twenty-server/src/engine/subscriptions/object-record-event/object-record-event-publisher.tsindex 036472c846a..d1b268ca797 100644--- a/packages/twenty-server/src/engine/subscriptions/object-record-event/object-record-event-publisher.ts+++ b/packages/twenty-server/src/engine/subscriptions/object-record-event/object-record-event-publisher.ts@@ -36,10 +36,10 @@ import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-objectimport { UserWorkspaceRoleMap } from 'src/engine/metadata-modules/role-target/types/user-workspace-role-map';import { type FlatRowLevelPermissionPredicateGroupMaps } from 'src/engine/metadata-modules/row-level-permission-predicate/types/flat-row-level-permission-predicate-group-maps.type';import { type FlatRowLevelPermissionPredicateMaps } from 'src/engine/metadata-modules/row-level-permission-predicate/types/flat-row-level-permission-predicate-maps.type';-import { RecordAccessPolicyService } from 'src/engine/record-share/services/record-access-policy.service';-import { type EventRecordAccessGate } from 'src/engine/record-share/types/event-record-access-gate.type';-import { omitInheritedReadabilityChildRecords } from 'src/engine/record-share/utils/omit-inherited-readability-child-records.util';-import { omitRestrictedFieldsFromEvent } from 'src/engine/record-share/utils/omit-restricted-fields-from-event.util';+import { RecordAccessPolicyService } from 'src/engine/core-modules/record-share/services/record-access-policy.service';+import { type EventRecordAccessGate } from 'src/engine/core-modules/record-share/types/event-record-access-gate.type';+import { omitInheritedReadabilityChildRecords } from 'src/engine/core-modules/record-share/utils/omit-inherited-readability-child-records.util';+import { omitRestrictedFieldsFromEvent } from 'src/engine/core-modules/record-share/utils/omit-restricted-fields-from-event.util';import { EventStreamService } from 'src/engine/subscriptions/event-stream.service';import { SubscriptionService } from 'src/engine/subscriptions/subscription.service';import {@@ -51,7 +51,7 @@ import { ObjectRecordSubscriptionEvent } from 'src/engine/subscriptions/types/obimport { RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config';import { buildRowLevelPermissionRecordFilter } from 'src/engine/twenty-orm/utils/build-row-level-permission-record-filter.util';import { computePermissionIntersection } from 'src/engine/twenty-orm/utils/compute-permission-intersection.util';-import { type RowAccessPolicySubject } from 'src/engine/twenty-orm/utils/build-row-access-policy.util';+import { type RowAccessPolicySubject } from 'src/engine/twenty-orm/types/row-access-policy.type';import { isRecordMatchingRLSRowLevelPermissionPredicate } from 'src/engine/twenty-orm/utils/is-record-matching-rls-row-level-permission-predicate.util';import { resolveRoleIdsForUser } from 'src/engine/twenty-orm/utils/resolve-role-ids-for-user.util';import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';diff --git a/packages/twenty-server/src/engine/subscriptions/subscriptions.module.ts b/packages/twenty-server/src/engine/subscriptions/subscriptions.module.tsindex ee48293461f..6b174b31cdb 100644--- a/packages/twenty-server/src/engine/subscriptions/subscriptions.module.ts+++ b/packages/twenty-server/src/engine/subscriptions/subscriptions.module.ts@@ -12,7 +12,7 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entimport { ApplicationTranslationCatalogModule } from 'src/engine/metadata-modules/application-translation-catalog/application-translation-catalog.module';import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';import { NavigationMenuItemModule } from 'src/engine/metadata-modules/navigation-menu-item/navigation-menu-item.module';-import { RecordShareModule } from 'src/engine/record-share/record-share.module';+import { RecordShareModule } from 'src/engine/core-modules/record-share/record-share.module';import { EventStreamResolver } from 'src/engine/subscriptions/event-stream.resolver';import { EventStreamService } from 'src/engine/subscriptions/event-stream.service';import { MetadataEventEmitter } from 'src/engine/subscriptions/metadata-event/metadata-event-emitter';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.tsindex 9c8a5dafcd2..c6fda70e984 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@@ -119,6 +119,7 @@ export class WorkspaceDataSourceServiceworkspaceContext.flatRowLevelPermissionPredicateGroupMaps,objectIdByNameSingular: workspaceContext.objectIdByNameSingular,featureFlagsMap: workspaceContext.featureFlagsMap,+ isRecordSharingEnabled: workspaceContext.isRecordSharingEnabled,userWorkspaceRoleMap: workspaceContext.userWorkspaceRoleMap,apiKeyRoleMap: workspaceContext.apiKeyRoleMap,eventEmitterService: this.workspaceEventEmitter,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.tsindex 43c4ac4c203..3a7dfd4ac08 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@@ -19,6 +19,7 @@ export interface WorkspaceInternalContext {flatRowLevelPermissionPredicateGroupMaps: FlatRowLevelPermissionPredicateGroupMaps;objectIdByNameSingular: Record<string, string>;featureFlagsMap: Record<FeatureFlagKey, boolean>;+ isRecordSharingEnabled: boolean;userWorkspaceRoleMap: UserWorkspaceRoleMap;apiKeyRoleMap: Record<string, string>;eventEmitterService: Pick<WorkspaceEventEmitter, 'emitDatabaseBatchEvent'>;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 ac4689549d9..1403cb52a78 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@@ -2,7 +2,6 @@ import { msg } from '@lingui/core/macro';import { isNonEmptyString } from '@sniptt/guards';import { QUERY_MAX_RECORDS } from 'twenty-shared/constants';import {- FeatureFlagKey,MetadataReadability,type ObjectRecord,type ObjectsPermissions,@@ -30,17 +29,17 @@ import {validateOperationIsPermittedOrThrow,} from 'src/engine/twenty-orm/repository/permissions.utils';import { type WorkspaceInternalContext } from 'src/engine/twenty-orm/interfaces/workspace-internal-context.interface';-import { type InheritedReadabilityChildRecords } from 'src/engine/twenty-orm/types/inherited-readability-child-records.type';-import { type InheritedReadabilityChildrenParent } from 'src/engine/twenty-orm/types/inherited-readability-children-parent.type';-import { type InheritedReadabilityColumnParent } from 'src/engine/twenty-orm/types/inherited-readability-column-parent.type';-import { type InheritedReadabilityParent } from 'src/engine/twenty-orm/types/inherited-readability-parent.type';-import { type InheritedReadabilityParentLink } from 'src/engine/twenty-orm/types/inherited-readability-parent-link.type';-import { type RowAccessPolicy } from 'src/engine/twenty-orm/types/row-access-policy.type';+import { type InheritedReadabilityChildRecords } from 'src/engine/core-modules/record-share/types/inherited-readability-child-records.type';+import { type InheritedReadabilityChildrenParent } from 'src/engine/core-modules/record-share/types/inherited-readability-children-parent.type';+import { type InheritedReadabilityColumnParent } from 'src/engine/core-modules/record-share/types/inherited-readability-column-parent.type';+import { type InheritedReadabilityParent } from 'src/engine/core-modules/record-share/types/inherited-readability-parent.type';+import { type InheritedReadabilityParentLink } from 'src/engine/core-modules/record-share/types/inherited-readability-parent-link.type';import {- buildRowAccessPolicy,+ type RowAccessPolicy,type RowAccessPolicyEnvironment,type RowAccessPolicySubject,-} from 'src/engine/twenty-orm/utils/build-row-access-policy.util';+} from 'src/engine/twenty-orm/types/row-access-policy.type';+import { buildRowAccessPolicy } from 'src/engine/twenty-orm/utils/build-row-access-policy.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';@@ -52,8 +51,8 @@ import {import { isChildRecordBoundAtDeletion } from 'src/engine/twenty-orm/utils/is-child-record-bound-at-deletion.util';import { isOwningApplicationAuthContext } from 'src/engine/twenty-orm/utils/is-owning-application-auth-context.util';import { resolvePrincipalIdsFromAuthContext } from 'src/engine/twenty-orm/utils/resolve-principal-ids-from-auth-context.util';-import { resolveInheritedReadabilityChildLinks } from 'src/engine/twenty-orm/utils/resolve-inherited-readability-child-links.util';-import { resolveInheritedReadabilityParents } from 'src/engine/twenty-orm/utils/resolve-inherited-readability-parents.util';+import { resolveInheritedReadabilityChildLinks } from 'src/engine/core-modules/record-share/utils/resolve-inherited-readability-child-links.util';+import { resolveInheritedReadabilityParents } from 'src/engine/core-modules/record-share/utils/resolve-inherited-readability-parents.util';import { resolveRowLevelPermissionRecordFilter } from 'src/engine/twenty-orm/utils/resolve-row-level-permission-record-filter.util';import { validateRLSPredicatesForRecords } from 'src/engine/twenty-orm/utils/validate-rls-predicates-for-records.util';import {@@ -1382,9 +1381,7 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {}private isRecordSharingEnabled(): boolean {- return this.options.internalContext.featureFlagsMap[- FeatureFlagKey.IS_RECORD_SHARING_ENABLED- ];+ return this.options.internalContext.isRecordSharingEnabled;}private async resolveWritableRecordIds({diff --git a/packages/twenty-server/src/engine/twenty-orm/storage/orm-workspace-context.storage.ts b/packages/twenty-server/src/engine/twenty-orm/storage/orm-workspace-context.storage.tsindex 3d83f0fa8d1..18fc4512e13 100644--- a/packages/twenty-server/src/engine/twenty-orm/storage/orm-workspace-context.storage.ts+++ b/packages/twenty-server/src/engine/twenty-orm/storage/orm-workspace-context.storage.ts@@ -21,6 +21,7 @@ export type ORMWorkspaceContext = {flatIndexMaps: FlatEntityMaps<FlatIndexMetadata>;objectIdByNameSingular: Record<string, string>;featureFlagsMap: Record<FeatureFlagKey, boolean>;+ isRecordSharingEnabled: boolean;permissionsPerRoleId: ObjectsPermissionsByRoleId;userWorkspaceRoleMap: UserWorkspaceRoleMap;apiKeyRoleMap: Record<string, string>;diff --git a/packages/twenty-server/src/engine/twenty-orm/twenty-orm.module.ts b/packages/twenty-server/src/engine/twenty-orm/twenty-orm.module.tsindex 201b67ad210..48d8c71bf9f 100644--- a/packages/twenty-server/src/engine/twenty-orm/twenty-orm.module.ts+++ b/packages/twenty-server/src/engine/twenty-orm/twenty-orm.module.ts@@ -10,6 +10,7 @@ import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';import { WorkspaceFeatureFlagsMapCacheModule } from 'src/engine/metadata-modules/workspace-feature-flags-map-cache/workspace-feature-flags-map-cache.module';+import { RecordSharingFeatureModule } from 'src/engine/core-modules/record-share/record-sharing-feature.module';import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';import { WorkspaceORMEntityMetadatasCacheService } from 'src/engine/twenty-orm/workspace-orm-entity-metadatas-cache.service';import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';@@ -35,6 +36,7 @@ import { WorkspaceEventEmitterModule } from 'src/engine/workspace-event-emitter/TwentyConfigModule,WorkspaceEventEmitterModule,WorkspaceCacheModule,+ RecordSharingFeatureModule,],providers: [WorkspaceOrmManager,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 46ec61d3869..213543e1d4d 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,8 +1,49 @@import { type ObjectLiteral } from 'typeorm';+import {+ type ObjectsPermissions,+ type RecordGqlOperationFilter,+} from 'twenty-shared/types';++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 OperationType } from 'src/engine/twenty-orm/repository/permissions.utils';+import { type WorkspaceRelationShape } from 'src/engine/twenty-orm/table-shape/types/workspace-table-shape.type';+export type SqlCondition = { sql: string; parameters: ObjectLiteral };export type RowAccessPolicy =| { kind: 'open' }| { kind: 'denied' }| { kind: 'gated'; condition: SqlCondition };++export type RowAccessPolicySubject = {+ objectsPermissions: ObjectsPermissions | undefined;+ principalIds: string[] | undefined;+ isOwningApplication: (objectMetadata: FlatObjectMetadata) => boolean;+ resolveRowLevelPermissionRecordFilter: (+ objectMetadata: FlatObjectMetadata,+ ) => RecordGqlOperationFilter | null;+};++export type RowAccessPolicyEnvironment = {+ isRecordSharingEnabled: boolean;+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;+ flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;+ recordShareTableExpression: string;+ resolveTableExpression: (objectMetadataId: string) => string;+};++export type RowAccessPolicyContext = {+ subject: RowAccessPolicySubject;+ environment: RowAccessPolicyEnvironment;+};++export type RowAccessPolicyTarget = {+ tableAlias: string;+ flatObjectMetadata: FlatObjectMetadata;+ operationType: OperationType;+ depth: number;+ joinParentRelationShape?: WorkspaceRelationShape;+};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 d6ddaa2845f..b80990304ee 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@@ -3,15 +3,15 @@ import { MetadataReadability } from 'twenty-shared/types';import { getFlatObjectMetadataMock } from 'src/engine/metadata-modules/flat-object-metadata/__mocks__/get-flat-object-metadata.mock';import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';import {- buildRowAccessPolicy,type RowAccessPolicyEnvironment,type RowAccessPolicySubject,-} from 'src/engine/twenty-orm/utils/build-row-access-policy.util';+} from 'src/engine/twenty-orm/types/row-access-policy.type';+import { buildRowAccessPolicy } from 'src/engine/twenty-orm/utils/build-row-access-policy.util';import { renderRowLevelPermissionFilterToSql } from 'src/engine/twenty-orm/utils/render-row-level-permission-filter-to-sql.util';-import { resolveInheritedReadabilityParents } from 'src/engine/twenty-orm/utils/resolve-inherited-readability-parents.util';+import { resolveInheritedReadabilityParents } from 'src/engine/core-modules/record-share/utils/resolve-inherited-readability-parents.util';jest.mock(- 'src/engine/twenty-orm/utils/resolve-inherited-readability-parents.util',+ 'src/engine/core-modules/record-share/utils/resolve-inherited-readability-parents.util',);jest.mock('src/engine/twenty-orm/utils/render-row-level-permission-filter-to-sql.util',diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/format-twenty-orm-event-to-database-batch-event.util.spec.ts b/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/format-twenty-orm-event-to-database-batch-event.util.spec.tsindex 2cc4bad1341..15aafcc2e7d 100644--- a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/format-twenty-orm-event-to-database-batch-event.util.spec.ts+++ b/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/format-twenty-orm-event-to-database-batch-event.util.spec.ts@@ -14,7 +14,7 @@ import {TwentyOrmExceptionCode,} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';import { formatTwentyOrmEventToDatabaseBatchEvent } from 'src/engine/twenty-orm/utils/format-twenty-orm-event-to-database-batch-event.util';-import { type InheritedReadabilityChildRecordsCarrier } from 'src/engine/twenty-orm/types/inherited-readability-child-records.type';+import { type InheritedReadabilityChildRecordsCarrier } from 'src/engine/core-modules/record-share/types/inherited-readability-child-records.type';describe('formatTwentyOrmEventToDatabaseBatchEvent', () => {const workspaceId = 'workspace-id';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 9b51b290b80..b8d4ce25d95 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@@ -1,62 +1,15 @@-import {- MetadataReadability,- type ObjectsPermissions,- type RecordGqlOperationFilter,- type RecordShareAccessLevel,-} from 'twenty-shared/types';-import { assertUnreachable, isDefined } from 'twenty-shared/utils';+import { isDefined } from 'twenty-shared/utils';-import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';-import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';-import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';-import { MAX_INHERITED_READABILITY_DEPTH } from 'src/engine/twenty-orm/constants/max-inherited-readability-depth.constant';-import { type OperationType } from 'src/engine/twenty-orm/repository/permissions.utils';-import { resolveRequiredRecordShareAccessLevels } from 'src/engine/twenty-orm/repository/resolve-required-record-share-access-levels.util';-import { type WorkspaceRelationShape } from 'src/engine/twenty-orm/table-shape/types/workspace-table-shape.type';-import { type InheritedReadabilityParent } from 'src/engine/twenty-orm/types/inherited-readability-parent.type';+import { buildRecordShareGate } from 'src/engine/core-modules/record-share/utils/build-record-share-gate.util';import {type RowAccessPolicy,+ type RowAccessPolicyContext,+ type RowAccessPolicyTarget,type SqlCondition,} from 'src/engine/twenty-orm/types/row-access-policy.type';import { combineSqlConditions } from 'src/engine/twenty-orm/utils/combine-sql-conditions.util';-import {- buildInheritedReadabilityCondition,- type InheritedReadabilityParentCondition,-} from 'src/engine/twenty-orm/utils/build-inherited-readability-condition.util';-import { buildRecordShareCondition } from 'src/engine/twenty-orm/utils/build-record-share-condition.util';import { isObjectOperationPermitted } from 'src/engine/twenty-orm/utils/is-object-operation-permitted.util';import { renderRowLevelPermissionFilterToSql } from 'src/engine/twenty-orm/utils/render-row-level-permission-filter-to-sql.util';-import { resolveInheritedReadabilityParents } from 'src/engine/twenty-orm/utils/resolve-inherited-readability-parents.util';--export type RowAccessPolicySubject = {- objectsPermissions: ObjectsPermissions | undefined;- principalIds: string[] | undefined;- isOwningApplication: (objectMetadata: FlatObjectMetadata) => boolean;- resolveRowLevelPermissionRecordFilter: (- objectMetadata: FlatObjectMetadata,- ) => RecordGqlOperationFilter | null;-};--export type RowAccessPolicyEnvironment = {- isRecordSharingEnabled: boolean;- flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;- flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;- recordShareTableExpression: string;- resolveTableExpression: (objectMetadataId: string) => string;-};--type RowAccessPolicyContext = {- subject: RowAccessPolicySubject;- environment: RowAccessPolicyEnvironment;-};--type RowAccessPolicyTarget = {- tableAlias: string;- flatObjectMetadata: FlatObjectMetadata;- operationType: OperationType;- depth: number;- joinParentRelationShape?: WorkspaceRelationShape;-};export const buildRowAccessPolicy = ({subject,@@ -76,7 +29,12 @@ export const buildRowAccessPolicy = ({return { kind: 'denied' };}- const recordShareGate = buildRecordShareGate(context, target);+ const recordShareGate = buildRecordShareGate({+ context,+ target,+ buildParentPolicy: (parentTarget) =>+ buildRowAccessPolicy({ ...context, ...parentTarget }),+ });if (recordShareGate.kind === 'denied') {return { kind: 'denied' };@@ -114,177 +72,3 @@ const buildRolePredicate = (}) ?? undefined);};--const buildRecordShareGate = (- context: RowAccessPolicyContext,- target: RowAccessPolicyTarget,-): RowAccessPolicy => {- const { isRecordSharingEnabled } = context.environment;- const isOwningApplication = context.subject.isOwningApplication(- target.flatObjectMetadata,- );-- switch (target.flatObjectMetadata.readability) {- case MetadataReadability.OPEN:- return { kind: 'open' };- case MetadataReadability.INHERITED:- if (!isRecordSharingEnabled || isOwningApplication) {- return { kind: 'open' };- }-- return buildInheritedReadabilityGate(context, target);- case MetadataReadability.SYSTEM:- return { kind: 'denied' };- case MetadataReadability.APPLICATION:- return isRecordSharingEnabled && !isOwningApplication- ? { kind: 'denied' }- : { kind: 'open' };- case MetadataReadability.PRIVATE:- if (!isRecordSharingEnabled || isOwningApplication) {- return { kind: 'open' };- }-- return buildOwnRecordShareGate(context, target);- default:- return assertUnreachable(target.flatObjectMetadata.readability);- }-};--const resolveRecordSharePrincipals = (- { subject }: RowAccessPolicyContext,- { operationType }: RowAccessPolicyTarget,-):- | { principalIds: string[]; accessLevels: RecordShareAccessLevel[] }- | undefined => {- if (!isDefined(subject.principalIds)) {- return undefined;- }-- const accessLevels = resolveRequiredRecordShareAccessLevels(operationType);-- if (accessLevels.length === 0) {- return undefined;- }-- return { principalIds: subject.principalIds, accessLevels };-};--const buildOwnRecordShareGate = (- context: RowAccessPolicyContext,- target: RowAccessPolicyTarget,-): RowAccessPolicy => {- const principals = resolveRecordSharePrincipals(context, target);-- if (!isDefined(principals)) {- return { kind: 'open' };- }-- return {- kind: 'gated',- condition: buildRecordShareCondition({- tableAlias: target.tableAlias,- recordShareTableExpression:- context.environment.recordShareTableExpression,- objectMetadataId: target.flatObjectMetadata.id,- ...principals,- }),- };-};--const buildInheritedReadabilityGate = (- context: RowAccessPolicyContext,- target: RowAccessPolicyTarget,-): RowAccessPolicy => {- const { tableAlias, flatObjectMetadata, depth, joinParentRelationShape } =- target;-- if (depth > MAX_INHERITED_READABILITY_DEPTH) {- return { kind: 'denied' };- }-- const parents = resolveInheritedReadabilityParents({- flatObjectMetadata,- flatFieldMetadataMaps: context.environment.flatFieldMetadataMaps,- flatObjectMetadataMaps: context.environment.flatObjectMetadataMaps,- });-- if (- isDefined(joinParentRelationShape) &&- parents.some(- (parent) =>- parent.kind === 'column' &&- parent.fieldMetadataId ===- joinParentRelationShape.targetFieldMetadataId,- )- ) {- return { kind: 'open' };- }-- if (parents.length === 0) {- return buildOwnRecordShareGate(context, target);- }-- const principals = resolveRecordSharePrincipals(context, target);-- if (!isDefined(principals)) {- return { kind: 'open' };- }-- return {- kind: 'gated',- condition: buildInheritedReadabilityCondition({- tableAlias,- objectMetadataId: flatObjectMetadata.id,- parents: parents.map((parent) =>- buildInheritedReadabilityParentCondition(context, target, parent),- ),- recordShareTableExpression:- context.environment.recordShareTableExpression,- ...principals,- }),- };-};--const buildInheritedReadabilityParentCondition = (- context: RowAccessPolicyContext,- { tableAlias, operationType, depth }: RowAccessPolicyTarget,- parent: InheritedReadabilityParent,-): InheritedReadabilityParentCondition => {- if (parent.kind === 'column') {- const parentTableAlias = `${tableAlias}_${parent.joinColumnName}`;-- return {- kind: 'column',- joinColumnName: parent.joinColumnName,- parentTableAlias,- parentTableExpression: context.environment.resolveTableExpression(- parent.parentFlatObjectMetadata.id,- ),- policy: buildRowAccessPolicy({- ...context,- tableAlias: parentTableAlias,- flatObjectMetadata: parent.parentFlatObjectMetadata,- operationType,- depth: depth + 1,- }),- };- }-- const childTableAlias = `${tableAlias}_${parent.childFlatObjectMetadata.nameSingular}`;-- return {- kind: 'children',- childTableAlias,- childTableExpression: context.environment.resolveTableExpression(- parent.childFlatObjectMetadata.id,- ),- childJoinColumnName: parent.childJoinColumnName,- policy: buildRowAccessPolicy({- ...context,- tableAlias: childTableAlias,- flatObjectMetadata: parent.childFlatObjectMetadata,- operationType,- depth: depth + 1,- }),- };-};diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/format-twenty-orm-event-to-database-batch-event.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/format-twenty-orm-event-to-database-batch-event.util.tsindex 408089fe484..7a75287b6b6 100644--- a/packages/twenty-server/src/engine/twenty-orm/utils/format-twenty-orm-event-to-database-batch-event.util.ts+++ b/packages/twenty-server/src/engine/twenty-orm/utils/format-twenty-orm-event-to-database-batch-event.util.ts@@ -28,7 +28,7 @@ import {TwentyOrmException,TwentyOrmExceptionCode,} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';-import { type InheritedReadabilityChildRecords } from 'src/engine/twenty-orm/types/inherited-readability-child-records.type';+import { type InheritedReadabilityChildRecords } from 'src/engine/core-modules/record-share/types/inherited-readability-child-records.type';import { type DatabaseBatchEventInput } from 'src/engine/workspace-event-emitter/workspace-event-emitter';export const formatTwentyOrmEventToDatabaseBatchEvent = <diff --git a/packages/twenty-server/src/engine/twenty-orm/workspace-orm.manager.ts b/packages/twenty-server/src/engine/twenty-orm/workspace-orm.manager.tsindex 03331c14a2e..658ecdf1371 100644--- a/packages/twenty-server/src/engine/twenty-orm/workspace-orm.manager.ts+++ b/packages/twenty-server/src/engine/twenty-orm/workspace-orm.manager.ts@@ -16,6 +16,7 @@ import {import type { RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config';import { WorkspaceDataSourceService } from 'src/engine/twenty-orm/datasource/workspace-data-source.service';import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace-repository';+import { RecordSharingFeatureService } from 'src/engine/core-modules/record-share/services/record-sharing-feature.service';import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';import { convertClassNameToObjectMetadataName } from 'src/engine/workspace-manager/utils/convert-class-to-object-metadata-name.util';@@ -24,6 +25,7 @@ export class WorkspaceOrmManager {constructor(private readonly workspaceCacheService: WorkspaceCacheService,private readonly workspaceDataSourceService: WorkspaceDataSourceService,+ private readonly recordSharingFeatureService: RecordSharingFeatureService,) {}getRepository<T extends ObjectLiteral = ObjectRecord>(@@ -136,6 +138,10 @@ export class WorkspaceOrmManager {flatRowLevelPermissionPredicateGroupMaps,objectIdByNameSingular,featureFlagsMap,+ isRecordSharingEnabled:+ await this.recordSharingFeatureService.isRecordSharingEnabled(+ workspaceId,+ ),permissionsPerRoleId,userWorkspaceRoleMap,apiKeyRoleMap,@@ -177,6 +183,7 @@ export class WorkspaceOrmManager {},objectIdByNameSingular,featureFlagsMap: {} as ORMWorkspaceContext['featureFlagsMap'],+ isRecordSharingEnabled: false,permissionsPerRoleId: {},userWorkspaceRoleMap: {},apiKeyRoleMap: {},diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/standard-object-readability.spec.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/standard-object-readability.spec.tsindex 00be0049a58..d9db0f3d158 100644--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/standard-object-readability.spec.ts+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/standard-object-readability.spec.ts@@ -6,7 +6,7 @@ import { MetadataReadability, MetadataWritability } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';-import { resolveInheritedReadabilityParents } from 'src/engine/twenty-orm/utils/resolve-inherited-readability-parents.util';+import { resolveInheritedReadabilityParents } from 'src/engine/core-modules/record-share/utils/resolve-inherited-readability-parents.util';import { computeTwentyStandardApplicationAllFlatEntityMaps } from 'src/engine/workspace-manager/twenty-standard-application/utils/twenty-standard-application-all-flat-entity-maps.constant';const WORKSPACE_ID = '20202020-1111-4111-8111-111111111111';diff --git a/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/automated-trigger.module.ts b/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/automated-trigger.module.tsindex ef58fa10810..b8af5066292 100644--- a/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/automated-trigger.module.ts+++ b/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/automated-trigger.module.ts@@ -5,7 +5,7 @@ import { CacheStorageModule } from 'src/engine/core-modules/cache-storage/cache-import { CronModule } from 'src/engine/core-modules/cron/cron.module';import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';-import { RecordShareModule } from 'src/engine/record-share/record-share.module';+import { RecordShareModule } from 'src/engine/core-modules/record-share/record-share.module';import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';import { WorkflowCommonModule } from 'src/modules/workflow/common/workflow-common.module';diff --git a/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/listeners/__tests__/workflow-database-event-trigger.listener.spec.ts b/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/listeners/__tests__/workflow-database-event-trigger.listener.spec.tsindex 39ae7f7591a..ad9706de3b5 100644--- a/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/listeners/__tests__/workflow-database-event-trigger.listener.spec.ts+++ b/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/listeners/__tests__/workflow-database-event-trigger.listener.spec.ts@@ -3,7 +3,6 @@ import { Test, type TestingModule } from '@nestjs/testing';import { TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER } from 'twenty-shared/application';import type { ObjectRecordUpdateEvent } from 'twenty-shared/database-events';import {- FeatureFlagKey,MetadataReadability,RecordShareAccessLevel,RecordSharePrincipalType,@@ -13,8 +12,9 @@ import {import { MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';import { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/constant/create-empty-flat-entity-maps.constant';-import { RecordAccessPolicyService } from 'src/engine/record-share/services/record-access-policy.service';-import { RecordShareService } from 'src/engine/record-share/services/record-share.service';+import { RecordAccessPolicyService } from 'src/engine/core-modules/record-share/services/record-access-policy.service';+import { RecordShareService } from 'src/engine/core-modules/record-share/services/record-share.service';+import { RecordSharingFeatureService } from 'src/engine/core-modules/record-share/services/record-sharing-feature.service';import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';import { type WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/workspace-event-batch.type';@@ -29,6 +29,9 @@ describe('WorkflowDatabaseEventTriggerListener', () => {let messageQueueService: jest.Mocked<MessageQueueService>;let workspaceCacheService: jest.Mocked<WorkspaceCacheService>;let recordShareService: jest.Mocked<RecordShareService>;+ let recordSharingFeatureService: jest.Mocked<+ Pick<RecordSharingFeatureService, 'isRecordSharingEnabled'>+ >;const setTriggerMap = (listeners: Array<{ workflowId: string; settings: object; type?: unknown }>,@@ -106,6 +109,10 @@ describe('WorkflowDatabaseEventTriggerListener', () => {findByRecordIds: jest.fn().mockResolvedValue([]),} as unknown as jest.Mocked<RecordShareService>;+ recordSharingFeatureService = {+ isRecordSharingEnabled: jest.fn().mockResolvedValue(false),+ };+const module: TestingModule = await Test.createTestingModule({providers: [WorkflowDatabaseEventTriggerListener,@@ -125,6 +132,10 @@ describe('WorkflowDatabaseEventTriggerListener', () => {provide: RecordShareService,useValue: recordShareService,},+ {+ provide: RecordSharingFeatureService,+ useValue: recordSharingFeatureService,+ },RecordAccessPolicyService,{provide: 'MESSAGE_QUEUE_workflow-queue',@@ -418,6 +429,10 @@ describe('WorkflowDatabaseEventTriggerListener', () => {],};+ recordSharingFeatureService.isRecordSharingEnabled.mockResolvedValue(+ true,+ );+workspaceCacheService.getOrRecompute.mockImplementation(((_workspaceId: string,keys: string[],@@ -425,9 +440,7 @@ describe('WorkflowDatabaseEventTriggerListener', () => {Promise.resolve(!keys.includes('workflowAutomatedTriggerMaps')? {- featureFlagsMap: {- [FeatureFlagKey.IS_RECORD_SHARING_ENABLED]: true,- },+ featureFlagsMap: {},flatApplicationMaps: {byId: {[applicationId]: {@@ -499,6 +512,10 @@ describe('WorkflowDatabaseEventTriggerListener', () => {}),};+ recordSharingFeatureService.isRecordSharingEnabled.mockResolvedValue(+ true,+ );+workspaceCacheService.getOrRecompute.mockImplementation(((_workspaceId: string,keys: string[],@@ -506,9 +523,7 @@ describe('WorkflowDatabaseEventTriggerListener', () => {Promise.resolve(!keys.includes('workflowAutomatedTriggerMaps')? {- featureFlagsMap: {- [FeatureFlagKey.IS_RECORD_SHARING_ENABLED]: true,- },+ featureFlagsMap: {},flatApplicationMaps: { byId: {}, idByUniversalIdentifier: {} },flatRoleMaps: { byUniversalIdentifier: {} },rolesPermissions: {},diff --git a/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/listeners/workflow-database-event-trigger.listener.ts b/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/listeners/workflow-database-event-trigger.listener.tsindex 2b5300a10df..b0ff511d3d4 100644--- a/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/listeners/workflow-database-event-trigger.listener.ts+++ b/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/listeners/workflow-database-event-trigger.listener.ts@@ -27,9 +27,9 @@ import { findFlatEntityByUniversalIdentifier } from 'src/engine/metadata-modulesimport { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';import { buildFieldMapsFromFlatObjectMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/build-field-maps-from-flat-object-metadata.util';import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';-import { RecordAccessPolicyService } from 'src/engine/record-share/services/record-access-policy.service';-import { omitInheritedReadabilityChildRecords } from 'src/engine/record-share/utils/omit-inherited-readability-child-records.util';-import { buildRoleRowAccessPolicySubject } from 'src/engine/record-share/utils/build-role-row-access-policy-subject.util';+import { RecordAccessPolicyService } from 'src/engine/core-modules/record-share/services/record-access-policy.service';+import { omitInheritedReadabilityChildRecords } from 'src/engine/core-modules/record-share/utils/omit-inherited-readability-child-records.util';+import { buildRoleRowAccessPolicySubject } from 'src/engine/core-modules/record-share/utils/build-role-row-access-policy-subject.util';import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';import { STANDARD_ROLE } from 'src/engine/workspace-manager/twenty-standard-application/constants/standard-role.constant';diff --git a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/create-share-with-object-records-permissions.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/create-share-with-object-records-permissions.integration-spec.tsindex c22f141dca3..151029c68fd 100644--- a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/create-share-with-object-records-permissions.integration-spec.ts+++ b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/create-share-with-object-records-permissions.integration-spec.ts@@ -1,3 +1,5 @@+/* @license Enterprise */+import { randomUUID } from 'node:crypto';import gql from 'graphql-tag';@@ -28,10 +30,10 @@ import {RecordShareRowCause,} from 'twenty-shared/types';-import { type ShareWithInput } from 'src/engine/record-share/types/share-with-input.type';+import { type ShareWithInput } from 'src/engine/core-modules/record-share/types/share-with-input.type';import { RelationType } from 'src/engine/metadata-modules/field-metadata/interfaces/relation-type.interface';import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';-import { type RecordShareService } from 'src/engine/record-share/services/record-share.service';+import { type RecordShareService } from 'src/engine/core-modules/record-share/services/record-share.service';import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';import { WORKSPACE_MEMBER_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/data/constants/workspace-member-data-seeds.constant';diff --git a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/inherited-readability-object-records-permissions.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/inherited-readability-object-records-permissions.integration-spec.tsindex 7e5f931cf20..cad039433e0 100644--- a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/inherited-readability-object-records-permissions.integration-spec.ts+++ b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/inherited-readability-object-records-permissions.integration-spec.ts@@ -1,3 +1,5 @@+/* @license Enterprise */+import { randomUUID } from 'node:crypto';import { createOneOperationFactory } from 'test/integration/graphql/utils/create-one-operation-factory.util';@@ -21,7 +23,7 @@ import {} from 'twenty-shared/types';import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';-import { type RecordShareService } from 'src/engine/record-share/services/record-share.service';+import { type RecordShareService } from 'src/engine/core-modules/record-share/services/record-share.service';import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';import { WORKSPACE_MEMBER_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/data/constants/workspace-member-data-seeds.constant';diff --git a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/inherited-through-children-readability-object-records-permissions.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/inherited-through-children-readability-object-records-permissions.integration-spec.tsindex 09ae585c284..997dcd1f717 100644--- a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/inherited-through-children-readability-object-records-permissions.integration-spec.ts+++ b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/inherited-through-children-readability-object-records-permissions.integration-spec.ts@@ -1,3 +1,5 @@+/* @license Enterprise */+import { randomUUID } from 'node:crypto';import { EVERYONE_PRINCIPAL_ID } from 'twenty-shared/constants';@@ -30,8 +32,8 @@ import {import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';-import { type RecordAccessPolicyService } from 'src/engine/record-share/services/record-access-policy.service';-import { type RecordShareService } from 'src/engine/record-share/services/record-share.service';+import { type RecordAccessPolicyService } from 'src/engine/core-modules/record-share/services/record-access-policy.service';+import { type RecordShareService } from 'src/engine/core-modules/record-share/services/record-share.service';import { type WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';import { WORKSPACE_MEMBER_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/data/constants/workspace-member-data-seeds.constant';diff --git a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/readability-object-records-permissions.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/readability-object-records-permissions.integration-spec.tsindex 9559c868198..2d49b774b7b 100644--- a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/readability-object-records-permissions.integration-spec.ts+++ b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/readability-object-records-permissions.integration-spec.ts@@ -1,3 +1,5 @@+/* @license Enterprise */+import { randomUUID } from 'node:crypto';import gql from 'graphql-tag';@@ -36,7 +38,7 @@ import { capitalize } from 'twenty-shared/utils';import { RelationType } from 'src/engine/metadata-modules/field-metadata/interfaces/relation-type.interface';import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';-import { type RecordShareService } from 'src/engine/record-share/services/record-share.service';+import { type RecordShareService } from 'src/engine/core-modules/record-share/services/record-share.service';import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';import { WORKSPACE_MEMBER_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/data/constants/workspace-member-data-seeds.constant';diff --git a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-share-object.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-share-object.integration-spec.tsindex ec051738a20..800e63906a4 100644--- a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-share-object.integration-spec.ts+++ b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-share-object.integration-spec.ts@@ -1,3 +1,5 @@+/* @license Enterprise */+import { randomUUID } from 'node:crypto';import { createOneOperationFactory } from 'test/integration/graphql/utils/create-one-operation-factory.util';@@ -14,8 +16,8 @@ import {} from 'twenty-shared/types';import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';-import { type RecordShareService } from 'src/engine/record-share/services/record-share.service';-import { type RecordShareInput } from 'src/engine/record-share/types/record-share-input.type';+import { type RecordShareService } from 'src/engine/core-modules/record-share/services/record-share.service';+import { type RecordShareInput } from 'src/engine/core-modules/record-share/types/record-share-input.type';import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';import { PERSON_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/data/constants/person-data-seeds.constant';diff --git a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-share-twin-object-records-permissions.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-share-twin-object-records-permissions.integration-spec.tsindex 7f3f469542c..48a6890838e 100644--- a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-share-twin-object-records-permissions.integration-spec.ts+++ b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-share-twin-object-records-permissions.integration-spec.ts@@ -1,3 +1,5 @@+/* @license Enterprise */+import { randomUUID } from 'node:crypto';import { createOneOperationFactory } from 'test/integration/graphql/utils/create-one-operation-factory.util';@@ -26,10 +28,10 @@ import {} from 'twenty-shared/types';import { capitalize } from 'twenty-shared/utils';-import { type RecordShareService } from 'src/engine/record-share/services/record-share.service';-import { type RecordShare } from 'src/engine/record-share/types/record-share.type';-import { resolveRecordIdsSharedWithPrincipals } from 'src/engine/record-share/utils/resolve-record-ids-shared-with-principals.util';-import { resolveRequiredRecordShareAccessLevels } from 'src/engine/twenty-orm/repository/resolve-required-record-share-access-levels.util';+import { type RecordShareService } from 'src/engine/core-modules/record-share/services/record-share.service';+import { type RecordShare } from 'src/engine/core-modules/record-share/types/record-share.type';+import { resolveRecordIdsSharedWithPrincipals } from 'src/engine/core-modules/record-share/utils/resolve-record-ids-shared-with-principals.util';+import { resolveRequiredRecordShareAccessLevels } from 'src/engine/core-modules/record-share/utils/resolve-required-record-share-access-levels.util';import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';import { WORKSPACE_MEMBER_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/data/constants/workspace-member-data-seeds.constant';diff --git a/packages/twenty-server/test/integration/graphql/suites/workflow/quick-lead-workflow.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/workflow/quick-lead-workflow.integration-spec.tsindex 47c77cd5902..e6aeb306aef 100644--- a/packages/twenty-server/test/integration/graphql/suites/workflow/quick-lead-workflow.integration-spec.ts+++ b/packages/twenty-server/test/integration/graphql/suites/workflow/quick-lead-workflow.integration-spec.ts@@ -5,6 +5,7 @@ import {runWorkflowVersion,waitForWorkflowCompletion,waitForWorkflowRunStatus,+ waitForWorkflowRunStepStatus,} from 'test/integration/graphql/suites/workflow/utils/workflow-run-test.util';import { v4 as uuidv4 } from 'uuid';@@ -126,9 +127,12 @@ describe('Quick Lead Workflow (e2e)', () => {createdWorkflowRunId = workflowRunId;- const workflowRun = await waitForWorkflowRunStatus(+ await waitForWorkflowRunStatus(workflowRunId, 'RUNNING');++ const workflowRun = await waitForWorkflowRunStepStatus(workflowRunId,- 'RUNNING',+ FORM_STEP_ID,+ 'PENDING',);expect(workflowRun).toBeDefined();diff --git a/packages/twenty-server/test/integration/graphql/suites/workflow/utils/workflow-run-test.util.ts b/packages/twenty-server/test/integration/graphql/suites/workflow/utils/workflow-run-test.util.tsindex 389d08da908..53c084b40f0 100644--- a/packages/twenty-server/test/integration/graphql/suites/workflow/utils/workflow-run-test.util.ts+++ b/packages/twenty-server/test/integration/graphql/suites/workflow/utils/workflow-run-test.util.ts@@ -147,6 +147,30 @@ export const waitForWorkflowCompletion = async (return workflowRun;};+export const waitForWorkflowRunStepStatus = async (+ workflowRunId: string,+ stepId: string,+ expectedStatus: string,+ maxAttempts = 30,+ intervalMs = 500,+): Promise<WorkflowRunResponse | null> => {+ let workflowRun = await getWorkflowRun(workflowRunId);+ let attempts = 0;++ while (+ attempts < maxAttempts &&+ workflowRun?.state?.stepInfos?.[stepId]?.status !== expectedStatus &&+ (workflowRun === null ||+ PENDING_WORKFLOW_RUN_STATUSES.includes(workflowRun.status))+ ) {+ await new Promise((resolve) => setTimeout(resolve, intervalMs));+ workflowRun = await getWorkflowRun(workflowRunId);+ attempts++;+ }++ return workflowRun;+};+export const waitForWorkflowRunStatus = async (workflowRunId: string,expectedStatus: WorkflowRunStatusType,