n8n-io/n8n
1
1
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-10-06 09:37:36 +03:00
Code Issues Projects Releases Wiki Activity

refactor(core): Rename ActiveWebhooks to LiveWebhooks (no-changelog) (#10355)

Browse Source
This commit is contained in:
Tomi Turtiainen 2024-08-13 09:49:24 +03:00 committed by GitHub
parent 9b647a9837
commit cdd0ab4031
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/cli/src/AbstractServer.ts
View File

@ -17,7 +17,7 @@ import { WaitingForms } from '@/WaitingForms';
import { TestWebhooks } from '@/webhooks/TestWebhooks';
import { WaitingWebhooks } from '@/webhooks/WaitingWebhooks';
import { createWebhookHandlerFor } from '@/webhooks/WebhookRequestHandler';
import { ActiveWebhooks } from '@/webhooks/ActiveWebhooks';
import { LiveWebhooks } from '@/webhooks/LiveWebhooks';
import { generateHostInstanceId } from './databases/utils/generators';
import { Logger } from '@/Logger';
import { ServiceUnavailableError } from './errors/response-errors/service-unavailable.error';
@ -181,12 +181,12 @@ export abstract class AbstractServer {
// Setup webhook handlers before bodyParser, to let the Webhook node handle binary data in requests
if (this.webhooksEnabled) {
const activeWebhooksRequestHandler = createWebhookHandlerFor(Container.get(ActiveWebhooks));
// Register a handler for active forms
this.app.all(`/${this.endpointForm}/:path(*)`, activeWebhooksRequestHandler);
const liveWebhooksRequestHandler = createWebhookHandlerFor(Container.get(LiveWebhooks));
// Register a handler for live forms
this.app.all(`/${this.endpointForm}/:path(*)`, liveWebhooksRequestHandler);
// Register a handler for active webhooks
this.app.all(`/${this.endpointWebhook}/:path(*)`, activeWebhooksRequestHandler);
// Register a handler for live webhooks
this.app.all(`/${this.endpointWebhook}/:path(*)`, liveWebhooksRequestHandler);
// Register a handler for waiting forms
this.app.all(

4
packages/cli/src/webhooks/ActiveWebhooks.ts → packages/cli/src/webhooks/LiveWebhooks.ts
View File

@ -20,12 +20,12 @@ import * as WebhookHelpers from '@/webhooks/WebhookHelpers';
import { WorkflowStaticDataService } from '@/workflows/workflowStaticData.service';
/**
* Service for handling the execution of production webhooks, i.e. webhooks
* Service for handling the execution of live webhooks, i.e. webhooks
* that belong to activated workflows and use the production URL
* (https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.webhook/#webhook-urls)
*/
@Service()
export class ActiveWebhooks implements IWebhookManager {
export class LiveWebhooks implements IWebhookManager {
constructor(
private readonly logger: Logger,
private readonly nodeTypes: NodeTypes,

6
packages/cli/test/integration/webhooks.test.ts
View File

@ -3,7 +3,7 @@ import { agent as testAgent } from 'supertest';
import { mock } from 'jest-mock-extended';
import { AbstractServer } from '@/AbstractServer';
import { ActiveWebhooks } from '@/webhooks/ActiveWebhooks';
import { LiveWebhooks } from '@/webhooks/LiveWebhooks';
import { ExternalHooks } from '@/ExternalHooks';
import { TestWebhooks } from '@/webhooks/TestWebhooks';
import { WaitingWebhooks } from '@/webhooks/WaitingWebhooks';
@ -21,7 +21,7 @@ describe('WebhookServer', () => {
describe('CORS', () => {
const corsOrigin = 'https://example.com';
const activeWebhooks = mockInstance(ActiveWebhooks);
const liveWebhooks = mockInstance(LiveWebhooks);
const testWebhooks = mockInstance(TestWebhooks);
mockInstance(WaitingWebhooks);
mockInstance(WaitingForms);
@ -35,7 +35,7 @@ describe('WebhookServer', () => {
});
const tests = [
['webhook', activeWebhooks],
['webhook', liveWebhooks],
['webhookTest', testWebhooks],
// TODO: enable webhookWaiting & waitingForms after CORS support is added
// ['webhookWaiting', waitingWebhooks],