[UN-2894] Fix n8n cloud review issues

.github/workflows/pr-checks.yml

@@ -16,8 +16,12 @@ jobs:
         run: npm ci
 
       - name: Run comprehensive checks
-        run: npm run prepublishOnly
-
+        run: npm run validate
+
+      - name: Run security audit
+        run: npm run audit
+        continue-on-error: true
+
       - name: Validate package structure
         run: npm pack --dry-run
 

credentials/LLMWhispererApi.credentials.ts

@@ -29,7 +29,7 @@ export class LLMWhispererApi implements ICredentialType {
 		type: 'generic',
 		properties: {
 			headers: {
-				'Authorization': '=Bearer apiKey',
+				'unstract-key': '={{$credentials.apiKey}}',
 			},
 		},
 	};

nodes/LlmWhisperer/LlmWhisperer.node.ts

@@ -195,8 +195,6 @@ export class LlmWhisperer implements INodeType {
 		const returnData: INodeExecutionData[] = [];
 
 		try {
-			const credentials = await this.getCredentials('llmWhispererApi');
-			const apiKey = credentials.apiKey as string;
 			const { helpers, logger } = this;
 
 			for (let i = 0; i < items.length; i++) {
@@ -231,7 +229,6 @@ export class LlmWhisperer implements INodeType {
 					method: 'POST' as IHttpRequestMethods,
 					url: `${host}/api/v2/whisper`,
 					headers: {
-						'unstract-key': `${apiKey}`,
 						'Content-Type': 'application/octet-stream',
 					},
 					body: fileBuffer,
@@ -256,7 +253,7 @@ export class LlmWhisperer implements INodeType {
 				logger.info('Making API request to LLMWhisperer API...');
 				let result: any;
 				try {
-					result = await helpers.request(requestOptions);
+					result = await helpers.httpRequestWithAuthentication.call(this, 'llmWhispererApi', requestOptions);
 				} catch (requestError) {
 					logger.error('Error during LLMWhisperer API request:', requestError);
 					throw requestError;
@@ -276,12 +273,9 @@ export class LlmWhisperer implements INodeType {
 				while (status !== 'processed' && status !== 'error') {
 					await sleep(2000);
 
-					const statusResult = await helpers.request({
+					const statusResult = await helpers.httpRequestWithAuthentication.call(this, 'llmWhispererApi', {
 						method: 'GET' as IHttpRequestMethods,
 						url: `${host}/api/v2/whisper-status`,
-						headers: {
-							'unstract-key': `${apiKey}`,
-						},
 						qs: {
 							whisper_hash: whisperHash,
 						},
@@ -311,12 +305,9 @@ export class LlmWhisperer implements INodeType {
 				}
 
 				if (status === 'processed') {
-					const retrieveResult = await helpers.request({
+					const retrieveResult = await helpers.httpRequestWithAuthentication.call(this, 'llmWhispererApi', {
 						method: 'GET' as IHttpRequestMethods,
 						url: `${host}/api/v2/whisper-retrieve`,
-						headers: {
-							'unstract-key': `${apiKey}`,
-						},
 						qs: {
 							whisper_hash: whisperHash,
 						},
@@ -327,6 +318,7 @@ export class LlmWhisperer implements INodeType {
 					delete retrieveResultContent.webhook_metadata;
 					returnData.push({
 						json: retrieveResultContent,
+						pairedItem: { item: i },
 					});
 				}
 			}

nodes/Unstract/Unstract.node.ts

@@ -112,7 +112,6 @@ export class Unstract implements INodeType {
 
 		try {
 			const credentials = await this.getCredentials('unstractApi');
-			const apiKey = credentials.apiKey as string;
 			const orgId = credentials.orgId as string;
 			const { helpers, logger } = this;
 
@@ -158,15 +157,12 @@ export class Unstract implements INodeType {
 				const requestOptions = {
 					method: 'POST' as IHttpRequestMethods,
 					url: `${host}/deployment/api/${orgId}/${deploymentName}/`,
-					headers: {
-						'Authorization': `Bearer ${apiKey}`,
-					},
 					formData,
 					timeout: 5 * 60 * 1000,
 				};
 
 				logger.info('Making API request to Unstract API...');
-				const result = await helpers.request(requestOptions);
+				const result = await helpers.httpRequestWithAuthentication.call(this, 'unstractApi', requestOptions);
 				let resultContent = JSON.parse(result).message;
 				let executionStatus = resultContent.execution_status;
 
@@ -180,14 +176,11 @@ export class Unstract implements INodeType {
 						const statusRequestOptions = {
 							method: 'GET' as IHttpRequestMethods,
 							url: `${host}${statusApi}`,
-							headers: {
-								'Authorization': `Bearer ${apiKey}`,
-							},
 							timeout: 5 * 60 * 1000,
 						};
 
 						try {
-							const statusResult = await helpers.request(statusRequestOptions);
+							const statusResult = await helpers.httpRequestWithAuthentication.call(this, 'unstractApi', statusRequestOptions);
 							resultContent = JSON.parse(statusResult);
 							executionStatus = resultContent.status;
 						} catch (error: any) {
@@ -217,6 +210,7 @@ export class Unstract implements INodeType {
 
 				returnData.push({
 					json: resultContent,
+					pairedItem: { item: i },
 				});
 			}
 

nodes/UnstractHitlFetch/UnstractHitlFetch.node.ts

@@ -56,7 +56,6 @@ export class UnstractHitlFetch implements INodeType {
 		const returnData: INodeExecutionData[] = [];
 
 		const credentials = await this.getCredentials('unstractHITLApi');
-		const hitlKey = credentials.HITLKey as string;
 		const orgId = credentials.orgId as string;
 		const helpers = this.helpers;
 
@@ -73,23 +72,26 @@ export class UnstractHitlFetch implements INodeType {
 			const options = {
 				method: 'GET' as IHttpRequestMethods,
 				url,
-				headers: {
-					Authorization: `Bearer ${hitlKey}`,
-				},
 			};
 
 			try {
-				const response = await helpers.request(options);
+				const response = await helpers.httpRequestWithAuthentication.call(this, 'unstractHITLApi', options);
 				const parsed = typeof response === 'string' ? JSON.parse(response) : response;
 
 				if (parsed.error) {
 					if (parsed.error === 'No approved items available.') {
-						returnData.push({ json: { message: 'No approved items available', hasData: false } });
+						returnData.push({
+							json: { message: 'No approved items available', hasData: false },
+							pairedItem: { item: i }
+						});
 					} else {
 						throw new NodeOperationError(this.getNode(), `API Error: ${parsed.error}`);
 					}
 				} else if (parsed.data) {
-					returnData.push({ json: { ...parsed.data, hasData: true } });
+					returnData.push({
+						json: { ...parsed.data, hasData: true },
+						pairedItem: { item: i }
+					});
 				} else {
 					throw new NodeOperationError(this.getNode(), 'Unexpected response format.');
 				}

nodes/UnstractHitlPush/UnstractHitlPush.node.ts

@@ -114,7 +114,6 @@ export class UnstractHitlPush implements INodeType {
 
 		try {
 			const credentials = await this.getCredentials('unstractApi');
-			const apiKey = credentials.apiKey as string;
 			const orgId = credentials.orgId as string;
 			const { helpers, logger } = this;
 
@@ -159,15 +158,12 @@ export class UnstractHitlPush implements INodeType {
 				const requestOptions = {
 					method: 'POST' as IHttpRequestMethods,
 					url: `${host}/deployment/api/${orgId}/${deploymentName}/`,
-					headers: {
-						Authorization: `Bearer ${apiKey}`,
-					},
 					formData,
 					timeout: 5 * 60 * 1000,
 				};
 
 				logger.info('[HITL] Sending file to Unstract HITL API...');
-				const result = await helpers.request(requestOptions);
+				const result = await helpers.httpRequestWithAuthentication.call(this, 'unstractApi', requestOptions);
 				let resultContent = JSON.parse(result).message;
 				let executionStatus = resultContent.execution_status;
 
@@ -181,14 +177,11 @@ export class UnstractHitlPush implements INodeType {
 						const pollRequest = {
 							method: 'GET' as IHttpRequestMethods,
 							url: `${host}${statusApi}`,
-							headers: {
-								Authorization: `Bearer ${apiKey}`,
-							},
 							timeout: 5 * 60 * 1000,
 						};
 
 						try {
-							const pollResult = await helpers.request(pollRequest);
+							const pollResult = await helpers.httpRequestWithAuthentication.call(this, 'unstractApi', pollRequest);
 							resultContent = JSON.parse(pollResult);
 							executionStatus = resultContent.status;
 						} catch (error: any) {
@@ -216,7 +209,10 @@ export class UnstractHitlPush implements INodeType {
 					}
 				}
 
-				returnData.push({ json: resultContent });
+				returnData.push({
+					json: resultContent,
+					pairedItem: { item: i }
+				});
 			}
 
 			return [returnData];

package.json

@@ -35,11 +35,13 @@
   "main": "index.js",
   "scripts": {
     "build": "npx rimraf dist && tsc && gulp build:icons",
+    "build:dev": "npx rimraf dist && tsc && gulp build:icons",
     "dev": "tsc --watch",
     "format": "prettier nodes credentials --write",
     "lint": "eslint nodes/**/*.ts credentials/**/*.ts package.json",
     "lintfix": "eslint nodes/**/*.ts credentials/**/*.ts package.json --fix",
-    "prepublishOnly": "npm run build && npm run lint -c .eslintrc.prepublish.js nodes credentials package.json && npm audit --audit-level=high"
+    "audit": "npm audit --audit-level=high",
+    "validate": "npm run build && eslint -c .eslintrc.prepublish.js nodes credentials package.json"
   },
   "files": [
     "dist",
@@ -70,8 +72,5 @@
   },
   "peerDependencies": {
     "n8n-workflow": "*"
-  },
-  "overrides": {
-    "form-data": "^4.0.4"
   }
 }