Merge pull request #2662 from Davide-Gheri/fix/apollo-context

Fix/apollo context

Author: kamilmysliwiec

packages/apollo/lib/drivers/apollo-base.driver.ts

@@ -133,7 +133,12 @@ export abstract class ApolloBaseDriver<
 
     await server.start();
 
-    app.use(path, expressMiddleware(server));
+    app.use(
+      path,
+      expressMiddleware(server, {
+        context: options.context,
+      }),
+    );
 
     this.apolloServer = server;
   }
@@ -171,7 +176,9 @@ export abstract class ApolloBaseDriver<
     app.route({
       url: path,
       method: ['GET', 'POST', 'OPTIONS'],
-      handler: fastifyApolloHandler(server),
+      handler: fastifyApolloHandler(server, {
+        context: options.context,
+      }),
     });
 
     this.apolloServer = server;
@@ -231,18 +238,26 @@ export abstract class ApolloBaseDriver<
     originalOptions: ApolloDriverConfig = { ...targetOptions },
   ) {
     if (!targetOptions.context) {
-      targetOptions.context = ({ req, request }) => ({ req: req ?? request });
+      targetOptions.context = async (contextOrRequest) => {
+        return {
+          // New ApolloServer fastify integration has Request as first parameter to the Context function
+          req: contextOrRequest.req ?? contextOrRequest,
+        };
+      };
     } else if (isFunction(targetOptions.context)) {
       targetOptions.context = async (...args: unknown[]) => {
         const ctx = await (originalOptions.context as Function)(...args);
-        const { req, request } = args[0] as Record<string, unknown>;
-        return this.assignReqProperty(ctx, req ?? request);
+        const contextOrRequest = args[0] as Record<string, unknown>;
+        return this.assignReqProperty(
+          ctx,
+          contextOrRequest.req ?? contextOrRequest,
+        );
       };
     } else {
-      targetOptions.context = ({ req, request }: Record<string, unknown>) => {
+      targetOptions.context = async (contextOrRequest) => {
         return this.assignReqProperty(
           originalOptions.context as Record<string, any>,
-          req ?? request,
+          contextOrRequest.req ?? contextOrRequest,
         );
       };
     }

packages/apollo/tests/e2e/custom-context.spec.ts

@@ -0,0 +1,52 @@
+import { INestApplication } from '@nestjs/common';
+import { ExpressAdapter } from '@nestjs/platform-express';
+import { Test } from '@nestjs/testing';
+import * as request from 'supertest';
+import { CustomContextModule } from '../graphql/custom-context/custom-context.module';
+import { FastifyAdapter } from '@nestjs/platform-fastify';
+
+describe('GraphQL (custom context)', () => {
+  let app: INestApplication;
+
+  describe.each([
+    ['Express', new ExpressAdapter()],
+    ['Fastify', new FastifyAdapter()],
+  ])('Custom context with %s', (_, adapter) => {
+    beforeEach(async () => {
+      const module = await Test.createTestingModule({
+        imports: [CustomContextModule],
+      }).compile();
+
+      app = module.createNestApplication(adapter);
+      await app.init();
+
+      const instance = app.getHttpAdapter().getInstance();
+      if ('ready' in instance && typeof instance.ready === 'function') {
+        await instance.ready();
+      }
+    });
+
+    it('should return query result', () => {
+      return request(app.getHttpServer())
+        .post('/graphql')
+        .send({
+          operationName: null,
+          variables: {},
+          query: `
+          {
+            fooFromContext
+          }
+          `,
+        })
+        .expect(200, {
+          data: {
+            fooFromContext: 'bar',
+          },
+        });
+    });
+
+    afterEach(async () => {
+      await app.close();
+    });
+  });
+});

packages/apollo/tests/graphql/custom-context/custom-context.module.ts

@@ -0,0 +1,20 @@
+import { Module } from '@nestjs/common';
+import { GraphQLModule } from '@nestjs/graphql';
+import { ApolloDriverConfig } from '../../../lib';
+import { ApolloDriver } from '../../../lib/drivers';
+import { CustomContextResolver } from './custom-context.resolver';
+
+@Module({
+  imports: [
+    GraphQLModule.forRoot<ApolloDriverConfig>({
+      driver: ApolloDriver,
+      autoSchemaFile: true,
+      context: (request) => ({
+        foo: 'bar',
+        request,
+      }),
+    }),
+  ],
+  providers: [CustomContextResolver],
+})
+export class CustomContextModule {}

packages/apollo/tests/graphql/custom-context/custom-context.resolver.ts

@@ -0,0 +1,9 @@
+import { Resolver, Query, Context } from '@nestjs/graphql';
+
+@Resolver()
+export class CustomContextResolver {
+  @Query(() => String)
+  fooFromContext(@Context() ctx: Record<string, unknown>) {
+    return ctx.foo;
+  }
+}