fix(awala): Send bundle request to background queue, not endpoint (#233)

Also pass public key id as CloudEvent data instead of id.

k8s/awala-service.yml

@@ -44,6 +44,8 @@ spec:
 
             - name: CE_CHANNEL_AWALA_OUTGOING_MESSAGES
               value: http://mock-awala-middleware.default
+            - name: CE_CHANNEL_BACKGROUND_QUEUE
+              value: http://veraid-authority-queue.default
           envFrom:
             - configMapRef:
                 name: mongodb

src/backgroundQueue/sinks/memberBundleRequest.sink.spec.ts

@@ -51,10 +51,11 @@ describe('memberBundleIssuance', () => {
   let dbConnection: Connection;
   let memberBundleRequestModel: ReturnModelType<typeof MemberBundleRequestModelSchema>;
   const triggerEvent = new CloudEvent<MemberBundleRequestPayload>({
-    id: MEMBER_PUBLIC_KEY_MONGO_ID,
     source: CE_SOURCE,
     type: BUNDLE_REQUEST_TYPE,
     subject: AWALA_PEER_ID,
+    datacontenttype: 'text/plain',
+    data: MEMBER_PUBLIC_KEY_MONGO_ID,
   });
 
   beforeEach(() => {
@@ -78,7 +79,7 @@ describe('memberBundleIssuance', () => {
       await postEvent(triggerEvent, server);
 
       expect(logs).toContainEqual(
-        partialPinoLog('debug', 'Starting member bundle request trigger', {
+        partialPinoLog('debug', 'Processing member bundle request', {
           publicKeyId: MEMBER_PUBLIC_KEY_MONGO_ID,
         }),
       );
@@ -126,16 +127,6 @@ describe('memberBundleIssuance', () => {
         );
       });
 
-      test('Id should be member public key id', async () => {
-        await postEvent(triggerEvent, server);
-
-        expect(getEvents(EmitterChannel.AWALA_OUTGOING_MESSAGES)).toContainEqual(
-          expect.objectContaining({
-            id: MEMBER_PUBLIC_KEY_MONGO_ID,
-          }),
-        );
-      });
-
       test('Source should be URL identifying Awala Internet Endpoint', async () => {
         await postEvent(triggerEvent, server);
 
@@ -233,11 +224,7 @@ describe('memberBundleIssuance', () => {
   });
 
   test('Event with missing subject should be refused', async () => {
-    const invalidTriggerEvent = new CloudEvent<MemberBundleRequestPayload>({
-      id: MEMBER_PUBLIC_KEY_MONGO_ID,
-      source: CE_SOURCE,
-      type: BUNDLE_REQUEST_TYPE,
-    });
+    const invalidTriggerEvent = triggerEvent.cloneWith({ subject: undefined });
 
     await postEvent(invalidTriggerEvent, server);
 

src/backgroundQueue/sinks/memberBundleRequest.sink.ts

@@ -11,13 +11,13 @@ import { Emitter } from '../../utilities/eventing/Emitter.js';
 import { EmitterChannel } from '../../utilities/eventing/EmitterChannel.js';
 
 export default async function memberBundleIssuance(
-  event: CloudEventV1<unknown>,
+  event: CloudEventV1<Buffer>,
   options: ServiceOptions,
 ): Promise<void> {
-  const publicKeyId = event.id;
+  const publicKeyId = event.data!.toString();
   const keyAwareLogger = options.logger.child({ publicKeyId });
 
-  keyAwareLogger.debug('Starting member bundle request trigger');
+  keyAwareLogger.debug('Processing member bundle request');
 
   if (event.subject === undefined) {
     keyAwareLogger.info('Refusing member bundle request with missing subject');
@@ -34,7 +34,6 @@ export default async function memberBundleIssuance(
 
     const now = new Date();
     const message = makeOutgoingServiceMessageEvent({
-      publicKeyId,
       peerId: event.subject,
       contentType: VeraidContentType.MEMBER_BUNDLE,
       content: Buffer.from(memberBundle.result),

src/events/bundleRequest.event.ts

@@ -1,3 +1,3 @@
 export const BUNDLE_REQUEST_TYPE = 'net.veraid.authority.member-bundle-request';
 
-export type MemberBundleRequestPayload = '';
+export type MemberBundleRequestPayload = string;

src/events/outgoingServiceMessage.event.spec.ts

@@ -1,5 +1,3 @@
-import { randomUUID } from 'node:crypto';
-
 import { addMinutes } from 'date-fns';
 
 import { AWALA_PEER_ID } from '../testUtils/stubs.js';
@@ -17,7 +15,6 @@ describe('makeIncomingServiceMessageEvent', () => {
   const options: OutgoingServiceMessageOptions = {
     creationDate: new Date(),
     expiryDate: addMinutes(new Date(), 5),
-    publicKeyId: randomUUID(),
     contentType: CE_SERVICE_MESSAGE_CONTENT_TYPE,
     content: CE_SERVICE_MESSAGE_CONTENT,
     peerId: AWALA_PEER_ID,
@@ -29,10 +26,10 @@ describe('makeIncomingServiceMessageEvent', () => {
     expect(version).toBe('1.0');
   });
 
-  test('Event id should be the parcel id', () => {
+  test('Event id should be auto-generated', () => {
     const { id } = makeOutgoingServiceMessageEvent(options);
 
-    expect(id).toBe(options.publicKeyId);
+    expect(id).toBeString();
   });
 
   test('Event type should be outgoing-service-message', () => {

src/events/outgoingServiceMessage.event.ts

@@ -8,7 +8,6 @@ export const OUTGOING_MESSAGE_SOURCE = 'https://relaycorp.tech/awala-endpoint-in
 export interface OutgoingServiceMessageOptions {
   readonly creationDate: Date;
   readonly expiryDate: Date;
-  readonly publicKeyId: string;
   readonly peerId: string;
   readonly contentType: string;
   readonly content: Buffer;
@@ -20,7 +19,6 @@ export function makeOutgoingServiceMessageEvent(
   return new CloudEvent({
     specversion: '1.0',
     type: OUTGOING_SERVICE_MESSAGE_TYPE,
-    id: options.publicKeyId,
     source: OUTGOING_MESSAGE_SOURCE,
     subject: options.peerId,
     datacontenttype: options.contentType,

src/memberKeyImportToken.spec.ts

@@ -160,14 +160,13 @@ describe('member key import token', () => {
       );
 
       requireSuccessfulResult(result);
-      expect(getEvents(EmitterChannel.AWALA_OUTGOING_MESSAGES)).toContainEqual(
+      expect(getEvents(EmitterChannel.BACKGROUND_QUEUE)).toContainEqual(
         expect.objectContaining<Partial<CloudEvent<string>>>({
-          id: MEMBER_PUBLIC_KEY_MONGO_ID,
           source: 'https://veraid.net/authority/awala-member-key-import',
           type: BUNDLE_REQUEST_TYPE,
           subject: AWALA_PEER_ID,
-          datacontenttype: 'application/vnd.veraid-authority.member-public-key-import',
-          data: '',
+          datacontenttype: 'text/plain',
+          data: MEMBER_PUBLIC_KEY_MONGO_ID,
         }),
       );
     });

src/memberKeyImportToken.ts

@@ -78,14 +78,13 @@ export async function processMemberKeyImportToken(
   }
 
   const event = new CloudEvent<string>({
-    id: publicKeyCreationResult.result.id,
     source: 'https://veraid.net/authority/awala-member-key-import',
     type: BUNDLE_REQUEST_TYPE,
     subject: peerId,
-    datacontenttype: 'application/vnd.veraid-authority.member-public-key-import',
-    data: '',
+    datacontenttype: 'text/plain',
+    data: publicKeyCreationResult.result.id,
   });
-  const ceEmitter = await Emitter.init(EmitterChannel.AWALA_OUTGOING_MESSAGES);
+  const ceEmitter = await Emitter.init(EmitterChannel.BACKGROUND_QUEUE);
   await ceEmitter.emit(event);
 
   await memberKeyImportTokenModel.findByIdAndDelete(keyImportRequest.publicKeyImportToken);