Parse out error message to request users to format with JSON

n8n-io · Jan 15, 2025 · 2bc02b3 · 2bc02b3
1 parent df6a17e
commit 2bc02b3
Showing 1 changed file with 15 additions and 20 deletions.
diff --git a/packages/nodes-base/nodes/GraphQL/GraphQL.node.ts b/packages/nodes-base/nodes/GraphQL/GraphQL.node.ts
@@ -510,26 +510,21 @@ export class GraphQL implements INodeType {
 						},
 					});
 				} else {
-					if (typeof response === 'string') {
-						try {
-							response = JSON.parse(response) as IDataObject;
-							if (
-								response.errors &&
-								Array.isArray(response.errors) &&
-								requestFormat === 'graphql'
-							) {
-								throw new NodeOperationError(
-									this.getNode(),
-									'Error in GraphQL request. Please try using the Request format "JSON" instead.',
-								);
-							}
-						} catch (error) {
-							throw new NodeOperationError(
-								this.getNode(),
-								'Response body is not valid JSON. Change "Response Format" to "String"',
-								{ itemIndex },
-							);
-						}
+					if (
+						typeof response === 'string' &&
+						(JSON.parse(response) as IDataObject).errorMessage &&
+						requestFormat === 'graphql'
+					) {
+						throw new NodeOperationError(
+							this.getNode(),
+							'Error in GraphQL request. Please try using the Request format "JSON" instead.',
+						);
+					} else {
+						throw new NodeOperationError(
+							this.getNode(),
+							'Response body is not valid JSON. Change "Response Format" to "String"',
+							{ itemIndex },
+						);
 					}
 
 					const executionData = this.helpers.constructExecutionMetaData(