PM-1073 PR feedback

Author: vas3a

src/api/webhooks/trolley/trolley.service.ts

@@ -33,14 +33,12 @@ export class TrolleyService {
    * @returns A boolean indicating whether the signature is valid.
    */
   validateSignature(headers: Request['headers'], bodyPayload: string): boolean {
-    if (!headers[TrolleyHeaders.signature]) {
+    const headerSignature = headers[TrolleyHeaders.signature] ?? '';
+    if (!headerSignature || !headerSignature.match(/t=\d+,v1=[a-f0-9]{64}/i)) {
       return false;
     }
 
-    const headerSignatureValues = (
-      headers[TrolleyHeaders.signature] ?? ''
-    ).split(',');
-
+    const headerSignatureValues = headerSignature.split(',');
     const t = headerSignatureValues[0].split('=')[1];
     const v1 = headerSignatureValues[1].split('=')[1];
 
@@ -59,6 +57,11 @@ export class TrolleyService {
    */
   async validateUnique(headers: Request['headers']): Promise<boolean> {
     const requestId = headers[TrolleyHeaders.id];
+
+    if (!requestId) {
+      return false;
+    }
+
     const whEvent = await this.prisma.trolley_webhook_log.findUnique({
       where: { event_id: requestId },
     });
@@ -126,7 +129,6 @@ export class TrolleyService {
       await handler(body);
       await this.setEventState(requestId, webhook_status.processed);
     } catch (e) {
-      console.log(e);
       await this.setEventState(requestId, webhook_status.error, void 0, {
         error_message: e.message ?? e,
       });

src/api/webhooks/webhooks.event-handlers.provider.ts

@@ -16,7 +16,10 @@ import { WEBHOOK_EVENT_METADATA_KEY } from './webhooks.decorators';
  *          bound handler functions for those events.
  */
 const whEventHandlersFactory = (reflector: Reflector, handlerClasses) => {
-  const handlersMap = new Map<string, () => void>();
+  const handlersMap = new Map<
+    string,
+    (eventPayload: any) => Promise<unknown>
+  >();
 
   for (const handlerClass of handlerClasses) {
     const prototype = Object.getPrototypeOf(handlerClass);
@@ -34,7 +37,6 @@ const whEventHandlersFactory = (reflector: Reflector, handlerClasses) => {
       if (eventTypes?.length > 0) {
         eventTypes.forEach((eventType) => {
           handlersMap.set(eventType, method.bind(handlerClass));
-          console.log(`Found event handler: ${eventType} -> ${propertyName}`);
         });
       }
     }