fix: defensively parse fetch request body

iFixit · Jan 9, 2024 · d30718d · d30718d
1 parent 2d21c67
commit d30718d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/frontend/lib/shopify-storefront-sdk/generated/sdk.ts b/frontend/lib/shopify-storefront-sdk/generated/sdk.ts
@@ -2654,7 +2654,7 @@ export enum CountryCode {
    Tn = 'TN',
    /** Tonga. */
    To = 'TO',
-   /** Turkey. */
+   /** Türkiye. */
    Tr = 'TR',
    /** Trinidad & Tobago. */
    Tt = 'TT',

diff --git a/packages/sentry/index.tsx b/packages/sentry/index.tsx
@@ -40,13 +40,20 @@ const withSentry: FetchMiddleware = (fetcher) => async (input, init) => {
       });
    }
 
+   let body;
+   try {
+      body = init?.body ? JSON.parse(String(init?.body)) : undefined;
+   } catch (e) {
+      body = init?.body ?? undefined;
+   }
+
    const context = {
       // Underscore sorts the resource first in Sentry's UI
       _resource: input,
       headers: init?.headers,
       method: init?.method,
       // Parse to pretty print GraphQL queries
-      body: init?.body ? JSON.parse(String(init?.body)) : undefined,
+      body,
    };
    try {
       const response = await fetcher(input, init);