Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Aug 13, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2073b0f
refactor(core): Rename ActiveWebhooks to LiveWebhooks
tomi Aug 12, 2024
518a145
refactor: Rename variable
tomi Aug 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions packages/cli/src/AbstractServer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/src/webhooks/ActiveWebhooks.ts → packages/cli/src/webhooks/LiveWebhooks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions packages/cli/test/integration/webhooks.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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);
Expand All @@ -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],
Expand Down
Loading