}
*/
this.authentications = {
- 'petstore_auth': {type: 'oauth2'},
- 'api_key': {type: 'apiKey', 'in': 'header', name: 'api_key'}
+ 'api_key': {type: 'apiKey', 'in': 'header', name: 'api_key'},
+ 'petstore_auth': {type: 'oauth2'}
};
/**
* The default HTTP headers to be included for all API calls.
diff --git a/samples/client/petstore/javascript/src/api/FakeApi.js b/samples/client/petstore/javascript/src/api/FakeApi.js
index f75b8f55890..9db45d334f5 100644
--- a/samples/client/petstore/javascript/src/api/FakeApi.js
+++ b/samples/client/petstore/javascript/src/api/FakeApi.js
@@ -41,8 +41,8 @@
*/
/**
- * Fake endpoint for testing various parameters
- * Fake endpoint for testing various parameters
+ * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
+ * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
* @param {Number} _number None
* @param {Number} _double None
* @param {String} _string None
@@ -105,8 +105,8 @@
};
var authNames = [];
- var contentTypes = [];
- var accepts = ['application/xml', 'application/json'];
+ var contentTypes = ['application/xml; charset=utf-8', 'application/json; charset=utf-8'];
+ var accepts = ['application/xml; charset=utf-8', 'application/json; charset=utf-8'];
var returnType = null;
return this.apiClient.callApi(
diff --git a/samples/client/petstore/javascript/src/index.js b/samples/client/petstore/javascript/src/index.js
index 727b4782f45..2c3e34b4efd 100644
--- a/samples/client/petstore/javascript/src/index.js
+++ b/samples/client/petstore/javascript/src/index.js
@@ -1,16 +1,16 @@
(function(factory) {
if (typeof define === 'function' && define.amd) {
// AMD. Register as an anonymous module.
- define(['ApiClient', 'model/Animal', 'model/AnimalFarm', 'model/ApiResponse', 'model/Cat', 'model/Category', 'model/Dog', 'model/EnumClass', 'model/EnumTest', 'model/FormatTest', 'model/Model200Response', 'model/ModelReturn', 'model/Name', 'model/Order', 'model/Pet', 'model/SpecialModelName', 'model/Tag', 'model/User', 'api/FakeApi', 'api/PetApi', 'api/StoreApi', 'api/UserApi'], factory);
+ define(['ApiClient', 'model/AdditionalPropertiesClass', 'model/Animal', 'model/AnimalFarm', 'model/ApiResponse', 'model/ArrayTest', 'model/Cat', 'model/Category', 'model/Dog', 'model/EnumClass', 'model/EnumTest', 'model/FormatTest', 'model/MixedPropertiesAndAdditionalPropertiesClass', 'model/Model200Response', 'model/ModelReturn', 'model/Name', 'model/Order', 'model/Pet', 'model/ReadOnlyFirst', 'model/SpecialModelName', 'model/Tag', 'model/User', 'api/FakeApi', 'api/PetApi', 'api/StoreApi', 'api/UserApi'], factory);
} else if (typeof module === 'object' && module.exports) {
// CommonJS-like environments that support module.exports, like Node.
- module.exports = factory(require('./ApiClient'), require('./model/Animal'), require('./model/AnimalFarm'), require('./model/ApiResponse'), require('./model/Cat'), require('./model/Category'), require('./model/Dog'), require('./model/EnumClass'), require('./model/EnumTest'), require('./model/FormatTest'), require('./model/Model200Response'), require('./model/ModelReturn'), require('./model/Name'), require('./model/Order'), require('./model/Pet'), require('./model/SpecialModelName'), require('./model/Tag'), require('./model/User'), require('./api/FakeApi'), require('./api/PetApi'), require('./api/StoreApi'), require('./api/UserApi'));
+ module.exports = factory(require('./ApiClient'), require('./model/AdditionalPropertiesClass'), require('./model/Animal'), require('./model/AnimalFarm'), require('./model/ApiResponse'), require('./model/ArrayTest'), require('./model/Cat'), require('./model/Category'), require('./model/Dog'), require('./model/EnumClass'), require('./model/EnumTest'), require('./model/FormatTest'), require('./model/MixedPropertiesAndAdditionalPropertiesClass'), require('./model/Model200Response'), require('./model/ModelReturn'), require('./model/Name'), require('./model/Order'), require('./model/Pet'), require('./model/ReadOnlyFirst'), require('./model/SpecialModelName'), require('./model/Tag'), require('./model/User'), require('./api/FakeApi'), require('./api/PetApi'), require('./api/StoreApi'), require('./api/UserApi'));
}
-}(function(ApiClient, Animal, AnimalFarm, ApiResponse, Cat, Category, Dog, EnumClass, EnumTest, FormatTest, Model200Response, ModelReturn, Name, Order, Pet, SpecialModelName, Tag, User, FakeApi, PetApi, StoreApi, UserApi) {
+}(function(ApiClient, AdditionalPropertiesClass, Animal, AnimalFarm, ApiResponse, ArrayTest, Cat, Category, Dog, EnumClass, EnumTest, FormatTest, MixedPropertiesAndAdditionalPropertiesClass, Model200Response, ModelReturn, Name, Order, Pet, ReadOnlyFirst, SpecialModelName, Tag, User, FakeApi, PetApi, StoreApi, UserApi) {
'use strict';
/**
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose..
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ .
* The index module provides access to constructors for all the classes which comprise the public API.
*
* An AMD (recommended!) or CommonJS application will generally do something equivalent to the following:
@@ -46,6 +46,11 @@
* @property {module:ApiClient}
*/
ApiClient: ApiClient,
+ /**
+ * The AdditionalPropertiesClass model constructor.
+ * @property {module:model/AdditionalPropertiesClass}
+ */
+ AdditionalPropertiesClass: AdditionalPropertiesClass,
/**
* The Animal model constructor.
* @property {module:model/Animal}
@@ -61,6 +66,11 @@
* @property {module:model/ApiResponse}
*/
ApiResponse: ApiResponse,
+ /**
+ * The ArrayTest model constructor.
+ * @property {module:model/ArrayTest}
+ */
+ ArrayTest: ArrayTest,
/**
* The Cat model constructor.
* @property {module:model/Cat}
@@ -91,6 +101,11 @@
* @property {module:model/FormatTest}
*/
FormatTest: FormatTest,
+ /**
+ * The MixedPropertiesAndAdditionalPropertiesClass model constructor.
+ * @property {module:model/MixedPropertiesAndAdditionalPropertiesClass}
+ */
+ MixedPropertiesAndAdditionalPropertiesClass: MixedPropertiesAndAdditionalPropertiesClass,
/**
* The Model200Response model constructor.
* @property {module:model/Model200Response}
@@ -116,6 +131,11 @@
* @property {module:model/Pet}
*/
Pet: Pet,
+ /**
+ * The ReadOnlyFirst model constructor.
+ * @property {module:model/ReadOnlyFirst}
+ */
+ ReadOnlyFirst: ReadOnlyFirst,
/**
* The SpecialModelName model constructor.
* @property {module:model/SpecialModelName}
diff --git a/samples/client/petstore/javascript/src/model/Animal.js b/samples/client/petstore/javascript/src/model/Animal.js
index e42874c669b..28e5904e840 100644
--- a/samples/client/petstore/javascript/src/model/Animal.js
+++ b/samples/client/petstore/javascript/src/model/Animal.js
@@ -34,6 +34,7 @@
var _this = this;
_this['className'] = className;
+
};
/**
@@ -50,6 +51,9 @@
if (data.hasOwnProperty('className')) {
obj['className'] = ApiClient.convertToType(data['className'], 'String');
}
+ if (data.hasOwnProperty('color')) {
+ obj['color'] = ApiClient.convertToType(data['color'], 'String');
+ }
}
return obj;
}
@@ -58,6 +62,11 @@
* @member {String} className
*/
exports.prototype['className'] = undefined;
+ /**
+ * @member {String} color
+ * @default 'red'
+ */
+ exports.prototype['color'] = 'red';
diff --git a/samples/client/petstore/javascript/src/model/Name.js b/samples/client/petstore/javascript/src/model/Name.js
index 93d1d55deb2..f8c24ef770c 100644
--- a/samples/client/petstore/javascript/src/model/Name.js
+++ b/samples/client/petstore/javascript/src/model/Name.js
@@ -37,6 +37,7 @@
_this['name'] = name;
+
};
/**
@@ -59,6 +60,9 @@
if (data.hasOwnProperty('property')) {
obj['property'] = ApiClient.convertToType(data['property'], 'String');
}
+ if (data.hasOwnProperty('123Number')) {
+ obj['123Number'] = ApiClient.convertToType(data['123Number'], 'Integer');
+ }
}
return obj;
}
@@ -75,6 +79,10 @@
* @member {String} property
*/
exports.prototype['property'] = undefined;
+ /**
+ * @member {Integer} 123Number
+ */
+ exports.prototype['123Number'] = undefined;
diff --git a/samples/client/petstore/typescript-node/default/api.ts b/samples/client/petstore/typescript-node/default/api.ts
index 2120b0b0088..6eaa16cfd97 100644
--- a/samples/client/petstore/typescript-node/default/api.ts
+++ b/samples/client/petstore/typescript-node/default/api.ts
@@ -1,6 +1,6 @@
import request = require('request');
import http = require('http');
-import promise = require('bluebird');
+import Promise = require('bluebird');
let defaultBasePath = 'http://petstore.swagger.io/v2';
@@ -132,8 +132,8 @@ export class PetApi {
protected authentications = {
'default': new VoidAuth(),
- 'petstore_auth': new OAuth(),
'api_key': new ApiKeyAuth('header', 'api_key'),
+ 'petstore_auth': new OAuth(),
}
constructor(basePath?: string);
@@ -182,7 +182,6 @@ export class PetApi {
let useFormData = false;
- let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any; }>();
let requestOptions: request.Options = {
method: 'POST',
qs: queryParameters,
@@ -204,18 +203,19 @@ export class PetApi {
requestOptions.form = formParams;
}
}
- request(requestOptions, (error, response, body) => {
- if (error) {
- localVarDeferred.reject(error);
- } else {
- if (response.statusCode >= 200 && response.statusCode <= 299) {
- localVarDeferred.resolve({ response: response, body: body });
+ return new Promise<{ response: http.ClientResponse; body?: any; }>((resolve, reject) => {
+ request(requestOptions, (error, response, body) => {
+ if (error) {
+ reject(error);
} else {
- localVarDeferred.reject({ response: response, body: body });
+ if (response.statusCode >= 200 && response.statusCode <= 299) {
+ resolve({ response: response, body: body });
+ } else {
+ reject({ response: response, body: body });
+ }
}
- }
+ });
});
- return localVarDeferred.promise;
}
/**
* Deletes a pet
@@ -240,7 +240,6 @@ export class PetApi {
let useFormData = false;
- let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any; }>();
let requestOptions: request.Options = {
method: 'DELETE',
qs: queryParameters,
@@ -261,18 +260,19 @@ export class PetApi {
requestOptions.form = formParams;
}
}
- request(requestOptions, (error, response, body) => {
- if (error) {
- localVarDeferred.reject(error);
- } else {
- if (response.statusCode >= 200 && response.statusCode <= 299) {
- localVarDeferred.resolve({ response: response, body: body });
+ return new Promise<{ response: http.ClientResponse; body?: any; }>((resolve, reject) => {
+ request(requestOptions, (error, response, body) => {
+ if (error) {
+ reject(error);
} else {
- localVarDeferred.reject({ response: response, body: body });
+ if (response.statusCode >= 200 && response.statusCode <= 299) {
+ resolve({ response: response, body: body });
+ } else {
+ reject({ response: response, body: body });
+ }
}
- }
+ });
});
- return localVarDeferred.promise;
}
/**
* Finds Pets by status
@@ -292,7 +292,6 @@ export class PetApi {
let useFormData = false;
- let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: Array; }>();
let requestOptions: request.Options = {
method: 'GET',
qs: queryParameters,
@@ -313,18 +312,19 @@ export class PetApi {
requestOptions.form = formParams;
}
}
- request(requestOptions, (error, response, body) => {
- if (error) {
- localVarDeferred.reject(error);
- } else {
- if (response.statusCode >= 200 && response.statusCode <= 299) {
- localVarDeferred.resolve({ response: response, body: body });
+ return new Promise<{ response: http.ClientResponse; body: Array; }>((resolve, reject) => {
+ request(requestOptions, (error, response, body) => {
+ if (error) {
+ reject(error);
} else {
- localVarDeferred.reject({ response: response, body: body });
+ if (response.statusCode >= 200 && response.statusCode <= 299) {
+ resolve({ response: response, body: body });
+ } else {
+ reject({ response: response, body: body });
+ }
}
- }
+ });
});
- return localVarDeferred.promise;
}
/**
* Finds Pets by tags
@@ -344,7 +344,6 @@ export class PetApi {
let useFormData = false;
- let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: Array; }>();
let requestOptions: request.Options = {
method: 'GET',
qs: queryParameters,
@@ -365,18 +364,19 @@ export class PetApi {
requestOptions.form = formParams;
}
}
- request(requestOptions, (error, response, body) => {
- if (error) {
- localVarDeferred.reject(error);
- } else {
- if (response.statusCode >= 200 && response.statusCode <= 299) {
- localVarDeferred.resolve({ response: response, body: body });
+ return new Promise<{ response: http.ClientResponse; body: Array; }>((resolve, reject) => {
+ request(requestOptions, (error, response, body) => {
+ if (error) {
+ reject(error);
} else {
- localVarDeferred.reject({ response: response, body: body });
+ if (response.statusCode >= 200 && response.statusCode <= 299) {
+ resolve({ response: response, body: body });
+ } else {
+ reject({ response: response, body: body });
+ }
}
- }
+ });
});
- return localVarDeferred.promise;
}
/**
* Find pet by ID
@@ -398,7 +398,6 @@ export class PetApi {
let useFormData = false;
- let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: Pet; }>();
let requestOptions: request.Options = {
method: 'GET',
qs: queryParameters,
@@ -408,10 +407,10 @@ export class PetApi {
json: true,
};
- this.authentications.petstore_auth.applyToRequest(requestOptions);
-
this.authentications.api_key.applyToRequest(requestOptions);
+ this.authentications.petstore_auth.applyToRequest(requestOptions);
+
this.authentications.default.applyToRequest(requestOptions);
if (Object.keys(formParams).length) {
@@ -421,18 +420,19 @@ export class PetApi {
requestOptions.form = formParams;
}
}
- request(requestOptions, (error, response, body) => {
- if (error) {
- localVarDeferred.reject(error);
- } else {
- if (response.statusCode >= 200 && response.statusCode <= 299) {
- localVarDeferred.resolve({ response: response, body: body });
+ return new Promise<{ response: http.ClientResponse; body: Pet; }>((resolve, reject) => {
+ request(requestOptions, (error, response, body) => {
+ if (error) {
+ reject(error);
} else {
- localVarDeferred.reject({ response: response, body: body });
+ if (response.statusCode >= 200 && response.statusCode <= 299) {
+ resolve({ response: response, body: body });
+ } else {
+ reject({ response: response, body: body });
+ }
}
- }
+ });
});
- return localVarDeferred.promise;
}
/**
* Update an existing pet
@@ -448,7 +448,6 @@ export class PetApi {
let useFormData = false;
- let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any; }>();
let requestOptions: request.Options = {
method: 'PUT',
qs: queryParameters,
@@ -470,18 +469,19 @@ export class PetApi {
requestOptions.form = formParams;
}
}
- request(requestOptions, (error, response, body) => {
- if (error) {
- localVarDeferred.reject(error);
- } else {
- if (response.statusCode >= 200 && response.statusCode <= 299) {
- localVarDeferred.resolve({ response: response, body: body });
+ return new Promise<{ response: http.ClientResponse; body?: any; }>((resolve, reject) => {
+ request(requestOptions, (error, response, body) => {
+ if (error) {
+ reject(error);
} else {
- localVarDeferred.reject({ response: response, body: body });
+ if (response.statusCode >= 200 && response.statusCode <= 299) {
+ resolve({ response: response, body: body });
+ } else {
+ reject({ response: response, body: body });
+ }
}
- }
+ });
});
- return localVarDeferred.promise;
}
/**
* Updates a pet in the store with form data
@@ -513,7 +513,6 @@ export class PetApi {
formParams['status'] = status;
}
- let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any; }>();
let requestOptions: request.Options = {
method: 'POST',
qs: queryParameters,
@@ -534,18 +533,19 @@ export class PetApi {
requestOptions.form = formParams;
}
}
- request(requestOptions, (error, response, body) => {
- if (error) {
- localVarDeferred.reject(error);
- } else {
- if (response.statusCode >= 200 && response.statusCode <= 299) {
- localVarDeferred.resolve({ response: response, body: body });
+ return new Promise<{ response: http.ClientResponse; body?: any; }>((resolve, reject) => {
+ request(requestOptions, (error, response, body) => {
+ if (error) {
+ reject(error);
} else {
- localVarDeferred.reject({ response: response, body: body });
+ if (response.statusCode >= 200 && response.statusCode <= 299) {
+ resolve({ response: response, body: body });
+ } else {
+ reject({ response: response, body: body });
+ }
}
- }
+ });
});
- return localVarDeferred.promise;
}
/**
* uploads an image
@@ -578,7 +578,6 @@ export class PetApi {
}
useFormData = true;
- let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any; }>();
let requestOptions: request.Options = {
method: 'POST',
qs: queryParameters,
@@ -599,18 +598,19 @@ export class PetApi {
requestOptions.form = formParams;
}
}
- request(requestOptions, (error, response, body) => {
- if (error) {
- localVarDeferred.reject(error);
- } else {
- if (response.statusCode >= 200 && response.statusCode <= 299) {
- localVarDeferred.resolve({ response: response, body: body });
+ return new Promise<{ response: http.ClientResponse; body?: any; }>((resolve, reject) => {
+ request(requestOptions, (error, response, body) => {
+ if (error) {
+ reject(error);
} else {
- localVarDeferred.reject({ response: response, body: body });
+ if (response.statusCode >= 200 && response.statusCode <= 299) {
+ resolve({ response: response, body: body });
+ } else {
+ reject({ response: response, body: body });
+ }
}
- }
+ });
});
- return localVarDeferred.promise;
}
}
export enum StoreApiApiKeys {
@@ -624,8 +624,8 @@ export class StoreApi {
protected authentications = {
'default': new VoidAuth(),
- 'petstore_auth': new OAuth(),
'api_key': new ApiKeyAuth('header', 'api_key'),
+ 'petstore_auth': new OAuth(),
}
constructor(basePath?: string);
@@ -680,7 +680,6 @@ export class StoreApi {
let useFormData = false;
- let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any; }>();
let requestOptions: request.Options = {
method: 'DELETE',
qs: queryParameters,
@@ -699,18 +698,19 @@ export class StoreApi {
requestOptions.form = formParams;
}
}
- request(requestOptions, (error, response, body) => {
- if (error) {
- localVarDeferred.reject(error);
- } else {
- if (response.statusCode >= 200 && response.statusCode <= 299) {
- localVarDeferred.resolve({ response: response, body: body });
+ return new Promise<{ response: http.ClientResponse; body?: any; }>((resolve, reject) => {
+ request(requestOptions, (error, response, body) => {
+ if (error) {
+ reject(error);
} else {
- localVarDeferred.reject({ response: response, body: body });
+ if (response.statusCode >= 200 && response.statusCode <= 299) {
+ resolve({ response: response, body: body });
+ } else {
+ reject({ response: response, body: body });
+ }
}
- }
+ });
});
- return localVarDeferred.promise;
}
/**
* Returns pet inventories by status
@@ -725,7 +725,6 @@ export class StoreApi {
let useFormData = false;
- let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: { [key: string]: number; }; }>();
let requestOptions: request.Options = {
method: 'GET',
qs: queryParameters,
@@ -746,18 +745,19 @@ export class StoreApi {
requestOptions.form = formParams;
}
}
- request(requestOptions, (error, response, body) => {
- if (error) {
- localVarDeferred.reject(error);
- } else {
- if (response.statusCode >= 200 && response.statusCode <= 299) {
- localVarDeferred.resolve({ response: response, body: body });
+ return new Promise<{ response: http.ClientResponse; body: { [key: string]: number; }; }>((resolve, reject) => {
+ request(requestOptions, (error, response, body) => {
+ if (error) {
+ reject(error);
} else {
- localVarDeferred.reject({ response: response, body: body });
+ if (response.statusCode >= 200 && response.statusCode <= 299) {
+ resolve({ response: response, body: body });
+ } else {
+ reject({ response: response, body: body });
+ }
}
- }
+ });
});
- return localVarDeferred.promise;
}
/**
* Find purchase order by ID
@@ -779,7 +779,6 @@ export class StoreApi {
let useFormData = false;
- let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: Order; }>();
let requestOptions: request.Options = {
method: 'GET',
qs: queryParameters,
@@ -798,18 +797,19 @@ export class StoreApi {
requestOptions.form = formParams;
}
}
- request(requestOptions, (error, response, body) => {
- if (error) {
- localVarDeferred.reject(error);
- } else {
- if (response.statusCode >= 200 && response.statusCode <= 299) {
- localVarDeferred.resolve({ response: response, body: body });
+ return new Promise<{ response: http.ClientResponse; body: Order; }>((resolve, reject) => {
+ request(requestOptions, (error, response, body) => {
+ if (error) {
+ reject(error);
} else {
- localVarDeferred.reject({ response: response, body: body });
+ if (response.statusCode >= 200 && response.statusCode <= 299) {
+ resolve({ response: response, body: body });
+ } else {
+ reject({ response: response, body: body });
+ }
}
- }
+ });
});
- return localVarDeferred.promise;
}
/**
* Place an order for a pet
@@ -825,7 +825,6 @@ export class StoreApi {
let useFormData = false;
- let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: Order; }>();
let requestOptions: request.Options = {
method: 'POST',
qs: queryParameters,
@@ -845,18 +844,19 @@ export class StoreApi {
requestOptions.form = formParams;
}
}
- request(requestOptions, (error, response, body) => {
- if (error) {
- localVarDeferred.reject(error);
- } else {
- if (response.statusCode >= 200 && response.statusCode <= 299) {
- localVarDeferred.resolve({ response: response, body: body });
+ return new Promise<{ response: http.ClientResponse; body: Order; }>((resolve, reject) => {
+ request(requestOptions, (error, response, body) => {
+ if (error) {
+ reject(error);
} else {
- localVarDeferred.reject({ response: response, body: body });
+ if (response.statusCode >= 200 && response.statusCode <= 299) {
+ resolve({ response: response, body: body });
+ } else {
+ reject({ response: response, body: body });
+ }
}
- }
+ });
});
- return localVarDeferred.promise;
}
}
export enum UserApiApiKeys {
@@ -870,8 +870,8 @@ export class UserApi {
protected authentications = {
'default': new VoidAuth(),
- 'petstore_auth': new OAuth(),
'api_key': new ApiKeyAuth('header', 'api_key'),
+ 'petstore_auth': new OAuth(),
}
constructor(basePath?: string);
@@ -920,7 +920,6 @@ export class UserApi {
let useFormData = false;
- let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any; }>();
let requestOptions: request.Options = {
method: 'POST',
qs: queryParameters,
@@ -940,18 +939,19 @@ export class UserApi {
requestOptions.form = formParams;
}
}
- request(requestOptions, (error, response, body) => {
- if (error) {
- localVarDeferred.reject(error);
- } else {
- if (response.statusCode >= 200 && response.statusCode <= 299) {
- localVarDeferred.resolve({ response: response, body: body });
+ return new Promise<{ response: http.ClientResponse; body?: any; }>((resolve, reject) => {
+ request(requestOptions, (error, response, body) => {
+ if (error) {
+ reject(error);
} else {
- localVarDeferred.reject({ response: response, body: body });
+ if (response.statusCode >= 200 && response.statusCode <= 299) {
+ resolve({ response: response, body: body });
+ } else {
+ reject({ response: response, body: body });
+ }
}
- }
+ });
});
- return localVarDeferred.promise;
}
/**
* Creates list of users with given input array
@@ -967,7 +967,6 @@ export class UserApi {
let useFormData = false;
- let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any; }>();
let requestOptions: request.Options = {
method: 'POST',
qs: queryParameters,
@@ -987,18 +986,19 @@ export class UserApi {
requestOptions.form = formParams;
}
}
- request(requestOptions, (error, response, body) => {
- if (error) {
- localVarDeferred.reject(error);
- } else {
- if (response.statusCode >= 200 && response.statusCode <= 299) {
- localVarDeferred.resolve({ response: response, body: body });
+ return new Promise<{ response: http.ClientResponse; body?: any; }>((resolve, reject) => {
+ request(requestOptions, (error, response, body) => {
+ if (error) {
+ reject(error);
} else {
- localVarDeferred.reject({ response: response, body: body });
+ if (response.statusCode >= 200 && response.statusCode <= 299) {
+ resolve({ response: response, body: body });
+ } else {
+ reject({ response: response, body: body });
+ }
}
- }
+ });
});
- return localVarDeferred.promise;
}
/**
* Creates list of users with given input array
@@ -1014,7 +1014,6 @@ export class UserApi {
let useFormData = false;
- let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any; }>();
let requestOptions: request.Options = {
method: 'POST',
qs: queryParameters,
@@ -1034,18 +1033,19 @@ export class UserApi {
requestOptions.form = formParams;
}
}
- request(requestOptions, (error, response, body) => {
- if (error) {
- localVarDeferred.reject(error);
- } else {
- if (response.statusCode >= 200 && response.statusCode <= 299) {
- localVarDeferred.resolve({ response: response, body: body });
+ return new Promise<{ response: http.ClientResponse; body?: any; }>((resolve, reject) => {
+ request(requestOptions, (error, response, body) => {
+ if (error) {
+ reject(error);
} else {
- localVarDeferred.reject({ response: response, body: body });
+ if (response.statusCode >= 200 && response.statusCode <= 299) {
+ resolve({ response: response, body: body });
+ } else {
+ reject({ response: response, body: body });
+ }
}
- }
+ });
});
- return localVarDeferred.promise;
}
/**
* Delete user
@@ -1067,7 +1067,6 @@ export class UserApi {
let useFormData = false;
- let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any; }>();
let requestOptions: request.Options = {
method: 'DELETE',
qs: queryParameters,
@@ -1086,18 +1085,19 @@ export class UserApi {
requestOptions.form = formParams;
}
}
- request(requestOptions, (error, response, body) => {
- if (error) {
- localVarDeferred.reject(error);
- } else {
- if (response.statusCode >= 200 && response.statusCode <= 299) {
- localVarDeferred.resolve({ response: response, body: body });
+ return new Promise<{ response: http.ClientResponse; body?: any; }>((resolve, reject) => {
+ request(requestOptions, (error, response, body) => {
+ if (error) {
+ reject(error);
} else {
- localVarDeferred.reject({ response: response, body: body });
+ if (response.statusCode >= 200 && response.statusCode <= 299) {
+ resolve({ response: response, body: body });
+ } else {
+ reject({ response: response, body: body });
+ }
}
- }
+ });
});
- return localVarDeferred.promise;
}
/**
* Get user by user name
@@ -1119,7 +1119,6 @@ export class UserApi {
let useFormData = false;
- let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: User; }>();
let requestOptions: request.Options = {
method: 'GET',
qs: queryParameters,
@@ -1138,18 +1137,19 @@ export class UserApi {
requestOptions.form = formParams;
}
}
- request(requestOptions, (error, response, body) => {
- if (error) {
- localVarDeferred.reject(error);
- } else {
- if (response.statusCode >= 200 && response.statusCode <= 299) {
- localVarDeferred.resolve({ response: response, body: body });
+ return new Promise<{ response: http.ClientResponse; body: User; }>((resolve, reject) => {
+ request(requestOptions, (error, response, body) => {
+ if (error) {
+ reject(error);
} else {
- localVarDeferred.reject({ response: response, body: body });
+ if (response.statusCode >= 200 && response.statusCode <= 299) {
+ resolve({ response: response, body: body });
+ } else {
+ reject({ response: response, body: body });
+ }
}
- }
+ });
});
- return localVarDeferred.promise;
}
/**
* Logs user into the system
@@ -1174,7 +1174,6 @@ export class UserApi {
let useFormData = false;
- let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: string; }>();
let requestOptions: request.Options = {
method: 'GET',
qs: queryParameters,
@@ -1193,18 +1192,19 @@ export class UserApi {
requestOptions.form = formParams;
}
}
- request(requestOptions, (error, response, body) => {
- if (error) {
- localVarDeferred.reject(error);
- } else {
- if (response.statusCode >= 200 && response.statusCode <= 299) {
- localVarDeferred.resolve({ response: response, body: body });
+ return new Promise<{ response: http.ClientResponse; body: string; }>((resolve, reject) => {
+ request(requestOptions, (error, response, body) => {
+ if (error) {
+ reject(error);
} else {
- localVarDeferred.reject({ response: response, body: body });
+ if (response.statusCode >= 200 && response.statusCode <= 299) {
+ resolve({ response: response, body: body });
+ } else {
+ reject({ response: response, body: body });
+ }
}
- }
+ });
});
- return localVarDeferred.promise;
}
/**
* Logs out current logged in user session
@@ -1219,7 +1219,6 @@ export class UserApi {
let useFormData = false;
- let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any; }>();
let requestOptions: request.Options = {
method: 'GET',
qs: queryParameters,
@@ -1238,18 +1237,19 @@ export class UserApi {
requestOptions.form = formParams;
}
}
- request(requestOptions, (error, response, body) => {
- if (error) {
- localVarDeferred.reject(error);
- } else {
- if (response.statusCode >= 200 && response.statusCode <= 299) {
- localVarDeferred.resolve({ response: response, body: body });
+ return new Promise<{ response: http.ClientResponse; body?: any; }>((resolve, reject) => {
+ request(requestOptions, (error, response, body) => {
+ if (error) {
+ reject(error);
} else {
- localVarDeferred.reject({ response: response, body: body });
+ if (response.statusCode >= 200 && response.statusCode <= 299) {
+ resolve({ response: response, body: body });
+ } else {
+ reject({ response: response, body: body });
+ }
}
- }
+ });
});
- return localVarDeferred.promise;
}
/**
* Updated user
@@ -1272,7 +1272,6 @@ export class UserApi {
let useFormData = false;
- let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any; }>();
let requestOptions: request.Options = {
method: 'PUT',
qs: queryParameters,
@@ -1292,17 +1291,18 @@ export class UserApi {
requestOptions.form = formParams;
}
}
- request(requestOptions, (error, response, body) => {
- if (error) {
- localVarDeferred.reject(error);
- } else {
- if (response.statusCode >= 200 && response.statusCode <= 299) {
- localVarDeferred.resolve({ response: response, body: body });
+ return new Promise<{ response: http.ClientResponse; body?: any; }>((resolve, reject) => {
+ request(requestOptions, (error, response, body) => {
+ if (error) {
+ reject(error);
} else {
- localVarDeferred.reject({ response: response, body: body });
+ if (response.statusCode >= 200 && response.statusCode <= 299) {
+ resolve({ response: response, body: body });
+ } else {
+ reject({ response: response, body: body });
+ }
}
- }
+ });
});
- return localVarDeferred.promise;
}
}
diff --git a/samples/client/petstore/typescript-node/npm/api.ts b/samples/client/petstore/typescript-node/npm/api.ts
index aa577559316..6eaa16cfd97 100644
--- a/samples/client/petstore/typescript-node/npm/api.ts
+++ b/samples/client/petstore/typescript-node/npm/api.ts
@@ -132,8 +132,8 @@ export class PetApi {
protected authentications = {
'default': new VoidAuth(),
- 'petstore_auth': new OAuth(),
'api_key': new ApiKeyAuth('header', 'api_key'),
+ 'petstore_auth': new OAuth(),
}
constructor(basePath?: string);
@@ -407,10 +407,10 @@ export class PetApi {
json: true,
};
- this.authentications.petstore_auth.applyToRequest(requestOptions);
-
this.authentications.api_key.applyToRequest(requestOptions);
+ this.authentications.petstore_auth.applyToRequest(requestOptions);
+
this.authentications.default.applyToRequest(requestOptions);
if (Object.keys(formParams).length) {
@@ -624,8 +624,8 @@ export class StoreApi {
protected authentications = {
'default': new VoidAuth(),
- 'petstore_auth': new OAuth(),
'api_key': new ApiKeyAuth('header', 'api_key'),
+ 'petstore_auth': new OAuth(),
}
constructor(basePath?: string);
@@ -870,8 +870,8 @@ export class UserApi {
protected authentications = {
'default': new VoidAuth(),
- 'petstore_auth': new OAuth(),
'api_key': new ApiKeyAuth('header', 'api_key'),
+ 'petstore_auth': new OAuth(),
}
constructor(basePath?: string);
diff --git a/samples/server/petstore/nodejs/api/swagger.yaml b/samples/server/petstore/nodejs/api/swagger.yaml
index f6987daa915..1aad0a1d4f4 100644
--- a/samples/server/petstore/nodejs/api/swagger.yaml
+++ b/samples/server/petstore/nodejs/api/swagger.yaml
@@ -587,6 +587,10 @@ paths:
description: "User not found"
x-swagger-router-controller: "User"
securityDefinitions:
+ api_key:
+ type: "apiKey"
+ name: "api_key"
+ in: "header"
petstore_auth:
type: "oauth2"
authorizationUrl: "http://petstore.swagger.io/api/oauth/dialog"
@@ -594,10 +598,6 @@ securityDefinitions:
scopes:
write:pets: "modify pets in your account"
read:pets: "read your pets"
- api_key:
- type: "apiKey"
- name: "api_key"
- in: "header"
definitions:
Order:
type: "object"
diff --git a/samples/server/petstore/nodejs/controllers/PetService.js b/samples/server/petstore/nodejs/controllers/PetService.js
index 2c464714aa7..55a4bf2b896 100644
--- a/samples/server/petstore/nodejs/controllers/PetService.js
+++ b/samples/server/petstore/nodejs/controllers/PetService.js
@@ -26,18 +26,18 @@ exports.findPetsByStatus = function(args, res, next) {
**/
var examples = {};
examples['application/json'] = [ {
- "photoUrls" : [ "aeiou" ],
- "name" : "doggie",
+ "tags" : [ {
+ "id" : 123456789,
+ "name" : "aeiou"
+ } ],
"id" : 123456789,
"category" : {
- "name" : "aeiou",
- "id" : 123456789
+ "id" : 123456789,
+ "name" : "aeiou"
},
- "tags" : [ {
- "name" : "aeiou",
- "id" : 123456789
- } ],
- "status" : "aeiou"
+ "status" : "aeiou",
+ "name" : "doggie",
+ "photoUrls" : [ "aeiou" ]
} ];
if(Object.keys(examples).length > 0) {
res.setHeader('Content-Type', 'application/json');
@@ -56,18 +56,18 @@ exports.findPetsByTags = function(args, res, next) {
**/
var examples = {};
examples['application/json'] = [ {
- "photoUrls" : [ "aeiou" ],
- "name" : "doggie",
+ "tags" : [ {
+ "id" : 123456789,
+ "name" : "aeiou"
+ } ],
"id" : 123456789,
"category" : {
- "name" : "aeiou",
- "id" : 123456789
+ "id" : 123456789,
+ "name" : "aeiou"
},
- "tags" : [ {
- "name" : "aeiou",
- "id" : 123456789
- } ],
- "status" : "aeiou"
+ "status" : "aeiou",
+ "name" : "doggie",
+ "photoUrls" : [ "aeiou" ]
} ];
if(Object.keys(examples).length > 0) {
res.setHeader('Content-Type', 'application/json');
@@ -86,18 +86,18 @@ exports.getPetById = function(args, res, next) {
**/
var examples = {};
examples['application/json'] = {
- "photoUrls" : [ "aeiou" ],
- "name" : "doggie",
+ "tags" : [ {
+ "id" : 123456789,
+ "name" : "aeiou"
+ } ],
"id" : 123456789,
"category" : {
- "name" : "aeiou",
- "id" : 123456789
+ "id" : 123456789,
+ "name" : "aeiou"
},
- "tags" : [ {
- "name" : "aeiou",
- "id" : 123456789
- } ],
- "status" : "aeiou"
+ "status" : "aeiou",
+ "name" : "doggie",
+ "photoUrls" : [ "aeiou" ]
};
if(Object.keys(examples).length > 0) {
res.setHeader('Content-Type', 'application/json');
@@ -138,9 +138,9 @@ exports.uploadFile = function(args, res, next) {
**/
var examples = {};
examples['application/json'] = {
+ "message" : "aeiou",
"code" : 123,
- "type" : "aeiou",
- "message" : "aeiou"
+ "type" : "aeiou"
};
if(Object.keys(examples).length > 0) {
res.setHeader('Content-Type', 'application/json');
diff --git a/samples/server/petstore/nodejs/controllers/StoreService.js b/samples/server/petstore/nodejs/controllers/StoreService.js
index d20619ceb9b..01759173bd4 100644
--- a/samples/server/petstore/nodejs/controllers/StoreService.js
+++ b/samples/server/petstore/nodejs/controllers/StoreService.js
@@ -34,12 +34,12 @@ exports.getOrderById = function(args, res, next) {
**/
var examples = {};
examples['application/json'] = {
- "petId" : 123456789,
- "quantity" : 123,
"id" : 123456789,
- "shipDate" : "2000-01-23T04:56:07.000+0000",
+ "petId" : 123456789,
"complete" : true,
- "status" : "aeiou"
+ "status" : "aeiou",
+ "quantity" : 123,
+ "shipDate" : "2000-01-23T04:56:07.000+0000"
};
if(Object.keys(examples).length > 0) {
res.setHeader('Content-Type', 'application/json');
@@ -58,12 +58,12 @@ exports.placeOrder = function(args, res, next) {
**/
var examples = {};
examples['application/json'] = {
- "petId" : 123456789,
- "quantity" : 123,
"id" : 123456789,
- "shipDate" : "2000-01-23T04:56:07.000+0000",
+ "petId" : 123456789,
"complete" : true,
- "status" : "aeiou"
+ "status" : "aeiou",
+ "quantity" : 123,
+ "shipDate" : "2000-01-23T04:56:07.000+0000"
};
if(Object.keys(examples).length > 0) {
res.setHeader('Content-Type', 'application/json');
diff --git a/samples/server/petstore/nodejs/controllers/UserService.js b/samples/server/petstore/nodejs/controllers/UserService.js
index 3a62feeaf3f..69fc1a81391 100644
--- a/samples/server/petstore/nodejs/controllers/UserService.js
+++ b/samples/server/petstore/nodejs/controllers/UserService.js
@@ -43,14 +43,14 @@ exports.getUserByName = function(args, res, next) {
**/
var examples = {};
examples['application/json'] = {
- "firstName" : "aeiou",
- "lastName" : "aeiou",
- "password" : "aeiou",
- "userStatus" : 123,
- "phone" : "aeiou",
"id" : 123456789,
+ "lastName" : "aeiou",
+ "phone" : "aeiou",
+ "username" : "aeiou",
"email" : "aeiou",
- "username" : "aeiou"
+ "userStatus" : 123,
+ "firstName" : "aeiou",
+ "password" : "aeiou"
};
if(Object.keys(examples).length > 0) {
res.setHeader('Content-Type', 'application/json');
diff --git a/samples/server/petstore/nodejs/package.json b/samples/server/petstore/nodejs/package.json
index c5884b196b9..0238a86860a 100644
--- a/samples/server/petstore/nodejs/package.json
+++ b/samples/server/petstore/nodejs/package.json
@@ -6,7 +6,7 @@
"keywords": [
"swagger"
],
- "license": "MIT",
+ "license": "Apache-2.0",
"private": true,
"dependencies": {
"connect": "^3.2.0",