admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-17 18:12:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Add IRequestOptions type to helpers.request for more type safety (no-changelog) (#8563)

Browse Source 
Co-authored-by: कारतोफ्फेलस्क्रिप्ट™ <aditya@netroy.in>
This commit is contained in:
Elias Meire
2024-02-14 16:29:09 +01:00
committed by GitHub
parent 24859cfef5
commit 100d9bc087
330 changed files with 1682 additions and 1492 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
packages/nodes-base/nodes/GraphQL/GraphQL.node.ts
View File

@@ -7,12 +7,11 @@ import type {
INodeTypeDescription,
JsonObject,
IRequestOptionsSimplified,
IRequestOptions,
IHttpRequestMethods,
} from 'n8n-workflow';
import { NodeApiError, NodeOperationError, jsonParse } from 'n8n-workflow';
import type { OptionsWithUri } from 'request';
import type { RequestPromiseOptions } from 'request-promise-native';
export class GraphQL implements INodeType {
description: INodeTypeDescription = {
displayName: 'GraphQL',
@@ -340,12 +339,16 @@ export class GraphQL implements INodeType {
// Do nothing
}
let requestOptions: OptionsWithUri & RequestPromiseOptions;
let requestOptions: IRequestOptions;
const returnItems: INodeExecutionData[] = [];
for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
try {
const requestMethod = this.getNodeParameter('requestMethod', itemIndex, 'POST') as string;
const requestMethod = this.getNodeParameter(
'requestMethod',
itemIndex,
'POST',
) as IHttpRequestMethods;
const endpoint = this.getNodeParameter('endpoint', itemIndex, '') as string;
const requestFormat = this.getNodeParameter(
'requestFormat',
@@ -421,30 +424,29 @@ export class GraphQL implements INodeType {
requestOptions.qs.query = gqlQuery;
} else {
if (requestFormat === 'json') {
const jsonBody = requestOptions.body as IDataObject;
requestOptions.body = {
...requestOptions.body,
...jsonBody,
query: gqlQuery,
variables: this.getNodeParameter('variables', itemIndex, {}) as object,
operationName: this.getNodeParameter('operationName', itemIndex) as string,
};
if (typeof requestOptions.body.variables === 'string') {
if (typeof jsonBody.variables === 'string') {
try {
requestOptions.body.variables = JSON.parse(
(requestOptions.body.variables as string) || '{}',
);
jsonBody.variables = JSON.parse(jsonBody.variables || '{}');
} catch (error) {
throw new NodeOperationError(
this.getNode(),
'Using variables failed:\n' +
(requestOptions.body.variables as string) +
(jsonBody.variables as string) +
'\n\nWith error message:\n' +
(error as string),
{ itemIndex },
);
}
}
if (requestOptions.body.operationName === '') {
requestOptions.body.operationName = null;
if (jsonBody.operationName === '') {
jsonBody.operationName = null;
}
requestOptions.json = true;
} else {