Merge pull request #588 from gregbty/master

Destructure the correct error object
apollographql · Aug 12, 2020 · e193535 · e193535
2 parents 191925d + 9088ed8
commit e193535
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,8 @@
   [@benjie](https://github.com/benjie) in [#514](https://github.com/apollographql/subscriptions-transport-ws/pull/514)
 - Fix invalid `formatResponse` console error.  <br/>
   [@renatorib](https://github.com/renatorib) in [#761](https://github.com/apollographql/subscriptions-transport-ws/pull/761)
+- Destructure the correct error object in `MessageTypes.GQL_START`.  <br/>
+  [@gregbty](https://github.com/gregbty) in [#588](https://github.com/apollographql/subscriptions-transport-ws/pull/588)
 
 ### New Features
 

diff --git a/src/server.ts b/src/server.ts
@@ -400,8 +400,8 @@ export class SubscriptionServer {
                   }
 
                   // plain Error object cannot be JSON stringified.
-                  if (Object.keys(e).length === 0) {
-                    error = { name: e.name, message: e.message };
+                  if (Object.keys(error).length === 0) {
+                    error = { name: error.name, message: error.message };
                   }
 
                   this.sendError(connectionContext, opId, error);