Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions src/modules/webhooks/webhook.controllers.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ function createMockResponse() {
res.status = jest.fn().mockReturnValue(res);
res.json = jest.fn().mockReturnValue(res);
res.setHeader = jest.fn().mockReturnValue(res);
res.end = jest.fn().mockReturnValue(res);
return res as Response;
}

Expand Down Expand Up @@ -120,15 +121,15 @@ describe('deleteWebhookHandler', () => {
expect(res.status).toHaveBeenCalledWith(404);
});

it('returns 200 on successful deletion', async () => {
it('returns 204 on successful deletion', async () => {
mockService.deleteWebhook.mockResolvedValue({ id: 'wh-1' });

const req = createMockSignedRequest('creator-1', { webhookId: 'wh-1' });
const res = createMockResponse();

await deleteWebhookHandler(req, res);

expect(res.status).toHaveBeenCalledWith(200);
expect(res.status).toHaveBeenCalledWith(204);
expect(mockService.deleteWebhook).toHaveBeenCalledWith('wh-1', 'creator-1');
});
});
2 changes: 1 addition & 1 deletion src/modules/webhooks/webhook.controllers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export async function deleteWebhookHandler(
sendNotFound(res, 'Webhook');
return;
}
sendSuccess(res, result, 200, 'Webhook deleted successfully');
res.status(204).end();
} catch {
sendError(res, 500, ErrorCode.INTERNAL_ERROR, 'Failed to delete webhook');
}
Expand Down
45 changes: 43 additions & 2 deletions src/modules/webhooks/webhook.integration.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,7 @@ describe('DELETE /api/v1/creators/:id/webhooks/:webhookId', () => {
.delete(`/api/v1/creators/${creatorId}/webhooks/${webhookId}`)
.set(authHeaders('DELETE', `/api/v1/creators/${creatorId}/webhooks/${webhookId}`, creatorId));

expect(deleteRes.status).toBe(200);
expect(deleteRes.body.success).toBe(true);
expect(deleteRes.status).toBe(204);

const verifyRes = await supertest(app)
.get(`/api/v1/creators/${creatorId}/webhooks`)
Expand All @@ -195,6 +194,48 @@ describe('DELETE /api/v1/creators/:id/webhooks/:webhookId', () => {

expect(res.status).toBe(404);
});

it('stops future deliveries when a webhook is deleted (#506)', async () => {
// Register a webhook and confirm it exists
const webhook = await prisma.webhook.create({
data: {
id: 'webhook-deletion-test-506',
creatorId,
callbackUrl: 'https://example.com/deleted-hook',
events: { set: ['BUY', 'SELL'] },
},
});

// Delete the webhook and assert the response is 204
const deleteRes = await supertest(app)
.delete(`/api/v1/creators/${creatorId}/webhooks/${webhook.id}`)
.set(authHeaders('DELETE', `/api/v1/creators/${creatorId}/webhooks/${webhook.id}`, creatorId));

expect(deleteRes.status).toBe(204);

// Webhook record no longer exists after deletion
const deletedWebhook = await prisma.webhook.findUnique({ where: { id: webhook.id } });
expect(deletedWebhook).toBeNull();

// Simulate a trade event after deletion
const { dispatchWebhookEvent } = await import('./webhook.service');
await dispatchWebhookEvent({
type: 'buy',
creatorId,
buyerOrSellerAddress: 'GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWHF',
amount: '100',
price: '10.5',
feePaid: '0.5',
timestamp: new Date().toISOString(),
});

// Assert no delivery attempt was made for the deleted webhook
const events = await prisma.webhookEvent.findMany({
where: { webhookId: webhook.id },
});

expect(events.length).toBe(0);
});
});

describe('webhook dispatch', () => {
Expand Down
Loading