feat(MISP Node): Update credential to support HTTP Request node (#7268)

n8n-io · Sep 27, 2023 · e4c302c · e4c302c
1 parent 6d7fe95
commit e4c302c
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 6 deletions.
diff --git a/packages/nodes-base/credentials/MispApi.credentials.ts b/packages/nodes-base/credentials/MispApi.credentials.ts
@@ -1,4 +1,9 @@
-import type { ICredentialType, INodeProperties } from 'n8n-workflow';
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
 
 export class MispApi implements ICredentialType {
 	name = 'mispApi';
@@ -29,4 +34,21 @@ export class MispApi implements ICredentialType {
 			default: false,
 		},
 	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				Authorization: '={{$credentials.apiKey}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: '={{$credentials.baseUrl.replace(new RegExp("/$"), "")}}',
+			url: '/tags',
+			skipSslCertificateValidation: '={{$credentials.allowUnauthorizedCerts}}',
+		},
+	};
 }
diff --git a/packages/nodes-base/nodes/Misp/GenericFunctions.ts b/packages/nodes-base/nodes/Misp/GenericFunctions.ts
@@ -19,14 +19,11 @@ export async function mispApiRequest(
 	body: IDataObject = {},
 	qs: IDataObject = {},
 ) {
-	const { baseUrl, apiKey, allowUnauthorizedCerts } = (await this.getCredentials(
+	const { baseUrl, allowUnauthorizedCerts } = (await this.getCredentials(
 		'mispApi',
 	)) as MispCredentials;
 
 	const options: OptionsWithUri = {
-		headers: {
-			Authorization: apiKey,
-		},
 		method,
 		body,
 		qs,
@@ -44,7 +41,7 @@ export async function mispApiRequest(
 	}
 
 	try {
-		return await this.helpers.request(options);
+		return await this.helpers.requestWithAuthentication.call(this, 'mispApi', options);
 	} catch (error) {
 		// MISP API wrongly returns 403 for malformed requests
 		if (error.statusCode === 403) {