Skip to content

Fixing content-type header being present for empty body requests #173

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
pyzdabol wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Fixing content-type header being present for empty body requests #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
187ce8d
Fixing content-type header being present for empty body requests
pyzdabol Jun 6, 2023
2379b8c
changes
pyzdabol Jun 6, 2023
c5b1a43
Update ThumbnailOperations.test.ts
pyzdabol Jun 6, 2023
2693ce6
cccccc
pyzdabol Jun 6, 2023
8bce46d
Update ThumbnailOperations.test.ts
pyzdabol Jun 6, 2023
efc1d4f
Update ThumbnailOperations.test.ts
pyzdabol Jun 6, 2023
f91baa9
Update ThumbnailOperations.test.ts
pyzdabol Jun 6, 2023
2af3485
Update ThumbnailOperations.test.ts
pyzdabol Jun 6, 2023
88f03f8
changes
pyzdabol Jun 7, 2023
1ee050a
changes
pyzdabol Jun 12, 2023
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: 1 addition & 1 deletion clients/imodels-client-management/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"extends": "./node_modules/@itwin/imodels-client-common-config/.eslintrc.json"
},
"dependencies": {
"axios": "^1.0.0"
"axios": "1.1.0"
},
"devDependencies": {
"@itwin/imodels-client-common-config": "workspace:*",
Expand Down
6 changes: 4 additions & 2 deletions clients/imodels-client-management/src/base/internal/AxiosRestClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ export class AxiosRestClient implements RestClient {

constructor(parseErrorFunc: ParseErrorFunc) {
this._parseErrorFunc = parseErrorFunc;
delete axios.defaults.headers.post["Content-Type"];

@austeja-bentley austeja-bentley Jun 12, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a comment explaining why we are doing this. Also does this solution require to pin axios to exact version 1.1.0?

@pyzdabol pyzdabol Jun 12, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a problem with transpiling axios on 1.1.3, here's an issue for further information:
axios/axios#5011
it should would work if all axios import statements would be changed to require('axios') but since it's a bug inside axios i'm not sure if it is worth to do it rather than just to change version and wait for new version

delete axios.defaults.headers.patch["Content-Type"];
}

public sendGetRequest<TResponse>(params: HttpGetRequestParams & { responseType: ContentType.Json }): Promise<TResponse>;
Expand All @@ -43,7 +45,7 @@ export class AxiosRestClient implements RestClient {
headers: params.headers
};

return this.executeRequest(async () => axios.post(params.url, params.body.content ?? {}, requestConfig));
return this.executeRequest(async () => axios.post(params.url, params.body.content, requestConfig));
}

public async sendPutRequest<TResponse>(params: HttpRequestWithBinaryBodyParams): Promise<TResponse> {
Expand All @@ -59,7 +61,7 @@ export class AxiosRestClient implements RestClient {
headers: params.headers
};

return this.executeRequest(async () => axios.patch(params.url, params.body.content ?? {}, requestConfig));
return this.executeRequest(async () => axios.patch(params.url, params.body.content, requestConfig));
}

public async sendDeleteRequest<TResponse>(params: HttpRequestParams): Promise<TResponse> {
Expand Down
4 changes: 2 additions & 2 deletions clients/imodels-client-management/src/base/internal/OperationsBase.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ export class OperationsBase<TOptions extends OperationsBaseOptions> {
}
}

private async formHeaders(params: CommonRequestParams & { preferReturn?: PreferReturn, contentType?: ContentType}): Promise<Dictionary<string>> {
private async formHeaders(params: CommonRequestParams & { preferReturn?: PreferReturn, contentType?: ContentType, body?: object }): Promise<Dictionary<string>> {
const headers: Dictionary<string> = {};
const authorizationInfo = await params.authorization();
headers[Constants.headers.authorization] = `${authorizationInfo.scheme} ${authorizationInfo.token}`;
Expand All @@ -128,7 +128,7 @@ export class OperationsBase<TOptions extends OperationsBaseOptions> {
if (params.preferReturn)
headers[Constants.headers.prefer] = `return=${params.preferReturn}`;

if (params.contentType)
if (params.contentType && params.body !== undefined)
headers[Constants.headers.contentType] = params.contentType;

this.addOrUpdateHeaders(headers, this._options.headers);
Expand Down
Loading