diff --git a/plugins/events-backend/src/schema/openapi.generated.ts b/plugins/events-backend/src/schema/openapi.generated.ts index 4b1db5aeb0..d6278ff070 100644 --- a/plugins/events-backend/src/schema/openapi.generated.ts +++ b/plugins/events-backend/src/schema/openapi.generated.ts @@ -250,6 +250,7 @@ export const spec = { 'application/json': { schema: { type: 'object', + required: ['events'], properties: { events: { type: 'array', @@ -258,7 +259,6 @@ export const spec = { }, }, }, - required: ['results'], }, }, }, diff --git a/plugins/events-backend/src/schema/openapi.yaml b/plugins/events-backend/src/schema/openapi.yaml index 0d228a7b0b..48f2c74e5e 100644 --- a/plugins/events-backend/src/schema/openapi.yaml +++ b/plugins/events-backend/src/schema/openapi.yaml @@ -164,13 +164,13 @@ paths: application/json: schema: type: object + required: + - events properties: events: type: array items: $ref: '#/components/schemas/Event' - required: - - results '202': description: No new events are available. Response will block until the client should try again. default: diff --git a/plugins/events-backend/src/service/hub/createEventBusRouter.ts b/plugins/events-backend/src/service/hub/createEventBusRouter.ts index 4a6c34bb6c..a5f67538bf 100644 --- a/plugins/events-backend/src/service/hub/createEventBusRouter.ts +++ b/plugins/events-backend/src/service/hub/createEventBusRouter.ts @@ -216,7 +216,12 @@ export async function createEventBusRouter(options: { ); if (events.length > 0) { - res.json({ events }); + res.json({ + events: events.map(event => ({ + topic: event.topic, + payload: event.eventPayload, + })), + }); } else { res.status(202); res.flushHeaders(); diff --git a/plugins/events-node/src/generated/models/GetSubscriptionEvents200Response.model.ts b/plugins/events-node/src/generated/models/GetSubscriptionEvents200Response.model.ts index 653bfaf3fc..c9fc37f5bb 100644 --- a/plugins/events-node/src/generated/models/GetSubscriptionEvents200Response.model.ts +++ b/plugins/events-node/src/generated/models/GetSubscriptionEvents200Response.model.ts @@ -20,5 +20,5 @@ import { Event } from '../models/Event.model'; export interface GetSubscriptionEvents200Response { - events?: Array; + events: Array; }