Improve handling when djdt views dont respond with JSON (#1877)

jazzband · Feb 22, 2024 · 9f66bd3 · 9f66bd3
1 parent e80c05d
commit 9f66bd3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/debug_toolbar/static/debug_toolbar/js/utils.js b/debug_toolbar/static/debug_toolbar/js/utils.js
@@ -75,7 +75,11 @@ function ajax(url, init) {
     return fetch(url, init)
         .then(function (response) {
             if (response.ok) {
-                return response.json();
+                    return response.json().catch(function(error){
+                        return Promise.reject(
+                            new Error("The response  is a invalid Json object : " + error)
+                        );
+                    });
             }
             return Promise.reject(
                 new Error(response.status + ": " + response.statusText)

diff --git a/docs/changes.rst b/docs/changes.rst
@@ -7,6 +7,8 @@ Pending
 * Raised the minimum Django version to 4.2.
 * Automatically support Docker rather than having the developer write a
   workaround for ``INTERNAL_IPS``.
+* Display a better error message when the toolbar's requests
+  return invalid json.
 
 4.3.0 (2024-02-01)
 ------------------