9e21e55db4
## 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" />
125 lines
4.9 KiB
TypeScript
125 lines
4.9 KiB
TypeScript
import {
|
|
UseFilters,
|
|
UseGuards,
|
|
UseInterceptors,
|
|
UsePipes,
|
|
} from '@nestjs/common';
|
|
import { Args, Mutation, Query } from '@nestjs/graphql';
|
|
|
|
import { PermissionFlagType } from 'twenty-shared/constants';
|
|
|
|
import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';
|
|
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
|
|
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
|
|
import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
|
|
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
|
|
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
|
|
import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
|
|
import { CreatePageLayoutInput } from 'src/engine/metadata-modules/page-layout/dtos/inputs/create-page-layout.input';
|
|
import { UpdatePageLayoutWithTabsInput } from 'src/engine/metadata-modules/page-layout/dtos/inputs/update-page-layout-with-tabs.input';
|
|
import { UpdatePageLayoutInput } from 'src/engine/metadata-modules/page-layout/dtos/inputs/update-page-layout.input';
|
|
import { PageLayoutDTO } from 'src/engine/metadata-modules/page-layout/dtos/page-layout.dto';
|
|
import { PageLayoutType } from 'src/engine/metadata-modules/page-layout/enums/page-layout-type.enum';
|
|
import { PageLayoutUpdateService } from 'src/engine/metadata-modules/page-layout/services/page-layout-update.service';
|
|
import { PageLayoutService } from 'src/engine/metadata-modules/page-layout/services/page-layout.service';
|
|
import { PageLayoutGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/page-layout/utils/page-layout-graphql-api-exception.filter';
|
|
import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';
|
|
|
|
@MetadataResolver(() => PageLayoutDTO)
|
|
@UseInterceptors(WorkspaceMigrationGraphqlApiExceptionInterceptor)
|
|
@UseFilters(PageLayoutGraphqlApiExceptionFilter)
|
|
@UseGuards(WorkspaceAuthGuard)
|
|
@UsePipes(ResolverValidationPipe)
|
|
export class PageLayoutResolver {
|
|
constructor(
|
|
private readonly pageLayoutService: PageLayoutService,
|
|
private readonly pageLayoutUpdateService: PageLayoutUpdateService,
|
|
) {}
|
|
|
|
@Query(() => [PageLayoutDTO])
|
|
@UseGuards(NoPermissionGuard)
|
|
async getPageLayouts(
|
|
@AuthWorkspace() workspace: WorkspaceEntity,
|
|
@Args('objectMetadataId', { type: () => String, nullable: true })
|
|
objectMetadataId?: string,
|
|
@Args('pageLayoutType', { type: () => PageLayoutType, nullable: true })
|
|
pageLayoutType?: PageLayoutType,
|
|
): Promise<PageLayoutDTO[]> {
|
|
if (objectMetadataId || pageLayoutType) {
|
|
return this.pageLayoutService.findBy({
|
|
workspaceId: workspace.id,
|
|
filter: {
|
|
objectMetadataId,
|
|
pageLayoutType,
|
|
},
|
|
});
|
|
}
|
|
|
|
return this.pageLayoutService.findByWorkspaceId(workspace.id);
|
|
}
|
|
|
|
@Query(() => PageLayoutDTO, { nullable: true })
|
|
@UseGuards(NoPermissionGuard)
|
|
async getPageLayout(
|
|
@Args('id', { type: () => String }) id: string,
|
|
@AuthWorkspace() workspace: WorkspaceEntity,
|
|
): Promise<PageLayoutDTO | null> {
|
|
return this.pageLayoutService.findByIdOrThrow({
|
|
id,
|
|
workspaceId: workspace.id,
|
|
});
|
|
}
|
|
|
|
@Mutation(() => PageLayoutDTO)
|
|
@UseGuards(SettingsPermissionGuard(PermissionFlagType.LAYOUTS))
|
|
async createPageLayout(
|
|
@Args('input') input: CreatePageLayoutInput,
|
|
@AuthWorkspace() workspace: WorkspaceEntity,
|
|
): Promise<PageLayoutDTO> {
|
|
return this.pageLayoutService.create({
|
|
createPageLayoutInput: input,
|
|
workspaceId: workspace.id,
|
|
});
|
|
}
|
|
|
|
@Mutation(() => PageLayoutDTO)
|
|
@UseGuards(SettingsPermissionGuard(PermissionFlagType.LAYOUTS))
|
|
async updatePageLayout(
|
|
@Args('id', { type: () => String }) id: string,
|
|
@Args('input') input: UpdatePageLayoutInput,
|
|
@AuthWorkspace() workspace: WorkspaceEntity,
|
|
): Promise<PageLayoutDTO> {
|
|
return this.pageLayoutService.update({
|
|
id,
|
|
workspaceId: workspace.id,
|
|
updateData: input,
|
|
});
|
|
}
|
|
|
|
@Mutation(() => Boolean)
|
|
@UseGuards(SettingsPermissionGuard(PermissionFlagType.LAYOUTS))
|
|
async destroyPageLayout(
|
|
@Args('id', { type: () => String }) id: string,
|
|
@AuthWorkspace() workspace: WorkspaceEntity,
|
|
): Promise<boolean> {
|
|
return this.pageLayoutService.destroy({
|
|
id,
|
|
workspaceId: workspace.id,
|
|
});
|
|
}
|
|
|
|
@Mutation(() => PageLayoutDTO)
|
|
@UseGuards(SettingsPermissionGuard(PermissionFlagType.LAYOUTS))
|
|
async updatePageLayoutWithTabsAndWidgets(
|
|
@Args('id', { type: () => String }) id: string,
|
|
@Args('input') input: UpdatePageLayoutWithTabsInput,
|
|
@AuthWorkspace() workspace: WorkspaceEntity,
|
|
): Promise<PageLayoutDTO> {
|
|
return this.pageLayoutUpdateService.updatePageLayoutWithTabs({
|
|
id,
|
|
workspaceId: workspace.id,
|
|
input,
|
|
});
|
|
}
|
|
}
|