Merge pull request #16 from markusguenther/bugfix/prevent-json-error

BUGFIX: Prevent json parse error
Sebobo · Jan 10, 2024 · 38712c4 · 38712c4
2 parents 187fb5c + ab9f7c5
commit 38712c4
Showing 1 changed file with 24 additions and 2 deletions.
diff --git a/Resources/Private/JavaScript/Terminal/src/helpers/fetchCommands.ts b/Resources/Private/JavaScript/Terminal/src/helpers/fetchCommands.ts
@@ -14,12 +14,34 @@ const fetchCommands = async (endPoint: string): Promise<{ success: boolean; resu
                 'Content-Type': 'application/json',
             },
         }))
-        .then((response: Response) => response && response.json())
+        .then((response: Response) => {
+            if (!response.ok) {
+                return {
+                    success: false,
+                    result: {},
+                };
+            }
+
+            return (
+                response &&
+                response
+                    .json()
+                    .then((data: CommandList) => {
+                        return data;
+                    })
+                    .catch((error: Error) => {
+                        return {
+                            success: false,
+                            result: {},
+                        };
+                    })
+            );
+        })
         .catch((error: Error) => {
             logToConsole('error', error.message);
             return {
                 success: false,
-                result: [],
+                result: {},
             };
         });
 };