Skip to content

The open alternative to Salesforce, designed for AI.

Remove legacy record sharing rollout policy (#26756)

Félix Malfaitb4866685f3c2
diff --git a/packages/twenty-docs/developers/extend/apps/data/objects.mdx b/packages/twenty-docs/developers/extend/apps/data/objects.mdx
index 0089443ed83..ef4ed8e831a 100644
--- a/packages/twenty-docs/developers/extend/apps/data/objects.mdx
+++ b/packages/twenty-docs/developers/extend/apps/data/objects.mdx
@@ -81,7 +81,7 @@ export default defineObject({
- The `fields` array is optional — you can define objects without custom fields.
- `openRecordIn` sets where records of this object open when clicked: `ObjectOpenRecordIn.USER_CHOICE` (the default, following each workspace member's own preference from Settings → Experience), `ObjectOpenRecordIn.SIDE_PANEL`, or `ObjectOpenRecordIn.RECORD_PAGE`. Pin it to `RECORD_PAGE` for records that need a full page to be usable, the way workflows and dashboards do, or to `SIDE_PANEL` for records that only make sense as a quick panel, the way calendar events do.
- `writability` controls who may write records of the object at all, before role permissions apply: `MetadataWritability.OPEN` (the default — workspace roles decide), `MetadataWritability.APPLICATION` (only your app's own logic functions can create, update, or delete records; use this for configuration-like objects whose records grant behavior, so workspace members with broad record access cannot edit them through the API), or `MetadataWritability.SYSTEM` (reserved for platform-managed data). Reads are unaffected — this is enforced server-side, unlike `isUIEditable`, which only hides UI affordances. It also exists per field, where it can only be stricter than the object's level.
-- `readability` declares who may read records of the object: `MetadataReadability.OPEN` (the default — workspace roles decide), `MetadataReadability.PRIVATE` (only principals the record was shared with), `MetadataReadability.INHERITED` (whoever reads the parent record), `MetadataReadability.APPLICATION` (only your app's own logic functions) or `MetadataReadability.SYSTEM` (platform-managed data). `SYSTEM` is always enforced. `PRIVATE`, `INHERITED` and `APPLICATION` are enforced on workspaces where record sharing is enabled (`IS_RECORD_SHARING_ENABLED`); elsewhere they still behave like `OPEN`.
+- `readability` declares who may read records of the object: `MetadataReadability.OPEN` (the default — workspace roles decide), `MetadataReadability.PRIVATE` (only principals the record was shared with), `MetadataReadability.INHERITED` (whoever reads the parent record), `MetadataReadability.APPLICATION` (only your app's own logic functions) or `MetadataReadability.SYSTEM` (platform-managed data). All readability policies are always enforced.
- `readabilityParentFieldUniversalIdentifiers` goes with `MetadataReadability.INHERITED`: the universal identifiers of the relation fields that lead to the parent records.
- A many-to-one field names the record the row points to. Declaring one field of a morph relation covers every target of that relation.
- A one-to-many field names a child object whose rows point back at the record, such as the join rows of a many-to-many relation. The record is then readable when at least one of those rows leads to a readable record: a note follows the people, companies and opportunities its note targets attach it to.
diff --git a/packages/twenty-docs/developers/extend/apps/logic/logic-functions.mdx b/packages/twenty-docs/developers/extend/apps/logic/logic-functions.mdx
index 11afa5200b7..7172f473a80 100644
--- a/packages/twenty-docs/developers/extend/apps/logic/logic-functions.mdx
+++ b/packages/twenty-docs/developers/extend/apps/logic/logic-functions.mdx
@@ -996,7 +996,7 @@ const { createContract } = await client.mutation({
});
```
-`shareWith` only matters on an object whose readability is `PRIVATE`; every object is `OPEN` by default, and on an `OPEN` object the argument is ignored. On a `PRIVATE` object it lists who gets access to the created record: each entry targets exactly one of `workspaceMemberId`, `roleId` or `everyone: true` with an `accessLevel` of `READ`, `READ_WRITE` or `FULL`. A workspace member creating a record always receives a `FULL` owner grant, so the argument is optional for them; a logic function acting as its application or an API key also receives a `FULL` grant for its role, and on a workspace where record sharing is enabled (`IS_RECORD_SHARING_ENABLED`) such callers, like a system caller, must pass `shareWith` or the create is rejected — while the flag is off a create without `shareWith` grants `FULL` access to everyone instead, so the record stays as open as it is today. Rows written while the flag is off are kept and take effect the moment the flag is turned on. Every entry must name a member or a role of the workspace. A logic function or API key shares through its role, so every holder of that role gets the same access to the records it creates; give a key whose records must stay private to it a role of its own.
+`shareWith` only matters on an object whose readability is `PRIVATE`; every object is `OPEN` by default, and on an `OPEN` object the argument is ignored. On a `PRIVATE` object it lists who gets access to the created record: each entry targets exactly one of `workspaceMemberId`, `roleId` or `everyone: true` with an `accessLevel` of `READ`, `READ_WRITE` or `FULL`. A workspace member creating a record always receives a `FULL` owner grant, so the argument is optional for them; a logic function acting as its application or an API key also receives a `FULL` grant for its role, and such callers, like a system caller, must pass `shareWith` or the create is rejected. Every entry must name a member or a role of the workspace. A logic function or API key shares through its role, so every holder of that role gets the same access to the records it creates; give a key whose records must stay private to it a role of its own.
The client uses a selection-set syntax: pass `true` to include a field, use `__args` for arguments, and nest objects for relations. You get full autocompletion and type checking based on your workspace schema.
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/constants/SettingsAdminFeatureFlagMetadata.ts b/packages/twenty-front/src/modules/settings/admin-panel/constants/SettingsAdminFeatureFlagMetadata.ts
index f2642cbc044..b06be9654c6 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/constants/SettingsAdminFeatureFlagMetadata.ts
+++ b/packages/twenty-front/src/modules/settings/admin-panel/constants/SettingsAdminFeatureFlagMetadata.ts
@@ -42,10 +42,6 @@ export const SETTINGS_ADMIN_FEATURE_FLAG_METADATA: Partial<
label: msg`Workflow index page`,
description: msg`Use the dedicated workflow index page to browse workflows and their versions.`,
},
- [FeatureFlagKey.IS_RECORD_SHARING_ENABLED]: {
- label: msg`Record sharing`,
- description: msg`Allow sharing individual records with workspace members.`,
- },
[FeatureFlagKey.IS_AI_CHAT_SHARING_DROPDOWN_ENABLED]: {
label: msg`AI chat sharing dropdown`,
description: msg`Show the sharing dropdown on AI conversations when record sharing is enabled.`,
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/is-legacy-record-access-open.util.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/utils/__tests__/is-legacy-record-access-open.util.spec.ts
similarity index 86%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/is-legacy-record-access-open.util.spec.ts
rename to packages/twenty-server/src/database/commands/upgrade-version-command/2-43/utils/__tests__/is-legacy-record-access-open.util.spec.ts
index 36ab88c5e71..5c0332a06cc 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/is-legacy-record-access-open.util.spec.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/utils/__tests__/is-legacy-record-access-open.util.spec.ts
@@ -1,6 +1,6 @@
import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
import { MetadataReadability } from 'twenty-shared/types';
-import { isLegacyRecordAccessOpen } from 'src/engine/core-modules/record-share/utils/is-legacy-record-access-open.util';
+import { isLegacyRecordAccessOpen } from 'src/database/commands/upgrade-version-command/2-43/utils/is-legacy-record-access-open.util';
import { resolveRecordShareGateKind } from 'src/engine/core-modules/record-share/utils/resolve-record-share-gate-kind.util';
it.each([
@@ -27,14 +27,12 @@ it.each([
resolveRecordShareGateKind({
readability: MetadataReadability.PRIVATE,
isOwningApplication: false,
- isLegacyRecordAccessOpen: legacyOpen,
}),
- ).toBe(expected ? 'open' : 'private');
+ ).toBe('private');
expect(
resolveRecordShareGateKind({
readability: MetadataReadability.SYSTEM,
isOwningApplication: false,
- isLegacyRecordAccessOpen: legacyOpen,
}),
).toBe('deny');
},
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/is-legacy-record-access-open.util.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/utils/is-legacy-record-access-open.util.ts
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/is-legacy-record-access-open.util.ts
rename to packages/twenty-server/src/database/commands/upgrade-version-command/2-43/utils/is-legacy-record-access-open.util.ts
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/utils/preserve-legacy-record-access.util.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/utils/preserve-legacy-record-access.util.ts
index d9f66643260..0ba32501031 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/utils/preserve-legacy-record-access.util.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/utils/preserve-legacy-record-access.util.ts
@@ -1,5 +1,5 @@
import { type EntityManager } from 'typeorm';
-import { isLegacyRecordAccessOpen } from 'src/engine/core-modules/record-share/utils/is-legacy-record-access-open.util';
+import { isLegacyRecordAccessOpen } from 'src/database/commands/upgrade-version-command/2-43/utils/is-legacy-record-access-open.util';
import { EVERYONE_PRINCIPAL_ID } from 'twenty-shared/constants';
import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
import { MetadataReadability, MetadataWritability } from 'twenty-shared/types';
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/2-44-upgrade-version-command.module.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/2-44-upgrade-version-command.module.ts
index a87f18b95c0..464e1efb491 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/2-44-upgrade-version-command.module.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/2-44-upgrade-version-command.module.ts
@@ -1,6 +1,7 @@
import { Module } from '@nestjs/common';
import { WorkspaceIteratorModule } from 'src/database/commands/command-runners/workspace-iterator.module';
+import { VerifyCommonRecordSharingCommand } from 'src/database/commands/upgrade-version-command/2-44/2-44-workspace-command-1790590808102-verify-common-record-sharing.command';
import { RenameCallRecordingTabsToTranscriptCommand } from 'src/database/commands/upgrade-version-command/2-44/2-44-workspace-command-1790583246061-rename-call-recording-tabs-to-transcript.command';
import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';
import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration.module';
@@ -11,6 +12,9 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace
WorkspaceIteratorModule,
WorkspaceMigrationModule,
],
- providers: [RenameCallRecordingTabsToTranscriptCommand],
+ providers: [
+ RenameCallRecordingTabsToTranscriptCommand,
+ VerifyCommonRecordSharingCommand,
+ ],
})
export class V2_44_UpgradeVersionCommandModule {}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/2-44-workspace-command-1790590808102-verify-common-record-sharing.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/2-44-workspace-command-1790590808102-verify-common-record-sharing.command.ts
new file mode 100644
index 00000000000..05d28886516
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/2-44-workspace-command-1790590808102-verify-common-record-sharing.command.ts
@@ -0,0 +1,48 @@
+import { Command } from 'nest-commander';
+import { MetadataReadability } from 'twenty-shared/types';
+import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
+
+import { ProvisionedWorkspaceCommandRunner } from 'src/database/commands/command-runners/provisioned-workspace.command-runner';
+import { WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';
+import { type RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspace.command-runner';
+import { RegisteredWorkspaceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-workspace-command.decorator';
+import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
+
+@RegisteredWorkspaceCommand('2.44.0', 1790590808102)
+@Command({
+ name: 'upgrade:2-44:verify-common-record-sharing',
+ description:
+ 'Verify that conversation sharing completed before removing legacy access',
+})
+export class VerifyCommonRecordSharingCommand extends ProvisionedWorkspaceCommandRunner {
+ constructor(
+ protected readonly workspaceIteratorService: WorkspaceIteratorService,
+ private readonly workspaceCacheService: WorkspaceCacheService,
+ ) {
+ super(workspaceIteratorService);
+ }
+
+ override runOnWorkspace(args: RunOnWorkspaceArgs): Promise<void> {
+ return this.up(args);
+ }
+
+ async up({ workspaceId }: RunOnWorkspaceArgs): Promise<void> {
+ const { flatObjectMetadataMaps } =
+ await this.workspaceCacheService.getOrRecompute(workspaceId, [
+ 'flatObjectMetadataMaps',
+ ]);
+ const thread =
+ flatObjectMetadataMaps.byUniversalIdentifier[
+ STANDARD_OBJECTS.agentChatThread.universalIdentifier
+ ];
+ if (thread?.readability === MetadataReadability.SYSTEM) {
+ throw new Error(
+ `Conversation sharing is incomplete for ${workspaceId}. Run upgrade:2-43:enable-common-record-sharing before serving this workspace.`,
+ );
+ }
+ }
+
+ async down(_args: RunOnWorkspaceArgs): Promise<void> {
+ // A readiness check changes no data and must not restore legacy open access.
+ }
+}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/__tests__/verify-common-record-sharing.command.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/__tests__/verify-common-record-sharing.command.spec.ts
new file mode 100644
index 00000000000..51c839f4724
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/__tests__/verify-common-record-sharing.command.spec.ts
@@ -0,0 +1,34 @@
+import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
+import { MetadataReadability } from 'twenty-shared/types';
+
+import { VerifyCommonRecordSharingCommand } from 'src/database/commands/upgrade-version-command/2-44/2-44-workspace-command-1790590808102-verify-common-record-sharing.command';
+
+it.each([MetadataReadability.SYSTEM, MetadataReadability.PRIVATE, undefined])(
+ 'verifies conversation readiness (%s)',
+ async (readability) => {
+ const command = new VerifyCommonRecordSharingCommand(
+ {} as never,
+ {
+ getOrRecompute: jest.fn().mockResolvedValue({
+ flatObjectMetadataMaps: {
+ byUniversalIdentifier: {
+ [STANDARD_OBJECTS.agentChatThread.universalIdentifier]:
+ readability ? { readability } : undefined,
+ },
+ },
+ }),
+ } as never,
+ );
+ const result = command.up({
+ workspaceId: 'workspace',
+ options: { dryRun: true },
+ } as never);
+ if (readability === MetadataReadability.SYSTEM) {
+ await expect(result).rejects.toThrow(
+ 'upgrade:2-43:enable-common-record-sharing',
+ );
+ } else {
+ await expect(result).resolves.toBeUndefined();
+ }
+ },
+);
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.ts
index e30530d7858..b655273d78c 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
@@ -77,17 +77,13 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSer
queryRunnerContext.flatObjectMetadata.readability ===
MetadataReadability.PRIVATE;
const isGatedThroughRecordShares =
- isPrivateObject ||
- queryRunnerContext.flatObjectMetadata.readability ===
- MetadataReadability.INHERITED;
+ this.isGatedThroughRecordShares(queryRunnerContext);
// An inherited record is reachable through its parent, so shareWith stays
// optional there and is checked only when given
if (isPrivateObject || isNonEmptyArray(args.shareWith)) {
await this.shareWithService.validateShareWithOrThrow({
authContext: queryRunnerContext.authContext,
- isRecordSharingEnforced:
- this.isRecordSharingEnforced(queryRunnerContext),
shareWith: args.shareWith,
});
}
@@ -612,14 +608,13 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSer
const { authContext, flatObjectMetadata, repository, transactionScope } =
queryRunnerContext;
- if (!this.shouldInsertRecordSharesForCreatedRecords(queryRunnerContext)) {
+ if (!this.isGatedThroughRecordShares(queryRunnerContext)) {
return;
}
await this.shareWithService.insertRecordSharesForCreatedRecords({
authContext,
objectMetadataId: flatObjectMetadata.id,
- isRecordSharingEnforced: this.isRecordSharingEnforced(queryRunnerContext),
recordIds: insertResult.generatedMaps.map((record) => record.id),
apiKeyRoleMap: repository.internalContext.apiKeyRoleMap,
shareWith,
@@ -627,26 +622,15 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSer
});
}
- private shouldInsertRecordSharesForCreatedRecords(
+ private isGatedThroughRecordShares(
queryRunnerContext: CommonExtendedQueryRunnerContext,
): boolean {
- switch (queryRunnerContext.flatObjectMetadata.readability) {
- case MetadataReadability.PRIVATE:
- return true;
- // Legacy inherited records must keep following their parent after
- // activation instead of receiving an EVERYONE compatibility grant.
- case MetadataReadability.INHERITED:
- return this.isRecordSharingEnforced(queryRunnerContext);
- default:
- return false;
- }
- }
-
- private isRecordSharingEnforced(
- queryRunnerContext: CommonExtendedQueryRunnerContext,
- ): boolean {
- return !queryRunnerContext.repository.internalContext
- .isLegacyRecordAccessOpen;
+ return (
+ queryRunnerContext.flatObjectMetadata.readability ===
+ MetadataReadability.PRIVATE ||
+ queryRunnerContext.flatObjectMetadata.readability ===
+ MetadataReadability.INHERITED
+ );
}
private resolveNestedRelationsForCreate({
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.ts
index b4a1149d1e9..273bc7ee233 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,7 +32,6 @@ 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';
@@ -104,7 +103,6 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache
BillingSyncPlansDataCommand,
BillingUsageService,
BillingCreditAllowanceProvider,
- BillingRecordSharingEntitlementProvider,
BillingUsageLimitEntitlementProvider,
BillingPriceService,
BillingCreditRolloverService,
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.ts
deleted file mode 100644
index 4095ddfc65d..00000000000
--- a/packages/twenty-server/src/engine/core-modules/billing/services/billing-record-sharing-entitlement-provider.service.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/* @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/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
index 246a71bf096..671c9660d77 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
@@ -21,7 +21,6 @@ import { getFlatFieldMetadataMock } from 'src/engine/metadata-modules/flat-field
import { getFlatObjectMetadataMock } from 'src/engine/metadata-modules/flat-object-metadata/__mocks__/get-flat-object-metadata.mock';
import { RecordAccessPolicyService } from 'src/engine/core-modules/record-share/services/record-access-policy.service';
import { RecordShareStorageService } from 'src/engine/core-modules/record-share/services/record-share-storage.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,10 +129,6 @@ describe('CallDatabaseEventTriggerJobsJob', () => {
let job: CallDatabaseEventTriggerJobsJob;
let messageQueueService: { bulkAdd: jest.Mock };
let recordShareStorageService: { findByRecordIds: jest.Mock };
- let recordSharingFeatureService: {
- isRecordSharingEnabled: jest.Mock;
- isLegacyRecordAccessOpen: jest.Mock;
- };
let cacheData: Record<string, unknown>;
const buildBatch = (
@@ -188,10 +183,6 @@ describe('CallDatabaseEventTriggerJobsJob', () => {
recordShareStorageService = {
findByRecordIds: jest.fn().mockResolvedValue([]),
};
- recordSharingFeatureService = {
- isLegacyRecordAccessOpen: jest.fn().mockResolvedValue(false),
- isRecordSharingEnabled: jest.fn().mockResolvedValue(false),
- };
const module: TestingModule = await Test.createTestingModule({
providers: [
@@ -218,10 +209,7 @@ describe('CallDatabaseEventTriggerJobsJob', () => {
provide: RecordShareStorageService,
useValue: recordShareStorageService,
},
- {
- provide: RecordSharingFeatureService,
- useValue: recordSharingFeatureService,
- },
+
{
provide: WorkspaceOrmManager,
useValue: {
@@ -362,7 +350,6 @@ describe('CallDatabaseEventTriggerJobsJob', () => {
});
it('should only enqueue the events of a private object shared with the application role', async () => {
- recordSharingFeatureService.isRecordSharingEnabled.mockResolvedValue(true);
recordShareStorageService.findByRecordIds.mockResolvedValue([
{
id: 'record-share-1',
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.ts
deleted file mode 100644
index 1f8dbdf8a60..00000000000
--- a/packages/twenty-server/src/engine/core-modules/record-share/interfaces/record-sharing-entitlement-provider.service.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-@Injectable()
-export abstract class RecordSharingEntitlementProvider {
- abstract hasRecordSharingEntitlement(workspaceId: string): Promise<boolean>;
-}
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.ts
index abd229dbfc8..22880ec9e9d 100644
--- 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.ts
@@ -4,7 +4,6 @@ import { RecordSharingResolver } from 'src/engine/core-modules/record-share/reso
import { RecordSharingService } from 'src/engine/core-modules/record-share/services/record-sharing.service';
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 { RecordShareStorageModule } from 'src/engine/core-modules/record-share/record-share-storage.module';
import { ShareWithService } from 'src/engine/core-modules/record-share/services/share-with.service';
@@ -12,12 +11,7 @@ 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,
- RecordShareStorageModule,
- ],
+ imports: [TwentyOrmModule, WorkspaceCacheModule, RecordShareStorageModule],
providers: [
ShareWithService,
RecordAccessPolicyService,
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.ts
deleted file mode 100644
index 9bce9393382..00000000000
--- a/packages/twenty-server/src/engine/core-modules/record-share/record-sharing-feature.module.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/* @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-access-policy.service.spec.ts b/packages/twenty-server/src/engine/core-modules/record-share/services/__tests__/record-access-policy.service.spec.ts
index d466310c88f..383d052660e 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/services/__tests__/record-access-policy.service.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/record-share/services/__tests__/record-access-policy.service.spec.ts
@@ -5,27 +5,17 @@ import {
RecordShareAccessLevel,
} from 'twenty-shared/types';
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 { RecordShareStorageService } from 'src/engine/core-modules/record-share/services/record-share-storage.service';
import { COMPANY_FLAT_OBJECT_MOCK } from 'src/engine/metadata-modules/flat-object-metadata/__mocks__/company-flat-object.mock';
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
-const setup = async ({
- rowCause,
- legacyOpen = false,
-}: { rowCause?: RecordShareRowCause; legacyOpen?: boolean } = {}) => {
+const setup = async ({ rowCause }: { rowCause?: RecordShareRowCause } = {}) => {
const module = await Test.createTestingModule({
providers: [
RecordAccessPolicyService,
{ provide: WorkspaceOrmManager, useValue: {} },
{ provide: WorkspaceCacheService, useValue: {} },
- {
- provide: RecordSharingFeatureService,
- useValue: {
- isLegacyRecordAccessOpen: jest.fn().mockResolvedValue(legacyOpen),
- },
- },
{
provide: RecordShareStorageService,
useValue: {
@@ -64,7 +54,7 @@ const subject = {
};
describe('mandatory event visibility', () => {
- it('resolves rollout access once per batch across concurrent subscribers', async () => {
+ it('loads record grants once per batch across concurrent subscribers', async () => {
const { module, gate } = await setup({
rowCause: RecordShareRowCause.OWNER,
});
@@ -78,11 +68,11 @@ describe('mandatory event visibility', () => {
]);
expect(admitted).toEqual([new Set(['record']), new Set()]);
expect(
- module.get(RecordSharingFeatureService).isLegacyRecordAccessOpen,
+ module.get(RecordShareStorageService).findByRecordIds,
).toHaveBeenCalledTimes(1);
await gate(MetadataReadability.PRIVATE).resolveAdmittedRecordIds(subject);
expect(
- module.get(RecordSharingFeatureService).isLegacyRecordAccessOpen,
+ module.get(RecordShareStorageService).findByRecordIds,
).toHaveBeenCalledTimes(2);
await module.close();
});
@@ -113,16 +103,11 @@ describe('mandatory event visibility', () => {
await module.close();
});
- it.each([true, false])(
- 'uses the resolved legacy-access decision (%s) for unshared events',
- async (legacyOpen) => {
- const { module, gate } = await setup({ legacyOpen });
- expect(
- await gate(MetadataReadability.PRIVATE).resolveAdmittedRecordIds(
- subject,
- ),
- ).toEqual(new Set(legacyOpen ? ['record'] : []));
- await module.close();
- },
- );
+ it('denies unshared private events', async () => {
+ const { module, gate } = await setup();
+ expect(
+ await gate(MetadataReadability.PRIVATE).resolveAdmittedRecordIds(subject),
+ ).toEqual(new Set());
+ await module.close();
+ });
});
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/services/__tests__/record-sharing-feature.service.legacy-access.spec.ts b/packages/twenty-server/src/engine/core-modules/record-share/services/__tests__/record-sharing-feature.service.legacy-access.spec.ts
deleted file mode 100644
index 071414386a1..00000000000
--- a/packages/twenty-server/src/engine/core-modules/record-share/services/__tests__/record-sharing-feature.service.legacy-access.spec.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-import { Test } from '@nestjs/testing';
-import { DiscoveryService } from '@nestjs/core';
-import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
-import { MetadataReadability } 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';
-
-class TestEntitlementProvider extends RecordSharingEntitlementProvider {
- hasRecordSharingEntitlement = jest.fn<Promise<boolean>, [string]>();
-}
-
-const setup = async ({
- readability = MetadataReadability.SYSTEM,
- flag = true,
- entitled = false,
-}: {
- readability?: MetadataReadability;
- flag?: boolean;
- entitled?: boolean;
-} = {}) => {
- const provider = new TestEntitlementProvider();
- provider.hasRecordSharingEntitlement.mockResolvedValue(entitled);
- const module = await Test.createTestingModule({
- providers: [
- RecordSharingFeatureService,
- {
- provide: DiscoveryService,
- useValue: { getProviders: () => [{ instance: provider }] },
- },
- {
- provide: WorkspaceCacheService,
- useValue: {
- getOrRecompute: jest.fn().mockResolvedValue({
- flatObjectMetadataMaps: {
- byUniversalIdentifier: {
- [STANDARD_OBJECTS.agentChatThread.universalIdentifier]: {
- readability,
- },
- },
- },
- featureFlagsMap: { IS_RECORD_SHARING_ENABLED: flag },
- billingEntitlements: {},
- }),
- },
- },
- ],
- }).compile();
- await module.init();
- return { module, provider, service: module.get(RecordSharingFeatureService) };
-};
-
-describe('record-sharing rollout entitlement compatibility', () => {
- it('honors an effective self-hosted entitlement even with an empty billing cache', async () => {
- const { module, provider, service } = await setup({ entitled: true });
- expect(await service.isLegacyRecordAccessOpen('workspace')).toBe(false);
- expect(provider.hasRecordSharingEntitlement).toHaveBeenCalledWith(
- 'workspace',
- );
- await module.close();
- });
-
- it('preserves legacy access when sharing was not entitled', async () => {
- const { module, service } = await setup();
- expect(await service.isLegacyRecordAccessOpen('workspace')).toBe(true);
- await module.close();
- });
-
- it('does not consult entitlement once metadata has been activated', async () => {
- const { module, provider, service } = await setup({
- readability: MetadataReadability.PRIVATE,
- flag: false,
- });
- expect(await service.isLegacyRecordAccessOpen('workspace')).toBe(false);
- expect(provider.hasRecordSharingEntitlement).not.toHaveBeenCalled();
- await module.close();
- });
-
- it('keeps the legacy-open policy when the feature flag is off', async () => {
- const { module, provider, service } = await setup({
- flag: false,
- entitled: true,
- });
- expect(await service.isLegacyRecordAccessOpen('workspace')).toBe(true);
- expect(provider.hasRecordSharingEntitlement).not.toHaveBeenCalled();
- await module.close();
- });
-});
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.ts
deleted file mode 100644
index f978c55e245..00000000000
--- a/packages/twenty-server/src/engine/core-modules/record-share/services/__tests__/record-sharing-feature.service.spec.ts
+++ /dev/null
@@ -1,120 +0,0 @@
-/* @license Enterprise */
-
-import { Test } from '@nestjs/testing';
-import { DiscoveryService } from '@nestjs/core';
-import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
-import { MetadataReadability } 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';
-
-class TestEntitlementProvider extends RecordSharingEntitlementProvider {
- hasRecordSharingEntitlement = jest.fn<Promise<boolean>, [string]>();
-}
-
-const setup = async ({
- readability = MetadataReadability.SYSTEM,
- flag = true,
- entitled = false,
- chatDropdownFlag,
-}: {
- readability?: MetadataReadability;
- flag?: boolean;
- entitled?: boolean;
- chatDropdownFlag?: boolean;
-} = {}) => {
- const provider = new TestEntitlementProvider();
- provider.hasRecordSharingEntitlement.mockResolvedValue(entitled);
- const module = await Test.createTestingModule({
- providers: [
- RecordSharingFeatureService,
- {
- provide: DiscoveryService,
- useValue: { getProviders: () => [{ instance: provider }] },
- },
- {
- provide: WorkspaceCacheService,
- useValue: {
- getOrRecompute: jest.fn().mockResolvedValue({
- flatObjectMetadataMaps: {
- byUniversalIdentifier: {
- [STANDARD_OBJECTS.agentChatThread.universalIdentifier]: {
- readability,
- },
- },
- },
- featureFlagsMap: {
- IS_RECORD_SHARING_ENABLED: flag,
- IS_AI_CHAT_SHARING_DROPDOWN_ENABLED: chatDropdownFlag,
- },
- billingEntitlements: {},
- }),
- },
- },
- ],
- }).compile();
- await module.init();
- return { module, provider, service: module.get(RecordSharingFeatureService) };
-};
-
-describe('record-sharing rollout entitlement compatibility', () => {
- it.each([undefined, false, true])(
- 'keeps backend sharing and activated permissions independent of the chat dropdown flag (%s)',
- async (chatDropdownFlag) => {
- const { module, service } = await setup({
- readability: MetadataReadability.PRIVATE,
- chatDropdownFlag,
- });
-
- expect(await service.isRecordSharingEnabled('workspace')).toBe(true);
- expect(await service.isLegacyRecordAccessOpen('workspace')).toBe(false);
-
- await module.close();
- },
- );
-
- it('honors an effective self-hosted entitlement even with an empty billing cache', async () => {
- const { module, provider, service } = await setup({ entitled: true });
- expect(await service.isLegacyRecordAccessOpen('workspace')).toBe(false);
- expect(provider.hasRecordSharingEntitlement).toHaveBeenCalledWith(
- 'workspace',
- );
- await module.close();
- });
-
- it('preserves legacy access when sharing was not entitled', async () => {
- const { module, service } = await setup();
- expect(await service.isLegacyRecordAccessOpen('workspace')).toBe(true);
- await module.close();
- });
-
- it('does not consult entitlement once metadata has been activated', async () => {
- const { module, provider, service } = await setup({
- readability: MetadataReadability.PRIVATE,
- flag: false,
- });
- expect(await service.isLegacyRecordAccessOpen('workspace')).toBe(false);
- expect(provider.hasRecordSharingEntitlement).not.toHaveBeenCalled();
- await module.close();
- });
-
- it('keeps the legacy-open policy when the feature flag is off', async () => {
- const { module, provider, service } = await setup({
- flag: false,
- entitled: true,
- });
- expect(await service.isLegacyRecordAccessOpen('workspace')).toBe(true);
- expect(provider.hasRecordSharingEntitlement).not.toHaveBeenCalled();
- await module.close();
- });
-
- it.each([true, false])(
- 'allows basic sharing with flag=%s without an entitlement',
- async (flag) => {
- const { module, provider, service } = await setup({ flag });
- expect(await service.isRecordSharingEnabled('workspace')).toBe(flag);
- expect(provider.hasRecordSharingEntitlement).not.toHaveBeenCalled();
- await module.close();
- },
- );
-});
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/services/__tests__/record-sharing.service.spec.ts b/packages/twenty-server/src/engine/core-modules/record-share/services/__tests__/record-sharing.service.spec.ts
index 42c79c734cf..f4cd3c850e1 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/services/__tests__/record-sharing.service.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/record-share/services/__tests__/record-sharing.service.spec.ts
@@ -83,12 +83,10 @@ const buildService = () => {
findByRecordIds: jest.fn().mockResolvedValue([grant]),
setManualShare: jest.fn(),
};
- const feature = { isRecordSharingEnabled: jest.fn().mockResolvedValue(true) };
const service = new RecordSharingService(
manager as never,
cache as never,
shares as never,
- feature as never,
);
return {
service,
@@ -99,7 +97,6 @@ const buildService = () => {
allowed,
shares,
scope,
- feature,
};
};
@@ -314,12 +311,8 @@ describe('Generic record sharing', () => {
expect(shares.setManualShare).not.toHaveBeenCalled();
});
- it('allows revocation with the flag disabled and a removed recipient', async () => {
- const { service, feature, shares } = buildService();
- feature.isRecordSharingEnabled.mockResolvedValue(false);
- await expect(service.setShare(change)).rejects.toThrow(
- 'Sharing is unavailable',
- );
+ it('allows revocation for a removed recipient', async () => {
+ const { service, shares } = buildService();
await service.setShare({
...change,
principal: { workspaceMemberId: ROLE_ID },
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.ts
deleted file mode 100644
index 292d7e4c6da..00000000000
--- a/packages/twenty-server/src/engine/core-modules/record-share/services/no-record-sharing-entitlement-provider.service.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-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/core-modules/record-share/services/record-access-policy.service.ts b/packages/twenty-server/src/engine/core-modules/record-share/services/record-access-policy.service.ts
index 0139d8da957..43f449828ab 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/services/record-access-policy.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/record-share/services/record-access-policy.service.ts
@@ -3,7 +3,7 @@
import { Injectable } from '@nestjs/common';
import { type ObjectRecordEvent } from 'twenty-shared/database-events';
-import { MetadataReadability, 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';
@@ -11,7 +11,6 @@ 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 { RecordSharingFeatureService } from 'src/engine/core-modules/record-share/services/record-sharing-feature.service';
import { RecordShareStorageService } from 'src/engine/core-modules/record-share/services/record-share-storage.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';
@@ -46,7 +45,6 @@ type SnapshotEvaluation = {
subject: RowAccessPolicySubject;
depth: number;
maps?: ReadabilityMaps;
- isLegacyRecordAccessOpen?: boolean;
};
type SnapshotEvaluationInContext = SnapshotEvaluation & {
@@ -61,7 +59,6 @@ export class RecordAccessPolicyService {
private readonly workspaceOrmManager: WorkspaceOrmManager,
private readonly workspaceCacheService: WorkspaceCacheService,
private readonly recordShareStorageService: RecordShareStorageService,
- private readonly recordSharingFeatureService: RecordSharingFeatureService,
) {}
// A subject receives the records a query would return it: its role must read
@@ -80,11 +77,6 @@ export class RecordAccessPolicyService {
recordIds: events.map((event) => event.recordId),
}));
- let legacyRecordAccessOpenPromise: Promise<boolean> | undefined;
- const fetchLegacyRecordAccessOpen = () =>
- (legacyRecordAccessOpenPromise ??=
- this.recordSharingFeatureService.isLegacyRecordAccessOpen(workspaceId));
-
return {
resolveAdmittedRecordIds: async (subject) => {
const snapshots = await this.resolveSnapshotsReadableByRole({
@@ -106,10 +98,6 @@ export class RecordAccessPolicyService {
snapshots,
subject,
depth: 0,
- isLegacyRecordAccessOpen:
- objectMetadata.readability !== MetadataReadability.SYSTEM &&
- objectMetadata.readability !== MetadataReadability.OPEN &&
- (await fetchLegacyRecordAccessOpen()),
},
fetchRecordShares,
);
@@ -173,13 +161,7 @@ export class RecordAccessPolicyService {
fetchRecordShares: FetchRecordShares,
): Promise<Set<string>> {
const { objectMetadata, snapshots, subject } = evaluation;
- const legacyOpen =
- evaluation.isLegacyRecordAccessOpen ??
- (await this.recordSharingFeatureService.isLegacyRecordAccessOpen(
- evaluation.workspaceId,
- ));
const gateKind = resolveRecordShareGateKind({
- isLegacyRecordAccessOpen: legacyOpen,
readability: objectMetadata.readability,
isOwningApplication: subject.isOwningApplication(objectMetadata),
});
@@ -202,7 +184,6 @@ export class RecordAccessPolicyService {
)),
...(await this.resolveSnapshotIdsReadableThroughParents({
...evaluation,
- isLegacyRecordAccessOpen: legacyOpen,
})),
]);
default:
@@ -316,7 +297,6 @@ export class RecordAccessPolicyService {
subject,
depth,
maps,
- isLegacyRecordAccessOpen,
parent,
}: SnapshotEvaluationInContext & {
parent: InheritedReadabilityChildrenParent;
@@ -380,7 +360,6 @@ export class RecordAccessPolicyService {
subject,
depth: depth + 1,
maps,
- isLegacyRecordAccessOpen,
});
for (const [
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.ts
deleted file mode 100644
index 6a83736ae00..00000000000
--- a/packages/twenty-server/src/engine/core-modules/record-share/services/record-sharing-feature.service.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-/* @license Enterprise */
-
-import { Injectable, type OnModuleInit } from '@nestjs/common';
-import { DiscoveryService } from '@nestjs/core';
-
-import { FeatureFlagKey } from 'twenty-shared/types';
-
-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 { isLegacyRecordAccessOpen } from 'src/engine/core-modules/record-share/utils/is-legacy-record-access-open.util';
-import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
-
-@Injectable()
-export class RecordSharingFeatureService implements OnModuleInit {
- private entitlementProvider: RecordSharingEntitlementProvider;
-
- constructor(
- private readonly discoveryService: DiscoveryService,
- private readonly workspaceCacheService: WorkspaceCacheService,
- ) {}
-
- onModuleInit() {
- const discoveredProvider = findRecordSharingEntitlementProvider(
- this.discoveryService,
- );
-
- this.entitlementProvider =
- discoveredProvider ?? new NoRecordSharingEntitlementProvider();
- }
-
- async isRecordSharingEnabled(workspaceId: string): Promise<boolean> {
- const { featureFlagsMap } = await this.workspaceCacheService.getOrRecompute(
- workspaceId,
- ['featureFlagsMap'],
- );
- return featureFlagsMap[FeatureFlagKey.IS_RECORD_SHARING_ENABLED] ?? false;
- }
-
- async isLegacyRecordAccessOpen(workspaceId: string): Promise<boolean> {
- const { flatObjectMetadataMaps } =
- await this.workspaceCacheService.getOrRecompute(workspaceId, [
- 'flatObjectMetadataMaps',
- ]);
- if (
- !isLegacyRecordAccessOpen({
- flatObjectMetadataMaps,
- wasRecordSharingEnabled: false,
- })
- ) {
- return false;
- }
-
- return !(
- (await this.isRecordSharingEnabled(workspaceId)) &&
- (await this.entitlementProvider.hasRecordSharingEntitlement(workspaceId))
- );
- }
-}
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/services/record-sharing.service.ts b/packages/twenty-server/src/engine/core-modules/record-share/services/record-sharing.service.ts
index f303ceb2820..6c164722b73 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/services/record-sharing.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/record-share/services/record-sharing.service.ts
@@ -10,10 +10,7 @@ import {
import { isDefined } from 'twenty-shared/utils';
import { type UserWorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
-import {
- NotFoundError,
- UserInputError,
-} from 'src/engine/core-modules/graphql/utils/graphql-errors.util';
+import { NotFoundError } from 'src/engine/core-modules/graphql/utils/graphql-errors.util';
import { type RecordPermissionsDTO } from 'src/engine/core-modules/record-share/dtos/record-permissions.dto';
import {
type RecordSharingDTO,
@@ -21,7 +18,6 @@ import {
type RecordSharePrincipalInput,
} from 'src/engine/core-modules/record-share/dtos/record-sharing.dto';
import { RecordShareStorageService } from 'src/engine/core-modules/record-share/services/record-share-storage.service';
-import { RecordSharingFeatureService } from 'src/engine/core-modules/record-share/services/record-sharing-feature.service';
import { resolveShareWithPrincipalOrThrow } from 'src/engine/core-modules/record-share/utils/resolve-share-with-principal-or-throw.util';
import { validateShareWithPrincipalsOrThrow } from 'src/engine/core-modules/record-share/utils/validate-share-with-principals-or-throw.util';
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
@@ -45,7 +41,6 @@ export class RecordSharingService {
private readonly workspaceOrmManager: WorkspaceOrmManager,
private readonly workspaceCacheService: WorkspaceCacheService,
private readonly recordShareStorageService: RecordShareStorageService,
- private readonly featureService: RecordSharingFeatureService,
) {}
async getPermissions(args: RecordSharingArgs): Promise<RecordPermissionsDTO> {
@@ -116,11 +111,7 @@ export class RecordSharingService {
objectMetadata: FlatObjectMetadata;
permissions: RecordPermissionsDTO;
}): Promise<RecordSharingDTO> {
- const isEnabled =
- this.isShareable(objectMetadata) &&
- (await this.featureService.isRecordSharingEnabled(
- args.authContext.workspace.id,
- ));
+ const isEnabled = this.isShareable(objectMetadata);
const { shares, viewerAccessLevel } = await this.getRecordShares(args);
const canChangeSharing =
permissions.canUpdate &&
@@ -210,13 +201,6 @@ export class RecordSharingService {
throw new NotFoundError('Record not found');
}
if (args.enabled) {
- if (
- !(await this.featureService.isRecordSharingEnabled(workspaceId))
- ) {
- throw new UserInputError(
- 'Sharing is unavailable for this workspace',
- );
- }
const maps = await this.workspaceCacheService.getOrRecompute(
workspaceId,
['flatWorkspaceMemberMaps', 'flatRoleMaps'],
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/services/share-with.service.ts b/packages/twenty-server/src/engine/core-modules/record-share/services/share-with.service.ts
index 2ff005a9cf7..20158aedd4d 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/services/share-with.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/record-share/services/share-with.service.ts
@@ -22,16 +22,13 @@ export class ShareWithService {
async validateShareWithOrThrow({
authContext,
- isRecordSharingEnforced,
shareWith,
}: {
authContext: WorkspaceAuthContext;
- isRecordSharingEnforced: boolean;
shareWith?: ShareWithInput[] | null;
}): Promise<void> {
validateShareWithArgOrThrow({
authContext,
- isRecordSharingEnforced,
shareWith,
});
@@ -58,7 +55,6 @@ export class ShareWithService {
recordIds,
apiKeyRoleMap,
shareWith,
- isRecordSharingEnforced,
transactionScope,
}: {
authContext: WorkspaceAuthContext;
@@ -67,7 +63,6 @@ export class ShareWithService {
apiKeyRoleMap: Record<string, string>;
shareWith?: ShareWithInput[] | null;
transactionScope?: WorkspaceTransactionScope;
- isRecordSharingEnforced: boolean;
}): Promise<void> {
const workspaceId = authContext.workspace.id;
@@ -87,7 +82,6 @@ export class ShareWithService {
authContext,
apiKeyRoleMap,
shareWith,
- isRecordSharingEnforced,
}),
transactionScope,
});
diff --git a/packages/twenty-server/src/engine/core-modules/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
index 4a83be71519..1ca9f3777ff 100644
--- a/packages/twenty-server/src/engine/core-modules/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,6 +1,7 @@
/* @license Enterprise */
import { EVERYONE_PRINCIPAL_ID } from 'twenty-shared/constants';
+
import {
RecordShareAccessLevel,
RecordSharePrincipalType,
@@ -347,30 +348,3 @@ describe('buildRecordShareInputsForCreatedRecords', () => {
});
});
});
-
-it.each([
- userAuthContext,
- apiKeyAuthContext,
- applicationAuthContext,
- systemAuthContext,
-])(
- 'preserves flag-off shared access for $type creates without invitations',
- (authContext) => {
- const rows = buildRecordShareInputsForCreatedRecords({
- recordIds: ['record'],
- objectMetadataId: OBJECT_METADATA_ID,
- authContext,
- apiKeyRoleMap,
- isRecordSharingEnforced: false,
- });
- expect(rows).toContainEqual({
- recordId: 'record',
- objectMetadataId: OBJECT_METADATA_ID,
- principalId: EVERYONE_PRINCIPAL_ID,
- principalType: RecordSharePrincipalType.EVERYONE,
- accessLevel: RecordShareAccessLevel.FULL,
- rowCause: RecordShareRowCause.APPLICATION,
- sourceId: OBJECT_METADATA_ID,
- });
- },
-);
diff --git a/packages/twenty-server/src/engine/core-modules/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
index 4fc113126cf..c261b124cb6 100644
--- a/packages/twenty-server/src/engine/core-modules/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
@@ -29,13 +29,10 @@ const SHARE_WITH_REQUIRED_MESSAGE =
describe('validateShareWithArgOrThrow', () => {
describe('with record sharing enabled', () => {
- const isRecordSharingEnforced = true;
-
it('should accept a user without shareWith', () => {
expect(() =>
validateShareWithArgOrThrow({
authContext: userAuthContext,
- isRecordSharingEnforced,
}),
).not.toThrow();
});
@@ -44,7 +41,6 @@ describe('validateShareWithArgOrThrow', () => {
expect(() =>
validateShareWithArgOrThrow({
authContext: apiKeyAuthContext,
- isRecordSharingEnforced,
}),
).toThrow(SHARE_WITH_REQUIRED_MESSAGE);
});
@@ -53,7 +49,6 @@ describe('validateShareWithArgOrThrow', () => {
expect(() =>
validateShareWithArgOrThrow({
authContext: apiKeyAuthContext,
- isRecordSharingEnforced,
shareWith: [],
}),
).toThrow(SHARE_WITH_REQUIRED_MESSAGE);
@@ -63,7 +58,6 @@ describe('validateShareWithArgOrThrow', () => {
expect(() =>
validateShareWithArgOrThrow({
authContext: systemAuthContext,
- isRecordSharingEnforced,
}),
).toThrow(SHARE_WITH_REQUIRED_MESSAGE);
});
@@ -72,7 +66,6 @@ describe('validateShareWithArgOrThrow', () => {
expect(() =>
validateShareWithArgOrThrow({
authContext: apiKeyAuthContext,
- isRecordSharingEnforced,
shareWith: [
{ everyone: true, accessLevel: RecordShareAccessLevel.READ },
],
@@ -81,48 +74,10 @@ describe('validateShareWithArgOrThrow', () => {
});
});
- describe('with record sharing disabled', () => {
- const isRecordSharingEnforced = false;
-
- it('should accept an api key without shareWith', () => {
- expect(() =>
- validateShareWithArgOrThrow({
- authContext: apiKeyAuthContext,
- isRecordSharingEnforced,
- }),
- ).not.toThrow();
- });
-
- it('should accept a system caller with an empty shareWith', () => {
- expect(() =>
- validateShareWithArgOrThrow({
- authContext: systemAuthContext,
- isRecordSharingEnforced,
- shareWith: [],
- }),
- ).not.toThrow();
- });
-
- it('should still reject a malformed entry', () => {
- expect(() =>
- validateShareWithArgOrThrow({
- authContext: apiKeyAuthContext,
- isRecordSharingEnforced,
- shareWith: [
- { everyone: false, accessLevel: RecordShareAccessLevel.READ },
- ],
- }),
- ).toThrow(
- 'Each shareWith entry must target exactly one of workspaceMemberId, roleId or everyone',
- );
- });
- });
-
it('should treat a null shareWith as omitted for a user', () => {
expect(() =>
validateShareWithArgOrThrow({
authContext: userAuthContext,
- isRecordSharingEnforced: true,
shareWith: null,
}),
).not.toThrow();
@@ -132,7 +87,6 @@ describe('validateShareWithArgOrThrow', () => {
expect(() =>
validateShareWithArgOrThrow({
authContext: userAuthContext,
- isRecordSharingEnforced: true,
shareWith: [
{
workspaceMemberId: OTHER_WORKSPACE_MEMBER_ID,
@@ -151,7 +105,6 @@ describe('validateShareWithArgOrThrow', () => {
expect(() =>
validateShareWithArgOrThrow({
authContext: userAuthContext,
- isRecordSharingEnforced: true,
shareWith: [
{ everyone: false, accessLevel: RecordShareAccessLevel.READ },
],
@@ -165,7 +118,6 @@ describe('validateShareWithArgOrThrow', () => {
expect(() =>
validateShareWithArgOrThrow({
authContext: userAuthContext,
- isRecordSharingEnforced: true,
shareWith: [
{
workspaceMemberId: 'not-a-uuid',
@@ -180,7 +132,6 @@ describe('validateShareWithArgOrThrow', () => {
expect(() =>
validateShareWithArgOrThrow({
authContext: userAuthContext,
- isRecordSharingEnforced: true,
shareWith: [
{
workspaceMemberId: OTHER_WORKSPACE_MEMBER_ID,
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.ts
index d96942c7c41..e969a9005e0 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/build-record-share-gate.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/record-share/utils/build-record-share-gate.util.ts
@@ -39,7 +39,6 @@ export const buildRecordShareGate = ({
const gateKind = resolveRecordShareGateKind({
readability: target.flatObjectMetadata.readability,
isOwningApplication,
- isLegacyRecordAccessOpen: context.environment.isLegacyRecordAccessOpen,
});
switch (gateKind) {
case 'open':
diff --git a/packages/twenty-server/src/engine/core-modules/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
index 4fda79f0182..8e368156dc6 100644
--- a/packages/twenty-server/src/engine/core-modules/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,6 +1,5 @@
/* @license Enterprise */
-import { EVERYONE_PRINCIPAL_ID } from 'twenty-shared/constants';
import {
RecordShareAccessLevel,
RecordSharePrincipalType,
@@ -113,14 +112,12 @@ export const buildRecordShareInputsForCreatedRecords = ({
authContext,
apiKeyRoleMap,
shareWith,
- isRecordSharingEnforced = true,
}: {
recordIds: string[];
objectMetadataId: string;
authContext: WorkspaceAuthContext;
apiKeyRoleMap: Record<string, string>;
shareWith?: ShareWithInput[] | null;
- isRecordSharingEnforced?: boolean;
}): RecordShareInput[] => {
const shareWithEntries = shareWith ?? [];
const creatorRoleId = resolveCreatorRoleId({ authContext, apiKeyRoleMap });
@@ -134,19 +131,6 @@ export const buildRecordShareInputsForCreatedRecords = ({
return [
...recordIds.flatMap((recordId) => [
- ...(!isRecordSharingEnforced && shareWithEntries.length === 0
- ? [
- {
- recordId,
- objectMetadataId,
- principalId: EVERYONE_PRINCIPAL_ID,
- principalType: RecordSharePrincipalType.EVERYONE,
- accessLevel: RecordShareAccessLevel.FULL,
- rowCause: RecordShareRowCause.APPLICATION,
- sourceId: objectMetadataId,
- },
- ]
- : []),
...buildCreatorRows({
authContext,
apiKeyRoleMap,
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.ts
deleted file mode 100644
index db7e6fca075..00000000000
--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/find-record-sharing-entitlement-provider.util.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-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/core-modules/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
index 8f4c5b988eb..3d29186a9c1 100644
--- a/packages/twenty-server/src/engine/core-modules/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
@@ -8,11 +8,9 @@ export type RecordShareGateKind = 'open' | 'deny' | 'private' | 'inherited';
export const resolveRecordShareGateKind = ({
readability,
isOwningApplication,
- isLegacyRecordAccessOpen = false,
}: {
readability: MetadataReadability;
isOwningApplication: boolean;
- isLegacyRecordAccessOpen?: boolean;
}): RecordShareGateKind => {
switch (readability) {
case MetadataReadability.OPEN:
@@ -20,15 +18,11 @@ export const resolveRecordShareGateKind = ({
case MetadataReadability.SYSTEM:
return 'deny';
case MetadataReadability.APPLICATION:
- return isLegacyRecordAccessOpen || isOwningApplication ? 'open' : 'deny';
+ return isOwningApplication ? 'open' : 'deny';
case MetadataReadability.PRIVATE:
- return isLegacyRecordAccessOpen || isOwningApplication
- ? 'open'
- : 'private';
+ return isOwningApplication ? 'open' : 'private';
case MetadataReadability.INHERITED:
- return isLegacyRecordAccessOpen || isOwningApplication
- ? 'open'
- : 'inherited';
+ return isOwningApplication ? 'open' : 'inherited';
default:
assertUnreachable(readability);
}
diff --git a/packages/twenty-server/src/engine/core-modules/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
index 0c2d2caf468..be133a9918a 100644
--- a/packages/twenty-server/src/engine/core-modules/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
@@ -14,18 +14,12 @@ import { resolveShareWithPrincipalOrThrow } from 'src/engine/core-modules/record
export const validateShareWithArgOrThrow = ({
authContext,
- isRecordSharingEnforced,
shareWith,
}: {
authContext: WorkspaceAuthContext;
- isRecordSharingEnforced: boolean;
shareWith?: ShareWithInput[] | null;
}): void => {
- if (
- isRecordSharingEnforced &&
- !isUserAuthContext(authContext) &&
- !isNonEmptyArray(shareWith)
- ) {
+ if (!isUserAuthContext(authContext) && !isNonEmptyArray(shareWith)) {
throw new RecordShareException(
'Creating a record of a private object requires the shareWith argument',
RecordShareExceptionCode.INVALID_SHARE_WITH,
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-sharing.service.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-sharing.service.spec.ts
index a0d7835455e..c85d2e4172d 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-sharing.service.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-sharing.service.spec.ts
@@ -177,16 +177,19 @@ describe('Conversation common record access', () => {
});
});
- it('keeps legacy SYSTEM history owner-only until migration', async () => {
+ it('does not bypass the common policy for owners of SYSTEM history', async () => {
const { service, objectMetadata, repository } = buildService();
objectMetadata.readability = MetadataReadability.SYSTEM;
+ repository.findRecordIdsAllowedForOperation.mockResolvedValue([]);
await expect(service.getReadableThread(args)).rejects.toMatchObject({
code: 'THREAD_NOT_FOUND',
});
await expect(
service.getReadableThread({ ...args, userWorkspaceId: 'owner' }),
- ).resolves.toBeDefined();
- expect(repository.findRecordIdsAllowedForOperation).not.toHaveBeenCalled();
+ ).rejects.toMatchObject({ code: 'THREAD_NOT_FOUND' });
+ expect(repository.findRecordIdsAllowedForOperation).toHaveBeenCalledTimes(
+ 2,
+ );
});
it('returns common capabilities, including destructive permission differences', async () => {
@@ -203,16 +206,10 @@ describe('Conversation common record access', () => {
it.each([MetadataReadability.SYSTEM, MetadataReadability.PRIVATE])(
'bounds the readable thread list before ranking for %s metadata',
async (readability) => {
- const { service, repository, threadRepository, objectMetadata, sharing } =
- buildService();
+ const { service, repository, objectMetadata, sharing } = buildService();
objectMetadata.readability = readability;
await service.getReadableThreadIds(args);
- const selectedRepository =
- readability === MetadataReadability.SYSTEM
- ? threadRepository
- : repository;
- expect(selectedRepository.find).toHaveBeenCalledWith(
- ...(readability === MetadataReadability.SYSTEM ? [WORKSPACE_ID] : []),
+ expect(repository.find).toHaveBeenCalledWith(
expect.objectContaining({
take: 1000,
order: { updatedAt: 'DESC', id: 'DESC' },
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-sharing.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-sharing.service.ts
index 265822e4454..e3665e48e41 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-sharing.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-sharing.service.ts
@@ -1,5 +1,4 @@
import { lockAgentChatThread } from 'src/engine/metadata-modules/ai/ai-chat/utils/lock-agent-chat-thread.util';
-import { In } from 'typeorm';
import { mapAgentHistoryFieldNameToWorkspace } from 'src/engine/metadata-modules/ai/ai-history/utils/map-agent-history-field-name-to-workspace.util';
import { type AgentHistoryStorageContext } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-workspace-storage.service';
import { escapeIdentifier } from 'src/engine/workspace-manager/workspace-migration/utils/remove-sql-injection.util';
@@ -11,7 +10,6 @@ import { Injectable } from '@nestjs/common';
import { PermissionFlagType } from 'twenty-shared/constants';
import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
-import { MetadataReadability } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { RecordShareStorageService } from 'src/engine/core-modules/record-share/services/record-share-storage.service';
@@ -70,15 +68,6 @@ export class AgentChatSharingService {
if (!isDefined(thread)) {
return this.throwNotFound();
}
- const objectMetadata = await this.getThreadObjectMetadata(args.workspaceId);
- // Old core history remains owner-only until the workspace upgrade installs
- // ownership grants and switches the metadata to the common private policy.
- if (objectMetadata.readability === MetadataReadability.SYSTEM) {
- if (thread.userWorkspaceId !== args.userWorkspaceId) {
- return this.throwNotFound();
- }
- return thread;
- }
const allowedIds = await this.workspaceOrmManager.executeInWorkspaceContext(
() =>
this.workspaceOrmManager
@@ -110,30 +99,6 @@ export class AgentChatSharingService {
) {
const authContext = await this.getAuthContext(args);
const objectMetadata = await this.getThreadObjectMetadata(args.workspaceId);
- if (objectMetadata.readability === MetadataReadability.SYSTEM) {
- const ownedThreads = await this.threadRepository.find(args.workspaceId, {
- where: {
- id: In(args.threadIds),
- userWorkspaceId: args.userWorkspaceId,
- },
- select: ['id'],
- });
- const ownedThreadIds = new Set(ownedThreads.map(({ id }) => id));
- return new Map(
- args.threadIds.map((threadId) => {
- const isOwner = ownedThreadIds.has(threadId);
- return [
- threadId,
- {
- canRead: isOwner,
- canUpdate: isOwner,
- canDelete: isOwner,
- canSoftDelete: isOwner,
- },
- ] as const;
- }),
- );
- }
return this.recordSharingService.getPermissionsForRecords({
authContext,
objectMetadataId: objectMetadata.id,
@@ -146,17 +111,6 @@ export class AgentChatSharingService {
args: Omit<ThreadAccessArgs, 'threadId'>,
): Promise<string[]> {
const authContext = await this.getAuthContext(args);
- const objectMetadata = await this.getThreadObjectMetadata(args.workspaceId);
- if (objectMetadata.readability === MetadataReadability.SYSTEM) {
- return (
- await this.threadRepository.find(args.workspaceId, {
- where: { userWorkspaceId: args.userWorkspaceId },
- select: ['id'],
- order: { updatedAt: 'DESC', id: 'DESC' },
- take: MAX_CHAT_THREADS,
- })
- ).map(({ id }) => id);
- }
return this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const records = await this.workspaceOrmManager
.getRepositoryWithContextPermissions('agentChatThread')
@@ -181,19 +135,19 @@ export class AgentChatSharingService {
const writesWorkspaceMember = await this.hasWorkspaceMemberOwnerField(
args.workspaceId,
);
- if (objectMetadata.readability !== MetadataReadability.SYSTEM) {
- await this.workspaceOrmManager.executeInWorkspaceContext(
- () =>
- this.workspaceOrmManager
- .getRepositoryWithContextPermissions('agentChatThread')
- .validateWriteIsPermitted({
- operationType: 'insert',
- columnsToReturn: ['id'],
- updatedColumns: isDefined(args.title) ? ['title'] : [],
- }),
- authContext,
- );
- }
+
+ await this.workspaceOrmManager.executeInWorkspaceContext(
+ () =>
+ this.workspaceOrmManager
+ .getRepositoryWithContextPermissions('agentChatThread')
+ .validateWriteIsPermitted({
+ operationType: 'insert',
+ columnsToReturn: ['id'],
+ updatedColumns: isDefined(args.title) ? ['title'] : [],
+ }),
+ authContext,
+ );
+
return this.threadRepository.query(
args.workspaceId,
async ({ manager, table }) => {
@@ -325,25 +279,19 @@ export class AgentChatSharingService {
objectMetadataId: objectMetadata.id,
threadId: args.threadId,
});
- if (
- objectMetadata.readability === MetadataReadability.SYSTEM &&
- thread.userWorkspaceId !== args.userWorkspaceId
- ) {
+
+ const allowedIds = await this.workspaceOrmManager
+ .getRepositoryWithContextPermissions('agentChatThread')
+ .findRecordIdsAllowedForOperation({
+ recordIds: [args.threadId],
+ operationType,
+ updatedColumns,
+ withDeleted: false,
+ });
+ if (allowedIds.length !== 1) {
return this.throwNotFound();
}
- if (objectMetadata.readability !== MetadataReadability.SYSTEM) {
- const allowedIds = await this.workspaceOrmManager
- .getRepositoryWithContextPermissions('agentChatThread')
- .findRecordIdsAllowedForOperation({
- recordIds: [args.threadId],
- operationType,
- updatedColumns,
- withDeleted: false,
- });
- if (allowedIds.length !== 1) {
- return this.throwNotFound();
- }
- }
+
return mutate(context, thread);
}),
authContext,
diff --git a/packages/twenty-server/src/engine/metadata-modules/record-permissions/__tests__/record-permissions.resolver.spec.ts b/packages/twenty-server/src/engine/metadata-modules/record-permissions/__tests__/record-permissions.resolver.spec.ts
index 3b8a45d65ed..2bd579a7658 100644
--- a/packages/twenty-server/src/engine/metadata-modules/record-permissions/__tests__/record-permissions.resolver.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/record-permissions/__tests__/record-permissions.resolver.spec.ts
@@ -21,11 +21,6 @@ const buildResolver = () => {
.fn()
.mockResolvedValue(new Map([['record', readable]])),
};
- const legacyChat = {
- getPermissionsForThreads: jest
- .fn()
- .mockResolvedValue(new Map([['record', readable]])),
- };
const cache = {
getOrRecompute: jest.fn().mockResolvedValue({
flatObjectMetadataMaps: {
@@ -46,7 +41,6 @@ const buildResolver = () => {
};
const resolver = new RecordPermissionsResolver(
sharing as never,
- legacyChat as never,
cache as never,
);
const query = (
@@ -61,12 +55,12 @@ const buildResolver = () => {
} as never,
() => resolver.recordPermissions(targets),
);
- return { query, sharing, legacyChat, cache, objectMetadata };
+ return { query, sharing, cache, objectMetadata };
};
describe('Generic record permissions query', () => {
it('deduplicates and batches by object using the authenticated viewer and existing policy', async () => {
- const { query, sharing, legacyChat } = buildResolver();
+ const { query, sharing } = buildResolver();
const target = { objectMetadataId: 'object', recordId: 'record' };
const result = await query([
target,
@@ -93,7 +87,6 @@ describe('Generic record permissions query', () => {
objectMetadataId: 'object',
recordIds: ['record', 'missing'],
});
- expect(legacyChat.getPermissionsForThreads).not.toHaveBeenCalled();
});
it('does not disclose missing or foreign workspace objects', async () => {
@@ -103,19 +96,13 @@ describe('Generic record permissions query', () => {
expect(sharing.getPermissionsForRecords).not.toHaveBeenCalled();
});
- it('preserves the owner-only compatibility policy before the workspace upgrade', async () => {
- const { query, sharing, legacyChat, objectMetadata } = buildResolver();
+ it('uses the common policy even for SYSTEM chat metadata', async () => {
+ const { query, sharing, objectMetadata } = buildResolver();
objectMetadata.readability = MetadataReadability.SYSTEM;
+ sharing.getPermissionsForRecords.mockResolvedValue(new Map());
const target = { objectMetadataId: 'object', recordId: 'record' };
- expect(await query([target])).toEqual([
- { ...target, permissions: readable },
- ]);
- expect(legacyChat.getPermissionsForThreads).toHaveBeenCalledWith({
- workspaceId: 'workspace',
- userWorkspaceId: 'viewer',
- threadIds: ['record'],
- });
- expect(sharing.getPermissionsForRecords).not.toHaveBeenCalled();
+ expect(await query([target])).toEqual([{ ...target, permissions: denied }]);
+ expect(sharing.getPermissionsForRecords).toHaveBeenCalledTimes(1);
});
it('rejects oversized batches before reading metadata', async () => {
diff --git a/packages/twenty-server/src/engine/metadata-modules/record-permissions/record-permissions.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/record-permissions/record-permissions.resolver.ts
index c1433b2ae43..01cbc1175b0 100644
--- a/packages/twenty-server/src/engine/metadata-modules/record-permissions/record-permissions.resolver.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/record-permissions/record-permissions.resolver.ts
@@ -1,7 +1,5 @@
import { UseGuards } from '@nestjs/common';
import { Args, Query } from '@nestjs/graphql';
-import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
-import { MetadataReadability } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
@@ -17,7 +15,6 @@ import { RecordSharingService } from 'src/engine/core-modules/record-share/servi
import { CustomPermissionGuard } from 'src/engine/guards/custom-permission.guard';
import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
-import { AgentChatSharingService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-sharing.service';
import {
RecordPermissionsResult,
RecordPermissionsTargetInput,
@@ -31,7 +28,6 @@ const MAX_PERMISSION_TARGETS = 100;
export class RecordPermissionsResolver {
constructor(
private readonly recordSharingService: RecordSharingService,
- private readonly agentChatSharingService: AgentChatSharingService,
private readonly workspaceCacheService: WorkspaceCacheService,
) {}
@@ -74,25 +70,13 @@ export class RecordPermissionsResolver {
canDelete: false,
canSoftDelete: false,
};
- // Older workspaces keep chat history owner-only until the sharing upgrade
- // installs grants. Reuse that compatibility policy during rolling deploys.
- const isLegacyChat =
- objectMetadata?.universalIdentifier ===
- STANDARD_OBJECTS.agentChatThread.universalIdentifier &&
- objectMetadata.readability === MetadataReadability.SYSTEM;
const permissions = !isDefined(objectMetadata)
? new Map<string, RecordPermissionsDTO>()
- : isLegacyChat
- ? await this.agentChatSharingService.getPermissionsForThreads({
- workspaceId: authContext.workspace.id,
- userWorkspaceId: authContext.userWorkspaceId,
- threadIds: [...recordIds],
- })
- : await this.recordSharingService.getPermissionsForRecords({
- authContext,
- objectMetadataId,
- recordIds: [...recordIds],
- });
+ : await this.recordSharingService.getPermissionsForRecords({
+ authContext,
+ objectMetadataId,
+ recordIds: [...recordIds],
+ });
for (const recordId of recordIds) {
results.push({
objectMetadataId,
diff --git a/packages/twenty-server/src/engine/metadata-modules/webhook/jobs/__tests__/call-webhook-jobs.job.spec.ts b/packages/twenty-server/src/engine/metadata-modules/webhook/jobs/__tests__/call-webhook-jobs.job.spec.ts
index 3340c71e063..fd4a24d14c5 100644
--- a/packages/twenty-server/src/engine/metadata-modules/webhook/jobs/__tests__/call-webhook-jobs.job.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/webhook/jobs/__tests__/call-webhook-jobs.job.spec.ts
@@ -4,7 +4,6 @@ import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queu
import { getQueueToken } from 'src/engine/core-modules/message-queue/utils/get-queue-token.util';
import { RecordAccessPolicyService } from 'src/engine/core-modules/record-share/services/record-access-policy.service';
import { RecordShareStorageService } from 'src/engine/core-modules/record-share/services/record-share-storage.service';
-import { RecordSharingFeatureService } from 'src/engine/core-modules/record-share/services/record-sharing-feature.service';
import { COMPANY_FLAT_OBJECT_MOCK } from 'src/engine/metadata-modules/flat-object-metadata/__mocks__/company-flat-object.mock';
import { CallWebhookJobsJob } from 'src/engine/metadata-modules/webhook/jobs/call-webhook-jobs.job';
import { WebhookRateLimitService } from 'src/engine/metadata-modules/webhook/jobs/webhook-rate-limit.service';
@@ -12,85 +11,76 @@ import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
describe('webhook mandatory visibility', () => {
- it.each([false, true])(
- 'drops missing metadata and SYSTEM batches with sharing=%s',
- async (sharingEnabled) => {
- const add = jest.fn();
- const objectMetadata = {
- ...COMPANY_FLAT_OBJECT_MOCK,
- readability: MetadataReadability.SYSTEM,
- };
- const maps = {
- byUniversalIdentifier: {},
- universalIdentifierById: {},
- universalIdentifiersByApplicationId: {},
- };
- const getOrRecompute = jest.fn();
- const module = await Test.createTestingModule({
- providers: [
- CallWebhookJobsJob,
- RecordAccessPolicyService,
- {
- provide: getQueueToken(MessageQueue.webhookQueue),
- useValue: { add },
- },
- { provide: WorkspaceCacheService, useValue: { getOrRecompute } },
- { provide: WorkspaceOrmManager, useValue: {} },
- { provide: RecordShareStorageService, useValue: {} },
- {
- provide: RecordSharingFeatureService,
- useValue: {
- isLegacyRecordAccessOpen: async () => false,
- isRecordSharingEnabled: async () => sharingEnabled,
- },
- },
- {
- provide: WebhookRateLimitService,
- useValue: {
- admitWebhookEventsWithinRateLimit: async ({
- webhookEvents,
- }: {
- webhookEvents: unknown[];
- }) => webhookEvents,
- },
- },
- ],
- }).compile();
- for (const flatObjectMetadataMaps of [
- maps,
+ it('drops missing metadata and SYSTEM batches', async () => {
+ const add = jest.fn();
+ const objectMetadata = {
+ ...COMPANY_FLAT_OBJECT_MOCK,
+ readability: MetadataReadability.SYSTEM,
+ };
+ const maps = {
+ byUniversalIdentifier: {},
+ universalIdentifierById: {},
+ universalIdentifiersByApplicationId: {},
+ };
+ const getOrRecompute = jest.fn();
+ const module = await Test.createTestingModule({
+ providers: [
+ CallWebhookJobsJob,
+ RecordAccessPolicyService,
{
+ provide: getQueueToken(MessageQueue.webhookQueue),
+ useValue: { add },
+ },
+ { provide: WorkspaceCacheService, useValue: { getOrRecompute } },
+ { provide: WorkspaceOrmManager, useValue: {} },
+ { provide: RecordShareStorageService, useValue: {} },
+
+ {
+ provide: WebhookRateLimitService,
+ useValue: {
+ admitWebhookEventsWithinRateLimit: async ({
+ webhookEvents,
+ }: {
+ webhookEvents: unknown[];
+ }) => webhookEvents,
+ },
+ },
+ ],
+ }).compile();
+ for (const flatObjectMetadataMaps of [
+ maps,
+ {
+ ...maps,
+ byUniversalIdentifier: {
+ [objectMetadata.universalIdentifier]: objectMetadata,
+ },
+ universalIdentifierById: {
+ [objectMetadata.id]: objectMetadata.universalIdentifier,
+ },
+ },
+ ]) {
+ getOrRecompute.mockResolvedValue({
+ flatObjectMetadataMaps,
+ flatWebhookMaps: {
...maps,
byUniversalIdentifier: {
- [objectMetadata.universalIdentifier]: objectMetadata,
- },
- universalIdentifierById: {
- [objectMetadata.id]: objectMetadata.universalIdentifier,
+ webhook: { id: 'webhook', operations: ['company.created'] },
},
},
- ]) {
- getOrRecompute.mockResolvedValue({
- flatObjectMetadataMaps,
- flatWebhookMaps: {
- ...maps,
- byUniversalIdentifier: {
- webhook: { id: 'webhook', operations: ['company.created'] },
- },
+ });
+ await module.get(CallWebhookJobsJob).handle({
+ name: 'company.created',
+ workspaceId: objectMetadata.workspaceId,
+ objectMetadata,
+ events: [
+ {
+ recordId: 'private-record',
+ properties: { after: { id: 'private-record' } },
},
- });
- await module.get(CallWebhookJobsJob).handle({
- name: 'company.created',
- workspaceId: objectMetadata.workspaceId,
- objectMetadata,
- events: [
- {
- recordId: 'private-record',
- properties: { after: { id: 'private-record' } },
- },
- ],
- });
- expect(add).not.toHaveBeenCalled();
- }
- await module.close();
- },
- );
+ ],
+ });
+ expect(add).not.toHaveBeenCalled();
+ }
+ await module.close();
+ });
});
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.ts
index f98fc268daa..01d6fa47f33 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
@@ -11,7 +11,6 @@ import { CallWebhookJobsJob } from 'src/engine/metadata-modules/webhook/jobs/cal
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/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({
@@ -21,7 +20,6 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache
FlatWebhookModule,
MetricsModule,
RecordShareModule,
- RecordSharingFeatureModule,
SecureHttpClientModule,
UsageLimitModule,
WorkspaceCacheModule,
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.ts
index c6b3813d67a..7435bc0f8b9 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
@@ -26,7 +26,6 @@ import { COMPANY_FLAT_OBJECT_MOCK } from 'src/engine/metadata-modules/flat-objec
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { RecordAccessPolicyService } from 'src/engine/core-modules/record-share/services/record-access-policy.service';
import { RecordShareStorageService } from 'src/engine/core-modules/record-share/services/record-share-storage.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/core-modules/record-share/types/record-share.type';
import { EventStreamService } from 'src/engine/subscriptions/event-stream.service';
@@ -105,12 +104,6 @@ describe('ObjectRecordEventPublisher', () => {
'getOrRecomputeManyOrAllFlatEntityMaps'
>
>;
- let mockRecordSharingFeatureService: jest.Mocked<
- Pick<
- RecordSharingFeatureService,
- 'isRecordSharingEnabled' | 'isLegacyRecordAccessOpen'
- >
- >;
let mockRecordShareStorageService: jest.Mocked<
Pick<RecordShareStorageService, 'findByRecordIds'>
>;
@@ -287,11 +280,6 @@ describe('ObjectRecordEventPublisher', () => {
findByRecordIds: jest.fn().mockResolvedValue([]),
};
- mockRecordSharingFeatureService = {
- isLegacyRecordAccessOpen: jest.fn().mockResolvedValue(false),
- isRecordSharingEnabled: jest.fn().mockResolvedValue(false),
- };
-
mockWorkspaceOrmManager = {
executeInWorkspaceContext: jest.fn(),
getRepository: jest.fn(),
@@ -346,10 +334,7 @@ describe('ObjectRecordEventPublisher', () => {
provide: RecordShareStorageService,
useValue: mockRecordShareStorageService,
},
- {
- provide: RecordSharingFeatureService,
- useValue: mockRecordSharingFeatureService,
- },
+
RecordAccessPolicyService,
{
provide: WorkspaceOrmManager,
@@ -484,10 +469,6 @@ describe('ObjectRecordEventPublisher', () => {
...companyObjectMetadata,
readability: MetadataReadability.INHERITED,
};
-
- mockRecordSharingFeatureService.isRecordSharingEnabled.mockResolvedValue(
- true,
- );
mockEventStreamService.getStreamsData.mockResolvedValue(
new Map([
[
@@ -615,10 +596,6 @@ describe('ObjectRecordEventPublisher', () => {
});
it('publishes a batch without consulting the sharing rollout flag', async () => {
- mockRecordSharingFeatureService.isRecordSharingEnabled.mockResolvedValue(
- true,
- );
-
mockEventStreamService.getStreamsData.mockResolvedValue(
new Map([
[streamChannelId, mockStreamData],
@@ -637,9 +614,6 @@ describe('ObjectRecordEventPublisher', () => {
expect(
mockSubscriptionService.publishToEventStream,
).toHaveBeenCalledTimes(3);
- expect(
- mockRecordSharingFeatureService.isRecordSharingEnabled,
- ).not.toHaveBeenCalled();
});
it('should not publish events when record does not match RLS filter', async () => {
diff --git a/packages/twenty-server/src/engine/twenty-orm/__tests__/workspace-orm-context-permissions.spec.ts b/packages/twenty-server/src/engine/twenty-orm/__tests__/workspace-orm-context-permissions.spec.ts
index f3447854214..8083a628a8f 100644
--- a/packages/twenty-server/src/engine/twenty-orm/__tests__/workspace-orm-context-permissions.spec.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/__tests__/workspace-orm-context-permissions.spec.ts
@@ -12,7 +12,6 @@ const setup = (userRoleId: string | undefined = 'member-role') => {
const manager = new WorkspaceOrmManager(
{} as never,
{ getDataSource: () => ({ getRepository }) } as never,
- {} as never,
);
jest.mocked(getWorkspaceContext).mockReturnValue({
authContext: {
diff --git a/packages/twenty-server/src/engine/twenty-orm/__tests__/workspace-orm.manager.spec.ts b/packages/twenty-server/src/engine/twenty-orm/__tests__/workspace-orm.manager.spec.ts
index dc429c833f0..c3983ab41f6 100644
--- a/packages/twenty-server/src/engine/twenty-orm/__tests__/workspace-orm.manager.spec.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/__tests__/workspace-orm.manager.spec.ts
@@ -1,6 +1,5 @@
import { Test } from '@nestjs/testing';
-import { RecordSharingFeatureService } from 'src/engine/core-modules/record-share/services/record-sharing-feature.service';
import { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/constant/create-empty-flat-entity-maps.constant';
import { WorkspaceDataSourceService } from 'src/engine/twenty-orm/datasource/workspace-data-source.service';
import { getWorkspaceContext } from 'src/engine/twenty-orm/storage/orm-workspace-context.storage';
@@ -10,8 +9,8 @@ import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/works
describe('workspace context sharing enforcement', () => {
it.each([true, false])(
- 'uses the same rollout decision (%s) in lite and full contexts',
- async (isLegacyRecordAccessOpen) => {
+ 'loads the authenticated workspace without a sharing rollout lookup (lite=%s)',
+ async (lite) => {
const module = await Test.createTestingModule({
providers: [
WorkspaceOrmManager,
@@ -24,26 +23,19 @@ describe('workspace context sharing enforcement', () => {
}),
},
},
- {
- provide: RecordSharingFeatureService,
- useValue: {
- isLegacyRecordAccessOpen: jest
- .fn()
- .mockResolvedValue(isLegacyRecordAccessOpen),
- },
- },
],
}).compile();
const manager = module.get(WorkspaceOrmManager);
const authContext = buildSystemAuthContext('workspace');
- for (const lite of [true, false]) {
- const decision = await manager.executeInWorkspaceContext(
- () => getWorkspaceContext().isLegacyRecordAccessOpen,
- authContext,
- { lite },
- );
- expect(decision).toBe(isLegacyRecordAccessOpen);
- }
+ const context = await manager.executeInWorkspaceContext(
+ () => getWorkspaceContext(),
+ authContext,
+ { lite },
+ );
+ expect(context.authContext).toBe(authContext);
+ expect(
+ module.get(WorkspaceCacheService).getOrRecompute,
+ ).toHaveBeenCalledTimes(1);
await module.close();
},
);
diff --git a/packages/twenty-server/src/engine/twenty-orm/datasource/workspace-data-source.service.ts b/packages/twenty-server/src/engine/twenty-orm/datasource/workspace-data-source.service.ts
index b2a2fc2fc77..cc6a36ca264 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
@@ -122,7 +122,6 @@ export class WorkspaceDataSourceService
objectIdByNameSingular: workspaceContext.objectIdByNameSingular,
featureFlagsMap: workspaceContext.featureFlagsMap,
billingEntitlements: workspaceContext.billingEntitlements,
- isLegacyRecordAccessOpen: workspaceContext.isLegacyRecordAccessOpen,
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.ts
index 6e4bc998237..d0a5f23f0a6 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
@@ -22,7 +22,6 @@ export interface WorkspaceInternalContext {
objectIdByNameSingular: Record<string, string>;
featureFlagsMap: Record<FeatureFlagKey, boolean>;
billingEntitlements: BillingEntitlements;
- isLegacyRecordAccessOpen?: 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.ts
index 7def0aac5f7..4bf825ffab1 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
@@ -2037,8 +2037,6 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
private resolveRowAccessPolicyEnvironment(): RowAccessPolicyEnvironment {
return {
- isLegacyRecordAccessOpen:
- this.options.internalContext.isLegacyRecordAccessOpen,
flatFieldMetadataMaps: this.options.internalContext.flatFieldMetadataMaps,
flatObjectMetadataMaps:
this.options.internalContext.flatObjectMetadataMaps,
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.ts
index 8626a865804..180a071ef48 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
@@ -23,7 +23,6 @@ export type ORMWorkspaceContext = {
objectIdByNameSingular: Record<string, string>;
featureFlagsMap: Record<FeatureFlagKey, boolean>;
billingEntitlements: BillingEntitlements;
- isLegacyRecordAccessOpen?: 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.ts
index 896a9f7edfe..ef88e627814 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
@@ -12,7 +12,6 @@ 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';
@@ -40,7 +39,6 @@ import { WorkspaceEventEmitterModule } from 'src/engine/workspace-event-emitter/
UsageLimitModule,
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.ts
index cfc9d5ae380..0c9f684fe13 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
@@ -29,7 +29,6 @@ export type RowAccessPolicySubject = {
};
export type RowAccessPolicyEnvironment = {
- isLegacyRecordAccessOpen?: boolean;
flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
recordShareTableExpression: string;
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.ts
index f55a41373e2..2bf91249640 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
@@ -24,7 +24,6 @@ import {
import type { RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
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';
@@ -33,7 +32,6 @@ export class WorkspaceOrmManager {
constructor(
private readonly workspaceCacheService: WorkspaceCacheService,
private readonly workspaceDataSourceService: WorkspaceDataSourceService,
- private readonly recordSharingFeatureService: RecordSharingFeatureService,
) {}
getRepository<T extends ObjectLiteral = ObjectRecord>(
@@ -127,16 +125,7 @@ export class WorkspaceOrmManager {
? await this.loadLiteWorkspaceContext(resolvedAuthContext)
: await this.loadWorkspaceContext(resolvedAuthContext);
- return withWorkspaceContext(
- {
- ...context,
- isLegacyRecordAccessOpen:
- await this.recordSharingFeatureService.isLegacyRecordAccessOpen(
- resolvedAuthContext.workspace.id,
- ),
- },
- fn,
- );
+ return withWorkspaceContext(context, fn);
}
private async loadWorkspaceContext(
diff --git a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util.ts b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util.ts
index 373794a8f1e..27a4387434e 100644
--- a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util.ts
@@ -7,7 +7,6 @@ const DEFAULT_SEEDED_FEATURE_FLAGS: Partial<Record<FeatureFlagKey, boolean>> = {
[FeatureFlagKey.IS_UNIQUE_INDEXES_ENABLED]: false,
[FeatureFlagKey.IS_JUNCTION_RELATIONS_ENABLED]: true,
[FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED]: true,
- [FeatureFlagKey.IS_RECORD_SHARING_ENABLED]: true,
[FeatureFlagKey.IS_AI_CHAT_SHARING_DROPDOWN_ENABLED]: false,
[FeatureFlagKey.IS_INITIAL_OBJECT_VIEW_ENABLED]: false,
[FeatureFlagKey.IS_EXECUTION_QUOTA_ENABLED]: true,
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.ts
index ff20528278d..835ca63bd98 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
@@ -14,7 +14,6 @@ import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object
import { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/constant/create-empty-flat-entity-maps.constant';
import { RecordAccessPolicyService } from 'src/engine/core-modules/record-share/services/record-access-policy.service';
import { RecordShareStorageService } from 'src/engine/core-modules/record-share/services/record-share-storage.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,12 +28,6 @@ describe('WorkflowDatabaseEventTriggerListener', () => {
let messageQueueService: jest.Mocked<MessageQueueService>;
let workspaceCacheService: jest.Mocked<WorkspaceCacheService>;
let recordShareStorageService: jest.Mocked<RecordShareStorageService>;
- let recordSharingFeatureService: jest.Mocked<
- Pick<
- RecordSharingFeatureService,
- 'isRecordSharingEnabled' | 'isLegacyRecordAccessOpen'
- >
- >;
const setTriggerMap = (
listeners: Array<{ workflowId: string; settings: object; type?: unknown }>,
@@ -115,11 +108,6 @@ describe('WorkflowDatabaseEventTriggerListener', () => {
findByRecordIds: jest.fn().mockResolvedValue([]),
} as unknown as jest.Mocked<RecordShareStorageService>;
- recordSharingFeatureService = {
- isLegacyRecordAccessOpen: jest.fn().mockResolvedValue(false),
- isRecordSharingEnabled: jest.fn().mockResolvedValue(false),
- };
-
const module: TestingModule = await Test.createTestingModule({
providers: [
WorkflowDatabaseEventTriggerListener,
@@ -139,10 +127,7 @@ describe('WorkflowDatabaseEventTriggerListener', () => {
provide: RecordShareStorageService,
useValue: recordShareStorageService,
},
- {
- provide: RecordSharingFeatureService,
- useValue: recordSharingFeatureService,
- },
+
RecordAccessPolicyService,
{
provide: 'MESSAGE_QUEUE_workflow-queue',
@@ -436,10 +421,6 @@ describe('WorkflowDatabaseEventTriggerListener', () => {
],
};
- recordSharingFeatureService.isRecordSharingEnabled.mockResolvedValue(
- true,
- );
-
workspaceCacheService.getOrRecompute.mockImplementation(((
_workspaceId: string,
keys: string[],
@@ -512,64 +493,55 @@ describe('WorkflowDatabaseEventTriggerListener', () => {
);
});
- it.each([true, false])(
- 'should not trigger workflow for a system object with sharing=%s and no resolved role',
- async (sharingEnabled) => {
- const systemPayload: WorkspaceEventBatch<ObjectRecordUpdateEvent> = {
- ...mockPayload,
- objectMetadata: createMockFlatObjectMetadata({
- readability: MetadataReadability.SYSTEM,
- }),
- };
-
- recordSharingFeatureService.isRecordSharingEnabled.mockResolvedValue(
- sharingEnabled,
- );
-
- workspaceCacheService.getOrRecompute.mockImplementation(((
- _workspaceId: string,
- keys: string[],
- ) =>
- Promise.resolve(
- !keys.includes('workflowAutomatedTriggerMaps')
- ? {
- flatObjectMetadataMaps: { byUniversalIdentifier: {} },
- featureFlagsMap: {},
- flatApplicationMaps: {
- byId: {},
- idByUniversalIdentifier: {},
- },
- flatRoleMaps: { byUniversalIdentifier: {} },
- rolesPermissions: {},
- flatRowLevelPermissionPredicateMaps:
- createEmptyFlatEntityMaps(),
- flatRowLevelPermissionPredicateGroupMaps:
- createEmptyFlatEntityMaps(),
- flatFieldMetadataMaps: createEmptyFlatEntityMaps(),
- }
- : {
- workflowAutomatedTriggerMaps: {
- byWorkflowId: {
- [workflowId]: {
- type: AutomatedTriggerType.DATABASE_EVENT,
- coreWorkflowVersionId: `core-version-${workflowId}`,
- workspaceWorkflowVersionId: `workspace-version-${workflowId}`,
- workflowId,
- settings: { eventName: databaseEventName },
- },
+ it('should not trigger workflow for a system object and no resolved role', async () => {
+ const systemPayload: WorkspaceEventBatch<ObjectRecordUpdateEvent> = {
+ ...mockPayload,
+ objectMetadata: createMockFlatObjectMetadata({
+ readability: MetadataReadability.SYSTEM,
+ }),
+ };
+
+ workspaceCacheService.getOrRecompute.mockImplementation(((
+ _workspaceId: string,
+ keys: string[],
+ ) =>
+ Promise.resolve(
+ !keys.includes('workflowAutomatedTriggerMaps')
+ ? {
+ flatObjectMetadataMaps: { byUniversalIdentifier: {} },
+ featureFlagsMap: {},
+ flatApplicationMaps: {
+ byId: {},
+ idByUniversalIdentifier: {},
+ },
+ flatRoleMaps: { byUniversalIdentifier: {} },
+ rolesPermissions: {},
+ flatRowLevelPermissionPredicateMaps:
+ createEmptyFlatEntityMaps(),
+ flatRowLevelPermissionPredicateGroupMaps:
+ createEmptyFlatEntityMaps(),
+ flatFieldMetadataMaps: createEmptyFlatEntityMaps(),
+ }
+ : {
+ workflowAutomatedTriggerMaps: {
+ byWorkflowId: {
+ [workflowId]: {
+ type: AutomatedTriggerType.DATABASE_EVENT,
+ coreWorkflowVersionId: `core-version-${workflowId}`,
+ workspaceWorkflowVersionId: `workspace-version-${workflowId}`,
+ workflowId,
+ settings: { eventName: databaseEventName },
},
},
},
- )) as never);
+ },
+ )) as never);
- await listener.handleObjectRecordUpdateEvent(systemPayload);
+ await listener.handleObjectRecordUpdateEvent(systemPayload);
- expect(
- recordShareStorageService.findByRecordIds,
- ).not.toHaveBeenCalled();
- expect(messageQueueService.add).not.toHaveBeenCalled();
- },
- );
+ expect(recordShareStorageService.findByRecordIds).not.toHaveBeenCalled();
+ expect(messageQueueService.add).not.toHaveBeenCalled();
+ });
it('should handle multiple events in a batch', async () => {
const batchPayload: WorkspaceEventBatch<any> = {
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.ts
index a9195ba12b3..2b691b80884 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
@@ -672,8 +672,6 @@ describe('createShareWithObjectRecordsPermissions', () => {
'PRIVATE creates with the flag off and conversation readability %s',
(conversationReadability) => {
let conversationObjectMetadata: ObjectMetadataEntity;
- const isLegacyOpen =
- conversationReadability === MetadataReadability.SYSTEM;
beforeAll(async () => {
conversationObjectMetadata =
@@ -703,7 +701,7 @@ describe('createShareWithObjectRecordsPermissions', () => {
);
});
- it('requires an explicit API sharing target after activation', async () => {
+ it('requires an explicit API sharing target regardless of rollout state', async () => {
const recordId = trackRecordId();
const response = await makeGraphqlApiRequestWithApiKey(
createOneOperation({
@@ -711,30 +709,13 @@ describe('createShareWithObjectRecordsPermissions', () => {
}),
);
- if (isLegacyOpen) {
- expect(response.body.errors).toBeUndefined();
- expect(response.body.data.createShareWithTestObject.id).toBe(
- recordId,
- );
- expect(await findRecordShares(recordId)).toEqual(
- expect.arrayContaining([
- expect.objectContaining({
- principalType: RecordSharePrincipalType.EVERYONE,
- accessLevel: RecordShareAccessLevel.FULL,
- rowCause: RecordShareRowCause.APPLICATION,
- sourceId: objectMetadataId,
- }),
- ]),
- );
- } else {
- expect(response.body.errors[0].message).toBe(
- SHARE_WITH_REQUIRED_MESSAGE,
- );
- expect(await findRecordShares(recordId)).toEqual([]);
- }
+ expect(response.body.errors[0].message).toBe(
+ SHARE_WITH_REQUIRED_MESSAGE,
+ );
+ expect(await findRecordShares(recordId)).toEqual([]);
});
- it('keeps new member records private after activation', async () => {
+ it('keeps new member records private regardless of rollout state', async () => {
const recordId = trackRecordId();
const response = await makeGraphqlApiRequest(
createOneOperation({
@@ -750,7 +731,7 @@ describe('createShareWithObjectRecordsPermissions', () => {
),
]),
);
- expect(shares).toHaveLength(isLegacyOpen ? 2 : 1);
+ expect(shares).toHaveLength(1);
const otherMemberResponse = await makeGraphqlApiRequestWithMemberRole(
findManyOperation(recordId),
@@ -758,7 +739,7 @@ describe('createShareWithObjectRecordsPermissions', () => {
expect(otherMemberResponse.body.errors).toBeUndefined();
expect(
otherMemberResponse.body.data.shareWithTestObjects.edges,
- ).toHaveLength(isLegacyOpen ? 1 : 0);
+ ).toHaveLength(0);
const ownerResponse = await makeGraphqlApiRequest(
findManyOperation(recordId),
);
diff --git a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-sharing-api.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-sharing-api.integration-spec.ts
index e4225aa9b86..d2047dc428f 100644
--- a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-sharing-api.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-sharing-api.integration-spec.ts
@@ -253,7 +253,7 @@ describe('Generic sharing API on an ordinary private object', () => {
await setFlag(originalFlag);
});
- it('keeps flag-off creates private after activation', async () => {
+ it('keeps creates private independently of the retired sharing flag', async () => {
await setFlag(false);
const recordId = randomUUID();
const created = await makeGraphqlApiRequest(
@@ -278,7 +278,7 @@ describe('Generic sharing API on an ordinary private object', () => {
(await readSettings(APPLE_JANE_ADMIN_ACCESS_TOKEN)).body.data
.recordSharing,
).toMatchObject({
- isEnabled: false,
+ isEnabled: true,
permissions: { canRead: true, canUpdate: true },
shares: [
expect.objectContaining({
@@ -627,13 +627,13 @@ describe('Generic sharing API on an ordinary private object', () => {
}
});
- it('preserves saved grants while the sharing UI is disabled', async () => {
+ it('enforces saved grants independently of the retired sharing flag', async () => {
await grant(RecordShareAccessLevel.READ);
await setFlag(false);
expect((await read()).body.data[OBJECT_PLURAL].edges).toHaveLength(1);
expect(
(await settings(APPLE_JANE_ADMIN_ACCESS_TOKEN)).body.data.recordSharing,
- ).toMatchObject({ isEnabled: false, permissions: { canUpdate: true } });
+ ).toMatchObject({ isEnabled: true, permissions: { canUpdate: true } });
await grant(RecordShareAccessLevel.READ, RecordShareRowCause.APPLICATION);
expect((await read()).body.data[OBJECT_PLURAL].edges).toHaveLength(1);
expect(