Skip to content

Fix 5 bugs in templates, config, and hand-written files #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
luke-hagar-sp wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix 5 bugs in templates, config, and hand-written files #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ build:
rm -rf ./sdk-output/v2026
node sdk-resources/prescript.js api-specs/idn/v2026/paths
java -jar openapi-generator-cli.jar generate -i api-specs/idn/sailpoint-api.v2026.yaml -g typescript-axios -o sdk-output/v2026 --global-property skipFormModel=false,apiDocs=true,modelDocs=true --config sdk-resources/v2026-config.yaml --api-name-suffix V2026Api --model-name-suffix V2026
rm -rf ./sdk-output/generic
java -jar openapi-generator-cli.jar generate -i api-specs/idn/sailpoint-api.generic.yaml -g typescript-axios -o sdk-output/generic --global-property skipFormModel=false,apiDocs=true,modelDocs=true --config sdk-resources/generic-config.yaml

.PHONY: test
test:
Expand Down
2 changes: 1 addition & 1 deletion sdk-output/configuration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ export class Configuration {
}
} catch (error) {
console.error("Unable to fetch access token. Aborting.");
throw new Error(error);
throw error;
}
}

Expand Down
2 changes: 1 addition & 1 deletion sdk-resources/generic-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ files:
destinationFilename: package.json
npmName: sailpoint-sdk
npmRepository: sailpoint.com
npmVersion: 1.6.7
npmVersion: 1.7.22
useSingleRequestParameter: true
2 changes: 1 addition & 1 deletion sdk-resources/resources/baseApi.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export class BaseAPI {
constructor(configuration?: Configuration, protected basePath: string = BASE_PATH, protected axios: AxiosInstance = globalAxios) {
if (configuration) {
this.configuration = configuration;
this.basePath = configuration.basePath {{#apiVersion}}+ "/{{{apiVersion}}}"{{/apiVersion}}|| this.basePath;
this.basePath = (configuration.basePath != null ? (configuration.basePath {{#apiVersion}}+ "/{{{apiVersion}}}"{{/apiVersion}}) : undefined) || this.basePath;
}
}
};
Expand Down
6 changes: 4 additions & 2 deletions sdk-resources/resources/common.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,9 @@ export const toPathString = function (url: URL) {
*/
export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) {
return <T = unknown, R = AxiosResponse<T>>(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
axiosRetry(axios, configuration.retriesConfig)
if (configuration?.retriesConfig) {
axiosRetry(axios, configuration.retriesConfig);
}
const headers = {
...{'User-Agent':'OpenAPI-Generator/{{npmVersion}}/ts'},
...axiosArgs.axiosOptions.headers,
Expand All @@ -151,7 +153,7 @@ export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxi
}

axiosArgs.axiosOptions.headers = headers
const axiosRequestArgs = {...axiosArgs.axiosOptions, url: (configuration?.basePath {{#apiVersion}}+ "/{{{apiVersion}}}"{{/apiVersion}} || basePath) + axiosArgs.url};
const axiosRequestArgs = {...axiosArgs.axiosOptions, url: ((configuration?.basePath != null ? (configuration.basePath {{#apiVersion}}+ "/{{{apiVersion}}}"{{/apiVersion}}) : undefined) || basePath) + axiosArgs.url};
return axios.request<T, R>(axiosRequestArgs);
};
}