From 7dcd488278f3dbeea6b0962d00f76f474673a438 Mon Sep 17 00:00:00 2001 From: Hector Jusforgues Date: Fri, 5 Apr 2019 00:50:48 +0200 Subject: [PATCH] [typescript-axios] Fix Bearer authentication (#2578) * [typescript-axios] Fix Bearer authentication It was generated the same as Basic authentication. Now we handle both cases differently. Fix #1446 * [typescript-axios] Bearer authentication : use config.accessToken instead of config.password As it is done in the angular client: https://github.com/OpenAPITools/openapi-generator/blob/0889b8ec1349d6f912ad7dfa221d3980f1801dba/modules/openapi-generator/src/main/resources/typescript-angular/api.service.mustache#L213-L220 --- .../resources/typescript-axios/apiInner.mustache | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache b/modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache index d48ce00acd7..9cfaf2aaa5f 100644 --- a/modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache @@ -74,12 +74,21 @@ export const {{classname}}AxiosParamCreator = function (configuration?: Configur } {{/isKeyInQuery}} {{/isApiKey}} - {{#isBasic}} + {{#isBasicBasic}} // http basic authentication required if (configuration && (configuration.username || configuration.password)) { localVarHeaderParameter["Authorization"] = "Basic " + btoa(configuration.username + ":" + configuration.password); } - {{/isBasic}} + {{/isBasicBasic}} + {{#isBasicBearer}} + // http bearer authentication required + if (configuration && configuration.accessToken) { + const accessToken = typeof configuration.accessToken === 'function' + ? configuration.accessToken() + : configuration.accessToken; + localVarHeaderParameter["Authorization"] = "Bearer " + accessToken; + } + {{/isBasicBearer}} {{#isOAuth}} // oauth required if (configuration && configuration.accessToken) {