matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-25 05:23:13 +03:00
Code Activity

Don't convert errors to JSON if they are JSON already

Browse Source 
For example, if the identity server throws a 401 on `/account`, we end up here with a JSON object. Don't convert the string `object Object` to JSON because it'll fail: just use the object.
This commit is contained in:
Travis Ralston
2019-08-23 12:00:07 -06:00
parent 09b00335f8
commit 0e51dfed46
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/http-api.js
View File

@@ -836,7 +836,8 @@ function parseErrorResponse(response, body) {
let err; let err;
if (contentType) { if (contentType) {
if (contentType.type === 'application/json') { if (contentType.type === 'application/json') {
err = new module.exports.MatrixError(JSON.parse(body)); const jsonBody = typeof(body) === 'object' ? body : JSON.parse(body);
err = new module.exports.MatrixError(jsonBody);
} else if (contentType.type === 'text/plain') { } else if (contentType.type === 'text/plain') {
err = new Error(`Server returned ${httpStatus} error: ${body}`); err = new Error(`Server returned ${httpStatus} error: ${body}`);
} }