ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup JSON parse (#23443)

Browse Source
This commit is contained in:
Cheena Malhotra
2023-06-23 23:22:21 -07:00
committed by GitHub
parent 07538b231b
commit aa6c5e1513
1 changed files with 1 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
extensions/azurecore/src/account-provider/auths/httpClient.ts
View File

@@ -228,26 +228,7 @@ const networkRequestViaProxy = <T>(
* there may be more than one ':' if the value of the header is supposed to be a JSON object * there may be more than one ':' if the value of the header is supposed to be a JSON object
*/ */
const headerKeyValue = header.split(new RegExp(/:\s(.*)/s)); const headerKeyValue = header.split(new RegExp(/:\s(.*)/s));
const headerKey = headerKeyValue[0]; entries.set(headerKeyValue[0], headerKeyValue[1]);
let headerValue = headerKeyValue[1];
// check if the value of the header is supposed to be a JSON object
try {
// TODO: Investigate this - https://github.com/microsoft/azuredatastudio/issues/22835
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
const object = JSON.parse(headerValue);
// if it is, then convert it from a string to a JSON object
if (object && (typeof object === 'object')) {
// TODO: Investigate this - https://github.com/microsoft/azuredatastudio/issues/22835
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
headerValue = object;
}
} catch (e) {
// otherwise, leave it as a string
}
entries.set(headerKey, headerValue);
}); });
const parsedHeaders = Object.fromEntries(entries) as Record<string, string>; const parsedHeaders = Object.fromEntries(entries) as Record<string, string>;
@@ -257,7 +238,6 @@ const networkRequestViaProxy = <T>(
status: httpStatusCode status: httpStatusCode
}; };
if (((httpStatusCode < HttpStatus.SUCCESS_RANGE_START) || (httpStatusCode > HttpStatus.SUCCESS_RANGE_END)) && if (((httpStatusCode < HttpStatus.SUCCESS_RANGE_START) || (httpStatusCode > HttpStatus.SUCCESS_RANGE_END)) &&
// do not destroy the request for the device code flow // do not destroy the request for the device code flow
// @ts-ignore // @ts-ignore