Fix: JSON parsing in backend_srv (#45598) (#45615)

* fix(plugins/state): console log errors during install / uninstall

* fix(backend_srv): catch JSON parse errors

Sometimes it can happen that a backend API responses says that it's
returning with a JSON content-type, however it actually returns an invalid
JSON (e.g. an empty body) - in which case the backendSrv() request errors out.

(cherry picked from commit 1e21184f65)

Co-authored-by: Levente Balogh <balogh.levente.hu@gmail.com>
This commit is contained in:
Grot (@grafanabot)
2022-02-18 16:24:16 +01:00
committed by GitHub
co-authored by Levente Balogh
parent 238c5bc7ee
commit 62c6522b1b
2 changed files with 10 additions and 1 deletions
+6 -1
View File
@@ -105,7 +105,12 @@ export async function parseResponseBody<T>(
return response.blob() as any;
case 'json':
return response.json();
try {
return await response.json();
} catch (err) {
console.warn(`${response.url} returned an invalid JSON -`, err);
return {} as unknown as T;
}
case 'text':
return response.text() as any;
@@ -73,6 +73,8 @@ export const install = createAsyncThunk(
return { id, changes } as Update<CatalogPlugin>;
} catch (e) {
console.error(e);
return thunkApi.rejectWithValue('Unknown error.');
}
}
@@ -90,6 +92,8 @@ export const uninstall = createAsyncThunk(`${STATE_PREFIX}/uninstall`, async (id
changes: { isInstalled: false, installedVersion: undefined },
} as Update<CatalogPlugin>;
} catch (e) {
console.error(e);
return thunkApi.rejectWithValue('Unknown error.');
}
});