Skip to content

Commit f752f29

Browse files
asterikxasterikx
authored
[typescript-axios] add promise to bearer and oauth tokens (#7132)
1 parent f5775f4 commit f752f29

File tree

17 files changed

+147
-147
lines changed

17 files changed

+147
-147
lines changed

‎modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,17 +87,17 @@ export const {{classname}}AxiosParamCreator = function (configuration?: Configur
8787
// http bearer authentication required
8888
if (configuration && configuration.accessToken) {
8989
const accessToken = typeof configuration.accessToken === 'function'
90-
? configuration.accessToken()
91-
: configuration.accessToken;
90+
? await configuration.accessToken()
91+
: await configuration.accessToken;
9292
localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
9393
}
9494
{{/isBasicBearer}}
9595
{{#isOAuth}}
9696
// oauth required
9797
if (configuration && configuration.accessToken) {
9898
const localVarAccessTokenValue = typeof configuration.accessToken === 'function'
99-
? configuration.accessToken("{{name}}", [{{#scopes}}"{{{scope}}}"{{^-last}}, {{/-last}}{{/scopes}}])
100-
: configuration.accessToken;
99+
? await configuration.accessToken("{{name}}", [{{#scopes}}"{{{scope}}}"{{^-last}}, {{/-last}}{{/scopes}}])
100+
: await configuration.accessToken;
101101
localVarHeaderParameter["Authorization"] = "Bearer " + localVarAccessTokenValue;
102102
}
103103
{{/isOAuth}}

‎modules/openapi-generator/src/main/resources/typescript-axios/configuration.mustache

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export interface ConfigurationParameters {
66
apiKey?: string | Promise<string> | ((name: string) => string) | ((name: string) => Promise<string>);
77
username?: string;
88
password?: string;
9-
accessToken?: string | ((name?: string, scopes?: string[]) => string);
9+
accessToken?: string | Promise<string> | ((name?: string, scopes?: string[]) => string) | ((name?: string, scopes?: string[]) => Promise<string>);
1010
basePath?: string;
1111
baseOptions?: any;
1212
}
@@ -20,14 +20,14 @@ export class Configuration {
2020
apiKey?: string | Promise<string> | ((name: string) => string) | ((name: string) => Promise<string>);
2121
/**
2222
* parameter for basic security
23-
*
23+
*
2424
* @type {string}
2525
* @memberof Configuration
2626
*/
2727
username?: string;
2828
/**
2929
* parameter for basic security
30-
*
30+
*
3131
* @type {string}
3232
* @memberof Configuration
3333
*/
@@ -38,10 +38,10 @@ export class Configuration {
3838
* @param scopes oauth2 scope
3939
* @memberof Configuration
4040
*/
41-
accessToken?: string | ((name?: string, scopes?: string[]) => string);
41+
accessToken?: string | Promise<string> | ((name?: string, scopes?: string[]) => string) | ((name?: string, scopes?: string[]) => Promise<string>);
4242
/**
4343
* override base path
44-
*
44+
*
4545
* @type {string}
4646
* @memberof Configuration
4747
*/

‎samples/client/petstore/typescript-axios/builds/composed-schemas/configuration.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export interface ConfigurationParameters {
1717
apiKey?: string | Promise<string> | ((name: string) => string) | ((name: string) => Promise<string>);
1818
username?: string;
1919
password?: string;
20-
accessToken?: string | ((name?: string, scopes?: string[]) => string);
20+
accessToken?: string | Promise<string> | ((name?: string, scopes?: string[]) => string) | ((name?: string, scopes?: string[]) => Promise<string>);
2121
basePath?: string;
2222
baseOptions?: any;
2323
}
@@ -31,14 +31,14 @@ export class Configuration {
3131
apiKey?: string | Promise<string> | ((name: string) => string) | ((name: string) => Promise<string>);
3232
/**
3333
* parameter for basic security
34-
*
34+
*
3535
* @type {string}
3636
* @memberof Configuration
3737
*/
3838
username?: string;
3939
/**
4040
* parameter for basic security
41-
*
41+
*
4242
* @type {string}
4343
* @memberof Configuration
4444
*/
@@ -49,10 +49,10 @@ export class Configuration {
4949
* @param scopes oauth2 scope
5050
* @memberof Configuration
5151
*/
52-
accessToken?: string | ((name?: string, scopes?: string[]) => string);
52+
accessToken?: string | Promise<string> | ((name?: string, scopes?: string[]) => string) | ((name?: string, scopes?: string[]) => Promise<string>);
5353
/**
5454
* override base path
55-
*
55+
*
5656
* @type {string}
5757
* @memberof Configuration
5858
*/

‎samples/client/petstore/typescript-axios/builds/default/api.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,8 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration)
279279
// oauth required
280280
if (configuration && configuration.accessToken) {
281281
const localVarAccessTokenValue = typeof configuration.accessToken === 'function'
282-
? configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
283-
: configuration.accessToken;
282+
? await configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
283+
: await configuration.accessToken;
284284
localVarHeaderParameter["Authorization"] = "Bearer " + localVarAccessTokenValue;
285285
}
286286

@@ -335,8 +335,8 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration)
335335
// oauth required
336336
if (configuration && configuration.accessToken) {
337337
const localVarAccessTokenValue = typeof configuration.accessToken === 'function'
338-
? configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
339-
: configuration.accessToken;
338+
? await configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
339+
: await configuration.accessToken;
340340
localVarHeaderParameter["Authorization"] = "Bearer " + localVarAccessTokenValue;
341341
}
342342

@@ -389,8 +389,8 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration)
389389
// oauth required
390390
if (configuration && configuration.accessToken) {
391391
const localVarAccessTokenValue = typeof configuration.accessToken === 'function'
392-
? configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
393-
: configuration.accessToken;
392+
? await configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
393+
: await configuration.accessToken;
394394
localVarHeaderParameter["Authorization"] = "Bearer " + localVarAccessTokenValue;
395395
}
396396

@@ -443,8 +443,8 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration)
443443
// oauth required
444444
if (configuration && configuration.accessToken) {
445445
const localVarAccessTokenValue = typeof configuration.accessToken === 'function'
446-
? configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
447-
: configuration.accessToken;
446+
? await configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
447+
: await configuration.accessToken;
448448
localVarHeaderParameter["Authorization"] = "Bearer " + localVarAccessTokenValue;
449449
}
450450

@@ -547,8 +547,8 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration)
547547
// oauth required
548548
if (configuration && configuration.accessToken) {
549549
const localVarAccessTokenValue = typeof configuration.accessToken === 'function'
550-
? configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
551-
: configuration.accessToken;
550+
? await configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
551+
: await configuration.accessToken;
552552
localVarHeaderParameter["Authorization"] = "Bearer " + localVarAccessTokenValue;
553553
}
554554

@@ -605,8 +605,8 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration)
605605
// oauth required
606606
if (configuration && configuration.accessToken) {
607607
const localVarAccessTokenValue = typeof configuration.accessToken === 'function'
608-
? configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
609-
: configuration.accessToken;
608+
? await configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
609+
: await configuration.accessToken;
610610
localVarHeaderParameter["Authorization"] = "Bearer " + localVarAccessTokenValue;
611611
}
612612

@@ -670,8 +670,8 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration)
670670
// oauth required
671671
if (configuration && configuration.accessToken) {
672672
const localVarAccessTokenValue = typeof configuration.accessToken === 'function'
673-
? configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
674-
: configuration.accessToken;
673+
? await configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
674+
: await configuration.accessToken;
675675
localVarHeaderParameter["Authorization"] = "Bearer " + localVarAccessTokenValue;
676676
}
677677

‎samples/client/petstore/typescript-axios/builds/default/configuration.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export interface ConfigurationParameters {
1717
apiKey?: string | Promise<string> | ((name: string) => string) | ((name: string) => Promise<string>);
1818
username?: string;
1919
password?: string;
20-
accessToken?: string | ((name?: string, scopes?: string[]) => string);
20+
accessToken?: string | Promise<string> | ((name?: string, scopes?: string[]) => string) | ((name?: string, scopes?: string[]) => Promise<string>);
2121
basePath?: string;
2222
baseOptions?: any;
2323
}
@@ -31,14 +31,14 @@ export class Configuration {
3131
apiKey?: string | Promise<string> | ((name: string) => string) | ((name: string) => Promise<string>);
3232
/**
3333
* parameter for basic security
34-
*
34+
*
3535
* @type {string}
3636
* @memberof Configuration
3737
*/
3838
username?: string;
3939
/**
4040
* parameter for basic security
41-
*
41+
*
4242
* @type {string}
4343
* @memberof Configuration
4444
*/
@@ -49,10 +49,10 @@ export class Configuration {
4949
* @param scopes oauth2 scope
5050
* @memberof Configuration
5151
*/
52-
accessToken?: string | ((name?: string, scopes?: string[]) => string);
52+
accessToken?: string | Promise<string> | ((name?: string, scopes?: string[]) => string) | ((name?: string, scopes?: string[]) => Promise<string>);
5353
/**
5454
* override base path
55-
*
55+
*
5656
* @type {string}
5757
* @memberof Configuration
5858
*/

‎samples/client/petstore/typescript-axios/builds/es6-target/api.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,8 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration)
279279
// oauth required
280280
if (configuration && configuration.accessToken) {
281281
const localVarAccessTokenValue = typeof configuration.accessToken === 'function'
282-
? configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
283-
: configuration.accessToken;
282+
? await configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
283+
: await configuration.accessToken;
284284
localVarHeaderParameter["Authorization"] = "Bearer " + localVarAccessTokenValue;
285285
}
286286

@@ -335,8 +335,8 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration)
335335
// oauth required
336336
if (configuration && configuration.accessToken) {
337337
const localVarAccessTokenValue = typeof configuration.accessToken === 'function'
338-
? configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
339-
: configuration.accessToken;
338+
? await configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
339+
: await configuration.accessToken;
340340
localVarHeaderParameter["Authorization"] = "Bearer " + localVarAccessTokenValue;
341341
}
342342

@@ -389,8 +389,8 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration)
389389
// oauth required
390390
if (configuration && configuration.accessToken) {
391391
const localVarAccessTokenValue = typeof configuration.accessToken === 'function'
392-
? configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
393-
: configuration.accessToken;
392+
? await configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
393+
: await configuration.accessToken;
394394
localVarHeaderParameter["Authorization"] = "Bearer " + localVarAccessTokenValue;
395395
}
396396

@@ -443,8 +443,8 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration)
443443
// oauth required
444444
if (configuration && configuration.accessToken) {
445445
const localVarAccessTokenValue = typeof configuration.accessToken === 'function'
446-
? configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
447-
: configuration.accessToken;
446+
? await configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
447+
: await configuration.accessToken;
448448
localVarHeaderParameter["Authorization"] = "Bearer " + localVarAccessTokenValue;
449449
}
450450

@@ -547,8 +547,8 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration)
547547
// oauth required
548548
if (configuration && configuration.accessToken) {
549549
const localVarAccessTokenValue = typeof configuration.accessToken === 'function'
550-
? configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
551-
: configuration.accessToken;
550+
? await configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
551+
: await configuration.accessToken;
552552
localVarHeaderParameter["Authorization"] = "Bearer " + localVarAccessTokenValue;
553553
}
554554

@@ -605,8 +605,8 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration)
605605
// oauth required
606606
if (configuration && configuration.accessToken) {
607607
const localVarAccessTokenValue = typeof configuration.accessToken === 'function'
608-
? configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
609-
: configuration.accessToken;
608+
? await configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
609+
: await configuration.accessToken;
610610
localVarHeaderParameter["Authorization"] = "Bearer " + localVarAccessTokenValue;
611611
}
612612

@@ -670,8 +670,8 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration)
670670
// oauth required
671671
if (configuration && configuration.accessToken) {
672672
const localVarAccessTokenValue = typeof configuration.accessToken === 'function'
673-
? configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
674-
: configuration.accessToken;
673+
? await configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
674+
: await configuration.accessToken;
675675
localVarHeaderParameter["Authorization"] = "Bearer " + localVarAccessTokenValue;
676676
}
677677

‎samples/client/petstore/typescript-axios/builds/es6-target/configuration.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export interface ConfigurationParameters {
1717
apiKey?: string | Promise<string> | ((name: string) => string) | ((name: string) => Promise<string>);
1818
username?: string;
1919
password?: string;
20-
accessToken?: string | ((name?: string, scopes?: string[]) => string);
20+
accessToken?: string | Promise<string> | ((name?: string, scopes?: string[]) => string) | ((name?: string, scopes?: string[]) => Promise<string>);
2121
basePath?: string;
2222
baseOptions?: any;
2323
}
@@ -31,14 +31,14 @@ export class Configuration {
3131
apiKey?: string | Promise<string> | ((name: string) => string) | ((name: string) => Promise<string>);
3232
/**
3333
* parameter for basic security
34-
*
34+
*
3535
* @type {string}
3636
* @memberof Configuration
3737
*/
3838
username?: string;
3939
/**
4040
* parameter for basic security
41-
*
41+
*
4242
* @type {string}
4343
* @memberof Configuration
4444
*/
@@ -49,10 +49,10 @@ export class Configuration {
4949
* @param scopes oauth2 scope
5050
* @memberof Configuration
5151
*/
52-
accessToken?: string | ((name?: string, scopes?: string[]) => string);
52+
accessToken?: string | Promise<string> | ((name?: string, scopes?: string[]) => string) | ((name?: string, scopes?: string[]) => Promise<string>);
5353
/**
5454
* override base path
55-
*
55+
*
5656
* @type {string}
5757
* @memberof Configuration
5858
*/

0 commit comments

Comments
 (0)