The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Let relation filters and selections reach objects shared beyond the role (#29418)
Charles Bochete5fcabcbec4d
diff --git a/packages/twenty-server/src/engine/api/common/common-select-fields/__tests__/common-select-fields-builder.spec.ts b/packages/twenty-server/src/engine/api/common/common-select-fields/__tests__/common-select-fields-builder.spec.tsindex bd99debe68a..d48aad10780 100644--- a/packages/twenty-server/src/engine/api/common/common-select-fields/__tests__/common-select-fields-builder.spec.ts+++ b/packages/twenty-server/src/engine/api/common/common-select-fields/__tests__/common-select-fields-builder.spec.ts@@ -6,6 +6,7 @@ import {} from 'twenty-shared/types';import { CommonSelectFieldsBuilder } from 'src/engine/api/common/common-select-fields/common-select-fields-builder';+import { RecordAccessPolicyService } from 'src/engine/permissions/combine/services/record-access-policy.service';import { MAX_SELECTION_DEPTH } from 'src/engine/api/common/common-select-fields/constants/max-selection-depth.constant';import { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/constant/create-empty-flat-entity-maps.constant';import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';@@ -16,6 +17,23 @@ import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-objectdescribe('CommonSelectFieldsBuilder', () => {let handler: CommonSelectFieldsBuilder;+ const buildFromDepth = (+ args: Omit<+ Parameters<CommonSelectFieldsBuilder['buildFromDepth']>[0],+ 'readableObjectMetadataIds'+ >,+ ) =>+ handler.buildFromDepth({+ ...args,+ readableObjectMetadataIds: new Set(+ Object.entries(args.objectsPermissions)+ .filter(+ ([, objectPermissions]) => objectPermissions.canReadObjectRecords,+ )+ .map(([objectMetadataId]) => objectMetadataId),+ ),+ });+const createMockField = (overrides: Partial<FlatFieldMetadata> & {id: string;@@ -119,7 +137,10 @@ describe('CommonSelectFieldsBuilder', () => {beforeEach(async () => {const module: TestingModule = await Test.createTestingModule({- providers: [CommonSelectFieldsBuilder],+ providers: [+ CommonSelectFieldsBuilder,+ { provide: RecordAccessPolicyService, useValue: {} },+ ],}).compile();handler = module.get<CommonSelectFieldsBuilder>(CommonSelectFieldsBuilder);@@ -212,7 +233,7 @@ describe('CommonSelectFieldsBuilder', () => {it('adds id and expands requested composite fields even when they exceed the default cap', () => {expect(- handler.buildFromDepth({+ buildFromDepth({...buildArgs(),requestedFields: new Set(['name']),maximumDefaultFieldCount: 1,@@ -224,7 +245,7 @@ describe('CommonSelectFieldsBuilder', () => {it('rejects unknown and unreadable requested fields', () => {expect(() =>- handler.buildFromDepth({+ buildFromDepth({...buildArgs(),requestedFields: new Set(['unknown', 'salary']),}),@@ -241,7 +262,7 @@ describe('CommonSelectFieldsBuilder', () => {it('rejects an explicitly empty selection', () => {expect(() =>- handler.buildFromDepth({ ...buildArgs(), requestedFields: new Set() }),+ buildFromDepth({ ...buildArgs(), requestedFields: new Set() }),).toThrow('Requested fields cannot be empty');});@@ -249,7 +270,7 @@ describe('CommonSelectFieldsBuilder', () => {'rejects one-to-many and morph relations at depth %s',(depth) => {expect(() =>- handler.buildFromDepth({+ buildFromDepth({...buildArgs(),depth,requestedFields: new Set(['activities', 'attachments']),@@ -260,7 +281,7 @@ describe('CommonSelectFieldsBuilder', () => {it('returns the foreign key of a requested many-to-one relation at depth zero', () => {expect(- handler.buildFromDepth({+ buildFromDepth({...buildArgs(),requestedFields: new Set(['company']),}).selectedFields,@@ -269,7 +290,7 @@ describe('CommonSelectFieldsBuilder', () => {it('expands only requested root relations without restricting related fields', () => {expect(- handler.buildFromDepth({+ buildFromDepth({...buildArgs(),depth: 1,requestedFields: new Set(['activities', 'attachments']),@@ -283,12 +304,12 @@ describe('CommonSelectFieldsBuilder', () => {it('caps defaults after permission filtering and excludes depth-zero one-to-many relations', () => {expect(- handler.buildFromDepth({ ...buildArgs(), maximumDefaultFieldCount: 2 }),+ buildFromDepth({ ...buildArgs(), maximumDefaultFieldCount: 2 }),).toEqual({selectedFields: { id: true, name: { firstName: true, lastName: true } },});expect(- handler.buildFromDepth({+ buildFromDepth({...buildArgs(),maximumDefaultFieldCount: 4,}).selectedFields,@@ -301,7 +322,7 @@ describe('CommonSelectFieldsBuilder', () => {it('counts expanded one-to-many and morph relations toward the default cap', () => {expect(- handler.buildFromDepth({+ buildFromDepth({...buildArgs(),depth: 1,maximumDefaultFieldCount: 4,@@ -337,7 +358,7 @@ describe('CommonSelectFieldsBuilder', () => {objectsPermissions: createObjectsPermissions(['wide']),depth: 0 as const,};- const capped = handler.buildFromDepth({+ const capped = buildFromDepth({...args,maximumDefaultFieldCount: 200,});@@ -345,12 +366,12 @@ describe('CommonSelectFieldsBuilder', () => {Math.min(fieldCount, 200),);expect(capped.selectedFields.id).toBe(true);- expect(- Object.keys(handler.buildFromDepth(args).selectedFields),- ).toHaveLength(fieldCount);+ expect(Object.keys(buildFromDepth(args).selectedFields)).toHaveLength(+ fieldCount,+ );expect(Object.keys(- handler.buildFromDepth({+ buildFromDepth({...args,maximumDefaultFieldCount: 200,requestedFields: new Set(fields.map((field) => field.name)),@@ -390,7 +411,7 @@ describe('CommonSelectFieldsBuilder', () => {personObject,]);- const { selectedFields: result } = handler.buildFromDepth({+ const { selectedFields: result } = buildFromDepth({objectsPermissions: createObjectsPermissions(['person-id']),flatObjectMetadataMaps,flatFieldMetadataMaps,@@ -450,7 +471,7 @@ describe('CommonSelectFieldsBuilder', () => {companyObject,]);- const { selectedFields: result } = handler.buildFromDepth({+ const { selectedFields: result } = buildFromDepth({objectsPermissions: createObjectsPermissions(['person-id','company-id',@@ -524,7 +545,7 @@ describe('CommonSelectFieldsBuilder', () => {'field-3': { canRead: false, canUpdate: false },};- const { selectedFields: result } = handler.buildFromDepth({+ const { selectedFields: result } = buildFromDepth({objectsPermissions,flatObjectMetadataMaps,flatFieldMetadataMaps,@@ -587,7 +608,7 @@ describe('CommonSelectFieldsBuilder', () => {'field-2': { canRead: false, canUpdate: false },};- const { selectedFields: result } = handler.buildFromDepth({+ const { selectedFields: result } = buildFromDepth({objectsPermissions,flatObjectMetadataMaps,flatFieldMetadataMaps,@@ -648,7 +669,7 @@ describe('CommonSelectFieldsBuilder', () => {'field-1': { canRead: false, canUpdate: false },};- const { selectedFields: result } = handler.buildFromDepth({+ const { selectedFields: result } = buildFromDepth({objectsPermissions,flatObjectMetadataMaps,flatFieldMetadataMaps,@@ -715,7 +736,7 @@ describe('CommonSelectFieldsBuilder', () => {companyObject,]);- const { selectedFields: result } = handler.buildFromDepth({+ const { selectedFields: result } = buildFromDepth({objectsPermissions: createObjectsPermissions(['person-id','company-id',@@ -775,7 +796,7 @@ describe('CommonSelectFieldsBuilder', () => {personObject,]);- const { selectedFields: result } = handler.buildFromDepth({+ const { selectedFields: result } = buildFromDepth({objectsPermissions: createObjectsPermissions(['person-id']),flatObjectMetadataMaps,flatFieldMetadataMaps,@@ -854,7 +875,7 @@ describe('CommonSelectFieldsBuilder', () => {companyObject,]);- const { selectedFields: result } = handler.buildFromDepth({+ const { selectedFields: result } = buildFromDepth({objectsPermissions: createObjectsPermissions(['noteTarget-id','note-id',@@ -954,7 +975,7 @@ describe('CommonSelectFieldsBuilder', () => {personObject,]);- const { selectedFields: result } = handler.buildFromDepth({+ const { selectedFields: result } = buildFromDepth({objectsPermissions: createObjectsPermissions(['company-id','junction-id',diff --git a/packages/twenty-server/src/engine/api/common/common-select-fields/common-select-fields-builder.ts b/packages/twenty-server/src/engine/api/common/common-select-fields/common-select-fields-builder.tsindex dcc331ba90b..c74488fa69e 100644--- a/packages/twenty-server/src/engine/api/common/common-select-fields/common-select-fields-builder.ts+++ b/packages/twenty-server/src/engine/api/common/common-select-fields/common-select-fields-builder.ts@@ -17,12 +17,61 @@ import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/typimport { findManyFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-many-flat-entity-by-id-in-flat-entity-maps-or-throw.util';import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';+import { RecordAccessPolicyService } from 'src/engine/permissions/combine/services/record-access-policy.service';+import { type PermissionsPrincipal } from 'src/engine/permissions/principal/types/permissions-principal.type';@Injectable()export class CommonSelectFieldsBuilder {- buildFromDepth = ({+ constructor(+ private readonly recordAccessPolicyService: RecordAccessPolicyService,+ ) {}++ // Relations to objects the ORM would refuse are left out, so they cannot fail the whole query+ async findReadableObjectMetadataIds({+ principal,objectsPermissions,flatObjectMetadataMaps,+ }: {+ principal: PermissionsPrincipal | undefined;+ objectsPermissions: ObjectsPermissions;+ flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;+ }): Promise<Set<string>> {+ const flatObjectMetadatas = Object.values(+ flatObjectMetadataMaps.byUniversalIdentifier,+ ).filter(isDefined);++ if (!isDefined(principal)) {+ return new Set(+ flatObjectMetadatas+ .filter(+ (flatObjectMetadata) =>+ objectsPermissions[flatObjectMetadata.id]?.canReadObjectRecords,+ )+ .map((flatObjectMetadata) => flatObjectMetadata.id),+ );+ }++ const readableFlags = await Promise.all(+ flatObjectMetadatas.map((flatObjectMetadata) =>+ this.recordAccessPolicyService.hasAccessToSomeRecords({+ principal,+ flatObjectMetadata,+ operationType: 'select',+ }),+ ),+ );++ return new Set(+ flatObjectMetadatas+ .filter((_, index) => readableFlags[index])+ .map((flatObjectMetadata) => flatObjectMetadata.id),+ );+ }++ buildFromDepth({+ objectsPermissions,+ readableObjectMetadataIds,+ flatObjectMetadataMaps,flatFieldMetadataMaps,flatObjectMetadata,depth,@@ -32,6 +81,7 @@ export class CommonSelectFieldsBuilder {maximumDefaultFieldCount,}: {objectsPermissions: ObjectsPermissions;+ readableObjectMetadataIds: ReadonlySet<string>;flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;flatObjectMetadata: FlatObjectMetadata;@@ -42,7 +92,7 @@ export class CommonSelectFieldsBuilder {maximumDefaultFieldCount?: number;}): {selectedFields: CommonSelectedFields;- } => {+ } {const restrictedFields =objectsPermissions[flatObjectMetadata.id].restrictedFields;@@ -86,6 +136,7 @@ export class CommonSelectFieldsBuilder {flatFieldMetadataMaps,flatObjectMetadata,objectsPermissions,+ readableObjectMetadataIds,depth,onlyUseLabelIdentifierFieldsInRelations,recurseIntoJunctionTableRelations,@@ -104,7 +155,7 @@ export class CommonSelectFieldsBuilder {...relationsSelectFields,},};- };+ }private validateRequestedFields({requestedFields,diff --git a/packages/twenty-server/src/engine/api/common/common-select-fields/utils/__tests__/build-relation-selection-from-depth.util.spec.ts b/packages/twenty-server/src/engine/api/common/common-select-fields/utils/__tests__/build-relation-selection-from-depth.util.spec.tsindex 939d2d5c3f1..d975c4fb2bd 100644--- a/packages/twenty-server/src/engine/api/common/common-select-fields/utils/__tests__/build-relation-selection-from-depth.util.spec.ts+++ b/packages/twenty-server/src/engine/api/common/common-select-fields/utils/__tests__/build-relation-selection-from-depth.util.spec.ts@@ -173,11 +173,9 @@ const buildArgs = (opportunity.fieldIds.includes(field.id),),objectsPermissions: Object.fromEntries(- objects.map((object) => [- object.id,- { canReadObjectRecords: true, restrictedFields: {} },- ]),+ objects.map((object) => [object.id, { restrictedFields: {} }]),),+ readableObjectMetadataIds: new Set(objects.map((object) => object.id)),depth,};};diff --git a/packages/twenty-server/src/engine/api/common/common-select-fields/utils/build-relation-selection-from-depth.util.ts b/packages/twenty-server/src/engine/api/common/common-select-fields/utils/build-relation-selection-from-depth.util.tsindex 08052932d12..031e7587e3f 100644--- a/packages/twenty-server/src/engine/api/common/common-select-fields/utils/build-relation-selection-from-depth.util.ts+++ b/packages/twenty-server/src/engine/api/common/common-select-fields/utils/build-relation-selection-from-depth.util.ts@@ -35,7 +35,7 @@ type RelationsSelectFlatFieldMetadata = FieldSelectionFlatFieldMetadata &type RelationsSelectObjectsPermissions = Record<string,- Pick<ObjectPermissions, 'canReadObjectRecords' | 'restrictedFields'>+ Pick<ObjectPermissions, 'restrictedFields'>>;export const buildRelationSelectionFromDepth = ({@@ -44,6 +44,7 @@ export const buildRelationSelectionFromDepth = ({flatObjectMetadata,flatFields,objectsPermissions,+ readableObjectMetadataIds,depth,onlyUseLabelIdentifierFieldsInRelations = false,currentDepthLevelIsAJunctionTable = false,@@ -54,6 +55,7 @@ export const buildRelationSelectionFromDepth = ({flatObjectMetadata: RelationsSelectFlatObjectMetadata;flatFields: readonly RelationsSelectFlatFieldMetadata[];objectsPermissions: RelationsSelectObjectsPermissions;+ readableObjectMetadataIds: ReadonlySet<string>;depth: SelectionDepth | undefined;onlyUseLabelIdentifierFieldsInRelations?: boolean;currentDepthLevelIsAJunctionTable?: boolean;@@ -98,8 +100,12 @@ export const buildRelationSelectionFromDepth = ({flatEntityId: flatField.relationTargetObjectMetadataId,});+ const relationTargetObjectPermissions =+ objectsPermissions[relationTargetObjectMetadata.id];+if (- !objectsPermissions[relationTargetObjectMetadata.id]?.canReadObjectRecords+ !readableObjectMetadataIds.has(relationTargetObjectMetadata.id) ||+ !isDefined(relationTargetObjectPermissions)) {continue;}@@ -114,8 +120,7 @@ export const buildRelationSelectionFromDepth = ({});const relationFieldSelectFields = buildFieldSelection({- restrictedFields:- objectsPermissions[relationTargetObjectMetadata.id].restrictedFields,+ restrictedFields: relationTargetObjectPermissions.restrictedFields,flatObjectMetadata: relationTargetObjectMetadata,flatFields: relationFlatFields,onlyUseLabelIdentifierFieldsInRelations,@@ -142,6 +147,7 @@ export const buildRelationSelectionFromDepth = ({flatObjectMetadata: relationTargetObjectMetadata,flatFields: relationFlatFields,objectsPermissions,+ readableObjectMetadataIds,depth: 1,onlyUseLabelIdentifierFieldsInRelations,currentDepthLevelIsAJunctionTable: nextLevelIsAJunctionTable,diff --git a/packages/twenty-server/src/engine/api/common/core-common-api.module.ts b/packages/twenty-server/src/engine/api/common/core-common-api.module.tsindex ab631c129d6..99ad9bd8177 100644--- a/packages/twenty-server/src/engine/api/common/core-common-api.module.ts+++ b/packages/twenty-server/src/engine/api/common/core-common-api.module.ts@@ -1,5 +1,7 @@import { Module } from '@nestjs/common';+import { CommonSelectFieldsBuilder } from 'src/engine/api/common/common-select-fields/common-select-fields-builder';+import { CommonArgsProcessors } from 'src/engine/api/common/common-args-processors/common-args-processors';import { GroupByArgProcessorService } from 'src/engine/api/common/common-args-processors/group-by-arg-processor/group-by-arg-processor.service';import { CommonRecordVisibilityModule } from 'src/engine/api/common/common-record-visibility/common-record-visibility.module';@@ -39,12 +41,17 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cacheWorkspaceCacheModule,],providers: [+ CommonSelectFieldsBuilder,ProcessNestedRelationsHelper,...CommonArgsProcessors,...CommonQueryRunners,CommonResultGettersService,GroupByWithRecordsService,],- exports: [...CommonQueryRunners, GroupByArgProcessorService],+ exports: [+ ...CommonQueryRunners,+ CommonSelectFieldsBuilder,+ GroupByArgProcessorService,+ ],})export class CoreCommonApiModule {}diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-filter/graphql-query-filter-field.parser.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-filter/graphql-query-filter-field.parser.tsindex 6074ed3db45..753ce7a8efd 100644--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-filter/graphql-query-filter-field.parser.ts+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-filter/graphql-query-filter-field.parser.ts@@ -20,7 +20,6 @@ import {GraphqlQueryRunnerExceptionCode,} from 'src/engine/api/graphql/graphql-query-runner/errors/graphql-query-runner.exception';import { addRelationJoinAliasToQueryBuilder } from 'src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/utils/add-relation-join-alias.util';-import { isOperationGrantedBeyondRole } from 'src/engine/permissions/record-share/utils/is-operation-granted-beyond-role.util';import { assertFieldIsReadableOrThrow } from 'src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/utils/assert-field-is-readable-or-throw.util';import { resolveFilterKeyFieldMetadata } from 'src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/utils/resolve-filter-key-field-metadata.util';import { assertArrayOperatorValueIsNonEmptyArray } from 'src/engine/api/graphql/graphql-query-runner/utils/assert-array-operator-value-is-non-empty-array.util';@@ -34,11 +33,6 @@ import { buildFieldMapsFromFlatObjectMetadata } from 'src/engine/metadata-moduleimport { findFlatFieldMetadataByName } from 'src/engine/metadata-modules/flat-field-metadata/utils/find-flat-field-metadata-by-name.util';import { isMorphOrRelationFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-morph-or-relation-flat-field-metadata.util';import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';-import {- PermissionsException,- PermissionsExceptionCode,- PermissionsExceptionMessage,-} from 'src/engine/permissions/permissions.exception';import { GraphqlQueryFilterConditionParser } from './graphql-query-filter-condition.parser';import { type WorkspaceSelectQueryBuilder } from 'src/engine/twenty-orm/query-builder/workspace-select-query-builder';@@ -109,28 +103,6 @@ export class GraphqlQueryFilterFieldParser {throw new Error(`Field metadata not found for field: ${key}`);}- const objectPermissions =- outerQueryBuilder.objectRecordsPermissions[this.flatObjectMetadata.id];-- // Filtering the queried object itself stays possible on records shared by- // name, while a filter through a relation still needs the object readable- if (- objectPermissions?.canReadObjectRecords === false &&- !(- this.depth === 0 &&- isOperationGrantedBeyondRole({- flatObjectMetadata: this.flatObjectMetadata,- featureFlagsMap: outerQueryBuilder.featureFlagsMap,- operationType: 'select',- })- )- ) {- throw new PermissionsException(- PermissionsExceptionMessage.PERMISSION_DENIED,- PermissionsExceptionCode.PERMISSION_DENIED,- );- }-assertFieldIsReadableOrThrow({objectsPermissions: outerQueryBuilder.objectRecordsPermissions,flatObjectMetadata: this.flatObjectMetadata,diff --git a/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-base.handler.ts b/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-base.handler.tsindex 33646b8ae2a..c99cf330634 100644--- a/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-base.handler.ts+++ b/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-base.handler.ts@@ -40,6 +40,7 @@ import { WorkspaceCacheStorageService } from 'src/engine/workspace-cache-storageimport { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';import { isApplicationAuthContext } from 'src/engine/core-modules/auth/guards/is-application-auth-context.guard';import { type RoleIdsBySource } from 'src/engine/permissions/principal/types/role-permission-config.type';+import { buildPermissionsPrincipal } from 'src/engine/permissions/principal/utils/build-permissions-principal.util';import { getObjectsPermissionsFromRolePermissionConfig } from 'src/engine/permissions/role/utils/get-objects-permissions-from-role-permission-config.util';export interface PageInfo {@@ -85,7 +86,7 @@ export abstract class RestApiBaseHandler {FormatResult | { data: FormatResult[] } | CommonGroupByOutputItem[]>;- private getObjectsPermissions = async (authContext: WorkspaceAuthContext) => {+ private getPermissionsContext = async (authContext: WorkspaceAuthContext) => {let intersectionOf: RoleIdsBySource;if (isApiKeyAuthContext(authContext)) {@@ -139,10 +140,17 @@ export abstract class RestApiBaseHandler {],);+ const rolePermissionConfig = { intersectionOf };+return {+ principal: buildPermissionsPrincipal({+ workspaceId: authContext.workspace.id,+ rolePermissionConfig,+ authContext,+ }),objectsPermissions: getObjectsPermissionsFromRolePermissionConfig({rolesPermissions,- rolePermissionConfig: { intersectionOf },+ rolePermissionConfig,flatObjectMetadataMaps,flatFieldMetadataMaps,flatApplicationMaps,@@ -163,11 +171,18 @@ export abstract class RestApiBaseHandler {flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;}): Promise<CommonSelectedFields> {- const { objectsPermissions } =- await this.getObjectsPermissions(authContext);+ const { principal, objectsPermissions } =+ await this.getPermissionsContext(authContext);const { selectedFields } = this.commonSelectFieldsBuilder.buildFromDepth({objectsPermissions,+ readableObjectMetadataIds:+ await this.findRelationReadableObjectMetadataIds({+ principal,+ objectsPermissions,+ flatObjectMetadataMaps,+ depth,+ }),flatObjectMetadataMaps,flatFieldMetadataMaps,flatObjectMetadata,@@ -194,11 +209,18 @@ export abstract class RestApiBaseHandler {}): Promise<{selectedFields: CommonSelectedFields;}> {- const { objectsPermissions } =- await this.getObjectsPermissions(authContext);+ const { principal, objectsPermissions } =+ await this.getPermissionsContext(authContext);return this.commonSelectFieldsBuilder.buildFromDepth({objectsPermissions,+ readableObjectMetadataIds:+ await this.findRelationReadableObjectMetadataIds({+ principal,+ objectsPermissions,+ flatObjectMetadataMaps,+ depth,+ }),flatObjectMetadataMaps,flatFieldMetadataMaps,flatObjectMetadata,@@ -208,6 +230,27 @@ export abstract class RestApiBaseHandler {});}+ private async findRelationReadableObjectMetadataIds({+ principal,+ objectsPermissions,+ flatObjectMetadataMaps,+ depth,+ }: Parameters<+ CommonSelectFieldsBuilder['findReadableObjectMetadataIds']+ >[0] & {+ depth: SelectionDepth | undefined;+ }): Promise<ReadonlySet<string>> {+ if (!isDefined(depth) || depth === 0) {+ return new Set();+ }++ return this.commonSelectFieldsBuilder.findReadableObjectMetadataIds({+ principal,+ objectsPermissions,+ flatObjectMetadataMaps,+ });+ }+async buildCommonOptions(request: AuthenticatedRequest) {const { object: parsedObject } = parseCorePath(request);diff --git a/packages/twenty-server/src/engine/api/rest/core/rest-api-core.module.ts b/packages/twenty-server/src/engine/api/rest/core/rest-api-core.module.tsindex 04d43824a92..c90f98b1052 100644--- a/packages/twenty-server/src/engine/api/rest/core/rest-api-core.module.ts+++ b/packages/twenty-server/src/engine/api/rest/core/rest-api-core.module.ts@@ -17,7 +17,6 @@ import { RestApiRestoreManyHandler } from 'src/engine/api/rest/core/handlers/resimport { RestApiRestoreOneHandler } from 'src/engine/api/rest/core/handlers/rest-api-restore-one.handler';import { RestApiUpdateManyHandler } from 'src/engine/api/rest/core/handlers/rest-api-update-many.handler';import { RestApiUpdateOneHandler } from 'src/engine/api/rest/core/handlers/rest-api-update-one.handler';-import { CommonSelectFieldsBuilder } from 'src/engine/api/common/common-select-fields/common-select-fields-builder';import { RestApiCoreService } from 'src/engine/api/rest/core/services/rest-api-core.service';import { ActorModule } from 'src/engine/core-modules/actor/actor.module';import { ApiKeyModule } from 'src/engine/core-modules/api-key/api-key.module';@@ -62,10 +61,6 @@ const restApiCoreResolvers = [WorkspaceCacheModule,],controllers: [RestApiCoreController],- providers: [- RestApiCoreService,- ...restApiCoreResolvers,- CommonSelectFieldsBuilder,- ],+ providers: [RestApiCoreService, ...restApiCoreResolvers],})export class RestApiCoreModule {}diff --git a/packages/twenty-server/src/engine/core-modules/record-crud/services/common-api-context-builder.service.ts b/packages/twenty-server/src/engine/core-modules/record-crud/services/common-api-context-builder.service.tsindex afe1eed8c64..4c32e22a4a5 100644--- a/packages/twenty-server/src/engine/core-modules/record-crud/services/common-api-context-builder.service.ts+++ b/packages/twenty-server/src/engine/core-modules/record-crud/services/common-api-context-builder.service.ts@@ -18,6 +18,8 @@ import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';import { buildObjectIdByNameMaps } from 'src/engine/metadata-modules/flat-object-metadata/utils/build-object-id-by-name-maps.util';+import { type PermissionsPrincipal } from 'src/engine/permissions/principal/types/permissions-principal.type';+import { buildPermissionsPrincipal } from 'src/engine/permissions/principal/utils/build-permissions-principal.util';import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';import { resolveRolePermissionConfig } from 'src/engine/permissions/principal/utils/resolve-role-permission-config.util';import { getObjectsPermissionsFromRolePermissionConfig } from 'src/engine/permissions/role/utils/get-objects-permissions-from-role-permission-config.util';@@ -30,6 +32,7 @@ export type CommonApiContext = {flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;objectsPermissions: ObjectsPermissions;+ principal: PermissionsPrincipal | undefined;};@Injectable()@@ -93,7 +96,7 @@ export class CommonApiContextBuilderService {);}- const objectsPermissions = await this.getObjectsPermissions({+ const { objectsPermissions, principal } = await this.getPermissionsContext({authContext,rolePermissionConfig,});@@ -125,16 +128,20 @@ export class CommonApiContextBuilderService {flatObjectMetadataMaps,flatFieldMetadataMaps,objectsPermissions,+ principal,};}- private async getObjectsPermissions({+ private async getPermissionsContext({authContext,rolePermissionConfig,}: {authContext: WorkspaceAuthContext;rolePermissionConfig?: RolePermissionConfig;- }): Promise<ObjectsPermissions> {+ }): Promise<{+ objectsPermissions: ObjectsPermissions;+ principal: PermissionsPrincipal | undefined;+ }> {const {rolesPermissions,flatObjectMetadataMaps,@@ -172,12 +179,19 @@ export class CommonApiContextBuilderService {);}- return getObjectsPermissionsFromRolePermissionConfig({- rolesPermissions,- rolePermissionConfig: resolvedRolePermissionConfig,- flatObjectMetadataMaps,- flatFieldMetadataMaps,- flatApplicationMaps,- });+ return {+ objectsPermissions: getObjectsPermissionsFromRolePermissionConfig({+ rolesPermissions,+ rolePermissionConfig: resolvedRolePermissionConfig,+ flatObjectMetadataMaps,+ flatFieldMetadataMaps,+ flatApplicationMaps,+ }),+ principal: buildPermissionsPrincipal({+ workspaceId: authContext.workspace.id,+ rolePermissionConfig: resolvedRolePermissionConfig,+ authContext,+ }),+ };}}diff --git a/packages/twenty-server/src/engine/core-modules/record-crud/services/find-records.service.ts b/packages/twenty-server/src/engine/core-modules/record-crud/services/find-records.service.tsindex 9d2855754a5..d5c9bc9abf2 100644--- a/packages/twenty-server/src/engine/core-modules/record-crud/services/find-records.service.ts+++ b/packages/twenty-server/src/engine/core-modules/record-crud/services/find-records.service.ts@@ -10,6 +10,7 @@ import { isNonEmptyArray } from '@sniptt/guards';import { CommonFindManyQueryRunnerService } from 'src/engine/api/common/common-query-runners/common-find-many-query-runner.service';import { DEFAULT_ID_ORDER_BY_TIEBREAKER } from 'src/engine/api/common/constants/default-id-order-by-tiebreaker.constant';import { buildRelationSelectionFromDepth } from 'src/engine/api/common/common-select-fields/utils/build-relation-selection-from-depth.util';+import { CommonSelectFieldsBuilder } from 'src/engine/api/common/common-select-fields/common-select-fields-builder';import { CommonApiContextBuilderService } from 'src/engine/core-modules/record-crud/services/common-api-context-builder.service';import { type FindRecordsParams } from 'src/engine/core-modules/record-crud/types/find-records-params.type';import { type FindRecordsResult } from 'src/engine/core-modules/record-crud/types/find-records-result.type';@@ -25,6 +26,7 @@ export class FindRecordsService {constructor(private readonly commonFindManyRunner: CommonFindManyQueryRunnerService,private readonly commonApiContextBuilder: CommonApiContextBuilderService,+ private readonly commonSelectFieldsBuilder: CommonSelectFieldsBuilder,) {}async execute(@@ -58,6 +60,7 @@ export class FindRecordsService {flatObjectMetadataMaps,flatFieldMetadataMaps,objectsPermissions,+ principal,} = await this.commonApiContextBuilder.build({authContext,objectName,@@ -85,6 +88,10 @@ export class FindRecordsService {flatFieldMetadataMaps,flatObjectMetadata,objectsPermissions,+ readableObjectMetadataIds:+ await this.commonSelectFieldsBuilder.findReadableObjectMetadataIds(+ { principal, objectsPermissions, flatObjectMetadataMaps },+ ),depth: 1,onlyUseLabelIdentifierFieldsInRelations: true,}),diff --git a/packages/twenty-server/src/engine/core-modules/record-crud/utils/__tests__/build-effective-selected-fields.util.spec.ts b/packages/twenty-server/src/engine/core-modules/record-crud/utils/__tests__/build-effective-selected-fields.util.spec.tsindex 1725eced815..ea4177e3b36 100644--- a/packages/twenty-server/src/engine/core-modules/record-crud/utils/__tests__/build-effective-selected-fields.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/record-crud/utils/__tests__/build-effective-selected-fields.util.spec.ts@@ -437,6 +437,13 @@ describe('buildEffectiveSelectedFields', () => {flatFieldMetadataMaps: relationFieldMaps,flatObjectMetadata: investorLeadObjectMetadata,objectsPermissions,+ readableObjectMetadataIds: new Set(+ Object.entries(objectsPermissions)+ .filter(+ ([, objectPermissions]) => objectPermissions.canReadObjectRecords,+ )+ .map(([objectMetadataId]) => objectMetadataId),+ ),depth: 1,onlyUseLabelIdentifierFieldsInRelations: true,});diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/providers/database-tool.provider.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/providers/database-tool.provider.tsindex 22daf564cdc..a79be34c0ee 100644--- a/packages/twenty-server/src/engine/core-modules/tool-provider/providers/database-tool.provider.ts+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/providers/database-tool.provider.ts@@ -31,9 +31,8 @@ import { type ToolOutput } from 'src/engine/core-modules/tool/types/tool-output.import { getDatabaseCrudToolFlatObjects } from 'src/engine/metadata-modules/ai/ai-agent/utils/get-database-crud-tool-flat-objects.util';import { type FlatObjectPermission } from 'src/engine/metadata-modules/flat-object-permission/types/flat-object-permission.type';import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';-import { isUserAuthContext } from 'src/engine/core-modules/auth/guards/is-user-auth-context.guard';import { RecordAccessPolicyService } from 'src/engine/permissions/combine/services/record-access-policy.service';-import { type PermissionsPrincipal } from 'src/engine/permissions/principal/types/permissions-principal.type';+import { buildPermissionsPrincipal } from 'src/engine/permissions/principal/utils/build-permissions-principal.util';import { type OperationType } from 'src/engine/permissions/role/utils/validate-operation-is-permitted-or-throw.util';import { getObjectsPermissionsFromRolePermissionConfig } from 'src/engine/permissions/role/utils/get-objects-permissions-from-role-permission-config.util';import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';@@ -103,7 +102,11 @@ export class DatabaseToolProvider implements ToolProvider {return descriptors;}- const principal = buildToolPermissionsPrincipal(context);+ const principal = buildPermissionsPrincipal({+ workspaceId: context.workspaceId,+ rolePermissionConfig: context.rolePermissionConfig,+ authContext: context.authContext,+ });const { explicitObjectGrantsRoleId } = context;const requireExplicitObjectGrants = isDefined(explicitObjectGrantsRoleId);@@ -576,25 +579,3 @@ export class DatabaseToolProvider implements ToolProvider {);}}--const buildToolPermissionsPrincipal = ({- workspaceId,- rolePermissionConfig,- authContext,-}: Pick<- ToolProviderContext,- 'workspaceId' | 'rolePermissionConfig' | 'authContext'->): PermissionsPrincipal | undefined => {- if (!('intersectionOf' in rolePermissionConfig)) {- return undefined;- }-- return {- workspaceId,- intersectionOf: rolePermissionConfig.intersectionOf,- workspaceMember:- isDefined(authContext) && isUserAuthContext(authContext)- ? authContext.workspaceMember- : undefined,- };-};diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/build-permissions-principal.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/build-permissions-principal.util.tsnew file mode 100644index 00000000000..10cf97ab954--- /dev/null+++ b/packages/twenty-server/src/engine/permissions/principal/utils/build-permissions-principal.util.ts@@ -0,0 +1,32 @@+/* @license Enterprise */++import { isDefined } from 'twenty-shared/utils';++import { isUserAuthContext } from 'src/engine/core-modules/auth/guards/is-user-auth-context.guard';+import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';+import { type PermissionsPrincipal } from 'src/engine/permissions/principal/types/permissions-principal.type';+import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';++// Undefined when the caller bypasses permission checks: there is no system principal+export const buildPermissionsPrincipal = ({+ workspaceId,+ rolePermissionConfig,+ authContext,+}: {+ workspaceId: string;+ rolePermissionConfig: RolePermissionConfig;+ authContext?: WorkspaceAuthContext;+}): PermissionsPrincipal | undefined => {+ if (!('intersectionOf' in rolePermissionConfig)) {+ return undefined;+ }++ return {+ workspaceId,+ intersectionOf: rolePermissionConfig.intersectionOf,+ workspaceMember:+ isDefined(authContext) && isUserAuthContext(authContext)+ ? authContext.workspaceMember+ : undefined,+ };+};diff --git a/packages/twenty-server/src/engine/subscriptions/object-record-event/object-record-event-publisher.ts b/packages/twenty-server/src/engine/subscriptions/object-record-event/object-record-event-publisher.tsindex 5ca8173f278..dc71e1eb0c8 100644--- a/packages/twenty-server/src/engine/subscriptions/object-record-event/object-record-event-publisher.ts+++ b/packages/twenty-server/src/engine/subscriptions/object-record-event/object-record-event-publisher.ts@@ -45,6 +45,9 @@ import {} from 'src/engine/permissions/principal/types/role-permission-config.type';import { computePermissionIntersection } from 'src/engine/permissions/role/utils/compute-permission-intersection.util';import { isRecordMatchingRLSRowLevelPermissionPredicate } from 'src/engine/permissions/rls/utils/is-record-matching-rls-row-level-permission-predicate.util';+import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';+import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';+import { type PermissionsPrincipal } from 'src/engine/permissions/principal/types/permissions-principal.type';import { buildUserRoleIdsBySource } from 'src/engine/permissions/principal/utils/build-user-role-ids-by-source.util';import { getRoleIdsToIntersect } from 'src/engine/permissions/principal/utils/get-role-ids-to-intersect.util';import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';@@ -73,6 +76,7 @@ export class ObjectRecordEventPublisher {private readonly workspaceManyOrAllFlatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,private readonly commonSelectFieldsBuilder: CommonSelectFieldsBuilder,private readonly recordAccessPolicyService: RecordAccessPolicyService,+ private readonly workspaceOrmManager: WorkspaceOrmManager,) {}async publish(@@ -204,16 +208,15 @@ export class ObjectRecordEventPublisher {}),};+ const principal: PermissionsPrincipal = {+ workspaceId: workspaceEventBatch.workspaceId,+ intersectionOf: rolePermissionConfig.intersectionOf,+ workspaceMember: isDefined(subscriberAuthContext.workspaceMemberId)+ ? flatWorkspaceMemberMaps.byId[subscriberAuthContext.workspaceMemberId]+ : undefined,+ };const admittedRecordIds =- await eventRecordAccessGate.resolveAdmittedRecordIds({- workspaceId: workspaceEventBatch.workspaceId,- intersectionOf: rolePermissionConfig.intersectionOf,- workspaceMember: isDefined(subscriberAuthContext.workspaceMemberId)- ? flatWorkspaceMemberMaps.byId[- subscriberAuthContext.workspaceMemberId- ]- : undefined,- });+ await eventRecordAccessGate.resolveAdmittedRecordIds(principal);if (admittedRecordIds.size === 0) {return;@@ -278,6 +281,7 @@ export class ObjectRecordEventPublisher {streamData,workspaceId: workspaceEventBatch.workspaceId,rolePermissionConfig,+ principal,objectsPermissions,});} catch (error) {@@ -308,6 +312,7 @@ export class ObjectRecordEventPublisher {events,workspaceId,rolePermissionConfig,+ principal,objectsPermissions,}: {streamData: EventStreamData;@@ -315,6 +320,7 @@ export class ObjectRecordEventPublisher {events: ObjectRecordEvent[];workspaceId: string;rolePermissionConfig: RolePermissionConfig;+ principal: PermissionsPrincipal;objectsPermissions: ObjectsPermissions;}) {const { flatFieldMetadataMaps, flatObjectMetadataMaps } =@@ -346,6 +352,12 @@ export class ObjectRecordEventPublisher {}const { selectedFields } = this.commonSelectFieldsBuilder.buildFromDepth({+ readableObjectMetadataIds:+ await this.commonSelectFieldsBuilder.findReadableObjectMetadataIds({+ principal: { ...principal, workspaceMember: undefined },+ objectsPermissions,+ flatObjectMetadataMaps,+ }),depth: 1,flatObjectMetadata: objectMetadata,flatObjectMetadataMaps,@@ -364,20 +376,26 @@ export class ObjectRecordEventPublisher {const selectedFieldsResult =commonQueryParser.parseSelectedFields(selectedFields);- await this.processNestedRelationsHelper.processNestedRelations({- flatObjectMetadataMaps,- flatFieldMetadataMaps,- parentObjectMetadataItem: objectMetadata,- parentObjectRecords: allRecords,- authContext: streamData.authContext as unknown as WorkspaceAuthContext,- limit: QUERY_MAX_RECORDS_FROM_RELATION,- rolePermissionConfig,- relations: selectedFieldsResult.relations as Record<- string,- FindOptionsRelations<ObjectLiteral>- >,- selectedFields: selectedFieldsResult.select,- });+ // The ambient context is the writer's, so relations load as the subscriber's roles alone+ await this.workspaceOrmManager.executeInWorkspaceContext(+ () =>+ this.processNestedRelationsHelper.processNestedRelations({+ flatObjectMetadataMaps,+ flatFieldMetadataMaps,+ parentObjectMetadataItem: objectMetadata,+ parentObjectRecords: allRecords,+ authContext:+ streamData.authContext as unknown as WorkspaceAuthContext,+ limit: QUERY_MAX_RECORDS_FROM_RELATION,+ rolePermissionConfig,+ relations: selectedFieldsResult.relations as Record<+ string,+ FindOptionsRelations<ObjectLiteral>+ >,+ selectedFields: selectedFieldsResult.select,+ }),+ buildSystemAuthContext(workspaceId),+ );}private resolveStreamRolePermissionConfig(diff --git a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-sharing-relation-filter.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-sharing-relation-filter.integration-spec.tsnew file mode 100644index 00000000000..29f39e6848d--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-sharing-relation-filter.integration-spec.ts@@ -0,0 +1,231 @@+import { randomUUID } from 'node:crypto';++import { parse } from 'graphql';+import { STANDARD_OBJECTS } from 'twenty-shared/metadata';+import {+ FeatureFlagKey,+ FieldMetadataType,+ RecordShareAccessLevel,+} from 'twenty-shared/types';+import { isDefined } from 'twenty-shared/utils';++import { createOneOperationFactory } from 'test/integration/graphql/utils/create-one-operation-factory.util';+import { destroyManyOperationFactory } from 'test/integration/graphql/utils/destroy-many-operation-factory.util';+import { findManyOperationFactory } from 'test/integration/graphql/utils/find-many-operation-factory.util';+import { makeGraphqlApiRequest } from 'test/integration/graphql/utils/make-graphql-api-request.util';+import { createOneFieldMetadata } from 'test/integration/metadata/suites/field-metadata/utils/create-one-field-metadata.util';+import { createOneObjectMetadata } from 'test/integration/metadata/suites/object-metadata/utils/create-one-object-metadata.util';+import { deleteOneObjectMetadata } from 'test/integration/metadata/suites/object-metadata/utils/delete-one-object-metadata.util';+import { updateOneObjectMetadata } from 'test/integration/metadata/suites/object-metadata/utils/update-one-object-metadata.util';+import { upsertObjectPermissions } from 'test/integration/metadata/suites/object-permission/utils/upsert-object-permissions.util';+import { findOneRoleByLabel } from 'test/integration/metadata/suites/role/utils/find-one-role-by-label.util';+import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';+import { updateFeatureFlag } from 'test/integration/metadata/suites/utils/update-feature-flag.util';+import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';++import { RelationType } from 'src/engine/metadata-modules/field-metadata/interfaces/relation-type.interface';+import { findFlatEntityByUniversalIdentifier } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-universal-identifier.util';+import { type RecordShareStorageService } from 'src/engine/permissions/record-share/services/record-share-storage.service';+import { type WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';+import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';+import { WORKSPACE_MEMBER_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/data/constants/workspace-member-data-seeds.constant';++const OBJECT_NAME = 'sharedOnlyProject';+const OBJECT_PLURAL = 'sharedOnlyProjects';+const RELATION_FIELD_NAME = 'sharedOnlyProject';+const SHARED_PROJECT_ID = randomUUID();+const UNSHARED_PROJECT_ID = randomUUID();+const PERSON_ON_SHARED_PROJECT_ID = randomUUID();+const PERSON_ON_UNSHARED_PROJECT_ID = randomUUID();+const SET_SHARE = parse(+ `mutation SetShare($target: RecordTargetInput!, $principal: RecordSharePrincipalInput!, $accessLevel: RecordShareAccessLevel!) { setRecordShare(target: $target, principal: $principal, accessLevel: $accessLevel) { canManageSharing } }`,+);++describe('Relation filters through an object reached only by shares', () => {+ let objectMetadataId: string;+ let memberRoleId: string;++ const setMemberObjectAccess = (canAccessObject: boolean) =>+ upsertObjectPermissions({+ expectToFail: false,+ input: {+ roleId: memberRoleId,+ objectPermissions: [+ {+ objectMetadataId,+ canReadObjectRecords: canAccessObject,+ canUpdateObjectRecords: canAccessObject,+ canSoftDeleteObjectRecords: canAccessObject,+ canDestroyObjectRecords: canAccessObject,+ },+ ],+ },+ });++ const findPeopleOnProjectsAsJony = async () => {+ const response = await makeGraphqlApiRequest(+ findManyOperationFactory({+ objectMetadataSingularName: 'person',+ objectMetadataPluralName: 'people',+ gqlFields: 'id',+ filter: {+ id: {+ in: [PERSON_ON_SHARED_PROJECT_ID, PERSON_ON_UNSHARED_PROJECT_ID],+ },+ [RELATION_FIELD_NAME]: { name: { in: ['Shared', 'Unshared'] } },+ },+ }),+ APPLE_JONY_MEMBER_ACCESS_TOKEN,+ );++ return {+ errors: response.body.errors,+ ids: (response.body.data?.people?.edges ?? []).map(+ ({ node }: { node: { id: string } }) => node.id,+ ),+ };+ };++ beforeAll(async () => {+ memberRoleId = (await findOneRoleByLabel({ label: 'Member' })).id;++ const { data } = await createOneObjectMetadata({+ input: {+ nameSingular: OBJECT_NAME,+ namePlural: OBJECT_PLURAL,+ labelSingular: 'Shared only project',+ labelPlural: 'Shared only projects',+ icon: 'IconShare',+ isLabelSyncedWithName: false,+ },+ gqlFields: 'id',+ });++ objectMetadataId = data.createOneObject.id;++ const { flatObjectMetadataMaps } =+ await getAppProviderByClassName<WorkspaceCacheService>(+ 'WorkspaceCacheService',+ ).getOrRecompute(SEED_APPLE_WORKSPACE_ID, ['flatObjectMetadataMaps']);+ const personObjectMetadataId = findFlatEntityByUniversalIdentifier({+ flatEntityMaps: flatObjectMetadataMaps,+ universalIdentifier: STANDARD_OBJECTS.person.universalIdentifier,+ })?.id;++ if (!isDefined(personObjectMetadataId)) {+ throw new Error('The person object is not seeded');+ }++ await createOneFieldMetadata({+ input: {+ objectMetadataId: personObjectMetadataId,+ name: RELATION_FIELD_NAME,+ label: 'Shared only project',+ type: FieldMetadataType.RELATION,+ relationCreationPayload: {+ targetObjectMetadataId: objectMetadataId,+ targetFieldLabel: 'People',+ targetFieldIcon: 'IconUsers',+ type: RelationType.MANY_TO_ONE,+ },+ },+ gqlFields: 'id',+ expectToFail: false,+ });++ for (const [id, name] of [+ [SHARED_PROJECT_ID, 'Shared'],+ [UNSHARED_PROJECT_ID, 'Unshared'],+ ]) {+ const created = await makeGraphqlApiRequest(+ createOneOperationFactory({+ objectMetadataSingularName: OBJECT_NAME,+ gqlFields: 'id',+ data: { id, name },+ }),+ );++ expect(created.body.errors).toBeUndefined();+ }++ for (const [id, projectId] of [+ [PERSON_ON_SHARED_PROJECT_ID, SHARED_PROJECT_ID],+ [PERSON_ON_UNSHARED_PROJECT_ID, UNSHARED_PROJECT_ID],+ ]) {+ const created = await makeGraphqlApiRequest(+ createOneOperationFactory({+ objectMetadataSingularName: 'person',+ gqlFields: 'id',+ data: { id, [`${RELATION_FIELD_NAME}Id`]: projectId },+ }),+ );++ expect(created.body.errors).toBeUndefined();+ }++ await updateFeatureFlag({+ featureFlag: FeatureFlagKey.IS_RECORD_LEVEL_SHARING_ENABLED,+ value: true,+ expectToFail: false,+ });+ await setMemberObjectAccess(false);+ });++ afterAll(async () => {+ await updateFeatureFlag({+ featureFlag: FeatureFlagKey.IS_RECORD_LEVEL_SHARING_ENABLED,+ value: false,+ expectToFail: false,+ });+ await setMemberObjectAccess(true);+ await getAppProviderByClassName<RecordShareStorageService>(+ 'RecordShareStorageService',+ ).deleteByRecordIds({+ workspaceId: SEED_APPLE_WORKSPACE_ID,+ objectMetadataId,+ recordIds: [SHARED_PROJECT_ID, UNSHARED_PROJECT_ID],+ });+ await makeGraphqlApiRequest(+ destroyManyOperationFactory({+ objectMetadataSingularName: 'person',+ objectMetadataPluralName: 'people',+ gqlFields: 'id',+ filter: {+ id: {+ in: [PERSON_ON_SHARED_PROJECT_ID, PERSON_ON_UNSHARED_PROJECT_ID],+ },+ },+ }),+ );+ await updateOneObjectMetadata({+ input: {+ idToUpdate: objectMetadataId,+ updatePayload: { isActive: false },+ },+ expectToFail: false,+ });+ await deleteOneObjectMetadata({ input: { idToDelete: objectMetadataId } });+ });++ it('should filter through the relation without matching unshared records', async () => {+ expect(await findPeopleOnProjectsAsJony()).toEqual({+ errors: undefined,+ ids: [],+ });++ const shared = await makeMetadataApiRequest({+ query: SET_SHARE,+ variables: {+ target: { objectMetadataId, recordId: SHARED_PROJECT_ID },+ principal: { workspaceMemberId: WORKSPACE_MEMBER_DATA_SEED_IDS.JONY },+ accessLevel: RecordShareAccessLevel.READ,+ },+ });++ expect(shared.body.errors).toBeUndefined();+ expect(await findPeopleOnProjectsAsJony()).toEqual({+ errors: undefined,+ ids: [PERSON_ON_SHARED_PROJECT_ID],+ });+ });+});