Add try/catch around JSON.parse to avoid fail loop

Signed-off-by: Cédric Boirard <cedric@framer.com>
framer · Dec 3, 2024 · fe474f2 · fe474f2
1 parent e5234c0
commit fe474f2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/plugins/airtable/src/airtable.ts b/plugins/airtable/src/airtable.ts
@@ -534,11 +534,15 @@ function getIgnoredFieldIds(rawIgnoredFieldIds: string | null) {
         return []
     }
 
-    const parsed = JSON.parse(rawIgnoredFieldIds)
-    if (!Array.isArray(parsed)) return []
-    if (!parsed.every(val => typeof val === "string")) return []
+    try {
+        const parsed = JSON.parse(rawIgnoredFieldIds)
+        if (!Array.isArray(parsed)) return []
+        if (!parsed.every(val => typeof val === "string")) return []
 
-    return parsed
+        return parsed
+    } catch {
+        return []
+    }
 }
 
 export async function getTableIdMapForBase(baseId: string | null): Promise<TableIdMap> {

diff --git a/plugins/airtable/src/auth.ts b/plugins/airtable/src/auth.ts
@@ -123,10 +123,14 @@ class Auth {
             const serializedTokens = localStorage.getItem(this.PLUGIN_TOKENS_KEY)
             if (!serializedTokens) return null
 
-            const storedTokens = JSON.parse(serializedTokens) as StoredTokens
-            this.storedTokens = storedTokens
+            try {
+                const storedTokens = JSON.parse(serializedTokens) as StoredTokens
+                this.storedTokens = storedTokens
 
-            return storedTokens
+                return storedTokens
+            } catch {
+                return null
+            }
         },
         clear: () => {
             this.storedTokens = null