Merge pull request #1175 from yukun-han/fix/retire-lodash-omitby

fix: retire lodash omitby to fix vulnerability

Author: mefellows

package-lock.json

@@ -110,7 +110,6 @@
     "lodash.isnil": "4.0.0",
     "lodash.isundefined": "3.0.1",
     "lodash.omit": "^4.5.0",
-    "lodash.omitby": "4.6.0",
     "pkginfo": "^0.4.1",
     "ramda": "^0.28.0",
     "randexp": "^0.5.3"

package.json

@@ -3,7 +3,8 @@
  *
  * @module GraphQL
  */
-import { isNil, extend, omitBy, isUndefined } from 'lodash';
+import { isNil, extend, isUndefined } from 'lodash';
+import { reject } from 'ramda';
 import gql from 'graphql-tag';
 import { Interaction, InteractionStateComplete } from './interaction';
 import { regex } from './matchers';
@@ -106,17 +107,14 @@ export class GraphQLInteraction extends Interaction {
 
     this.state.request = extend(
       {
-        body: omitBy(
-          {
-            operationName: this.operation,
-            query: regex({
-              generate: this.query,
-              matcher: escapeGraphQlQuery(this.query),
-            }),
-            variables: this.variables,
-          },
-          isUndefined
-        ),
+        body: reject(isUndefined, {
+          operationName: this.operation,
+          query: regex({
+            generate: this.query,
+            matcher: escapeGraphQlQuery(this.query),
+          }),
+          variables: this.variables,
+        }),
         headers: { 'Content-Type': 'application/json' },
         method: 'POST',
       },

src/dsl/graphql.ts

@@ -3,7 +3,8 @@
  * @module Interaction
  */
 
-import { isNil, keys, omitBy } from 'lodash';
+import { isNil, keys } from 'lodash';
+import { reject } from 'ramda';
 import { HTTPMethods, HTTPMethod } from '../common/request';
 import { Matcher, isMatcher, AnyTemplate } from './matchers';
 import ConfigurationError from '../errors/configurationError';
@@ -131,7 +132,7 @@ export class Interaction {
       throwIfQueryObjectInvalid(requestOpts.query);
     }
 
-    this.state.request = omitBy(requestOpts, isNil) as RequestOptions;
+    this.state.request = reject(isNil, requestOpts) as RequestOptions;
 
     return this;
   }
@@ -152,14 +153,11 @@ export class Interaction {
       throw new ConfigurationError('You must provide a status code.');
     }
 
-    this.state.response = omitBy(
-      {
-        body: responseOpts.body,
-        headers: responseOpts.headers || undefined,
-        status: responseOpts.status,
-      },
-      isNil
-    ) as ResponseOptions;
+    this.state.response = reject(isNil, {
+      body: responseOpts.body,
+      headers: responseOpts.headers || undefined,
+      status: responseOpts.status,
+    }) as ResponseOptions;
     return this;
   }