[typescript-nestjs] Accept async function for fetching access token #18190
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
achie27
commented
Mar 21, 2024
modules/openapi-generator/src/main/resources/typescript-nestjs/api.module.mustache
Show resolved
Hide resolved
achie27
commented
Mar 21, 2024
modules/openapi-generator/src/main/resources/typescript-nestjs/api.service.mustache
Show resolved
Hide resolved
achie27
commented
Mar 21, 2024
| @@ -144,17 +147,16 @@ export class {{classname}} { | |||
| {{/isBasicBasic}} | |||
| {{#isBasicBearer}} | |||
| if (typeof this.configuration.accessToken === 'function') { | |||
| headers['Authorization'] = `Bearer ${this.configuration.accessToken()}`; | |||
| accessTokenObservable = from(Promise.resolve(this.configuration.accessToken())); | |||
There was a problem hiding this comment.
Encapsulation with Promise.resolve(...) allows from to be used irrespective of whether the (returned) accesstoken is a Promise or not
achie27
commented
Mar 21, 2024
Comment on lines
229
to
248
| return accessTokenObservable.pipe( | ||
| map((accessToken) => { | ||
| if(accessToken) { | ||
| headers['Authorization'] = `Bearer ${accessToken}`; | ||
| } | ||
|
|
||
| return this.httpClient.{{httpMethod}}{{^isResponseFile}}<{{#returnType}}{{{returnType}}}{{#isResponseTypeFile}}|undefined{{/isResponseTypeFile}}{{/returnType}}{{^returnType}}any{{/returnType}}>{{/isResponseFile}}(`${this.basePath}{{{path}}}`,{{#isBodyAllowed}} | ||
| {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}{{#hasFormParams}}convertFormParamsToString ? formParams!.toString() : formParams!{{/hasFormParams}}{{^hasFormParams}}null{{/hasFormParams}}{{/bodyParam}},{{/isBodyAllowed}} | ||
| { | ||
| {{#hasQueryParams}} | ||
| params: queryParameters, | ||
| {{/hasQueryParams}} | ||
| {{#isResponseFile}} | ||
| responseType: "blob", | ||
| {{/isResponseFile}} | ||
| withCredentials: this.configuration.withCredentials, | ||
| headers: headers | ||
| } | ||
| ); | ||
| }) |
There was a problem hiding this comment.
I couldn’t find a clean way to combine templating with observables+operators - will be nice if anyone has ideas on how to structure this :)
|
CC @macjohnny |
macjohnny
reviewed
Mar 21, 2024
modules/openapi-generator/src/main/resources/typescript-nestjs/api.service.mustache
Outdated
Show resolved
Hide resolved
modules/openapi-generator/src/main/resources/typescript-nestjs/api.service.mustache
Outdated
Show resolved
Hide resolved
|
@achie27 thanks for your contribution! |
macjohnny
approved these changes
Apr 22, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is for #18048.
PR checklist
Commit all changed files.
This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master.
These must match the expectations made by your contribution.
You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example
./bin/generate-samples.sh bin/configs/java*.IMPORTANT: Do NOT purge/delete any folders/files (e.g. tests) when regenerating the samples as manually written tests may be removed.
master(upcoming 7.1.0 minor release - breaking changes with fallbacks),8.0.x(breaking changes without fallbacks)