Fix: resolve correct data if schema is wrapped (#1562)

* Fix wrong proxying subscriptios * fix * Use targetFieldName
ardatan · May 30, 2020 · fb48136 · fb48136
1 parent 81c85fd
commit fb48136
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 8 deletions.
diff --git a/packages/delegate/src/delegateToSchema.ts b/packages/delegate/src/delegateToSchema.ts
@@ -271,10 +271,22 @@ export function delegateRequest({
 
 function createDefaultExecutor(schema: GraphQLSchema, rootValue: Record<string, any>) {
   return ({ document, context, variables, info }: ExecutionParams) =>
-    execute(schema, document, rootValue ?? info?.rootValue, context, variables);
+    execute({
+      schema,
+      document,
+      contextValue: context,
+      variableValues: variables,
+      rootValue: rootValue ?? info?.rootValue,
+    });
 }
 
 function createDefaultSubscriber(schema: GraphQLSchema, rootValue: Record<string, any>) {
   return ({ document, context, variables, info }: ExecutionParams) =>
-    subscribe(schema, document, rootValue ?? info?.rootValue, context, variables) as any;
+    subscribe({
+      schema,
+      document,
+      contextValue: context,
+      variableValues: variables,
+      rootValue: rootValue ?? info?.rootValue,
+    }) as any;
 }
diff --git a/packages/wrap/src/generateProxyingResolvers.ts b/packages/wrap/src/generateProxyingResolvers.ts
@@ -1,4 +1,4 @@
-import { GraphQLSchema, GraphQLFieldResolver, GraphQLObjectType } from 'graphql';
+import { GraphQLSchema, GraphQLFieldResolver, GraphQLObjectType, GraphQLResolveInfo } from 'graphql';
 
 import { Transform, Operation, getResponseKeyFromInfo, getErrors, applySchemaTransforms } from '@graphql-tools/utils';
 import {
@@ -44,8 +44,6 @@ export function generateProxyingResolvers(
 
   const resolvers = {};
   Object.keys(operationTypes).forEach((operation: Operation) => {
-    const resolveField = operation === 'subscription' ? 'subscribe' : 'resolve';
-
     const rootType = operationTypes[operation];
     if (rootType != null) {
       const typeName = rootType.name;
@@ -63,9 +61,17 @@ export function generateProxyingResolvers(
 
         const finalResolver = createPossiblyNestedProxyingResolver(subschemaOrSubschemaConfig, proxyingResolver);
 
-        resolvers[typeName][fieldName] = {
-          [resolveField]: finalResolver,
-        };
+        if (operation === 'subscription') {
+          resolvers[typeName][fieldName] = {
+            subscribe: finalResolver,
+            resolve: (payload: any, _: never, __: never, { fieldName: targetFieldName }: GraphQLResolveInfo) =>
+              payload[targetFieldName],
+          };
+        } else {
+          resolvers[typeName][fieldName] = {
+            resolve: finalResolver,
+          };
+        }
       });
     }
   });