Merge pull request nestjs#2805 from Reasno/proxy-fix

bugfix(microservices) pass all arguments to request-scoped proxies

Author: kamilmysliwiec

integration/graphql/package-lock.json

@@ -13,7 +13,7 @@
     "@nestjs/core": "6.5.3",
     "@nestjs/graphql": "6.4.2",
     "apollo-server-express": "2.8.1",
-    "graphql": "14.5.0",
+    "graphql": "14.5.1",
     "graphql-tools": "4.0.5",
     "reflect-metadata": "0.1.13",
     "rxjs": "6.5.2",

integration/graphql/package.json

@@ -15,7 +15,7 @@
     "apollo-server-express": "2.8.1",
     "class-transformer": "0.2.3",
     "class-validator": "0.10.0",
-    "graphql": "14.5.0",
+    "graphql": "14.5.1",
     "graphql-tools": "4.0.5",
     "reflect-metadata": "0.1.13",
     "rxjs": "6.5.2",

integration/typegraphql/package-lock.json

@@ -56,7 +56,7 @@
     "fastify-cors": "2.1.3",
     "fastify-formbody": "3.1.0",
     "fastify-multipart": "1.0.2",
-    "graphql": "14.5.0",
+    "graphql": "14.5.1",
     "grpc": "1.23.3",
     "http2": "3.3.7",
     "iterare": "1.2.0",

integration/typegraphql/package.json

@@ -118,7 +118,7 @@ export class ListenersController {
           contextId,
           wrapper.id,
         );
-        return proxy(data);
+        return proxy(...args);
       } catch (err) {
         let exceptionFilter = this.exceptionFiltersCache.get(
           instance[methodKey],

package-lock.json

@@ -20,8 +20,10 @@ describe('ListenersController', () => {
     metadataExplorer: ListenerMetadataExplorer,
     server: any,
     addSpy: sinon.SinonSpy,
+    proxySpy: sinon.SinonSpy,
     container: NestContainer,
     injector: Injector,
+    rpcContextCreator: RpcContextCreator,
     exceptionFiltersContext: ExceptionFiltersContext;
 
   before(() => {
@@ -35,9 +37,12 @@ describe('ListenersController', () => {
       container,
       new ApplicationConfig(),
     );
+    rpcContextCreator = sinon.createStubInstance(RpcContextCreator) as any;
+    proxySpy = sinon.spy();
+    (rpcContextCreator as any).create.callsFake(()=>proxySpy);
     instance = new ListenersController(
       new ClientsContainer(),
-      sinon.createStubInstance(RpcContextCreator) as any,
+      rpcContextCreator,
       container,
       injector,
       ClientProxyFactory,
@@ -81,16 +86,41 @@ describe('ListenersController', () => {
     let handleSpy: sinon.SinonSpy;
 
     beforeEach(() => {
-      sinon.stub(injector, 'loadPerContext').callsFake(() => {
-        throw new Error();
-      });
       handleSpy = sinon.spy();
       sinon.stub(exceptionFiltersContext, 'create').callsFake(
         () =>
           ({
             handle: handleSpy,
           } as any),
       );
+      
+      sinon.stub((instance as any), 'registerRequestProvider').callsFake(() => ({} as any));
+    });
+
+    describe('when "loadPerContext" resolves', () => {
+      const moduleKey = 'moduleKey';
+      const methodKey = 'methodKey';
+      const module = {
+        controllers: new Map(),
+      } as any;
+      const pattern = {};
+      const wrapper = new InstanceWrapper({ instance: { [methodKey]: {} } });
+
+      it('should pass all arguments to the proxy chain', async () => {
+        sinon.stub(injector, 'loadPerContext').callsFake(() => Promise.resolve({}));
+        const handler = instance.createRequestScopedHandler(
+          wrapper,
+          pattern,
+          module,
+          moduleKey,
+          methodKey,
+        );
+        await handler("data", "metadata");
+
+        expect(proxySpy.called).to.be.true;
+        expect(proxySpy.getCall(0).args[0]).to.be.eql("data");
+        expect(proxySpy.getCall(0).args[1]).to.be.eql("metadata");
+      });
     });
 
     describe('when "loadPerContext" throws', () => {
@@ -103,6 +133,9 @@ describe('ListenersController', () => {
       const wrapper = new InstanceWrapper({ instance: { [methodKey]: {} } });
 
       it('should delegete error to exception filters', async () => {
+        sinon.stub(injector, 'loadPerContext').callsFake(() => {
+          throw new Error();
+        });
         const handler = instance.createRequestScopedHandler(
           wrapper,
           pattern,

package.json

@@ -17,7 +17,7 @@
     "apollo-server-express": "2.8.1",
     "class-transformer": "0.2.3",
     "class-validator": "0.10.0",
-    "graphql": "14.5.0",
+    "graphql": "14.5.1",
     "graphql-subscriptions": "1.1.0",
     "reflect-metadata": "0.1.13",
     "rxjs": "6.5.2",

packages/microservices/listeners-controller.ts

@@ -14,7 +14,7 @@
     "@nestjs/core": "6.5.3",
     "@nestjs/platform-express": "6.5.3",
     "@nestjs/typeorm": "6.1.3",
-    "mongodb": "3.2.7",
+    "mongodb": "3.3.1",
     "reflect-metadata": "0.1.13",
     "rxjs": "6.5.2",
     "typeorm": "0.2.18",