From 5bb27c22ecb3bb2e8694e8f96cfe8281937032c6 Mon Sep 17 00:00:00 2001 From: alanngloux <69470811+alanngloux@users.noreply.github.com> Date: Mon, 17 Aug 2020 11:16:10 +0200 Subject: [PATCH] [Typescript-redux-query] Fix issue on api template when we have non empty header (#7179) * Update apis.mustache * add import add httpheaders import * add model httpHeader and remove useless import * regeneration of sample * regenerate sample Co-authored-by: Alann GLOUX --- .../typescript-redux-query/apis.mustache | 3 +-- .../typescript-redux-query/runtime.mustache | 2 ++ .../builds/with-npm-version/src/apis/PetApi.ts | 17 ++++++++--------- .../with-npm-version/src/apis/StoreApi.ts | 9 ++++----- .../builds/with-npm-version/src/apis/UserApi.ts | 17 ++++++++--------- .../builds/with-npm-version/src/runtime.ts | 2 ++ 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript-redux-query/apis.mustache b/modules/openapi-generator/src/main/resources/typescript-redux-query/apis.mustache index 4e176764ca9..db6139cf646 100644 --- a/modules/openapi-generator/src/main/resources/typescript-redux-query/apis.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-redux-query/apis.mustache @@ -3,7 +3,6 @@ import { HttpMethods, QueryConfig, ResponseBody, ResponseText } from 'redux-query'; import * as runtime from '../runtime'; - {{#imports.0}} import { {{#imports}} @@ -82,7 +81,7 @@ function {{nickname}}Raw({{#allParams.0}}requestParameters: {{operationIdCame {{/isListContainer}} {{/queryParams}} - const headerParameters = {}; + const headerParameters : runtime.HttpHeaders = {}; {{#bodyParam}} {{^consumes}} diff --git a/modules/openapi-generator/src/main/resources/typescript-redux-query/runtime.mustache b/modules/openapi-generator/src/main/resources/typescript-redux-query/runtime.mustache index 39311bdb8cf..d4bbf67367c 100644 --- a/modules/openapi-generator/src/main/resources/typescript-redux-query/runtime.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-redux-query/runtime.mustache @@ -39,6 +39,8 @@ export const COLLECTION_FORMATS = { export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original'; +export type HttpHeaders = { [key: string]: string }; + export function exists(json: any, key: string) { const value = json[key]; return value !== null && value !== undefined; diff --git a/samples/client/petstore/typescript-redux-query/builds/with-npm-version/src/apis/PetApi.ts b/samples/client/petstore/typescript-redux-query/builds/with-npm-version/src/apis/PetApi.ts index ecef6e21cd8..e2f23063bb3 100644 --- a/samples/client/petstore/typescript-redux-query/builds/with-npm-version/src/apis/PetApi.ts +++ b/samples/client/petstore/typescript-redux-query/builds/with-npm-version/src/apis/PetApi.ts @@ -14,7 +14,6 @@ import { HttpMethods, QueryConfig, ResponseBody, ResponseText } from 'redux-query'; import * as runtime from '../runtime'; - import { ModelApiResponse, ModelApiResponseFromJSON, @@ -73,7 +72,7 @@ function addPetRaw(requestParameters: AddPetRequest, requestConfig: runtime.T let queryParameters = null; - const headerParameters = {}; + const headerParameters : runtime.HttpHeaders = {}; headerParameters['Content-Type'] = 'application/json'; @@ -121,7 +120,7 @@ function deletePetRaw(requestParameters: DeletePetRequest, requestConfig: run let queryParameters = null; - const headerParameters = {}; + const headerParameters : runtime.HttpHeaders = {}; if (requestParameters.apiKey !== undefined && requestParameters.apiKey !== null) { headerParameters['api_key'] = String(requestParameters.apiKey); @@ -178,7 +177,7 @@ function findPetsByStatusRaw(requestParameters: FindPetsByStatusRequest, requ queryParameters['status'] = requestParameters.status?.join(runtime.COLLECTION_FORMATS["csv"]); } - const headerParameters = {}; + const headerParameters : runtime.HttpHeaders = {}; const { meta = {} } = requestConfig; @@ -233,7 +232,7 @@ function findPetsByTagsRaw(requestParameters: FindPetsByTagsRequest, requestC queryParameters['tags'] = requestParameters.tags?.join(runtime.COLLECTION_FORMATS["csv"]); } - const headerParameters = {}; + const headerParameters : runtime.HttpHeaders = {}; const { meta = {} } = requestConfig; @@ -282,7 +281,7 @@ function getPetByIdRaw(requestParameters: GetPetByIdRequest, requestConfig: r let queryParameters = null; - const headerParameters = {}; + const headerParameters : runtime.HttpHeaders = {}; const { meta = {} } = requestConfig; @@ -330,7 +329,7 @@ function updatePetRaw(requestParameters: UpdatePetRequest, requestConfig: run let queryParameters = null; - const headerParameters = {}; + const headerParameters : runtime.HttpHeaders = {}; headerParameters['Content-Type'] = 'application/json'; @@ -378,7 +377,7 @@ function updatePetWithFormRaw(requestParameters: UpdatePetWithFormRequest, re let queryParameters = null; - const headerParameters = {}; + const headerParameters : runtime.HttpHeaders = {}; const { meta = {} } = requestConfig; @@ -433,7 +432,7 @@ function uploadFileRaw(requestParameters: UploadFileRequest, requestConfig: r let queryParameters = null; - const headerParameters = {}; + const headerParameters : runtime.HttpHeaders = {}; const { meta = {} } = requestConfig; diff --git a/samples/client/petstore/typescript-redux-query/builds/with-npm-version/src/apis/StoreApi.ts b/samples/client/petstore/typescript-redux-query/builds/with-npm-version/src/apis/StoreApi.ts index a6ec0e8e05d..b4802bdad50 100644 --- a/samples/client/petstore/typescript-redux-query/builds/with-npm-version/src/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-redux-query/builds/with-npm-version/src/apis/StoreApi.ts @@ -14,7 +14,6 @@ import { HttpMethods, QueryConfig, ResponseBody, ResponseText } from 'redux-query'; import * as runtime from '../runtime'; - import { Order, OrderFromJSON, @@ -46,7 +45,7 @@ function deleteOrderRaw(requestParameters: DeleteOrderRequest, requestConfig: let queryParameters = null; - const headerParameters = {}; + const headerParameters : runtime.HttpHeaders = {}; const { meta = {} } = requestConfig; @@ -89,7 +88,7 @@ function getInventoryRaw( requestConfig: runtime.TypedQueryConfig(requestParameters: GetOrderByIdRequest, requestConfi let queryParameters = null; - const headerParameters = {}; + const headerParameters : runtime.HttpHeaders = {}; const { meta = {} } = requestConfig; @@ -184,7 +183,7 @@ function placeOrderRaw(requestParameters: PlaceOrderRequest, requestConfig: r let queryParameters = null; - const headerParameters = {}; + const headerParameters : runtime.HttpHeaders = {}; headerParameters['Content-Type'] = 'application/json'; diff --git a/samples/client/petstore/typescript-redux-query/builds/with-npm-version/src/apis/UserApi.ts b/samples/client/petstore/typescript-redux-query/builds/with-npm-version/src/apis/UserApi.ts index c4964b3238f..5e35989d886 100644 --- a/samples/client/petstore/typescript-redux-query/builds/with-npm-version/src/apis/UserApi.ts +++ b/samples/client/petstore/typescript-redux-query/builds/with-npm-version/src/apis/UserApi.ts @@ -14,7 +14,6 @@ import { HttpMethods, QueryConfig, ResponseBody, ResponseText } from 'redux-query'; import * as runtime from '../runtime'; - import { User, UserFromJSON, @@ -64,7 +63,7 @@ function createUserRaw(requestParameters: CreateUserRequest, requestConfig: r let queryParameters = null; - const headerParameters = {}; + const headerParameters : runtime.HttpHeaders = {}; headerParameters['Content-Type'] = 'application/json'; @@ -112,7 +111,7 @@ function createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArray let queryParameters = null; - const headerParameters = {}; + const headerParameters : runtime.HttpHeaders = {}; headerParameters['Content-Type'] = 'application/json'; @@ -159,7 +158,7 @@ function createUsersWithListInputRaw(requestParameters: CreateUsersWithListIn let queryParameters = null; - const headerParameters = {}; + const headerParameters : runtime.HttpHeaders = {}; headerParameters['Content-Type'] = 'application/json'; @@ -207,7 +206,7 @@ function deleteUserRaw(requestParameters: DeleteUserRequest, requestConfig: r let queryParameters = null; - const headerParameters = {}; + const headerParameters : runtime.HttpHeaders = {}; const { meta = {} } = requestConfig; @@ -253,7 +252,7 @@ function getUserByNameRaw(requestParameters: GetUserByNameRequest, requestCon let queryParameters = null; - const headerParameters = {}; + const headerParameters : runtime.HttpHeaders = {}; const { meta = {} } = requestConfig; @@ -314,7 +313,7 @@ function loginUserRaw(requestParameters: LoginUserRequest, requestConfig: run queryParameters['password'] = requestParameters.password; } - const headerParameters = {}; + const headerParameters : runtime.HttpHeaders = {}; const { meta = {} } = requestConfig; @@ -356,7 +355,7 @@ function logoutUserRaw( requestConfig: runtime.TypedQueryConfig = {} let queryParameters = null; - const headerParameters = {}; + const headerParameters : runtime.HttpHeaders = {}; const { meta = {} } = requestConfig; @@ -406,7 +405,7 @@ function updateUserRaw(requestParameters: UpdateUserRequest, requestConfig: r let queryParameters = null; - const headerParameters = {}; + const headerParameters : runtime.HttpHeaders = {}; headerParameters['Content-Type'] = 'application/json'; diff --git a/samples/client/petstore/typescript-redux-query/builds/with-npm-version/src/runtime.ts b/samples/client/petstore/typescript-redux-query/builds/with-npm-version/src/runtime.ts index 6eeaa8d3b84..63ad66b7a09 100644 --- a/samples/client/petstore/typescript-redux-query/builds/with-npm-version/src/runtime.ts +++ b/samples/client/petstore/typescript-redux-query/builds/with-npm-version/src/runtime.ts @@ -50,6 +50,8 @@ export const COLLECTION_FORMATS = { export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original'; +export type HttpHeaders = { [key: string]: string }; + export function exists(json: any, key: string) { const value = json[key]; return value !== null && value !== undefined;