fix(gmail): fix node and improve helper so to avoid double wrapping i…

…n json key (n8n-io#4052) * fix: improve helper so to avoid double wrapping in json key * fix: gmail node should now correctly output data
valya · Sep 7, 2022 · d84b787 · d84b787
1 parent 66a1726
commit d84b787
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 16 deletions.
diff --git a/packages/core/src/NodeExecuteFunctions.ts b/packages/core/src/NodeExecuteFunctions.ts
@@ -1309,8 +1309,13 @@ export function returnJsonArray(jsonData: IDataObject | IDataObject[]): INodeExe
 		jsonData = [jsonData];
 	}
 
-	jsonData.forEach((data: IDataObject) => {
-		returnData.push({ json: data });
+	jsonData.forEach((data: IDataObject & { json?: IDataObject }) => {
+		if (data.json) {
+			// We already have the JSON key so avoid double wrapping
+			returnData.push({ ...data, json: data.json });
+		} else {
+			returnData.push({ json: data });
+		}
 	});
 
 	return returnData;

diff --git a/packages/nodes-base/nodes/Google/Gmail/Gmail.node.ts b/packages/nodes-base/nodes/Google/Gmail/Gmail.node.ts
@@ -508,7 +508,7 @@ export class Gmail implements INodeType {
 							};
 						}
 
-						responseData = [nodeExecutionData];
+						responseData = nodeExecutionData;
 					}
 					if (operation === 'getAll') {
 						const returnAll = this.getNodeParameter('returnAll', i) as boolean;
@@ -734,7 +734,7 @@ export class Gmail implements INodeType {
 							};
 						}
 
-						responseData = [nodeExecutionData];
+						responseData = nodeExecutionData;
 					}
 					if (operation === 'delete') {
 						// https://developers.google.com/gmail/api/v1/reference/users/drafts/delete
@@ -818,18 +818,10 @@ export class Gmail implements INodeType {
 					}
 				}
 
-				let executionData = responseData as INodeExecutionData[];
-
-				if (!['get', 'getAll'].includes(operation) || resource === 'label') {
-					executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
-						{ itemData: { item: i } },
-					);
-				} else {
-					executionData = this.helpers.constructExecutionMetaData(executionData, {
-						itemData: { item: i },
-					});
-				}
+				const executionData = this.helpers.constructExecutionMetaData(
+					this.helpers.returnJsonArray(responseData),
+					{ itemData: { item: i } },
+				);
 
 				returnData.push(...executionData);
 			} catch (error) {