Skip to content

Commit 2d30714

Browse files
authored
Allow auth.accessToken to be either function or string (#7484)
1 parent 3f18d0f commit 2d30714

4 files changed

Lines changed: 16 additions & 4 deletions

File tree

modules/openapi-generator/src/main/resources/Javascript/ApiClient.mustache

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,10 @@
338338
break;
339339
case 'bearer':
340340
if (auth.accessToken) {
341-
request.set({'Authorization': 'Bearer ' + auth.accessToken});
341+
var localVarBearerToken = typeof auth.accessToken === 'function'
342+
? auth.accessToken()
343+
: auth.accessToken
344+
request.set({'Authorization': 'Bearer ' + localVarBearerToken});
342345
}
343346
break;
344347
case 'apiKey':

modules/openapi-generator/src/main/resources/Javascript/es6/ApiClient.mustache

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,10 @@ class ApiClient {
304304
break;
305305
case 'bearer':
306306
if (auth.accessToken) {
307-
request.set({'Authorization': 'Bearer ' + auth.accessToken});
307+
var localVarBearerToken = typeof auth.accessToken === 'function'
308+
? auth.accessToken()
309+
: auth.accessToken
310+
request.set({'Authorization': 'Bearer ' + localVarBearerToken});
308311
}
309312

310313
break;

samples/client/petstore/javascript-es6/src/ApiClient.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,10 @@ class ApiClient {
302302
break;
303303
case 'bearer':
304304
if (auth.accessToken) {
305-
request.set({'Authorization': 'Bearer ' + auth.accessToken});
305+
var localVarBearerToken = typeof auth.accessToken === 'function'
306+
? auth.accessToken()
307+
: auth.accessToken
308+
request.set({'Authorization': 'Bearer ' + localVarBearerToken});
306309
}
307310

308311
break;

samples/client/petstore/javascript-promise-es6/src/ApiClient.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,10 @@ class ApiClient {
302302
break;
303303
case 'bearer':
304304
if (auth.accessToken) {
305-
request.set({'Authorization': 'Bearer ' + auth.accessToken});
305+
var localVarBearerToken = typeof auth.accessToken === 'function'
306+
? auth.accessToken()
307+
: auth.accessToken
308+
request.set({'Authorization': 'Bearer ' + localVarBearerToken});
306309
}
307310

308311
break;

0 commit comments

Comments
 (0)