Wrap JSON.parse method in try/catch block (#150)

saleor · Dec 21, 2021 · 343eb56 · 343eb56
1 parent 013e001
commit 343eb56
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/src/apollo/client.ts b/src/apollo/client.ts
@@ -59,13 +59,17 @@ export const createFetch = ({
   let token = storage.getAccessToken();
   const authPluginId = storage.getAuthPluginId();
 
-  if (
-    ["refreshToken", "externalRefresh"].includes(
-      JSON.parse(init.body?.toString() || "{}")?.operationName
-    )
-  ) {
-    return fetch(input, init);
-  }
+  try {
+    if (
+      ["refreshToken", "externalRefresh"].includes(
+        // INFO: Non-null assertion is enabled because the block is wrapped inside try/catch
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        JSON.parse(init.body!.toString()).operationName
+      )
+    ) {
+      return fetch(input, init);
+    }
+  } catch (e) {}
 
   if (autoTokenRefresh && token) {
     // auto refresh token before provided time skew (in seconds) until it expires