Evaluate followOriginalHttpMethod to true if either request or options are true

Author: dhwaneetbhatt

codegens/curl/lib/index.js

@@ -244,7 +244,7 @@ self = module.exports = {
         id: 'followOriginalHttpMethod',
         type: 'boolean',
         default: false,
-        description: 'Use the original HTTP method when following redirects'
+        description: 'Redirect with the original HTTP method instead of the default behavior of redirecting with GET'
       },
       {
         name: 'Trim request body fields',

codegens/curl/lib/util.js

@@ -223,7 +223,7 @@ var self = module.exports = {
 
     if (body.mode === 'formdata' || body.mode === 'urlencoded') {
       let memberCount = 0;
-      body[body.mode].members && body[body.mode].members.forEach((param) => {
+      body[body.mode] && body[body.mode].members && body[body.mode].members.forEach((param) => {
         if (!param.disabled) {
           memberCount += 1;
         }
@@ -245,7 +245,7 @@ var self = module.exports = {
    */
   shouldAddHttpMethod: function (request, options) {
     const followOriginalHttpMethod =
-      _.get(request, 'protocolProfileBehavior.followOriginalHttpMethod', options.followOriginalHttpMethod),
+      options.followOriginalHttpMethod || _.get(request, 'protocolProfileBehavior.followOriginalHttpMethod', false),
       disableBodyPruning = _.get(request, 'protocolProfileBehavior.disableBodyPruning', true),
       isBodyEmpty = self.isBodyEmpty(request.body);
 

test/codegen/structure.test.js

@@ -61,7 +61,7 @@ const expectedOptions = {
       name: 'Follow original HTTP method',
       type: 'boolean',
       default: false,
-      description: 'Use the original HTTP method when following redirects'
+      description: 'Redirect with the original HTTP method instead of the default behavior of redirecting with GET'
     },
     trimRequestBody: {
       name: 'Trim request body fields',