BUGFIX: Prevent json encode error

Sebobo · Jan 8, 2024 · 930e62f · 930e62f
1 parent 187fb5c
commit 930e62f
Showing 1 changed file with 23 additions and 1 deletion.
diff --git a/Resources/Private/JavaScript/Terminal/src/helpers/fetchCommands.ts b/Resources/Private/JavaScript/Terminal/src/helpers/fetchCommands.ts
@@ -14,7 +14,29 @@ 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 {