Remove apiGatewayUrl from websocket event

dherault · Jul 3, 2019 · c0bea4c · c0bea4c
1 parent 4f5ce66
commit c0bea4c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/src/ApiGatewayWebSocket.js b/src/ApiGatewayWebSocket.js
@@ -175,7 +175,7 @@ module.exports = class ApiGatewayWebSocket {
 
               this.clients.delete(ws);
 
-              const event = wsHelpers.createDisconnectEvent('$disconnect', 'DISCONNECT', connection, this.options);
+              const event = wsHelpers.createDisconnectEvent('$disconnect', 'DISCONNECT', connection);
 
               doAction(ws, connection.connectionId, '$disconnect', event, false);
             },
@@ -216,7 +216,7 @@ module.exports = class ApiGatewayWebSocket {
 
         debugLog(`action:${action} on connection=${connection.connectionId}`);
 
-        const event = wsHelpers.createEvent(action, 'MESSAGE', connection, request.payload, this.options);
+        const event = wsHelpers.createEvent(action, 'MESSAGE', connection, request.payload);
 
         doAction(ws, connection.connectionId, action, event, true);
 

diff --git a/src/websocketHelpers.js b/src/websocketHelpers.js
@@ -61,9 +61,8 @@ const createRequestContext = (action, eventType, connection) => {
   return requestContext;
 };
 
-exports.createEvent = (action, eventType, connection, payload, options) => {
+exports.createEvent = (action, eventType, connection, payload) => {
   const event = {
-    apiGatewayUrl: `http${options.httpsProtocol ? 's' : ''}://${options.host}:${options.port + 1}`,
     body: JSON.stringify(payload),
     isBase64Encoded: false,
     requestContext: createRequestContext(action, eventType, connection),
@@ -85,7 +84,6 @@ exports.createConnectEvent = (action, eventType, connection, options) => {
   };
   const multiValueHeaders = createMultiValueHeaders(headers);
   const event = {
-    apiGatewayUrl: `http${options.httpsProtocol ? 's' : ''}://${options.host}:${options.port + 1}`,
     headers,
     isBase64Encoded: false,
     multiValueHeaders,
@@ -95,15 +93,14 @@ exports.createConnectEvent = (action, eventType, connection, options) => {
   return event;
 };
 
-exports.createDisconnectEvent = (action, eventType, connection, options) => {
+exports.createDisconnectEvent = (action, eventType, connection) => {
   const headers = {
     Host: 'localhost',
     'x-api-key': '',
     'x-restapi': '',
   };
   const multiValueHeaders = createMultiValueHeaders(headers);
   const event = {
-    apiGatewayUrl: `http${options.httpsProtocol ? 's' : ''}://${options.host}:${options.port + 1}`,
     headers,
     isBase64Encoded: false,
     multiValueHeaders,