Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-01-04 07:10:06 +08:00
Code Issues Projects Releases Packages Wiki Activity

Wrap decoding errors in APIError to prevent Sentry logging of "invalid JSON"

Browse source
This commit is contained in:
Ben Gotow 2019-10-23 01:17:35 -05:00
parent 3eb3eff537
commit af3172ff28
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/flux/mailspring-api-request.ts
View file

@ -104,7 +104,8 @@ export async function makeRequest(options) {
options.body = JSON.stringify(options.body);
}
const error = new APIError(`${options.method || 'GET'} ${options.url} failed`);
const desc = `${options.method || 'GET'} ${options.url}`;
const error = new APIError(`${desc} failed`);
let resp = null;
try {
resp = await fetch(options.url, options);
@ -113,12 +114,17 @@ export async function makeRequest(options) {
}
if (!resp.ok) {
error.statusCode = resp.status;
error.message = `${options.method || 'GET'} ${options.url} returned ${resp.status} ${
resp.statusText
}`;
error.message = `${desc} returned ${resp.status} ${resp.statusText}`;
throw error;
}
try {
return resp.json();
} catch (invalidJSONError) {
// We need to wrap this generic JSON error into our APIError class to attach the request
// description and also to prevent it from being reported to Sentry 7,000 times a month.
error.message = `${desc} returned invalid JSON: ${invalidJSONError.toString()}`;
throw error;
}
return resp.json();
}
export default {