Merge branch 'develop' into snyk-upgrade-96cfb2f8738592e158bfbb54017de21f

Author: Ankit Saini

.eslintrc

@@ -8,6 +8,9 @@
     "node": true,
     "es6": true
   },
+  "parserOptions": {
+    "ecmaVersion": 2018
+  },
   "rules": {
     // Possible Errors
     "for-direction": "error",

.gitignore

@@ -67,4 +67,5 @@ typings/
 out/
 
 newmanResponses.json
-dummyFile*.txt
+dummyFile*.txt
+dummyBinaryFile

codegens/curl/README.md

@@ -18,7 +18,7 @@ Convert function takes three parameters
     * `indentCount` - The number of indentation characters to add per code level
     * `trimRequestBody` - Trim request body fields
     * `followRedirect` - Boolean denoting whether to redirect a request
-    * `requestTimeout` - Integer denoting time after which the request will bail out in milli-seconds
+    * `requestTimeoutInSeconds` - Integer denoting time after which the request will bail out in seconds
     * `multiLine` - Boolean denoting whether to output code snippet with multi line breaks
     * `longFormat` - Boolean denoting whether to use longform cURL options in snippet
     * `quoteType` - String denoting the quote type to use (single or double) for URL

codegens/curl/lib/index.js

@@ -18,7 +18,7 @@ self = module.exports = {
       format, snippet, silent, url, quoteType;
 
     redirect = options.followRedirect;
-    timeout = options.requestTimeout;
+    timeout = options.requestTimeoutInSeconds;
     multiLine = options.multiLine;
     format = options.longFormat;
     trim = options.trimRequestBody;
@@ -222,11 +222,11 @@ self = module.exports = {
           '(Use double quotes when running curl in cmd.exe and single quotes for the rest)'
       },
       {
-        name: 'Set request timeout',
-        id: 'requestTimeout',
+        name: 'Set request timeout (in seconds)',
+        id: 'requestTimeoutInSeconds',
         type: 'positiveInteger',
         default: 0,
-        description: 'Set number of milliseconds the request should wait for a response before ' +
+        description: 'Set number of seconds the request should wait for a response before ' +
           'timing out (use 0 for infinity)'
       },
       {

codegens/curl/lib/util.js

@@ -5,7 +5,7 @@ var self = module.exports = {
      *
      * @param {String} inputString
      * @param {Boolean} [trim] - indicates whether to trim string or not
-     * @param {Boolean} [quoteType] - indicates which quoteType has to be escaped
+     * @param {String} [quoteType] - indicates which quoteType has to be escaped
      * @param {Boolean} [backSlash] - indicates whether to escape backslash(\\)
      * @returns {String}
      */
@@ -20,6 +20,8 @@ var self = module.exports = {
 
     if (quoteType === '"') {
       inputString = inputString.replace(/"/g, '\\"');
+      // Escape backslash if double quote was already escaped before call to sanitize
+      inputString = inputString.replace(/(?<!\\)\\\\"/g, '\\\\\\"');
     }
     else if (quoteType === '\'') {
       // for curl escaping of single quotes inside single quotes involves changing of ' to '\''

codegens/curl/test/unit/convert.test.js

@@ -499,6 +499,38 @@ describe('curl convert function', function () {
       });
     });
 
+    it('should not add appropriate escaping characters when quote type is "double"', function () {
+      var request = new sdk.Request({
+        'method': 'POST',
+        'header': [],
+        'body': {
+          'mode': 'graphql',
+          'graphql': {
+            'query': '{\n  findScenes(\n    filter: {per_page: 0}\n    scene_filter: {is_missing: "performers"}){\n    count\n    scenes {\n      id\n      title\n      path\n    }\n  }\n}', // eslint-disable-line
+            'variables': '{\n\t"variable_key": "variable_value"\n}'
+          }
+        },
+        'url': {
+          'raw': 'https://postman-echo.com/post',
+          'protocol': 'https',
+          'host': [
+            'postman-echo',
+            'com'
+          ],
+          'path': [
+            'post'
+          ]
+        }
+      });
+      convert(request, { quoteType: 'double', lineContinuationCharacter: '^' }, function (error, snippet) {
+        if (error) {
+          expect.fail(null, null, error);
+        }
+
+        expect(snippet).to.include('{\\"query\\":\\"{\\n  findScenes(\\n    filter: {per_page: 0}\\n    scene_filter: {is_missing: \\\\\\"performers\\\\\\"})'); // eslint-disable-line
+      });
+    });
+
     describe('getUrlStringfromUrlObject function', function () {
       var rawUrl, urlObject, outputUrlString;
 

codegens/java-okhttp/lib/okhttp.js

@@ -6,7 +6,7 @@ var _ = require('./lodash'),
   sanitizeOptions = require('./util').sanitizeOptions;
 
 //  Since Java OkHttp requires to add extralines of code to handle methods with body
-const METHODS_WITHOUT_BODY = ['GET', 'HEAD', 'COPY', 'UNLOCK', 'UNLINK', 'PURGE', 'LINK', 'VIEW'];
+const METHODS_WITHOUT_BODY = ['HEAD', 'COPY', 'UNLOCK', 'UNLINK', 'PURGE', 'LINK', 'VIEW'];
 
 /**
  * returns snippet of java okhttp by parsing data from Postman-SDK request object

codegens/js-fetch/package.json

@@ -29,7 +29,7 @@
   "dependencies": {},
   "devDependencies": {
     "form-data": "2.5.1",
-    "node-fetch": "2.6.1"
+    "node-fetch": "2.6.7"
   },
   "engines": {
     "node": ">=8"

codegens/nodejs-native/package.json

@@ -30,7 +30,7 @@
     "postman-collection": "3.6.11"
   },
   "devDependencies": {
-    "follow-redirects": "1.13.3"
+    "follow-redirects": "1.14.9"
   },
   "engines": {
     "node": ">=8"

npm/ci-requirements.sh

@@ -24,7 +24,7 @@ pushd ./codegens/csharp-restsharp &>/dev/null;
   sudo apt-get install dotnet-sdk-2.2
   dotnet new console -o testProject
   pushd ./testProject &>/dev/null;
-  dotnet add package RestSharp
+  dotnet add package RestSharp --version 106.15.0
   popd &>/dev/null;
 popd &>/dev/null;