[JavaScript] Update vulnerable dependencies (#784)

* Update vulnerable dependencies

* Update samples: javascript-es6

* Update samples: javascript-promise

* Update samples: javascript-promise-es6

* Update samples: javascript

* Update samples: petstore-security-test/javascript

* Rename operationId if it starts with a number

* Update samples

bin/javascript-petstore.sh
bin/javascript-es6-petstore.sh
bin/javascript-promise-petstore.sh
bin/javascript-promise-es6-petstore.sh

Author: ackintosh

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java

@@ -837,6 +837,13 @@ public String toOperationId(String operationId) {
             return newOperationId;
         }
 
+        // operationId starts with a number
+        if (operationId.matches("^\\d.*")) {
+            String newOperationId = camelize("call_" + operationId, true);
+            LOGGER.warn(operationId + " (starting with a number) cannot be used as method name. Renamed to " + newOperationId);
+            return newOperationId;
+        }
+
         return operationId;
     }
 

modules/openapi-generator/src/main/resources/Javascript/es6/package.mustache

@@ -13,7 +13,7 @@
   "dependencies": {
     "babel": "^6.23.0",
     "babel-cli": "^6.26.0",
-    "superagent": "3.5.2"
+    "superagent": "3.7.0"
   },
   "devDependencies": {
     "babel-core": "6.26.0",

modules/openapi-generator/src/main/resources/Javascript/package.mustache

@@ -11,7 +11,7 @@
     "fs": false
   },
   "dependencies": {
-    "superagent": "3.5.2"
+    "superagent": "3.7.0"
   },
   "devDependencies": {
     "mocha": "~2.3.4",

samples/client/petstore-security-test/javascript/.openapi-generator/VERSION

@@ -1 +1 @@
-2.3.0-SNAPSHOT
+3.2.0-SNAPSHOT

samples/client/petstore-security-test/javascript/README.md

@@ -1,12 +1,12 @@
-# swagger_petstore____end____rn_n_r
+# open_api_petstore____end____rn_n_r
 
-SwaggerPetstoreEndRnNR - JavaScript client for swagger_petstore____end____rn_n_r
+OpenApiPetstoreEndRnNR - JavaScript client for open_api_petstore____end____rn_n_r
 This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  *_/ ' \" =end --       
-This SDK is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
+This SDK is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
 - API version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r
 - Package version: 1.0.0 *_/   =end -- \r\n \n \r
-- Build package: io.swagger.codegen.languages.JavascriptClientCodegen
+- Build package: org.openapitools.codegen.languages.JavascriptClientCodegen
 
 ## Installation
 
@@ -20,7 +20,7 @@ please follow the procedure in ["Publishing npm packages"](https://docs.npmjs.co
 Then install it via:
 
 ```shell
-npm install swagger_petstore____end____rn_n_r --save
+npm install open_api_petstore____end____rn_n_r --save
 ```
 
 ##### Local development
@@ -38,13 +38,13 @@ Next, [link](https://docs.npmjs.com/cli/link) it globally in npm with the follow
 npm link
 ```
 
-Finally, switch to the directory you want to use your swagger_petstore____end____rn_n_r from, and run:
+Finally, switch to the directory you want to use your open_api_petstore____end____rn_n_r from, and run:
 
 ```shell
 npm link /path/to/<JAVASCRIPT_CLIENT_DIR>
 ```
 
-You should now be able to `require('swagger_petstore____end____rn_n_r')` in javascript files from the directory you ran the last 
+You should now be able to `require('open_api_petstore____end____rn_n_r')` in javascript files from the directory you ran the last 
 command above from.
 
 #### git
@@ -93,12 +93,11 @@ module: {
 Please follow the [installation](#installation) instruction and execute the following JS code:
 
 ```javascript
-var SwaggerPetstoreEndRnNR = require('swagger_petstore____end____rn_n_r');
+var OpenApiPetstoreEndRnNR = require('open_api_petstore____end____rn_n_r');
 
-var api = new SwaggerPetstoreEndRnNR.FakeApi()
-
-var opts = { 
-  'testCodeInjectEndRnNR': "testCodeInjectEndRnNR_example" // {String} To test code injection *_/ ' \" =end -- \\r\\n \\n \\r
+var api = new OpenApiPetstoreEndRnNR.FakeApi()
+var opts = {
+  'UNKNOWN_BASE_TYPE': new OpenApiPetstoreEndRnNR.UNKNOWN_BASE_TYPE() // {UNKNOWN_BASE_TYPE} 
 };
 
 var callback = function(error, data, response) {
@@ -114,16 +113,16 @@ api.testCodeInjectEndRnNR(opts, callback);
 
 ## Documentation for API Endpoints
 
-All URIs are relative to *https://petstore.swagger.io *_/ &#39; \&quot; &#x3D;end -- \\r\\n \\n \\r/v2 *_/ &#39; \&quot; &#x3D;end -- \\r\\n \\n \\r*
+All URIs are relative to *http://petstore.swagger.io *_/ &#39; \&quot; &#x3D;end -- \\r\\n \\n \\r/v2 *_/ &#39; \&quot; &#x3D;end -- \\r\\n \\n \\r*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*SwaggerPetstoreEndRnNR.FakeApi* | [**testCodeInjectEndRnNR**](docs/FakeApi.md#testCodeInjectEndRnNR) | **PUT** /fake | To test code injection *_/ &#39; \&quot; &#x3D;end -- \\r\\n \\n \\r
+*OpenApiPetstoreEndRnNR.FakeApi* | [**testCodeInjectEndRnNR**](docs/FakeApi.md#testCodeInjectEndRnNR) | **PUT** /fake | To test code injection *_/ &#39; \&quot; &#x3D;end -- \\r\\n \\n \\r
 
 
 ## Documentation for Models
 
- - [SwaggerPetstoreEndRnNR.ModelReturn](docs/ModelReturn.md)
+ - [OpenApiPetstoreEndRnNR.ModelReturn](docs/ModelReturn.md)
 
 
 ## Documentation for Authorization

samples/client/petstore-security-test/javascript/docs/FakeApi.md

@@ -1,6 +1,6 @@
-# SwaggerPetstoreEndRnNR.FakeApi
+# OpenApiPetstoreEndRnNR.FakeApi
 
-All URIs are relative to *https://petstore.swagger.io *_/ ' \" =end -- \\r\\n \\n \\r/v2 *_/ ' \" =end -- \\r\\n \\n \\r*
+All URIs are relative to *http://petstore.swagger.io *_/ ' \" =end -- \\r\\n \\n \\r/v2 *_/ ' \" =end -- \\r\\n \\n \\r*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
@@ -13,16 +13,16 @@ Method | HTTP request | Description
 
 To test code injection *_/ ' \" =end -- \\r\\n \\n \\r
 
+To test code injection *_/ ' \" =end -- \\r\\n \\n \\r
+
 ### Example
 ```javascript
-var SwaggerPetstoreEndRnNR = require('swagger_petstore____end____rn_n_r');
+var OpenApiPetstoreEndRnNR = require('open_api_petstore____end____rn_n_r');
 
-var apiInstance = new SwaggerPetstoreEndRnNR.FakeApi();
-
-var opts = { 
-  'testCodeInjectEndRnNR': "testCodeInjectEndRnNR_example" // String | To test code injection *_/ ' \" =end -- \\r\\n \\n \\r
+var apiInstance = new OpenApiPetstoreEndRnNR.FakeApi();
+var opts = {
+  'UNKNOWN_BASE_TYPE': new OpenApiPetstoreEndRnNR.UNKNOWN_BASE_TYPE() // UNKNOWN_BASE_TYPE | 
 };
-
 var callback = function(error, data, response) {
   if (error) {
     console.error(error);
@@ -37,7 +37,7 @@ apiInstance.testCodeInjectEndRnNR(opts, callback);
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **testCodeInjectEndRnNR** | **String**| To test code injection *_/ ' \" =end -- \\r\\n \\n \\r | [optional] 
+ **UNKNOWN_BASE_TYPE** | [**UNKNOWN_BASE_TYPE**](UNKNOWN_BASE_TYPE.md)|  | [optional] 
 
 ### Return type
 
@@ -50,5 +50,5 @@ No authorization required
 ### HTTP request headers
 
  - **Content-Type**: application/json, *_/   =end --       
- - **Accept**: application/json, *_/   =end --       
+ - **Accept**: Not defined
 

samples/client/petstore-security-test/javascript/docs/ModelReturn.md

@@ -1,4 +1,4 @@
-# SwaggerPetstoreEndRnNR.ModelReturn
+# OpenApiPetstoreEndRnNR.ModelReturn
 
 ## Properties
 Name | Type | Description | Notes

samples/client/petstore-security-test/javascript/git_push.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update"
 
 git_user_id=$1
 git_repo_id=$2

samples/client/petstore-security-test/javascript/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "swagger_petstore____end____rn_n_r",
+  "name": "open_api_petstore____end____rn_n_r",
   "version": "1.0.0 *_/   =end -- \r\n \n \r",
   "description": "This_spec_is_mainly_for_testing_Petstore_server_and_contains_fake_endpoints_models__Please_do_not_use_this_for_any_other_purpose__Special_characters_______end______",
   "license": "Apache-2.0 */ ' " =end -- \r\n \n \r",
@@ -11,7 +11,7 @@
     "fs": false
   },
   "dependencies": {
-    "superagent": "3.5.2"
+    "superagent": "3.7.0"
   },
   "devDependencies": {
     "mocha": "~2.3.4",

samples/client/petstore-security-test/javascript/src/ApiClient.js

@@ -1,14 +1,14 @@
 /**
- * Swagger Petstore *_/ ' \" =end -- \\r\\n \\n \\r
+ * OpenAPI Petstore *_/ ' \" =end -- \\r\\n \\n \\r
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  *_/ ' \" =end --       
  *
  * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r
- * Contact: apiteam@swagger.io *_/ ' \" =end -- \\r\\n \\n \\r
+ * Contact: something@something.abc *_/ ' \" =end -- \\r\\n \\n \\r
  *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
  *
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.2.0-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -23,10 +23,10 @@
     module.exports = factory(require('superagent'), require('querystring'));
   } else {
     // Browser globals (root is window)
-    if (!root.SwaggerPetstoreEndRnNR) {
-      root.SwaggerPetstoreEndRnNR = {};
+    if (!root.OpenApiPetstoreEndRnNR) {
+      root.OpenApiPetstoreEndRnNR = {};
     }
-    root.SwaggerPetstoreEndRnNR.ApiClient = factory(root.superagent, root.querystring);
+    root.OpenApiPetstoreEndRnNR.ApiClient = factory(root.superagent, root.querystring);
   }
 }(this, function(superagent, querystring) {
   'use strict';
@@ -47,9 +47,9 @@
     /**
      * The base URL against which to resolve every API call's (relative) path.
      * @type {String}
-     * @default https://petstore.swagger.io *_/ ' \" =end -- \\r\\n \\n \\r/v2 *_/ ' \" =end -- \\r\\n \\n \\r
+     * @default http://petstore.swagger.io *_/ ' \" =end -- \\r\\n \\n \\r/v2 *_/ ' \" =end -- \\r\\n \\n \\r
      */
-    this.basePath = 'https://petstore.swagger.io *_/ ' \" =end -- \\r\\n \\n \\r/v2 *_/ ' \" =end -- \\r\\n \\n \\r'.replace(/\/+$/, '');
+    this.basePath = 'http://petstore.swagger.io *_/ ' \" =end -- \\r\\n \\n \\r/v2 *_/ ' \" =end -- \\r\\n \\n \\r'.replace(/\/+$/, '');
 
     /**
      * The authentication methods to be included for all API calls.
@@ -96,6 +96,10 @@
       this.agent = new superagent.agent();
     }
 
+    /*
+     * Allow user to override superagent agent
+     */
+    this.requestAgent = null;
   };
 
   /**
@@ -413,6 +417,12 @@
     // set header parameters
     request.set(this.defaultHeaders).set(this.normalizeParams(headerParams));
 
+
+    // set requestAgent if it is set by user
+    if (this.requestAgent) {
+      request.agent(this.requestAgent);
+    }
+
     // set request timeout
     request.timeout(this.timeout);