fix(awala): Make Google PubSub push endpoints work (#232)

We were running the content type validation too soon, using the request `Content-Type` instead of the content type of the CloudEvent.
relaycorp · Oct 11, 2023 · 2f2b99c · 2f2b99c
1 parent f5aa959
commit 2f2b99c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/src/awala/routes/awala.routes.spec.ts b/src/awala/routes/awala.routes.spec.ts
@@ -76,7 +76,7 @@ describe('Awala routes', () => {
         'content-type': 'INVALID_CONTENT_TYPE',
       },
     });
-    expect(response).toHaveProperty('statusCode', HTTP_STATUS_CODES.UNSUPPORTED_MEDIA_TYPE);
+    expect(response).toHaveProperty('statusCode', HTTP_STATUS_CODES.BAD_REQUEST);
   });
 
   test('Content type application/json should resolve to unsupported media type error', async () => {
@@ -89,7 +89,7 @@ describe('Awala routes', () => {
         'content-type': 'application/json',
       },
     });
-    expect(response).toHaveProperty('statusCode', HTTP_STATUS_CODES.UNSUPPORTED_MEDIA_TYPE);
+    expect(response).toHaveProperty('statusCode', HTTP_STATUS_CODES.BAD_REQUEST);
   });
 
   test('Missing headers should resolve into bad request', async () => {

diff --git a/src/awala/routes/awala.routes.ts b/src/awala/routes/awala.routes.ts
@@ -86,22 +86,16 @@ const awalaEventToProcessor: {
   [AwalaRequestMessageType.MEMBER_BUNDLE_REQUEST]: processMemberBundleRequest,
   [AwalaRequestMessageType.MEMBER_PUBLIC_KEY_IMPORT]: processMemberKeyImportRequest,
 };
-const awalaRequestMessageTypeList: AwalaRequestMessageType[] =
-  Object.values(AwalaRequestMessageType);
 
 export default function registerRoutes(
   fastify: FastifyTypedInstance,
   _opts: RouteOptions,
   done: PluginDone,
 ): void {
   fastify.removeAllContentTypeParsers();
-  fastify.addContentTypeParser(
-    awalaRequestMessageTypeList,
-    { parseAs: 'buffer' },
-    (_request, payload, next) => {
-      next(null, payload);
-    },
-  );
+  fastify.addContentTypeParser('*', { parseAs: 'buffer' }, (_request, payload, next) => {
+    next(null, payload);
+  });
 
   fastify.route({
     method: ['POST'],