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

fix(TheHive Node): fixes for node issues

Browse Source
This commit is contained in:
Michael Kret
2022-10-21 19:46:31 +03:00
committed by GitHub
parent 2f4649cdf4
commit ca9eca9ae9
8 changed files with 277 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
packages/nodes-base/nodes/TheHive/GenericFunctions.ts
View File

@@ -78,7 +78,11 @@ export function prepareOptional(optionals: IDataObject): IDataObject {
} else if (moment(optionals[key] as string, moment.ISO_8601).isValid()) {
response[key] = Date.parse(optionals[key] as string);
} else if (key === 'artifacts') {
response[key] = JSON.parse(optionals[key] as string);
try {
response[key] = JSON.parse(optionals[key] as string);
} catch (error) {
throw new Error('Invalid JSON for artifacts');
}
} else if (key === 'tags') {
response[key] = splitTags(optionals[key] as string);
} else {
@@ -96,15 +100,26 @@ export async function prepareCustomFields(
): Promise<IDataObject | undefined> {
// Check if the additionalFields object contains customFields
if (jsonParameters === true) {
const customFieldsJson = additionalFields.customFieldsJson;
let customFieldsJson = additionalFields.customFieldsJson;
// Delete from additionalFields as some operations (e.g. alert:update) do not run prepareOptional
// which would remove the extra fields
delete additionalFields.customFieldsJson;
if (typeof customFieldsJson === 'string') {
return JSON.parse(customFieldsJson);
} else if (typeof customFieldsJson === 'object') {
return customFieldsJson as IDataObject;
try {
customFieldsJson = JSON.parse(customFieldsJson);
} catch (error) {
throw new Error('Invalid JSON for customFields');
}
}
if (typeof customFieldsJson === 'object') {
const customFields = Object.keys(customFieldsJson as IDataObject).reduce((acc, curr) => {
acc[`customFields.${curr}`] = (customFieldsJson as IDataObject)[curr];
return acc;
}, {} as IDataObject);
return customFields;
} else if (customFieldsJson) {
throw Error('customFieldsJson value is invalid');
}
@@ -136,9 +151,8 @@ export async function prepareCustomFields(
// Might be able to do some type conversions here if needed, TODO
acc[fieldName] = {
[referenceTypeMapping[fieldName]]: curr.value,
};
const updatedField = `customFields.${fieldName}.${[referenceTypeMapping[fieldName]]}`;
acc[updatedField] = curr.value;
return acc;
},
{} as IDataObject,
@@ -151,18 +165,10 @@ export async function prepareCustomFields(
}
export function buildCustomFieldSearch(customFields: IDataObject): IDataObject[] {
const customFieldTypes = ['boolean', 'date', 'float', 'integer', 'number', 'string'];
const searchQueries: IDataObject[] = [];
Object.keys(customFields).forEach((customFieldName) => {
const customField = customFields[customFieldName] as IDataObject;
// Figure out the field type from the object's keys
const fieldType = Object.keys(customField).filter(
(key) => customFieldTypes.indexOf(key) > -1,
)[0];
const fieldValue = customField[fieldType];
searchQueries.push(Eq(`customFields.${customFieldName}.${fieldType}`, fieldValue));
searchQueries.push(Eq(customFieldName, customFields[customFieldName]));
});
return searchQueries;
}