fix: Don't throw an error when parsing json response (#20747)

PostHog · Mar 7, 2024 · bca5d25 · bca5d25
1 parent d6650a5
commit bca5d25
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/frontend/src/lib/api.ts b/frontend/src/lib/api.ts
@@ -146,14 +146,11 @@ export function getCookie(name: string): string | null {
     return cookieValue
 }
 
-export async function getJSONOrThrow(response: Response): Promise<any> {
-    if (response.status === 204) {
-        return null
-    }
+export async function getJSONOrNull(response: Response): Promise<any> {
     try {
         return await response.json()
     } catch (e) {
-        throw new ApiError('Failed to parse response JSON', response.status, response.statusText)
+        return null
     }
 }
 
@@ -2050,7 +2047,7 @@ const api = {
     /** Fetch data from specified URL. The result already is JSON-parsed. */
     async get<T = any>(url: string, options?: ApiMethodOptions): Promise<T> {
         const res = await api.getResponse(url, options)
-        return await getJSONOrThrow(res)
+        return await getJSONOrNull(res)
     },
 
     async getResponse(url: string, options?: ApiMethodOptions): Promise<Response> {
@@ -2086,12 +2083,12 @@ const api = {
             })
         })
 
-        return await getJSONOrThrow(response)
+        return await getJSONOrNull(response)
     },
 
     async create(url: string, data?: any, options?: ApiMethodOptions): Promise<any> {
         const res = await api.createResponse(url, data, options)
-        return await getJSONOrThrow(res)
+        return await getJSONOrNull(res)
     },
 
     async createResponse(url: string, data?: any, options?: ApiMethodOptions): Promise<Response> {
@@ -2172,7 +2169,7 @@ async function handleFetch(url: string, method: string, fetcher: () => Promise<R
         const pathname = new URL(url, location.origin).pathname
         posthog.capture('client_request_failure', { pathname, method, duration, status: response.status })
 
-        const data = await getJSONOrThrow(response)
+        const data = await getJSONOrNull(response)
         throw new ApiError('Non-OK response', response.status, data)
     }
 

diff --git a/frontend/src/lib/internalMetrics.ts b/frontend/src/lib/internalMetrics.ts
@@ -1,4 +1,4 @@
-import api, { getJSONOrThrow } from 'lib/api'
+import api, { getJSONOrNull } from 'lib/api'
 import posthog from 'posthog-js'
 import { getResponseBytes } from 'scenes/insights/utils'
 
@@ -53,7 +53,7 @@ export async function apiGetWithTimeToSeeDataTracking<T>(
     const requestStartMs = performance.now()
     try {
         response = await api.getResponse(url)
-        responseData = await getJSONOrThrow(response)
+        responseData = await getJSONOrNull(response)
     } catch (e) {
         error = e
     }

diff --git a/frontend/src/scenes/dashboard/dashboardLogic.tsx b/frontend/src/scenes/dashboard/dashboardLogic.tsx
@@ -14,7 +14,7 @@ import {
 } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router, urlToAction } from 'kea-router'
-import api, { ApiMethodOptions, getJSONOrThrow } from 'lib/api'
+import api, { ApiMethodOptions, getJSONOrNull } from 'lib/api'
 import {
     AUTO_REFRESH_DASHBOARD_THRESHOLD_HOURS,
     DashboardPrivilegeLevel,
@@ -214,7 +214,7 @@ export const dashboardLogic = kea<dashboardLogicType>([
                         // :TODO: Send dashboardQueryId forward as well if refreshing
                         const apiUrl = values.apiUrl(refresh)
                         const dashboardResponse: Response = await api.getResponse(apiUrl)
-                        const dashboard: DashboardType = await getJSONOrThrow(dashboardResponse)
+                        const dashboard: DashboardType = await getJSONOrNull(dashboardResponse)
 
                         actions.setInitialLoadResponseBytes(getResponseBytes(dashboardResponse))
 
@@ -981,7 +981,7 @@ export const dashboardLogic = kea<dashboardLogicType>([
                     breakpoint()
 
                     const refreshedInsightResponse: Response = await api.getResponse(apiUrl, methodOptions)
-                    const refreshedInsight: InsightModel = await getJSONOrThrow(refreshedInsightResponse)
+                    const refreshedInsight: InsightModel = await getJSONOrNull(refreshedInsightResponse)
                     breakpoint()
                     updateExistingInsightState({ cachedInsight: insight, dashboardId, refreshedInsight })
                     dashboardsModel.actions.updateDashboardInsight(