Upgrade OpenAPI to version 5.0.0 (#4543)

* Upgrade to openapi-generator-cli version 5.0.0

Co-authored-by: Helmi Nour <Helmiinour@gmail.com>

Author: robbear

client/.gitignore

@@ -0,0 +1,33 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+
+# Runtime data
+pids
+*.pid
+*.seed
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directory
+node_modules
+
+# Optional npm cache directory
+.npm
+
+# Optional REPL history
+.node_repl_history

client/.openapi-generator/VERSION

@@ -1 +1 @@
-5.0.0-beta2
+5.0.0

client/docs/LoadData.md

@@ -9,7 +9,7 @@ Name | Type | Description | Notes
 **fileSchema** | [**FileSchema**](FileSchema.md) |  | [optional] 
 **fileSyntax** | [**FileSyntax**](FileSyntax.md) |  | [optional] 
 **integration** | [**Integration**](Integration.md) |  | [optional] 
-**key** | [**AnyType**](.md) |  | 
+**key** | **Object** |  | 
 **path** | **String** |  | [optional] 
 **type** | **String** |  | [default to 'LoadData']
 

client/docs/PairAnyValueAnyValue.md

@@ -4,8 +4,8 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**first** | [**AnyType**](.md) |  | [optional] 
-**second** | [**AnyType**](.md) |  | [optional] 
+**first** | **Object** |  | [optional] 
+**second** | **Object** |  | [optional] 
 **type** | **String** |  | [default to 'Pair_AnyValue_AnyValue_']
 
 

client/docs/Range.md

@@ -6,7 +6,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **area** | [**Area**](Area.md) |  | 
 **endByte** | **Number** |  | [default to 0]
-**input** | [**AnyType**](.md) |  | [optional] 
+**input** | **Object** |  | [optional] 
 **startByte** | **Number** |  | [default to 0]
 **type** | **String** |  | [default to 'Range']
 

client/docs/Relation.md

@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**columns** | **[[AnyType]]** |  | [optional] 
+**columns** | **[[Object]]** |  | [optional] 
 **relKey** | [**RelKey**](RelKey.md) |  | 
 **type** | **String** |  | [default to 'Relation']
 

client/src/ApiClient.js

@@ -147,7 +147,7 @@ class ApiClient {
             url = apiBasePath + path;
         }
 
-        url = url.replace(/\{([\w-]+)\}/g, (fullMatch, key) => {
+        url = url.replace(/\{([\w-\.]+)\}/g, (fullMatch, key) => {
             var value;
             if (pathParams.hasOwnProperty(key)) {
                 value = this.paramToString(pathParams[key]);
@@ -265,16 +265,18 @@ class ApiClient {
         }
         switch (collectionFormat) {
             case 'csv':
-                return param.map(this.paramToString).join(',');
+                return param.map(this.paramToString, this).join(',');
             case 'ssv':
-                return param.map(this.paramToString).join(' ');
+                return param.map(this.paramToString, this).join(' ');
             case 'tsv':
-                return param.map(this.paramToString).join('\t');
+                return param.map(this.paramToString, this).join('\t');
             case 'pipes':
-                return param.map(this.paramToString).join('|');
+                return param.map(this.paramToString, this).join('|');
             case 'multi':
                 //return the array directly as SuperAgent will handle it as expected
-                return param.map(this.paramToString);
+                return param.map(this.paramToString, this);
+            case 'passthrough':
+                return param;
             default:
                 throw new Error('Unknown collection format: ' + collectionFormat);
         }
@@ -297,7 +299,10 @@ class ApiClient {
                     break;
                 case 'bearer':
                     if (auth.accessToken) {
-                        request.set({'Authorization': 'Bearer ' + auth.accessToken});
+                        var localVarBearerToken = typeof auth.accessToken === 'function'
+                          ? auth.accessToken()
+                          : auth.accessToken
+                        request.set({'Authorization': 'Bearer ' + localVarBearerToken});
                     }
 
                     break;
@@ -431,11 +436,16 @@ class ApiClient {
             var _formParams = this.normalizeParams(formParams);
             for (var key in _formParams) {
                 if (_formParams.hasOwnProperty(key)) {
-                    if (this.isFileParam(_formParams[key])) {
+                    let _formParamsValue = _formParams[key];
+                    if (this.isFileParam(_formParamsValue)) {
                         // file field
-                        request.attach(key, _formParams[key]);
+                        request.attach(key, _formParamsValue);
+                    } else if (Array.isArray(_formParamsValue) && _formParamsValue.length
+                        && this.isFileParam(_formParamsValue[0])) {
+                        // multiple files
+                        _formParamsValue.forEach(file => request.attach(key, file));
                     } else {
-                        request.field(key, _formParams[key]);
+                        request.field(key, _formParamsValue);
                     }
                 }
             }

client/src/model/LoadData.js

@@ -12,7 +12,6 @@
  */
 
 import ApiClient from '../ApiClient';
-import AnyType from './AnyType';
 import FileSchema from './FileSchema';
 import FileSyntax from './FileSyntax';
 import Integration from './Integration';
@@ -27,7 +26,7 @@ class LoadData {
      * Constructs a new <code>LoadData</code>.
      * @alias module:model/LoadData
      * @param contentType {String} 
-     * @param key {module:model/AnyType} 
+     * @param key {Object} 
      * @param type {module:model/LoadData.TypeEnum} 
      */
     constructor(contentType, key, type) { 
@@ -73,7 +72,7 @@ class LoadData {
                 obj['integration'] = Integration.constructFromObject(data['integration']);
             }
             if (data.hasOwnProperty('key')) {
-                obj['key'] = ApiClient.convertToType(data['key'], AnyType);
+                obj['key'] = ApiClient.convertToType(data['key'], Object);
             }
             if (data.hasOwnProperty('path')) {
                 obj['path'] = ApiClient.convertToType(data['path'], 'String');
@@ -115,7 +114,7 @@ LoadData.prototype['file_syntax'] = undefined;
 LoadData.prototype['integration'] = undefined;
 
 /**
- * @member {module:model/AnyType} key
+ * @member {Object} key
  */
 LoadData.prototype['key'] = undefined;
 

client/src/model/PairAnyValueAnyValue.js

@@ -12,7 +12,6 @@
  */
 
 import ApiClient from '../ApiClient';
-import AnyType from './AnyType';
 
 /**
  * The PairAnyValueAnyValue model module.
@@ -51,10 +50,10 @@ class PairAnyValueAnyValue {
             obj = obj || new PairAnyValueAnyValue();
 
             if (data.hasOwnProperty('first')) {
-                obj['first'] = ApiClient.convertToType(data['first'], AnyType);
+                obj['first'] = ApiClient.convertToType(data['first'], Object);
             }
             if (data.hasOwnProperty('second')) {
-                obj['second'] = ApiClient.convertToType(data['second'], AnyType);
+                obj['second'] = ApiClient.convertToType(data['second'], Object);
             }
             if (data.hasOwnProperty('type')) {
                 obj['type'] = ApiClient.convertToType(data['type'], 'String');
@@ -67,12 +66,12 @@ class PairAnyValueAnyValue {
 }
 
 /**
- * @member {module:model/AnyType} first
+ * @member {Object} first
  */
 PairAnyValueAnyValue.prototype['first'] = undefined;
 
 /**
- * @member {module:model/AnyType} second
+ * @member {Object} second
  */
 PairAnyValueAnyValue.prototype['second'] = undefined;
 

client/src/model/Range.js

@@ -12,7 +12,6 @@
  */
 
 import ApiClient from '../ApiClient';
-import AnyType from './AnyType';
 import Area from './Area';
 
 /**
@@ -64,7 +63,7 @@ class Range {
                 obj['end_byte'] = ApiClient.convertToType(data['end_byte'], 'Number');
             }
             if (data.hasOwnProperty('input')) {
-                obj['input'] = ApiClient.convertToType(data['input'], AnyType);
+                obj['input'] = ApiClient.convertToType(data['input'], Object);
             }
             if (data.hasOwnProperty('start_byte')) {
                 obj['start_byte'] = ApiClient.convertToType(data['start_byte'], 'Number');
@@ -91,7 +90,7 @@ Range.prototype['area'] = undefined;
 Range.prototype['end_byte'] = 0;
 
 /**
- * @member {module:model/AnyType} input
+ * @member {Object} input
  */
 Range.prototype['input'] = undefined;