diff --git a/src/api/integrations/chatbot/dify/controllers/dify.controller.ts b/src/api/integrations/chatbot/dify/controllers/dify.controller.ts index eb6671e2..66c76f7b 100644 --- a/src/api/integrations/chatbot/dify/controllers/dify.controller.ts +++ b/src/api/integrations/chatbot/dify/controllers/dify.controller.ts @@ -332,6 +332,7 @@ export class DifyController extends ChatbotController implements ChatbotControll }, data: { enabled: data?.enabled, + description: data.description, botType: data.botType, apiUrl: data.apiUrl, apiKey: data.apiKey, diff --git a/src/api/integrations/chatbot/flowise/controllers/flowise.controller.ts b/src/api/integrations/chatbot/flowise/controllers/flowise.controller.ts index 3689f8c3..c1294e29 100644 --- a/src/api/integrations/chatbot/flowise/controllers/flowise.controller.ts +++ b/src/api/integrations/chatbot/flowise/controllers/flowise.controller.ts @@ -319,6 +319,7 @@ export class FlowiseController extends ChatbotController implements ChatbotContr }, data: { enabled: data?.enabled, + description: data.description, apiUrl: data.apiUrl, apiKey: data.apiKey, expire: data.expire, diff --git a/src/api/integrations/chatbot/generic/controllers/generic.controller.ts b/src/api/integrations/chatbot/generic/controllers/generic.controller.ts index 158fde35..f2e6a75b 100644 --- a/src/api/integrations/chatbot/generic/controllers/generic.controller.ts +++ b/src/api/integrations/chatbot/generic/controllers/generic.controller.ts @@ -319,6 +319,7 @@ export class GenericController extends ChatbotController implements ChatbotContr }, data: { enabled: data?.enabled, + description: data.description, apiUrl: data.apiUrl, apiKey: data.apiKey, expire: data.expire, diff --git a/src/api/integrations/chatbot/openai/controllers/openai.controller.ts b/src/api/integrations/chatbot/openai/controllers/openai.controller.ts index e689fc95..cb64d16c 100644 --- a/src/api/integrations/chatbot/openai/controllers/openai.controller.ts +++ b/src/api/integrations/chatbot/openai/controllers/openai.controller.ts @@ -523,6 +523,7 @@ export class OpenaiController extends ChatbotController implements ChatbotContro }, data: { enabled: data?.enabled, + description: data.description, openaiCredsId: data.openaiCredsId, botType: data.botType, assistantId: data.assistantId, diff --git a/src/api/integrations/chatbot/typebot/controllers/typebot.controller.ts b/src/api/integrations/chatbot/typebot/controllers/typebot.controller.ts index dcc1aa06..6f9fdc15 100644 --- a/src/api/integrations/chatbot/typebot/controllers/typebot.controller.ts +++ b/src/api/integrations/chatbot/typebot/controllers/typebot.controller.ts @@ -335,6 +335,7 @@ export class TypebotController extends ChatbotController implements ChatbotContr }, data: { enabled: data?.enabled, + description: data.description, url: data.url, typebot: data.typebot, expire: data.expire, diff --git a/src/api/integrations/event/webhook/webhook.controller.ts b/src/api/integrations/event/webhook/webhook.controller.ts index 7799b28e..ce8ee316 100644 --- a/src/api/integrations/event/webhook/webhook.controller.ts +++ b/src/api/integrations/event/webhook/webhook.controller.ts @@ -63,14 +63,14 @@ export class WebhookController extends EventController implements EventControlle apiKey, local, }: EmitData): Promise { - const instance = (await this.get(instanceName)) as EventDto; + const instance = (await this.get(instanceName)) as wa.LocalWebHook; - if (!instance || !instance.webhook?.enabled) { + if (!instance || !instance?.enabled) { return; } const webhookConfig = configService.get('WEBHOOK'); - const webhookLocal = instance.webhook?.events; + const webhookLocal = instance?.events; const we = event.replace(/[.-]/gm, '_').toUpperCase(); const transformedWe = we.replace(/_/gm, '-').toLowerCase(); const enabledLog = configService.get('LOG').LEVEL.includes('WEBHOOKS'); @@ -79,7 +79,7 @@ export class WebhookController extends EventController implements EventControlle event, instance: instanceName, data, - destination: instance.webhook?.url, + destination: instance?.url, date_time: dateTime, sender, server_url: serverUrl, @@ -90,10 +90,10 @@ export class WebhookController extends EventController implements EventControlle if (Array.isArray(webhookLocal) && webhookLocal.includes(we)) { let baseURL: string; - if (instance.webhook?.byEvents) { - baseURL = `${instance.webhook?.url}/${transformedWe}`; + if (instance?.webhookByEvents) { + baseURL = `${instance?.url}/${transformedWe}`; } else { - baseURL = instance.webhook?.url; + baseURL = instance?.url; } if (enabledLog) { @@ -107,7 +107,7 @@ export class WebhookController extends EventController implements EventControlle } try { - if (instance.webhook?.enabled && isURL(instance.webhook.url, { require_tld: false })) { + if (instance?.enabled && isURL(instance.url, { require_tld: false })) { const httpService = axios.create({ baseURL }); await httpService.post('', webhookData);