fix(server): Make sure to use onSubscribe result exclusively

ilijaNL · Oct 31, 2020 · 51fdb7c · 51fdb7c
1 parent 6cfe526
commit 51fdb7c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/server.ts b/src/server.ts
@@ -563,9 +563,8 @@ export function createServer(
               ]);
             }
 
-            // if you've provided your own root through
-            // `onSubscribe`, prefer that over the root's root
-            if (!execArgs.rootValue) {
+            // if onsubscribe didnt return anything, inject roots
+            if (!maybeExecArgsOrErrors) {
               execArgs.rootValue = roots?.[operationAST.operation];
             }
 

diff --git a/src/tests/server.ts b/src/tests/server.ts
@@ -704,8 +704,14 @@ describe('Subscribe', () => {
     };
     const { url } = await startTServer({
       schema: undefined,
+      roots: {
+        query: { not: 'me' },
+      },
       execute: (args) => {
-        expect(args).toBe(nopeArgs);
+        expect(args.schema).toBe(nopeArgs.schema); // schema from nopeArgs
+        expect(args.rootValue).toBeUndefined(); // nopeArgs didnt provide any root value
+        expect(args.operationName).toBe('Nope');
+        expect(args.variableValues).toBeUndefined(); // nopeArgs didnt provide variables
         return execute(args);
       },
       onSubscribe: (_ctx, _message) => {