## Fix resolver schema leaking between `/metadata` and `/graphql` endpoints ### Summary - Patch `@nestjs/graphql` to support a `resolverSchemaScope` option that filters resolvers at both schema generation and runtime, preventing cross-endpoint leaking - Introduce `@CoreResolver()` and `@MetadataResolver()` decorators to explicitly scope each resolver to its endpoint - Move most resolvers (auth, billing, workspace, user, etc.) to the metadata schema where the frontend expects them; only workflow and timeline calendar/messaging resolvers remain on `/graphql` - Fix frontend `SSEQuerySubscribeEffect` to use the default (metadata) Apollo client instead of the core client ### Problem NestJS GraphQL's module-based resolver discovery traverses transitive imports, causing resolvers from `/metadata` modules to leak into the `/graphql` schema and vice versa. This made the schemas unpredictable and tightly coupled to module import order. ### Approach - Added `resolverSchemaScope` to `GqlModuleOptions` via a patch on `@nestjs/graphql`, filtering in both `filterResolvers()` (runtime binding) and `getAllCtors()` (schema generation) - Each resolver is explicitly decorated with `@CoreResolver()` or `@MetadataResolver()` - Organized decorator, constant, and type files under `graphql-config/` following project conventions Core GQL Schema: (see: no more fields!) <img width="827" height="894" alt="image" src="https://github.com/user-attachments/assets/668f3f0f-485e-43f0-92be-4345aeccacb6" /> Metadata GQL Schema (see no more getTimelineCalendarEventsFromCompany) <img width="827" height="894" alt="image" src="https://github.com/user-attachments/assets/443913db-e5fe-4161-b0e7-4a971cc80a71" />
153 lines
4.4 KiB
TypeScript
153 lines
4.4 KiB
TypeScript
import gql from 'graphql-tag';
|
|
import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';
|
|
|
|
export const createCustomRoleWithObjectPermissions = async (options: {
|
|
label: string;
|
|
canReadPerson?: boolean;
|
|
canReadCompany?: boolean;
|
|
canReadOpportunities?: boolean;
|
|
canUpdatePerson?: boolean;
|
|
canUpdateCompany?: boolean;
|
|
canUpdateOpportunities?: boolean;
|
|
hasAllObjectRecordsReadPermission?: boolean;
|
|
}) => {
|
|
const createRoleOperation = {
|
|
query: gql`
|
|
mutation CreateOneRole {
|
|
createOneRole(createRoleInput: {
|
|
label: "${options.label}"
|
|
description: "Test role for permission testing"
|
|
canUpdateAllSettings: ${options.hasAllObjectRecordsReadPermission ?? true}
|
|
canReadAllObjectRecords: ${options.hasAllObjectRecordsReadPermission ?? true}
|
|
canUpdateAllObjectRecords: ${options.hasAllObjectRecordsReadPermission ?? true}
|
|
canSoftDeleteAllObjectRecords: ${options.hasAllObjectRecordsReadPermission ?? true}
|
|
canDestroyAllObjectRecords: ${options.hasAllObjectRecordsReadPermission ?? true}
|
|
}) {
|
|
id
|
|
label
|
|
}
|
|
}
|
|
`,
|
|
};
|
|
|
|
const response = await makeMetadataAPIRequest(createRoleOperation);
|
|
|
|
expect(response.body.errors).toBeUndefined();
|
|
expect(response.body.data.createOneRole).toBeDefined();
|
|
const roleId = response.body.data.createOneRole.id;
|
|
|
|
// Get object metadata IDs for Person and Company
|
|
const getObjectMetadataOperation = {
|
|
query: gql`
|
|
query {
|
|
objects(paging: { first: 1000 }) {
|
|
edges {
|
|
node {
|
|
id
|
|
nameSingular
|
|
}
|
|
}
|
|
}
|
|
}
|
|
`,
|
|
};
|
|
|
|
const objectMetadataResponse = await makeMetadataAPIRequest(
|
|
getObjectMetadataOperation,
|
|
);
|
|
const objects = objectMetadataResponse.body.data.objects.edges;
|
|
|
|
const personObjectId = objects.find(
|
|
(obj: any) => obj.node.nameSingular === 'person',
|
|
)?.node.id;
|
|
const companyObjectId = objects.find(
|
|
(obj: any) => obj.node.nameSingular === 'company',
|
|
)?.node.id;
|
|
const opportunityObjectId = objects.find(
|
|
(obj: any) => obj.node.nameSingular === 'opportunity',
|
|
)?.node.id;
|
|
|
|
// Create object permissions based on the options
|
|
const objectPermissions = [];
|
|
|
|
if (
|
|
options.canReadPerson !== undefined ||
|
|
options.canUpdatePerson !== undefined
|
|
) {
|
|
objectPermissions.push({
|
|
objectMetadataId: personObjectId,
|
|
canReadObjectRecords: options.canReadPerson,
|
|
canUpdateObjectRecords:
|
|
options.canUpdatePerson === undefined ? false : options.canUpdatePerson,
|
|
canSoftDeleteObjectRecords: false,
|
|
canDestroyObjectRecords: false,
|
|
});
|
|
}
|
|
|
|
if (
|
|
options.canReadCompany !== undefined ||
|
|
options.canUpdateCompany !== undefined
|
|
) {
|
|
objectPermissions.push({
|
|
objectMetadataId: companyObjectId,
|
|
canReadObjectRecords: options.canReadCompany,
|
|
canUpdateObjectRecords:
|
|
options.canUpdateCompany === undefined
|
|
? false
|
|
: options.canUpdateCompany,
|
|
canSoftDeleteObjectRecords: false,
|
|
canDestroyObjectRecords: false,
|
|
});
|
|
}
|
|
|
|
if (
|
|
options.canReadOpportunities !== undefined ||
|
|
options.canUpdateOpportunities !== undefined
|
|
) {
|
|
objectPermissions.push({
|
|
objectMetadataId: opportunityObjectId,
|
|
canReadObjectRecords: options.canReadOpportunities,
|
|
canUpdateObjectRecords:
|
|
options.canUpdateOpportunities === undefined
|
|
? false
|
|
: options.canUpdateOpportunities,
|
|
canSoftDeleteObjectRecords: false,
|
|
canDestroyObjectRecords: false,
|
|
});
|
|
}
|
|
|
|
if (objectPermissions.length > 0) {
|
|
const upsertObjectPermissionsOperation = {
|
|
query: gql`
|
|
mutation UpsertObjectPermissions(
|
|
$roleId: UUID!
|
|
$objectPermissions: [ObjectPermissionInput!]!
|
|
) {
|
|
upsertObjectPermissions(
|
|
upsertObjectPermissionsInput: {
|
|
roleId: $roleId
|
|
objectPermissions: $objectPermissions
|
|
}
|
|
) {
|
|
objectMetadataId
|
|
canReadObjectRecords
|
|
}
|
|
}
|
|
`,
|
|
variables: {
|
|
roleId,
|
|
objectPermissions,
|
|
},
|
|
};
|
|
|
|
await makeMetadataAPIRequest(upsertObjectPermissionsOperation);
|
|
}
|
|
|
|
return {
|
|
roleId,
|
|
personObjectId,
|
|
companyObjectId,
|
|
opportunityObjectId,
|
|
};
|
|
};
|