5dfb66917c
## Overview This PR upgrades all NestJS dependencies from version 10.x to 11.x, following the [official migration guide](https://docs.nestjs.com/migration-guide). This builds on top of the v9 to v10 upgrade completed in PR #15835. ## Changes ### Dependencies Updated **Core packages (10.x → 11.x):** - `@nestjs/common`: 10.4.16 → 11.0.8 - `@nestjs/core`: 10.4.16 → 11.0.8 - `@nestjs/platform-express`: 10.4.16 → 11.0.8 - `@nestjs/config`: 3.2.3 → 3.3.0 - `@nestjs/passport`: 10.0.3 → 11.0.0 - `@nestjs/axios`: 3.0.2 → 3.1.2 - `@nestjs/schedule`: ^3.0.0 → ^4.1.1 - `@nestjs/serve-static`: 4.0.2 → 5.0.1 - `@nestjs/cache-manager`: ^2.2.1 → ^2.3.0 - `@nestjs/jwt`: 10.2.0 → 11.0.0 - `@nestjs/typeorm`: 10.0.2 → 11.0.0 - `@nestjs/terminus`: 11.0.0 (already on v11) - `@nestjs/event-emitter`: 2.1.0 (compatible) **DevDependencies:** - `@nestjs/testing`: ^10.4.16 → ^11.0.8 - `@nestjs/schematics`: ^10.1.0 → ^11.0.2 - `@nestjs/cli`: 10.3.0 → 11.0.0 ### Code Changes **Fixed: TwentyConfigModule conditional imports** - Updated `TwentyConfigModule.forRoot()` to use spread operator for conditional imports - Fixes TypeScript error with NestJS 11's stricter DynamicModule type checking **Cleanup: Removed unused package** - Removed `@revertdotdev/revert-react` (not being used anywhere in the codebase) ## Breaking Changes Addressed ### 1. ✅ Reflector Type Inference - **Impact**: None - codebase only uses `reflector.get()` method - **Analysis**: Does not use `getAllAndMerge()` or `getAllAndOverride()` (the methods with breaking changes) - **Files reviewed**: feature-flag.guard.ts, message-queue-metadata.accessor.ts, workspace-query-hook-metadata.accessor.ts ### 2. ✅ Lifecycle Hooks Execution Order - **Change**: Termination hooks (`OnModuleDestroy`, `BeforeApplicationShutdown`, `OnApplicationShutdown`) now execute in REVERSE order - **Analysis**: Reviewed all lifecycle hook implementations - Redis client cleanup - Database connection cleanup (GlobalWorkspaceDataSource) - BullMQ queue/worker cleanup - Cache storage cleanup - **Result**: Dependency order is safe - services using connections clean up before the connections themselves ### 3. ✅ Middleware Registration Order - **Change**: Global middleware now executes first regardless of import order - **Analysis**: Middleware is not registered as global, so execution order remains consistent - **Files reviewed**: app.module.ts, middleware.module.ts ## Testing All tests passing and build successful: **Unit Tests (283+ tests):** - ✅ Health module: 38 tests passed - ✅ Auth module: 115 tests passed (passport v11 integration) - ✅ REST API: 90 tests passed (middleware and express platform) - ✅ Feature flags: 17 tests passed (Reflector usage) - ✅ Workspace: 23 tests passed **Build & Quality:** - ✅ Type checking: Passed - ✅ Linting: Passed - ✅ Build: 3,683 files compiled successfully ## Verification Tested critical NestJS functionality: - ✅ Authentication & Security (JWT, OAuth, guards) - ✅ HTTP Platform (Express integration, REST endpoints) - ✅ Dependency Injection (Services, factories, providers) - ✅ Cache Management (Redis with @nestjs/cache-manager) - ✅ GraphQL (Query runners, resolvers) - ✅ Configuration (Environment config) - ✅ Scheduling (Cron jobs with @nestjs/schedule v4) - ✅ Lifecycle Hooks (Module initialization and cleanup) - ✅ Reflector (Metadata reflection in guards) ## Related PRs - #15835 - Upgrade NestJS from 9.x to 10.x (completed) <!-- CURSOR_SUMMARY --> --- > [!NOTE] > Upgrades NestJS to v11 and updates routing patterns, auth strategies, GraphQL schema options, and build/dist paths (scripts, Docker, Nx, migrations, assets), plus enables Devtools in development. > > - **Backend (NestJS 11 upgrade)**: > - Bump `@nestjs/*` packages (core, platform-express, jwt, passport, typeorm, serve-static, schedule, cli/testing/schematics) to v11. > - Update REST/route-trigger/file controllers to new wildcard syntax (`*path`). > - Refactor OAuth (Google/Microsoft) and SAML strategies (abstract base + explicit `validate`); minor typings. > - Enable `DevtoolsModule` in development. > - **GraphQL**: > - Add `buildSchemaOptions.orphanedTypes` for client-config types; keep Yoga/Sentry setup. > - **Build/Runtime & Config**: > - Standardize dist layout (remove `src` in paths): update scripts, Docker `CMD`, Nx `project.json`, render scripts, TypeORM migration paths, asset resolution. > - Adjust `nest-cli.json` (watchOptions, asset globs, migrations outDir, monorepo/root). > - Improve config module imports (spread conditional); tsconfig excludes `node_modules`. > - Minor Nx default: `start` target caching disabled. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit 1139fd85a97d0c72314d416d07464cc3c9942783. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY -->
207 lines
6.6 KiB
TypeScript
207 lines
6.6 KiB
TypeScript
import { Injectable, UnauthorizedException } from '@nestjs/common';
|
|
import { ContextIdFactory, ModuleRef } from '@nestjs/core';
|
|
import { type GqlOptionsFactory } from '@nestjs/graphql';
|
|
|
|
import {
|
|
type YogaDriverConfig,
|
|
type YogaDriverServerContext,
|
|
} from '@graphql-yoga/nestjs';
|
|
import * as Sentry from '@sentry/node';
|
|
import { GraphQLError, GraphQLSchema } from 'graphql';
|
|
import GraphQLJSON from 'graphql-type-json';
|
|
import {
|
|
type GraphQLSchemaWithContext,
|
|
type YogaInitialContext,
|
|
} from 'graphql-yoga';
|
|
import { JsonWebTokenError, TokenExpiredError } from 'jsonwebtoken';
|
|
|
|
import { NodeEnvironment } from 'src/engine/core-modules/twenty-config/interfaces/node-environment.interface';
|
|
|
|
import { WorkspaceSchemaFactory } from 'src/engine/api/graphql/workspace-schema.factory';
|
|
import { type AuthContext } from 'src/engine/core-modules/auth/types/auth-context.type';
|
|
import {
|
|
ApiConfig,
|
|
Billing,
|
|
Captcha,
|
|
ClientAIModelConfig,
|
|
NativeModelCapabilities,
|
|
PublicFeatureFlag,
|
|
PublicFeatureFlagMetadata,
|
|
Sentry as SentryConfig,
|
|
Support,
|
|
} from 'src/engine/core-modules/client-config/client-config.entity';
|
|
import { CoreEngineModule } from 'src/engine/core-modules/core-engine.module';
|
|
import { ExceptionHandlerService } from 'src/engine/core-modules/exception-handler/exception-handler.service';
|
|
import { useSentryTracing } from 'src/engine/core-modules/exception-handler/hooks/use-sentry-tracing';
|
|
import { useGraphQLErrorHandlerHook } from 'src/engine/core-modules/graphql/hooks/use-graphql-error-handler.hook';
|
|
import { I18nService } from 'src/engine/core-modules/i18n/i18n.service';
|
|
import { MetricsService } from 'src/engine/core-modules/metrics/metrics.service';
|
|
import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';
|
|
import { UserEntity } from 'src/engine/core-modules/user/user.entity';
|
|
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
|
|
import { DataloaderService } from 'src/engine/dataloaders/dataloader.service';
|
|
import { handleExceptionAndConvertToGraphQLError } from 'src/engine/utils/global-exception-handler.util';
|
|
import { renderApolloPlayground } from 'src/engine/utils/render-apollo-playground.util';
|
|
|
|
export interface GraphQLContext extends YogaDriverServerContext<'express'> {
|
|
user?: UserEntity;
|
|
workspace?: WorkspaceEntity;
|
|
}
|
|
|
|
@Injectable()
|
|
export class GraphQLConfigService
|
|
implements GqlOptionsFactory<YogaDriverConfig<'express'>>
|
|
{
|
|
constructor(
|
|
private readonly exceptionHandlerService: ExceptionHandlerService,
|
|
private readonly twentyConfigService: TwentyConfigService,
|
|
private readonly moduleRef: ModuleRef,
|
|
private readonly metricsService: MetricsService,
|
|
private readonly dataloaderService: DataloaderService,
|
|
private readonly i18nService: I18nService,
|
|
) {}
|
|
|
|
createGqlOptions(): YogaDriverConfig {
|
|
const isDebugMode =
|
|
this.twentyConfigService.get('NODE_ENV') === NodeEnvironment.DEVELOPMENT;
|
|
const plugins = [
|
|
useGraphQLErrorHandlerHook({
|
|
metricsService: this.metricsService,
|
|
exceptionHandlerService: this.exceptionHandlerService,
|
|
i18nService: this.i18nService,
|
|
twentyConfigService: this.twentyConfigService,
|
|
}),
|
|
];
|
|
|
|
if (Sentry.isInitialized()) {
|
|
plugins.push(useSentryTracing());
|
|
}
|
|
|
|
const config: YogaDriverConfig = {
|
|
autoSchemaFile: true,
|
|
include: [CoreEngineModule],
|
|
buildSchemaOptions: {
|
|
orphanedTypes: [
|
|
ApiConfig,
|
|
Billing,
|
|
Captcha,
|
|
ClientAIModelConfig,
|
|
NativeModelCapabilities,
|
|
PublicFeatureFlag,
|
|
PublicFeatureFlagMetadata,
|
|
SentryConfig,
|
|
Support,
|
|
],
|
|
},
|
|
conditionalSchema: async (context) => {
|
|
let user: UserEntity | null | undefined;
|
|
let workspace: WorkspaceEntity | undefined;
|
|
|
|
try {
|
|
const {
|
|
user,
|
|
workspace,
|
|
apiKey,
|
|
workspaceMemberId,
|
|
userWorkspaceId,
|
|
} = context.req;
|
|
|
|
if (!workspace) {
|
|
return new GraphQLSchema({});
|
|
}
|
|
|
|
return await this.createSchema(context, {
|
|
user,
|
|
workspace,
|
|
apiKey,
|
|
workspaceMemberId,
|
|
userWorkspaceId,
|
|
});
|
|
} catch (error) {
|
|
if (error instanceof UnauthorizedException) {
|
|
throw new GraphQLError('Unauthenticated', {
|
|
extensions: {
|
|
code: 'UNAUTHENTICATED',
|
|
},
|
|
});
|
|
}
|
|
|
|
if (error instanceof JsonWebTokenError) {
|
|
//mockedUserJWT
|
|
throw new GraphQLError('Unauthenticated', {
|
|
extensions: {
|
|
code: 'UNAUTHENTICATED',
|
|
},
|
|
});
|
|
}
|
|
|
|
if (error instanceof TokenExpiredError) {
|
|
throw new GraphQLError('Unauthenticated', {
|
|
extensions: {
|
|
code: 'UNAUTHENTICATED',
|
|
},
|
|
});
|
|
}
|
|
|
|
throw handleExceptionAndConvertToGraphQLError(
|
|
error,
|
|
this.exceptionHandlerService,
|
|
user
|
|
? {
|
|
id: user.id,
|
|
email: user.email,
|
|
firstName: user.firstName,
|
|
lastName: user.lastName,
|
|
}
|
|
: undefined,
|
|
workspace
|
|
? {
|
|
id: workspace.id,
|
|
displayName: workspace.displayName,
|
|
activationStatus: workspace.activationStatus,
|
|
}
|
|
: undefined,
|
|
);
|
|
}
|
|
},
|
|
resolvers: { JSON: GraphQLJSON },
|
|
plugins: plugins,
|
|
context: () => ({
|
|
loaders: this.dataloaderService.createLoaders(),
|
|
}),
|
|
};
|
|
|
|
if (isDebugMode) {
|
|
config.renderGraphiQL = () => {
|
|
return renderApolloPlayground();
|
|
};
|
|
}
|
|
|
|
return config;
|
|
}
|
|
|
|
async createSchema(
|
|
context: YogaDriverServerContext<'express'> & YogaInitialContext,
|
|
data: AuthContext,
|
|
): Promise<GraphQLSchemaWithContext<YogaDriverServerContext<'express'>>> {
|
|
// Create a new contextId for each request
|
|
const contextId = ContextIdFactory.create();
|
|
|
|
if (this.moduleRef.registerRequestByContextId) {
|
|
// Register the request in the contextId
|
|
this.moduleRef.registerRequestByContextId(context.req, contextId);
|
|
}
|
|
|
|
// Resolve the WorkspaceSchemaFactory for the contextId
|
|
const workspaceFactory = await this.moduleRef.resolve(
|
|
WorkspaceSchemaFactory,
|
|
contextId,
|
|
{
|
|
strict: false,
|
|
},
|
|
);
|
|
|
|
return await workspaceFactory.createGraphQLSchema(data);
|
|
}
|
|
}
|