refactor: make verifyAndReceive extend verifyAndParse under the hood

Author: wolfy1339

src/verify-and-receive.ts

@@ -1,47 +1,15 @@
-import { verifyWithFallback } from "@octokit/webhooks-methods";
-
+import { verifyAndParse } from "./verify-and-parse.ts";
 import type {
-  EmitterWebhookEvent,
   EmitterWebhookEventWithStringPayloadAndSignature,
   State,
-  WebhookError,
 } from "./types.ts";
 import type { EventHandler } from "./event-handler/index.ts";
 
 export async function verifyAndReceive(
   state: State & { secret: string; eventHandler: EventHandler<unknown> },
   event: EmitterWebhookEventWithStringPayloadAndSignature,
 ): Promise<void> {
-  // verify will validate that the secret is not undefined
-  const matchesSignature = await verifyWithFallback(
-    state.secret,
-    event.payload,
-    event.signature,
-    state.additionalSecrets,
-  ).catch(() => false);
-
-  if (!matchesSignature) {
-    const error = new Error(
-      "[@octokit/webhooks] signature does not match event payload and secret",
-    );
-
-    return state.eventHandler.receive(
-      Object.assign(error, { event, status: 400 }) as WebhookError,
-    );
-  }
-
-  let payload: EmitterWebhookEvent["payload"];
-  try {
-    payload = JSON.parse(event.payload);
-  } catch (error: any) {
-    error.message = "Invalid JSON";
-    error.status = 400;
-    throw new AggregateError([error], error.message);
-  }
-
-  return state.eventHandler.receive({
-    id: event.id,
-    name: event.name,
-    payload,
-  } as EmitterWebhookEvent);
+  return state.eventHandler.receive(
+    await verifyAndParse(state.secret, event, state.additionalSecrets),
+  );
 }