mirror of
https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git
synced 2025-12-23 04:39:08 +00:00
fix(API): Fix manual chat trigger execution (#8300)
Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
This commit is contained in:
@@ -1,11 +1,11 @@
|
|||||||
import type express from 'express';
|
import type express from 'express';
|
||||||
import { Service } from 'typedi';
|
import { Service } from 'typedi';
|
||||||
import {
|
import { WebhookPathTakenError, Workflow } from 'n8n-workflow';
|
||||||
type IWebhookData,
|
import type {
|
||||||
type IWorkflowExecuteAdditionalData,
|
IWebhookData,
|
||||||
type IHttpRequestMethods,
|
IWorkflowExecuteAdditionalData,
|
||||||
WebhookPathTakenError,
|
IHttpRequestMethods,
|
||||||
Workflow,
|
IRunData,
|
||||||
} from 'n8n-workflow';
|
} from 'n8n-workflow';
|
||||||
import type {
|
import type {
|
||||||
IResponseCallbackData,
|
IResponseCallbackData,
|
||||||
@@ -189,6 +189,7 @@ export class TestWebhooks implements IWebhookManager {
|
|||||||
userId: string,
|
userId: string,
|
||||||
workflowEntity: IWorkflowDb,
|
workflowEntity: IWorkflowDb,
|
||||||
additionalData: IWorkflowExecuteAdditionalData,
|
additionalData: IWorkflowExecuteAdditionalData,
|
||||||
|
runData?: IRunData,
|
||||||
sessionId?: string,
|
sessionId?: string,
|
||||||
destinationNode?: string,
|
destinationNode?: string,
|
||||||
) {
|
) {
|
||||||
@@ -213,6 +214,10 @@ export class TestWebhooks implements IWebhookManager {
|
|||||||
const key = this.registrations.toKey(webhook);
|
const key = this.registrations.toKey(webhook);
|
||||||
const registration = await this.registrations.get(key);
|
const registration = await this.registrations.get(key);
|
||||||
|
|
||||||
|
if (runData && webhook.node in runData) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
if (registration && !webhook.webhookId) {
|
if (registration && !webhook.webhookId) {
|
||||||
throw new WebhookPathTakenError(webhook.node);
|
throw new WebhookPathTakenError(webhook.node);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -320,6 +320,7 @@ export class WorkflowService {
|
|||||||
user.id,
|
user.id,
|
||||||
workflowData,
|
workflowData,
|
||||||
additionalData,
|
additionalData,
|
||||||
|
runData,
|
||||||
sessionId,
|
sessionId,
|
||||||
destinationNode,
|
destinationNode,
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in New Issue
Block a user