Fixed from reviewers

n8n-io · Jan 31, 2022 · 61a541b · 61a541b
1 parent 99cc33e
commit 61a541b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 17 deletions.
diff --git a/packages/cli/commands/execute.ts b/packages/cli/commands/execute.ts
@@ -22,7 +22,7 @@ import {
 } from '../src';
 
 import { getLogger } from '../src/Logger';
-import { getInstanceowner } from '../src/UserManagement/UserManagementHelper';
+import { getInstanceOwner } from '../src/UserManagement/UserManagementHelper';
 
 export class Execute extends Command {
 	static description = '\nExecutes a given workflow';
@@ -166,7 +166,7 @@ export class Execute extends Command {
 				startNodes: [startNode.name],
 				// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 				workflowData: workflowData!,
-				user: await getInstanceowner(),
+				user: await getInstanceOwner(),
 			};
 
 			const workflowRunner = new WorkflowRunner();

diff --git a/packages/cli/commands/executeBatch.ts b/packages/cli/commands/executeBatch.ts
@@ -37,7 +37,7 @@ import {
 	WorkflowRunner,
 } from '../src';
 import { User } from '../src/databases/entities/User';
-import { getInstanceowner } from '../src/UserManagement/UserManagementHelper';
+import { getInstanceOwner } from '../src/UserManagement/UserManagementHelper';
 
 export class ExecuteBatch extends Command {
 	static description = '\nExecutes multiple workflows once';
@@ -280,7 +280,7 @@ export class ExecuteBatch extends Command {
 		// Wait till the database is ready
 		await startDbInitPromise;
 
-		ExecuteBatch.instanceOwner = await getInstanceowner();
+		ExecuteBatch.instanceOwner = await getInstanceOwner();
 
 		let allWorkflows;
 

diff --git a/packages/cli/src/UserManagement/UserManagementHelper.ts b/packages/cli/src/UserManagement/UserManagementHelper.ts
@@ -45,15 +45,16 @@ export async function saveCredentialOwnership(
 	})) as SharedCredentials;
 }
 
-export async function getWorkflowOwner(workflowId: string) {
-	const workflowDb = await Db.collections.Workflow!.findOneOrFail(workflowId, {
-		relations: ['shared', 'shared.user', 'shared.user.globalRole'],
+export async function getWorkflowOwner(workflowId: string | number) {
+	const sharedWorkflow = await Db.collections.SharedWorkflow!.findOneOrFail({
+		where: { workflow: { id: workflowId } },
+		relations: ['user', 'user.globalRole'],
 	});
 
-	return workflowDb.shared[0].user;
+	return sharedWorkflow.user;
 }
 
-export async function getInstanceowner() {
+export async function getInstanceOwner() {
 	const qb = Db.collections.User!.createQueryBuilder('u');
 	qb.innerJoin('u.globalRole', 'gr');
 	qb.andWhere('gr.name = :name and gr.scope = :scope', { name: 'owner', scope: 'global' });

diff --git a/packages/cli/src/WebhookHelpers.ts b/packages/cli/src/WebhookHelpers.ts
@@ -227,7 +227,7 @@ export async function executeWebhook(
 		try {
 			user = await getWorkflowOwner(workflowData.id.toString());
 		} catch (error) {
-			throw new ResponseHelper.ResponseError('Cannot find workflow', 500, 500);
+			throw new ResponseHelper.ResponseError('Cannot find workflow', undefined, 404);
 		}
 	}
 

diff --git a/packages/cli/src/WorkflowExecuteAdditionalData.ts b/packages/cli/src/WorkflowExecuteAdditionalData.ts
@@ -818,9 +818,7 @@ export async function executeWorkflow(
 	const nodeTypes = NodeTypes();
 
 	const workflowData =
-		loadedWorkflowData !== undefined
-			? loadedWorkflowData
-			: await getWorkflowData(workflowInfo, additionalData.user);
+		loadedWorkflowData ?? (await getWorkflowData(workflowInfo, additionalData.user));
 
 	const workflowName = workflowData ? workflowData.name : undefined;
 	const workflow = new Workflow({
@@ -833,10 +831,7 @@ export async function executeWorkflow(
 		staticData: workflowData.staticData,
 	});
 
-	const runData =
-		loadedRunData !== undefined
-			? loadedRunData
-			: await getRunData(workflowData, additionalData.user, inputData);
+	const runData = loadedRunData ?? (await getRunData(workflowData, additionalData.user, inputData));
 
 	let executionId;