From 74d91f4ea1141be6a3d19477199007d8c03c20b6 Mon Sep 17 00:00:00 2001 From: wing328 Date: Mon, 29 Feb 2016 12:11:54 +0800 Subject: [PATCH] add prefix, suffix to ts model --- .../AbstractTypeScriptClientCodegen.java | 32 +- .../resources/TypeScript-Angular/api.mustache | 4 +- .../resources/TypeScript-node/api.mustache | 14 +- .../TypeScriptAngularModelTest.java | 2 +- .../TypeScriptNodeModelTest.java | 2 +- .../typescript-angular/API/Client/PetApi.ts | 48 +- .../typescript-angular/API/Client/StoreApi.ts | 46 +- .../typescript-angular/API/Client/UserApi.ts | 32 +- .../client/petstore/typescript-node/api.ts | 444 +++++++++++------- 9 files changed, 400 insertions(+), 224 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java index 61ddfd2bf85..daf3d1543b1 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java @@ -17,12 +17,13 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp supportsInheritance = true; setReservedWordsLowerCase(Arrays.asList( // local variable names used in API methods (endpoints) - "path", "queryParameters", "headerParams", "formParams", "useFormData", "deferred", + "varLocalPath", "queryParameters", "headerParams", "formParams", "useFormData", "varLocalDeferred", "requestOptions", // Typescript reserved words "abstract", "await", "boolean", "break", "byte", "case", "catch", "char", "class", "const", "continue", "debugger", "default", "delete", "do", "double", "else", "enum", "export", "extends", "false", "final", "finally", "float", "for", "function", "goto", "if", "implements", "import", "in", "instanceof", "int", "interface", "let", "long", "native", "new", "null", "package", "private", "protected", "public", "return", "short", "static", "super", "switch", "synchronized", "this", "throw", "transient", "true", "try", "typeof", "var", "void", "volatile", "while", "with", "yield")); languageSpecificPrimitives = new HashSet(Arrays.asList( + "string", "String", "boolean", "Boolean", @@ -30,7 +31,12 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp "Integer", "Long", "Float", - "Object")); + "Object", + "Array", + "Date", + "number", + "any" + )); instantiationTypes.put("array", "Array"); typeMapping = new HashMap(); @@ -116,10 +122,22 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp @Override public String toModelName(String name) { - // model name cannot use reserved keyword, e.g. return - if (isReservedWord(name)) - throw new RuntimeException(name - + " (reserved word) cannot be used as a model name"); + name = sanitizeName(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. + + if (!StringUtils.isEmpty(modelNamePrefix)) { + name = modelNamePrefix + "_" + name; + } + + if (!StringUtils.isEmpty(modelNameSuffix)) { + name = name + "_" + modelNameSuffix; + } + + // model name cannot use reserved keyword, e.g. return + if (isReservedWord(name)) { + String modelName = camelize("object_" + name); + LOGGER.warn(name + " (reserved word) cannot be used as model name. Renamed to " + modelName); + return modelName; + } // camelize the model name // phone_number => PhoneNumber @@ -158,7 +176,7 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp return type; } else type = swaggerType; - return type; + return toModelName(type); } @Override diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache index 9efea198f36..427479cf675 100644 --- a/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache +++ b/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache @@ -39,7 +39,7 @@ namespace {{package}} { {{#allParams}}* @param {{paramName}} {{description}} {{/allParams}}*/ public {{nickname}} ({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/allParams}}extraHttpRequestParams?: any ) : ng.IHttpPromise<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}{}{{/returnType}}> { - const path = this.basePath + '{{path}}'{{#pathParams}} + const localVarPath = this.basePath + '{{path}}'{{#pathParams}} .replace('{' + '{{baseName}}' + '}', String({{paramName}})){{/pathParams}}; let queryParameters: any = {}; @@ -76,7 +76,7 @@ namespace {{package}} { {{/formParams}} let httpRequestParams: any = { method: '{{httpMethod}}', - url: path, + url: localVarPath, json: {{#hasFormParams}}false{{/hasFormParams}}{{^hasFormParams}}true{{/hasFormParams}}, {{#bodyParam}}data: {{paramName}}, {{/bodyParam}} diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache index a4f2bf62024..9e78174b956 100644 --- a/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache +++ b/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache @@ -179,7 +179,7 @@ export class {{classname}} { {{#allParams}}* @param {{paramName}} {{description}} {{/allParams}}*/ public {{nickname}} ({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) : Promise<{ response: http.ClientResponse; {{#returnType}}body: {{{returnType}}}; {{/returnType}}{{^returnType}}body?: any; {{/returnType}} }> { - const path = this.basePath + '{{path}}'{{#pathParams}} + const localVarPath = this.basePath + '{{path}}'{{#pathParams}} .replace('{' + '{{baseName}}' + '}', String({{paramName}})){{/pathParams}}; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); @@ -212,13 +212,13 @@ export class {{classname}} { {{/isFile}} {{/formParams}} - let deferred = promise.defer<{ response: http.ClientResponse; {{#returnType}}body: {{{returnType}}}; {{/returnType}}{{^returnType}}body?: any; {{/returnType}} }>(); + let localVarDeferred = promise.defer<{ response: http.ClientResponse; {{#returnType}}body: {{{returnType}}}; {{/returnType}}{{^returnType}}body?: any; {{/returnType}} }>(); let requestOptions: request.Options = { method: '{{httpMethod}}', qs: queryParameters, headers: headerParams, - uri: path, + uri: localVarPath, json: true, {{#bodyParam}} body: {{paramName}}, @@ -241,17 +241,17 @@ export class {{classname}} { request(requestOptions, (error, response, body) => { if (error) { - deferred.reject(error); + localVarDeferred.reject(error); } else { if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); + localVarDeferred.resolve({ response: response, body: body }); } else { - deferred.reject({ response: response, body: body }); + localVarDeferred.reject({ response: response, body: body }); } } }); - return deferred.promise; + return localVarDeferred.promise; } {{/operation}} } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptangular/TypeScriptAngularModelTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptangular/TypeScriptAngularModelTest.java index 78b14f50e87..26e8f841be9 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptangular/TypeScriptAngularModelTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptangular/TypeScriptAngularModelTest.java @@ -59,7 +59,7 @@ public class TypeScriptAngularModelTest { final CodegenProperty property3 = cm.vars.get(2); Assert.assertEquals(property3.baseName, "createdAt"); - Assert.assertEquals(property3.complexType, "Date"); + Assert.assertEquals(property3.complexType, null); Assert.assertEquals(property3.datatype, "Date"); Assert.assertEquals(property3.name, "createdAt"); Assert.assertEquals(property3.defaultValue, "null"); diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptnode/TypeScriptNodeModelTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptnode/TypeScriptNodeModelTest.java index 95398b155cf..81a67e87b87 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptnode/TypeScriptNodeModelTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptnode/TypeScriptNodeModelTest.java @@ -59,7 +59,7 @@ public class TypeScriptNodeModelTest { final CodegenProperty property3 = cm.vars.get(2); Assert.assertEquals(property3.baseName, "createdAt"); - Assert.assertEquals(property3.complexType, "Date"); + Assert.assertEquals(property3.complexType, null); Assert.assertEquals(property3.datatype, "Date"); Assert.assertEquals(property3.name, "createdAt"); Assert.assertEquals(property3.defaultValue, "null"); diff --git a/samples/client/petstore/typescript-angular/API/Client/PetApi.ts b/samples/client/petstore/typescript-angular/API/Client/PetApi.ts index 50a31d126a5..98a18b1124f 100644 --- a/samples/client/petstore/typescript-angular/API/Client/PetApi.ts +++ b/samples/client/petstore/typescript-angular/API/Client/PetApi.ts @@ -32,13 +32,13 @@ namespace API.Client { * @param body Pet object that needs to be added to the store */ public updatePet (body?: Pet, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { - const path = this.basePath + '/pet'; + const localVarPath = this.basePath + '/pet'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); let httpRequestParams: any = { method: 'PUT', - url: path, + url: localVarPath, json: true, data: body, @@ -59,13 +59,13 @@ namespace API.Client { * @param body Pet object that needs to be added to the store */ public addPet (body?: Pet, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { - const path = this.basePath + '/pet'; + const localVarPath = this.basePath + '/pet'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); let httpRequestParams: any = { method: 'POST', - url: path, + url: localVarPath, json: true, data: body, @@ -82,11 +82,11 @@ namespace API.Client { } /** * Finds Pets by status - * Multiple status values can be provided with comma seperated strings - * @param status Status values that need to be considered for filter + * Multiple status values can be provided with comma separated strings + * @param status Status values that need to be considered for query */ public findPetsByStatus (status?: Array, extraHttpRequestParams?: any ) : ng.IHttpPromise> { - const path = this.basePath + '/pet/findByStatus'; + const localVarPath = this.basePath + '/pet/findByStatus'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); @@ -96,7 +96,7 @@ namespace API.Client { let httpRequestParams: any = { method: 'GET', - url: path, + url: localVarPath, json: true, @@ -116,7 +116,7 @@ namespace API.Client { * @param tags Tags to filter by */ public findPetsByTags (tags?: Array, extraHttpRequestParams?: any ) : ng.IHttpPromise> { - const path = this.basePath + '/pet/findByTags'; + const localVarPath = this.basePath + '/pet/findByTags'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); @@ -126,7 +126,7 @@ namespace API.Client { let httpRequestParams: any = { method: 'GET', - url: path, + url: localVarPath, json: true, @@ -146,7 +146,7 @@ namespace API.Client { * @param petId ID of pet that needs to be fetched */ public getPetById (petId: number, extraHttpRequestParams?: any ) : ng.IHttpPromise { - const path = this.basePath + '/pet/{petId}' + const localVarPath = this.basePath + '/pet/{petId}' .replace('{' + 'petId' + '}', String(petId)); let queryParameters: any = {}; @@ -157,7 +157,7 @@ namespace API.Client { } let httpRequestParams: any = { method: 'GET', - url: path, + url: localVarPath, json: true, @@ -179,7 +179,7 @@ namespace API.Client { * @param status Updated status of the pet */ public updatePetWithForm (petId: string, name?: string, status?: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { - const path = this.basePath + '/pet/{petId}' + const localVarPath = this.basePath + '/pet/{petId}' .replace('{' + 'petId' + '}', String(petId)); let queryParameters: any = {}; @@ -198,7 +198,7 @@ namespace API.Client { let httpRequestParams: any = { method: 'POST', - url: path, + url: localVarPath, json: false, data: this.$httpParamSerializer(formParams), @@ -220,7 +220,7 @@ namespace API.Client { * @param apiKey */ public deletePet (petId: number, apiKey?: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { - const path = this.basePath + '/pet/{petId}' + const localVarPath = this.basePath + '/pet/{petId}' .replace('{' + 'petId' + '}', String(petId)); let queryParameters: any = {}; @@ -233,7 +233,7 @@ namespace API.Client { let httpRequestParams: any = { method: 'DELETE', - url: path, + url: localVarPath, json: true, @@ -255,7 +255,7 @@ namespace API.Client { * @param file file to upload */ public uploadFile (petId: number, additionalMetadata?: string, file?: any, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { - const path = this.basePath + '/pet/{petId}/uploadImage' + const localVarPath = this.basePath + '/pet/{petId}/uploadImage' .replace('{' + 'petId' + '}', String(petId)); let queryParameters: any = {}; @@ -274,7 +274,7 @@ namespace API.Client { let httpRequestParams: any = { method: 'POST', - url: path, + url: localVarPath, json: false, data: this.$httpParamSerializer(formParams), @@ -294,19 +294,19 @@ namespace API.Client { * Returns a pet when ID < 10. ID > 10 or nonintegers will simulate API error conditions * @param petId ID of pet that needs to be fetched */ - public getPetByIdWithByteArray (petId: number, extraHttpRequestParams?: any ) : ng.IHttpPromise { - const path = this.basePath + '/pet/{petId}?testing_byte_array=true' + public petPetIdtestingByteArraytrueGet (petId: number, extraHttpRequestParams?: any ) : ng.IHttpPromise { + const localVarPath = this.basePath + '/pet/{petId}?testing_byte_array=true' .replace('{' + 'petId' + '}', String(petId)); let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); // verify required parameter 'petId' is set if (!petId) { - throw new Error('Missing required parameter petId when calling getPetByIdWithByteArray'); + throw new Error('Missing required parameter petId when calling petPetIdtestingByteArraytrueGet'); } let httpRequestParams: any = { method: 'GET', - url: path, + url: localVarPath, json: true, @@ -326,13 +326,13 @@ namespace API.Client { * @param body Pet object in the form of byte array */ public addPetUsingByteArray (body?: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { - const path = this.basePath + '/pet?testing_byte_array=true'; + const localVarPath = this.basePath + '/pet?testing_byte_array=true'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); let httpRequestParams: any = { method: 'POST', - url: path, + url: localVarPath, json: true, data: body, diff --git a/samples/client/petstore/typescript-angular/API/Client/StoreApi.ts b/samples/client/petstore/typescript-angular/API/Client/StoreApi.ts index 3d3c445a144..7c9115fbe8f 100644 --- a/samples/client/petstore/typescript-angular/API/Client/StoreApi.ts +++ b/samples/client/petstore/typescript-angular/API/Client/StoreApi.ts @@ -26,18 +26,48 @@ namespace API.Client { return objA; } + /** + * Finds orders by status + * A single status value can be provided as a string + * @param status Status value that needs to be considered for query + */ + public findOrdersByStatus (status?: string, extraHttpRequestParams?: any ) : ng.IHttpPromise> { + const localVarPath = this.basePath + '/store/findByStatus'; + + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + if (status !== undefined) { + queryParameters['status'] = status; + } + + let httpRequestParams: any = { + method: 'GET', + url: localVarPath, + json: true, + + + params: queryParameters, + headers: headerParams + }; + + if (extraHttpRequestParams) { + httpRequestParams = this.extendObj(httpRequestParams, extraHttpRequestParams); + } + + return this.$http(httpRequestParams); + } /** * Returns pet inventories by status * Returns a map of status codes to quantities */ public getInventory (extraHttpRequestParams?: any ) : ng.IHttpPromise<{ [key: string]: number; }> { - const path = this.basePath + '/store/inventory'; + const localVarPath = this.basePath + '/store/inventory'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); let httpRequestParams: any = { method: 'GET', - url: path, + url: localVarPath, json: true, @@ -57,13 +87,13 @@ namespace API.Client { * @param body order placed for purchasing the pet */ public placeOrder (body?: Order, extraHttpRequestParams?: any ) : ng.IHttpPromise { - const path = this.basePath + '/store/order'; + const localVarPath = this.basePath + '/store/order'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); let httpRequestParams: any = { method: 'POST', - url: path, + url: localVarPath, json: true, data: body, @@ -84,7 +114,7 @@ namespace API.Client { * @param orderId ID of pet that needs to be fetched */ public getOrderById (orderId: string, extraHttpRequestParams?: any ) : ng.IHttpPromise { - const path = this.basePath + '/store/order/{orderId}' + const localVarPath = this.basePath + '/store/order/{orderId}' .replace('{' + 'orderId' + '}', String(orderId)); let queryParameters: any = {}; @@ -95,7 +125,7 @@ namespace API.Client { } let httpRequestParams: any = { method: 'GET', - url: path, + url: localVarPath, json: true, @@ -115,7 +145,7 @@ namespace API.Client { * @param orderId ID of the order that needs to be deleted */ public deleteOrder (orderId: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { - const path = this.basePath + '/store/order/{orderId}' + const localVarPath = this.basePath + '/store/order/{orderId}' .replace('{' + 'orderId' + '}', String(orderId)); let queryParameters: any = {}; @@ -126,7 +156,7 @@ namespace API.Client { } let httpRequestParams: any = { method: 'DELETE', - url: path, + url: localVarPath, json: true, diff --git a/samples/client/petstore/typescript-angular/API/Client/UserApi.ts b/samples/client/petstore/typescript-angular/API/Client/UserApi.ts index 376bdb8935a..719085a63ac 100644 --- a/samples/client/petstore/typescript-angular/API/Client/UserApi.ts +++ b/samples/client/petstore/typescript-angular/API/Client/UserApi.ts @@ -32,13 +32,13 @@ namespace API.Client { * @param body Created user object */ public createUser (body?: User, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { - const path = this.basePath + '/user'; + const localVarPath = this.basePath + '/user'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); let httpRequestParams: any = { method: 'POST', - url: path, + url: localVarPath, json: true, data: body, @@ -59,13 +59,13 @@ namespace API.Client { * @param body List of user object */ public createUsersWithArrayInput (body?: Array, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { - const path = this.basePath + '/user/createWithArray'; + const localVarPath = this.basePath + '/user/createWithArray'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); let httpRequestParams: any = { method: 'POST', - url: path, + url: localVarPath, json: true, data: body, @@ -86,13 +86,13 @@ namespace API.Client { * @param body List of user object */ public createUsersWithListInput (body?: Array, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { - const path = this.basePath + '/user/createWithList'; + const localVarPath = this.basePath + '/user/createWithList'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); let httpRequestParams: any = { method: 'POST', - url: path, + url: localVarPath, json: true, data: body, @@ -114,7 +114,7 @@ namespace API.Client { * @param password The password for login in clear text */ public loginUser (username?: string, password?: string, extraHttpRequestParams?: any ) : ng.IHttpPromise { - const path = this.basePath + '/user/login'; + const localVarPath = this.basePath + '/user/login'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); @@ -128,7 +128,7 @@ namespace API.Client { let httpRequestParams: any = { method: 'GET', - url: path, + url: localVarPath, json: true, @@ -147,13 +147,13 @@ namespace API.Client { * */ public logoutUser (extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { - const path = this.basePath + '/user/logout'; + const localVarPath = this.basePath + '/user/logout'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); let httpRequestParams: any = { method: 'GET', - url: path, + url: localVarPath, json: true, @@ -173,7 +173,7 @@ namespace API.Client { * @param username The name that needs to be fetched. Use user1 for testing. */ public getUserByName (username: string, extraHttpRequestParams?: any ) : ng.IHttpPromise { - const path = this.basePath + '/user/{username}' + const localVarPath = this.basePath + '/user/{username}' .replace('{' + 'username' + '}', String(username)); let queryParameters: any = {}; @@ -184,7 +184,7 @@ namespace API.Client { } let httpRequestParams: any = { method: 'GET', - url: path, + url: localVarPath, json: true, @@ -205,7 +205,7 @@ namespace API.Client { * @param body Updated user object */ public updateUser (username: string, body?: User, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { - const path = this.basePath + '/user/{username}' + const localVarPath = this.basePath + '/user/{username}' .replace('{' + 'username' + '}', String(username)); let queryParameters: any = {}; @@ -216,7 +216,7 @@ namespace API.Client { } let httpRequestParams: any = { method: 'PUT', - url: path, + url: localVarPath, json: true, data: body, @@ -237,7 +237,7 @@ namespace API.Client { * @param username The name that needs to be deleted */ public deleteUser (username: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { - const path = this.basePath + '/user/{username}' + const localVarPath = this.basePath + '/user/{username}' .replace('{' + 'username' + '}', String(username)); let queryParameters: any = {}; @@ -248,7 +248,7 @@ namespace API.Client { } let httpRequestParams: any = { method: 'DELETE', - url: path, + url: localVarPath, json: true, diff --git a/samples/client/petstore/typescript-node/api.ts b/samples/client/petstore/typescript-node/api.ts index c6a0b323ebd..8acf6f06000 100644 --- a/samples/client/petstore/typescript-node/api.ts +++ b/samples/client/petstore/typescript-node/api.ts @@ -127,7 +127,11 @@ export class UserApi { public authentications = { 'default': new VoidAuth(), + 'test_api_key_header': new ApiKeyAuth('header', 'test_api_key_header'), 'api_key': new ApiKeyAuth('header', 'api_key'), + 'test_api_client_secret': new ApiKeyAuth('header', 'x-test_api_client_secret'), + 'test_api_client_id': new ApiKeyAuth('header', 'x-test_api_client_id'), + 'test_api_key_query': new ApiKeyAuth('query', 'test_api_key_query'), 'petstore_auth': new OAuth(), } @@ -144,10 +148,26 @@ export class UserApi { } } + set apiKey(key: string) { + this.authentications.test_api_key_header.apiKey = key; + } + set apiKey(key: string) { this.authentications.api_key.apiKey = key; } + set apiKey(key: string) { + this.authentications.test_api_client_secret.apiKey = key; + } + + set apiKey(key: string) { + this.authentications.test_api_client_id.apiKey = key; + } + + set apiKey(key: string) { + this.authentications.test_api_key_query.apiKey = key; + } + set accessToken(token: string) { this.authentications.petstore_auth.accessToken = token; } @@ -165,7 +185,7 @@ export class UserApi { * @param body Created user object */ public createUser (body?: User) : Promise<{ response: http.ClientResponse; body?: any; }> { - const path = this.basePath + '/user'; + const localVarPath = this.basePath + '/user'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); let formParams: any = {}; @@ -173,13 +193,13 @@ export class UserApi { let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); + let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); let requestOptions: request.Options = { method: 'POST', qs: queryParameters, headers: headerParams, - uri: path, + uri: localVarPath, json: true, body: body, } @@ -196,17 +216,17 @@ export class UserApi { request(requestOptions, (error, response, body) => { if (error) { - deferred.reject(error); + localVarDeferred.reject(error); } else { if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); + localVarDeferred.resolve({ response: response, body: body }); } else { - deferred.reject({ response: response, body: body }); + localVarDeferred.reject({ response: response, body: body }); } } }); - return deferred.promise; + return localVarDeferred.promise; } /** * Creates list of users with given input array @@ -214,7 +234,7 @@ export class UserApi { * @param body List of user object */ public createUsersWithArrayInput (body?: Array) : Promise<{ response: http.ClientResponse; body?: any; }> { - const path = this.basePath + '/user/createWithArray'; + const localVarPath = this.basePath + '/user/createWithArray'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); let formParams: any = {}; @@ -222,13 +242,13 @@ export class UserApi { let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); + let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); let requestOptions: request.Options = { method: 'POST', qs: queryParameters, headers: headerParams, - uri: path, + uri: localVarPath, json: true, body: body, } @@ -245,17 +265,17 @@ export class UserApi { request(requestOptions, (error, response, body) => { if (error) { - deferred.reject(error); + localVarDeferred.reject(error); } else { if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); + localVarDeferred.resolve({ response: response, body: body }); } else { - deferred.reject({ response: response, body: body }); + localVarDeferred.reject({ response: response, body: body }); } } }); - return deferred.promise; + return localVarDeferred.promise; } /** * Creates list of users with given input array @@ -263,7 +283,7 @@ export class UserApi { * @param body List of user object */ public createUsersWithListInput (body?: Array) : Promise<{ response: http.ClientResponse; body?: any; }> { - const path = this.basePath + '/user/createWithList'; + const localVarPath = this.basePath + '/user/createWithList'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); let formParams: any = {}; @@ -271,13 +291,13 @@ export class UserApi { let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); + let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); let requestOptions: request.Options = { method: 'POST', qs: queryParameters, headers: headerParams, - uri: path, + uri: localVarPath, json: true, body: body, } @@ -294,17 +314,17 @@ export class UserApi { request(requestOptions, (error, response, body) => { if (error) { - deferred.reject(error); + localVarDeferred.reject(error); } else { if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); + localVarDeferred.resolve({ response: response, body: body }); } else { - deferred.reject({ response: response, body: body }); + localVarDeferred.reject({ response: response, body: body }); } } }); - return deferred.promise; + return localVarDeferred.promise; } /** * Logs user into the system @@ -313,7 +333,7 @@ export class UserApi { * @param password The password for login in clear text */ public loginUser (username?: string, password?: string) : Promise<{ response: http.ClientResponse; body: string; }> { - const path = this.basePath + '/user/login'; + const localVarPath = this.basePath + '/user/login'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); let formParams: any = {}; @@ -329,13 +349,13 @@ export class UserApi { let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body: string; }>(); + let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: string; }>(); let requestOptions: request.Options = { method: 'GET', qs: queryParameters, headers: headerParams, - uri: path, + uri: localVarPath, json: true, } @@ -351,24 +371,24 @@ export class UserApi { request(requestOptions, (error, response, body) => { if (error) { - deferred.reject(error); + localVarDeferred.reject(error); } else { if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); + localVarDeferred.resolve({ response: response, body: body }); } else { - deferred.reject({ response: response, body: body }); + localVarDeferred.reject({ response: response, body: body }); } } }); - return deferred.promise; + return localVarDeferred.promise; } /** * Logs out current logged in user session * */ public logoutUser () : Promise<{ response: http.ClientResponse; body?: any; }> { - const path = this.basePath + '/user/logout'; + const localVarPath = this.basePath + '/user/logout'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); let formParams: any = {}; @@ -376,13 +396,13 @@ export class UserApi { let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); + let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); let requestOptions: request.Options = { method: 'GET', qs: queryParameters, headers: headerParams, - uri: path, + uri: localVarPath, json: true, } @@ -398,17 +418,17 @@ export class UserApi { request(requestOptions, (error, response, body) => { if (error) { - deferred.reject(error); + localVarDeferred.reject(error); } else { if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); + localVarDeferred.resolve({ response: response, body: body }); } else { - deferred.reject({ response: response, body: body }); + localVarDeferred.reject({ response: response, body: body }); } } }); - return deferred.promise; + return localVarDeferred.promise; } /** * Get user by user name @@ -416,7 +436,7 @@ export class UserApi { * @param username The name that needs to be fetched. Use user1 for testing. */ public getUserByName (username: string) : Promise<{ response: http.ClientResponse; body: User; }> { - const path = this.basePath + '/user/{username}' + const localVarPath = this.basePath + '/user/{username}' .replace('{' + 'username' + '}', String(username)); let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); @@ -430,13 +450,13 @@ export class UserApi { let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body: User; }>(); + let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: User; }>(); let requestOptions: request.Options = { method: 'GET', qs: queryParameters, headers: headerParams, - uri: path, + uri: localVarPath, json: true, } @@ -452,17 +472,17 @@ export class UserApi { request(requestOptions, (error, response, body) => { if (error) { - deferred.reject(error); + localVarDeferred.reject(error); } else { if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); + localVarDeferred.resolve({ response: response, body: body }); } else { - deferred.reject({ response: response, body: body }); + localVarDeferred.reject({ response: response, body: body }); } } }); - return deferred.promise; + return localVarDeferred.promise; } /** * Updated user @@ -471,7 +491,7 @@ export class UserApi { * @param body Updated user object */ public updateUser (username: string, body?: User) : Promise<{ response: http.ClientResponse; body?: any; }> { - const path = this.basePath + '/user/{username}' + const localVarPath = this.basePath + '/user/{username}' .replace('{' + 'username' + '}', String(username)); let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); @@ -485,13 +505,13 @@ export class UserApi { let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); + let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); let requestOptions: request.Options = { method: 'PUT', qs: queryParameters, headers: headerParams, - uri: path, + uri: localVarPath, json: true, body: body, } @@ -508,17 +528,17 @@ export class UserApi { request(requestOptions, (error, response, body) => { if (error) { - deferred.reject(error); + localVarDeferred.reject(error); } else { if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); + localVarDeferred.resolve({ response: response, body: body }); } else { - deferred.reject({ response: response, body: body }); + localVarDeferred.reject({ response: response, body: body }); } } }); - return deferred.promise; + return localVarDeferred.promise; } /** * Delete user @@ -526,7 +546,7 @@ export class UserApi { * @param username The name that needs to be deleted */ public deleteUser (username: string) : Promise<{ response: http.ClientResponse; body?: any; }> { - const path = this.basePath + '/user/{username}' + const localVarPath = this.basePath + '/user/{username}' .replace('{' + 'username' + '}', String(username)); let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); @@ -540,13 +560,13 @@ export class UserApi { let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); + let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); let requestOptions: request.Options = { method: 'DELETE', qs: queryParameters, headers: headerParams, - uri: path, + uri: localVarPath, json: true, } @@ -562,17 +582,17 @@ export class UserApi { request(requestOptions, (error, response, body) => { if (error) { - deferred.reject(error); + localVarDeferred.reject(error); } else { if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); + localVarDeferred.resolve({ response: response, body: body }); } else { - deferred.reject({ response: response, body: body }); + localVarDeferred.reject({ response: response, body: body }); } } }); - return deferred.promise; + return localVarDeferred.promise; } } export class PetApi { @@ -583,7 +603,11 @@ export class PetApi { public authentications = { 'default': new VoidAuth(), + 'test_api_key_header': new ApiKeyAuth('header', 'test_api_key_header'), 'api_key': new ApiKeyAuth('header', 'api_key'), + 'test_api_client_secret': new ApiKeyAuth('header', 'x-test_api_client_secret'), + 'test_api_client_id': new ApiKeyAuth('header', 'x-test_api_client_id'), + 'test_api_key_query': new ApiKeyAuth('query', 'test_api_key_query'), 'petstore_auth': new OAuth(), } @@ -600,10 +624,26 @@ export class PetApi { } } + set apiKey(key: string) { + this.authentications.test_api_key_header.apiKey = key; + } + set apiKey(key: string) { this.authentications.api_key.apiKey = key; } + set apiKey(key: string) { + this.authentications.test_api_client_secret.apiKey = key; + } + + set apiKey(key: string) { + this.authentications.test_api_client_id.apiKey = key; + } + + set apiKey(key: string) { + this.authentications.test_api_key_query.apiKey = key; + } + set accessToken(token: string) { this.authentications.petstore_auth.accessToken = token; } @@ -621,7 +661,7 @@ export class PetApi { * @param body Pet object that needs to be added to the store */ public updatePet (body?: Pet) : Promise<{ response: http.ClientResponse; body?: any; }> { - const path = this.basePath + '/pet'; + const localVarPath = this.basePath + '/pet'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); let formParams: any = {}; @@ -629,13 +669,13 @@ export class PetApi { let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); + let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); let requestOptions: request.Options = { method: 'PUT', qs: queryParameters, headers: headerParams, - uri: path, + uri: localVarPath, json: true, body: body, } @@ -654,17 +694,17 @@ export class PetApi { request(requestOptions, (error, response, body) => { if (error) { - deferred.reject(error); + localVarDeferred.reject(error); } else { if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); + localVarDeferred.resolve({ response: response, body: body }); } else { - deferred.reject({ response: response, body: body }); + localVarDeferred.reject({ response: response, body: body }); } } }); - return deferred.promise; + return localVarDeferred.promise; } /** * Add a new pet to the store @@ -672,7 +712,7 @@ export class PetApi { * @param body Pet object that needs to be added to the store */ public addPet (body?: Pet) : Promise<{ response: http.ClientResponse; body?: any; }> { - const path = this.basePath + '/pet'; + const localVarPath = this.basePath + '/pet'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); let formParams: any = {}; @@ -680,13 +720,13 @@ export class PetApi { let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); + let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); let requestOptions: request.Options = { method: 'POST', qs: queryParameters, headers: headerParams, - uri: path, + uri: localVarPath, json: true, body: body, } @@ -705,25 +745,25 @@ export class PetApi { request(requestOptions, (error, response, body) => { if (error) { - deferred.reject(error); + localVarDeferred.reject(error); } else { if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); + localVarDeferred.resolve({ response: response, body: body }); } else { - deferred.reject({ response: response, body: body }); + localVarDeferred.reject({ response: response, body: body }); } } }); - return deferred.promise; + return localVarDeferred.promise; } /** * Finds Pets by status - * Multiple status values can be provided with comma seperated strings - * @param status Status values that need to be considered for filter + * Multiple status values can be provided with comma separated strings + * @param status Status values that need to be considered for query */ public findPetsByStatus (status?: Array) : Promise<{ response: http.ClientResponse; body: Array; }> { - const path = this.basePath + '/pet/findByStatus'; + const localVarPath = this.basePath + '/pet/findByStatus'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); let formParams: any = {}; @@ -735,13 +775,13 @@ export class PetApi { let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body: Array; }>(); + let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: Array; }>(); let requestOptions: request.Options = { method: 'GET', qs: queryParameters, headers: headerParams, - uri: path, + uri: localVarPath, json: true, } @@ -759,17 +799,17 @@ export class PetApi { request(requestOptions, (error, response, body) => { if (error) { - deferred.reject(error); + localVarDeferred.reject(error); } else { if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); + localVarDeferred.resolve({ response: response, body: body }); } else { - deferred.reject({ response: response, body: body }); + localVarDeferred.reject({ response: response, body: body }); } } }); - return deferred.promise; + return localVarDeferred.promise; } /** * Finds Pets by tags @@ -777,7 +817,7 @@ export class PetApi { * @param tags Tags to filter by */ public findPetsByTags (tags?: Array) : Promise<{ response: http.ClientResponse; body: Array; }> { - const path = this.basePath + '/pet/findByTags'; + const localVarPath = this.basePath + '/pet/findByTags'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); let formParams: any = {}; @@ -789,13 +829,13 @@ export class PetApi { let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body: Array; }>(); + let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: Array; }>(); let requestOptions: request.Options = { method: 'GET', qs: queryParameters, headers: headerParams, - uri: path, + uri: localVarPath, json: true, } @@ -813,17 +853,17 @@ export class PetApi { request(requestOptions, (error, response, body) => { if (error) { - deferred.reject(error); + localVarDeferred.reject(error); } else { if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); + localVarDeferred.resolve({ response: response, body: body }); } else { - deferred.reject({ response: response, body: body }); + localVarDeferred.reject({ response: response, body: body }); } } }); - return deferred.promise; + return localVarDeferred.promise; } /** * Find pet by ID @@ -831,7 +871,7 @@ export class PetApi { * @param petId ID of pet that needs to be fetched */ public getPetById (petId: number) : Promise<{ response: http.ClientResponse; body: Pet; }> { - const path = this.basePath + '/pet/{petId}' + const localVarPath = this.basePath + '/pet/{petId}' .replace('{' + 'petId' + '}', String(petId)); let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); @@ -845,18 +885,20 @@ export class PetApi { let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body: Pet; }>(); + let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: Pet; }>(); let requestOptions: request.Options = { method: 'GET', qs: queryParameters, headers: headerParams, - uri: path, + uri: localVarPath, json: true, } this.authentications.api_key.applyToRequest(requestOptions); + this.authentications.petstore_auth.applyToRequest(requestOptions); + this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -869,17 +911,17 @@ export class PetApi { request(requestOptions, (error, response, body) => { if (error) { - deferred.reject(error); + localVarDeferred.reject(error); } else { if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); + localVarDeferred.resolve({ response: response, body: body }); } else { - deferred.reject({ response: response, body: body }); + localVarDeferred.reject({ response: response, body: body }); } } }); - return deferred.promise; + return localVarDeferred.promise; } /** * Updates a pet in the store with form data @@ -889,7 +931,7 @@ export class PetApi { * @param status Updated status of the pet */ public updatePetWithForm (petId: string, name?: string, status?: string) : Promise<{ response: http.ClientResponse; body?: any; }> { - const path = this.basePath + '/pet/{petId}' + const localVarPath = this.basePath + '/pet/{petId}' .replace('{' + 'petId' + '}', String(petId)); let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); @@ -911,13 +953,13 @@ export class PetApi { formParams['status'] = status; } - let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); + let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); let requestOptions: request.Options = { method: 'POST', qs: queryParameters, headers: headerParams, - uri: path, + uri: localVarPath, json: true, } @@ -935,17 +977,17 @@ export class PetApi { request(requestOptions, (error, response, body) => { if (error) { - deferred.reject(error); + localVarDeferred.reject(error); } else { if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); + localVarDeferred.resolve({ response: response, body: body }); } else { - deferred.reject({ response: response, body: body }); + localVarDeferred.reject({ response: response, body: body }); } } }); - return deferred.promise; + return localVarDeferred.promise; } /** * Deletes a pet @@ -954,7 +996,7 @@ export class PetApi { * @param apiKey */ public deletePet (petId: number, apiKey?: string) : Promise<{ response: http.ClientResponse; body?: any; }> { - const path = this.basePath + '/pet/{petId}' + const localVarPath = this.basePath + '/pet/{petId}' .replace('{' + 'petId' + '}', String(petId)); let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); @@ -970,13 +1012,13 @@ export class PetApi { let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); + let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); let requestOptions: request.Options = { method: 'DELETE', qs: queryParameters, headers: headerParams, - uri: path, + uri: localVarPath, json: true, } @@ -994,17 +1036,17 @@ export class PetApi { request(requestOptions, (error, response, body) => { if (error) { - deferred.reject(error); + localVarDeferred.reject(error); } else { if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); + localVarDeferred.resolve({ response: response, body: body }); } else { - deferred.reject({ response: response, body: body }); + localVarDeferred.reject({ response: response, body: body }); } } }); - return deferred.promise; + return localVarDeferred.promise; } /** * uploads an image @@ -1014,7 +1056,7 @@ export class PetApi { * @param file file to upload */ public uploadFile (petId: number, additionalMetadata?: string, file?: any) : Promise<{ response: http.ClientResponse; body?: any; }> { - const path = this.basePath + '/pet/{petId}/uploadImage' + const localVarPath = this.basePath + '/pet/{petId}/uploadImage' .replace('{' + 'petId' + '}', String(petId)); let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); @@ -1037,13 +1079,13 @@ export class PetApi { } useFormData = true; - let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); + let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); let requestOptions: request.Options = { method: 'POST', qs: queryParameters, headers: headerParams, - uri: path, + uri: localVarPath, json: true, } @@ -1061,25 +1103,25 @@ export class PetApi { request(requestOptions, (error, response, body) => { if (error) { - deferred.reject(error); + localVarDeferred.reject(error); } else { if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); + localVarDeferred.resolve({ response: response, body: body }); } else { - deferred.reject({ response: response, body: body }); + localVarDeferred.reject({ response: response, body: body }); } } }); - return deferred.promise; + return localVarDeferred.promise; } /** * Fake endpoint to test byte array return by 'Find pet by ID' * Returns a pet when ID < 10. ID > 10 or nonintegers will simulate API error conditions * @param petId ID of pet that needs to be fetched */ - public getPetByIdWithByteArray (petId: number) : Promise<{ response: http.ClientResponse; body: string; }> { - const path = this.basePath + '/pet/{petId}?testing_byte_array=true' + public petPetIdtestingByteArraytrueGet (petId: number) : Promise<{ response: http.ClientResponse; body: string; }> { + const localVarPath = this.basePath + '/pet/{petId}?testing_byte_array=true' .replace('{' + 'petId' + '}', String(petId)); let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); @@ -1088,23 +1130,25 @@ export class PetApi { // verify required parameter 'petId' is set if (!petId) { - throw new Error('Missing required parameter petId when calling getPetByIdWithByteArray'); + throw new Error('Missing required parameter petId when calling petPetIdtestingByteArraytrueGet'); } let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body: string; }>(); + let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: string; }>(); let requestOptions: request.Options = { method: 'GET', qs: queryParameters, headers: headerParams, - uri: path, + uri: localVarPath, json: true, } this.authentications.api_key.applyToRequest(requestOptions); + this.authentications.petstore_auth.applyToRequest(requestOptions); + this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -1117,17 +1161,17 @@ export class PetApi { request(requestOptions, (error, response, body) => { if (error) { - deferred.reject(error); + localVarDeferred.reject(error); } else { if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); + localVarDeferred.resolve({ response: response, body: body }); } else { - deferred.reject({ response: response, body: body }); + localVarDeferred.reject({ response: response, body: body }); } } }); - return deferred.promise; + return localVarDeferred.promise; } /** * Fake endpoint to test byte array in body parameter for adding a new pet to the store @@ -1135,7 +1179,7 @@ export class PetApi { * @param body Pet object in the form of byte array */ public addPetUsingByteArray (body?: string) : Promise<{ response: http.ClientResponse; body?: any; }> { - const path = this.basePath + '/pet?testing_byte_array=true'; + const localVarPath = this.basePath + '/pet?testing_byte_array=true'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); let formParams: any = {}; @@ -1143,13 +1187,13 @@ export class PetApi { let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); + let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); let requestOptions: request.Options = { method: 'POST', qs: queryParameters, headers: headerParams, - uri: path, + uri: localVarPath, json: true, body: body, } @@ -1168,17 +1212,17 @@ export class PetApi { request(requestOptions, (error, response, body) => { if (error) { - deferred.reject(error); + localVarDeferred.reject(error); } else { if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); + localVarDeferred.resolve({ response: response, body: body }); } else { - deferred.reject({ response: response, body: body }); + localVarDeferred.reject({ response: response, body: body }); } } }); - return deferred.promise; + return localVarDeferred.promise; } } export class StoreApi { @@ -1189,7 +1233,11 @@ export class StoreApi { public authentications = { 'default': new VoidAuth(), + 'test_api_key_header': new ApiKeyAuth('header', 'test_api_key_header'), 'api_key': new ApiKeyAuth('header', 'api_key'), + 'test_api_client_secret': new ApiKeyAuth('header', 'x-test_api_client_secret'), + 'test_api_client_id': new ApiKeyAuth('header', 'x-test_api_client_id'), + 'test_api_key_query': new ApiKeyAuth('query', 'test_api_key_query'), 'petstore_auth': new OAuth(), } @@ -1206,10 +1254,26 @@ export class StoreApi { } } + set apiKey(key: string) { + this.authentications.test_api_key_header.apiKey = key; + } + set apiKey(key: string) { this.authentications.api_key.apiKey = key; } + set apiKey(key: string) { + this.authentications.test_api_client_secret.apiKey = key; + } + + set apiKey(key: string) { + this.authentications.test_api_client_id.apiKey = key; + } + + set apiKey(key: string) { + this.authentications.test_api_key_query.apiKey = key; + } + set accessToken(token: string) { this.authentications.petstore_auth.accessToken = token; } @@ -1221,12 +1285,68 @@ export class StoreApi { } return objA; } + /** + * Finds orders by status + * A single status value can be provided as a string + * @param status Status value that needs to be considered for query + */ + public findOrdersByStatus (status?: string) : Promise<{ response: http.ClientResponse; body: Array; }> { + const localVarPath = this.basePath + '/store/findByStatus'; + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + let formParams: any = {}; + + + if (status !== undefined) { + queryParameters['status'] = status; + } + + let useFormData = false; + + let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: Array; }>(); + + let requestOptions: request.Options = { + method: 'GET', + qs: queryParameters, + headers: headerParams, + uri: localVarPath, + json: true, + } + + this.authentications.test_api_client_id.applyToRequest(requestOptions); + + this.authentications.test_api_client_secret.applyToRequest(requestOptions); + + this.authentications.default.applyToRequest(requestOptions); + + if (Object.keys(formParams).length) { + if (useFormData) { + (requestOptions).formData = formParams; + } else { + 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 }); + } else { + localVarDeferred.reject({ response: response, body: body }); + } + } + }); + + return localVarDeferred.promise; + } /** * Returns pet inventories by status * Returns a map of status codes to quantities */ public getInventory () : Promise<{ response: http.ClientResponse; body: { [key: string]: number; }; }> { - const path = this.basePath + '/store/inventory'; + const localVarPath = this.basePath + '/store/inventory'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); let formParams: any = {}; @@ -1234,13 +1354,13 @@ export class StoreApi { let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body: { [key: string]: number; }; }>(); + let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: { [key: string]: number; }; }>(); let requestOptions: request.Options = { method: 'GET', qs: queryParameters, headers: headerParams, - uri: path, + uri: localVarPath, json: true, } @@ -1258,17 +1378,17 @@ export class StoreApi { request(requestOptions, (error, response, body) => { if (error) { - deferred.reject(error); + localVarDeferred.reject(error); } else { if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); + localVarDeferred.resolve({ response: response, body: body }); } else { - deferred.reject({ response: response, body: body }); + localVarDeferred.reject({ response: response, body: body }); } } }); - return deferred.promise; + return localVarDeferred.promise; } /** * Place an order for a pet @@ -1276,7 +1396,7 @@ export class StoreApi { * @param body order placed for purchasing the pet */ public placeOrder (body?: Order) : Promise<{ response: http.ClientResponse; body: Order; }> { - const path = this.basePath + '/store/order'; + const localVarPath = this.basePath + '/store/order'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); let formParams: any = {}; @@ -1284,17 +1404,21 @@ export class StoreApi { let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body: Order; }>(); + let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: Order; }>(); let requestOptions: request.Options = { method: 'POST', qs: queryParameters, headers: headerParams, - uri: path, + uri: localVarPath, json: true, body: body, } + this.authentications.test_api_client_id.applyToRequest(requestOptions); + + this.authentications.test_api_client_secret.applyToRequest(requestOptions); + this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -1307,17 +1431,17 @@ export class StoreApi { request(requestOptions, (error, response, body) => { if (error) { - deferred.reject(error); + localVarDeferred.reject(error); } else { if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); + localVarDeferred.resolve({ response: response, body: body }); } else { - deferred.reject({ response: response, body: body }); + localVarDeferred.reject({ response: response, body: body }); } } }); - return deferred.promise; + return localVarDeferred.promise; } /** * Find purchase order by ID @@ -1325,7 +1449,7 @@ export class StoreApi { * @param orderId ID of pet that needs to be fetched */ public getOrderById (orderId: string) : Promise<{ response: http.ClientResponse; body: Order; }> { - const path = this.basePath + '/store/order/{orderId}' + const localVarPath = this.basePath + '/store/order/{orderId}' .replace('{' + 'orderId' + '}', String(orderId)); let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); @@ -1339,16 +1463,20 @@ export class StoreApi { let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body: Order; }>(); + let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: Order; }>(); let requestOptions: request.Options = { method: 'GET', qs: queryParameters, headers: headerParams, - uri: path, + uri: localVarPath, json: true, } + this.authentications.test_api_key_header.applyToRequest(requestOptions); + + this.authentications.test_api_key_query.applyToRequest(requestOptions); + this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -1361,17 +1489,17 @@ export class StoreApi { request(requestOptions, (error, response, body) => { if (error) { - deferred.reject(error); + localVarDeferred.reject(error); } else { if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); + localVarDeferred.resolve({ response: response, body: body }); } else { - deferred.reject({ response: response, body: body }); + localVarDeferred.reject({ response: response, body: body }); } } }); - return deferred.promise; + return localVarDeferred.promise; } /** * Delete purchase order by ID @@ -1379,7 +1507,7 @@ export class StoreApi { * @param orderId ID of the order that needs to be deleted */ public deleteOrder (orderId: string) : Promise<{ response: http.ClientResponse; body?: any; }> { - const path = this.basePath + '/store/order/{orderId}' + const localVarPath = this.basePath + '/store/order/{orderId}' .replace('{' + 'orderId' + '}', String(orderId)); let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); @@ -1393,13 +1521,13 @@ export class StoreApi { let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); + let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); let requestOptions: request.Options = { method: 'DELETE', qs: queryParameters, headers: headerParams, - uri: path, + uri: localVarPath, json: true, } @@ -1415,16 +1543,16 @@ export class StoreApi { request(requestOptions, (error, response, body) => { if (error) { - deferred.reject(error); + localVarDeferred.reject(error); } else { if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); + localVarDeferred.resolve({ response: response, body: body }); } else { - deferred.reject({ response: response, body: body }); + localVarDeferred.reject({ response: response, body: body }); } } }); - return deferred.promise; + return localVarDeferred.promise; } }