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

⚡ Move "organizationId" in credentials and fix error messages

Browse Source
This commit is contained in:
Jan Oberhauser
2019-12-09 12:07:48 +01:00
parent 9250163c8c
commit b36efd4c9d
5 changed files with 47 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
packages/nodes-base/nodes/Flow/Flow.node.ts
View File

@@ -64,6 +64,12 @@ export class Flow implements INodeType {
};
async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
const credentials = this.getCredentials('flowApi');
if (credentials === undefined) {
throw new Error('No credentials got returned!');
}
const items = this.getInputData();
const returnData: IDataObject[] = [];
const length = items.length as unknown as number;
@@ -76,12 +82,11 @@ export class Flow implements INodeType {
if (resource === 'task') {
//https://developer.getflow.com/api/#tasks_create-task
if (operation === 'create') {
const organizationId = this.getNodeParameter('organizationId', i) as string;
const workspaceId = this.getNodeParameter('workspaceId', i) as string;
const name = this.getNodeParameter('name', i) as string;
const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
const body: ITask = {
organization_id: parseInt(organizationId, 10),
organization_id: credentials.organizationId as number,
};
const task: TaskInfo = {
name,
@@ -134,17 +139,16 @@ export class Flow implements INodeType {
responseData = await flowApiRequest.call(this, 'POST', '/tasks', body);
responseData = responseData.task;
} catch (err) {
throw new Error(`Flow Error: ${JSON.stringify(err)}`);
throw new Error(`Flow Error: ${err.message}`);
}
}
//https://developer.getflow.com/api/#tasks_update-a-task
if (operation === 'update') {
const organizationId = this.getNodeParameter('organizationId', i) as string;
const workspaceId = this.getNodeParameter('workspaceId', i) as string;
const taskId = this.getNodeParameter('taskId', i) as string;
const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
const body: ITask = {
organization_id: parseInt(organizationId, 10),
organization_id: credentials.organizationId as number,
};
const task: TaskInfo = {
workspace_id: parseInt(workspaceId, 10),
@@ -203,30 +207,28 @@ export class Flow implements INodeType {
responseData = await flowApiRequest.call(this, 'PUT', `/tasks/${taskId}`, body);
responseData = responseData.task;
} catch (err) {
throw new Error(`Flow Error: ${JSON.stringify(err)}`);
throw new Error(`Flow Error: ${err.message}`);
}
}
//https://developer.getflow.com/api/#tasks_get-task
if (operation === 'get') {
const organizationId = this.getNodeParameter('organizationId', i) as string;
const taskId = this.getNodeParameter('taskId', i) as string;
const filters = this.getNodeParameter('filters', i) as IDataObject;
qs.organization_id = organizationId;
qs.organization_id = credentials.organizationId as number;
if (filters.include) {
qs.include = (filters.include as string[]).join(',');
}
try {
responseData = await flowApiRequest.call(this,'GET', `/tasks/${taskId}`, {}, qs);
} catch (err) {
throw new Error(`Flow Error: ${JSON.stringify(err)}`);
throw new Error(`Flow Error: ${err.message}`);
}
}
//https://developer.getflow.com/api/#tasks_get-tasks
if (operation === 'getAll') {
const returnAll = this.getNodeParameter('returnAll', i) as boolean;
const organizationId = this.getNodeParameter('organizationId', i) as string;
const filters = this.getNodeParameter('filters', i) as IDataObject;
qs.organization_id = organizationId;
qs.organization_id = credentials.organizationId as number;
if (filters.include) {
qs.include = (filters.include as string[]).join(',');
}
@@ -263,7 +265,7 @@ export class Flow implements INodeType {
responseData = responseData.tasks;
}
} catch (err) {
throw new Error(`Flow Error: ${JSON.stringify(err)}`);
throw new Error(`Flow Error: ${err.message}`);
}
}
}