From 1f9c8667488b6ec7061036cc22b1f9f30525aa62 Mon Sep 17 00:00:00 2001 From: Johan Jnn <168817280+johan-jnn@users.noreply.github.com> Date: Tue, 2 Jun 2026 16:35:53 +0200 Subject: [PATCH 1/2] fix: Add support for bearer token authentication see https://github.com/swagger-api/swagger-codegen/issues/9493 --- .../src/main/resources/typescript-fetch/api.mustache | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/swagger-codegen/src/main/resources/typescript-fetch/api.mustache b/modules/swagger-codegen/src/main/resources/typescript-fetch/api.mustache index f9452e034aa..b01680bef7b 100644 --- a/modules/swagger-codegen/src/main/resources/typescript-fetch/api.mustache +++ b/modules/swagger-codegen/src/main/resources/typescript-fetch/api.mustache @@ -144,7 +144,15 @@ export const {{classname}}FetchParamCreator = function (configuration?: Configur localVarHeaderParameter["Authorization"] = "Bearer " + localVarAccessTokenValue; } {{/isOAuth}} - + {{#isBearer}} + // bearer token required + if (configuration && configuration.accessToken) { + const localVarAccessTokenValue = typeof configuration.accessToken === 'function' + ? configuration.accessToken("{{name}}") + : configuration.accessToken; + localVarHeaderParameter["Authorization"] = "Bearer " + localVarAccessTokenValue; + } + {{/isBearer}} {{/authMethods}} {{#queryParams}} {{#isListContainer}} From 059ae605776df266465db7a77ea0e53e3dab88b8 Mon Sep 17 00:00:00 2001 From: johan-jnn Date: Tue, 2 Jun 2026 19:21:05 +0200 Subject: [PATCH 2/2] feat: ran the typescript-fetch-petstore.sh script --- .../builds/default/.swagger-codegen/VERSION | 2 +- .../typescript-fetch/builds/default/api.ts | 15 +++------------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/samples/client/petstore/typescript-fetch/builds/default/.swagger-codegen/VERSION b/samples/client/petstore/typescript-fetch/builds/default/.swagger-codegen/VERSION index 6f4ec437a9b..bab531eaf33 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/.swagger-codegen/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/default/.swagger-codegen/VERSION @@ -1 +1 @@ -2.4.40-SNAPSHOT \ No newline at end of file +2.4.53-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/default/api.ts b/samples/client/petstore/typescript-fetch/builds/default/api.ts index 7e1be018694..349d5ff7b4a 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/api.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/api.ts @@ -63,7 +63,7 @@ export class BaseAPI { this.basePath = configuration.basePath || this.basePath; } } -}; +} /** * @@ -381,7 +381,6 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration) : configuration.accessToken; localVarHeaderParameter["Authorization"] = "Bearer " + localVarAccessTokenValue; } - localVarHeaderParameter['Content-Type'] = 'application/json'; localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query); @@ -424,7 +423,6 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration) : configuration.accessToken; localVarHeaderParameter["Authorization"] = "Bearer " + localVarAccessTokenValue; } - if (apiKey !== undefined && apiKey !== null) { localVarHeaderParameter['api_key'] = String(apiKey); } @@ -465,7 +463,6 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration) : configuration.accessToken; localVarHeaderParameter["Authorization"] = "Bearer " + localVarAccessTokenValue; } - if (status) { localVarQueryParameter['status'] = status.join(COLLECTION_FORMATS["csv"]); } @@ -506,7 +503,6 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration) : configuration.accessToken; localVarHeaderParameter["Authorization"] = "Bearer " + localVarAccessTokenValue; } - if (tags) { localVarQueryParameter['tags'] = tags.join(COLLECTION_FORMATS["csv"]); } @@ -547,7 +543,6 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration) : configuration.apiKey; localVarHeaderParameter["api_key"] = localVarApiKeyValue; } - localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query); // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943 localVarUrlObj.search = null; @@ -584,7 +579,6 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration) : configuration.accessToken; localVarHeaderParameter["Authorization"] = "Bearer " + localVarAccessTokenValue; } - localVarHeaderParameter['Content-Type'] = 'application/json'; localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query); @@ -619,7 +613,7 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration) const localVarRequestOptions = Object.assign({ method: 'POST' }, options); const localVarHeaderParameter = {} as any; const localVarQueryParameter = {} as any; - const localVarFormParams = new url.URLSearchParams(); + const localVarFormParams = new URLSearchParams(); // authentication petstore_auth required // oauth required @@ -629,7 +623,6 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration) : configuration.accessToken; localVarHeaderParameter["Authorization"] = "Bearer " + localVarAccessTokenValue; } - if (name !== undefined) { localVarFormParams.set('name', name as any); } @@ -671,7 +664,7 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration) const localVarRequestOptions = Object.assign({ method: 'POST' }, options); const localVarHeaderParameter = {} as any; const localVarQueryParameter = {} as any; - const localVarFormParams = new url.URLSearchParams(); + const localVarFormParams = new URLSearchParams(); // authentication petstore_auth required // oauth required @@ -681,7 +674,6 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration) : configuration.accessToken; localVarHeaderParameter["Authorization"] = "Bearer " + localVarAccessTokenValue; } - if (additionalMetadata !== undefined) { localVarFormParams.set('additionalMetadata', additionalMetadata as any); } @@ -1131,7 +1123,6 @@ export const StoreApiFetchParamCreator = function (configuration?: Configuration : configuration.apiKey; localVarHeaderParameter["api_key"] = localVarApiKeyValue; } - localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query); // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943 localVarUrlObj.search = null;