fix: rollback webhook handlers runnig on edge

Blazity · Sep 11, 2023 · 6ac5e00 · 6ac5e00
1 parent 4dc4cd0
commit 6ac5e00
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 41 deletions.
diff --git a/src/app/api/algolia-webhook/publish/route.ts b/src/app/api/algolia-webhook/publish/route.ts
@@ -7,8 +7,6 @@ import { errorToNextResponse } from "../httpError"
 import { NextRequestWithValidBody, validateBody } from "../validateBody"
 import { validateSignature } from "../validateSignature"
 
-export const runtime = "edge"
-
 async function handleAlgoliaPublishWebhook(req: NextRequestWithValidBody<z.infer<typeof bodySchema>>) {
  const article = req.validBody.data
 
@@ -26,8 +24,6 @@ async function handleAlgoliaPublishWebhook(req: NextRequestWithValidBody<z.infer
  })
  )
 
- console.log(indexingResults)
-
  return NextResponse.json({ result: indexingResults }, { status: 201 })
 }
 

diff --git a/src/app/api/algolia-webhook/unpublish/route.ts b/src/app/api/algolia-webhook/unpublish/route.ts
@@ -6,8 +6,6 @@ import { errorToNextResponse } from "../httpError"
 import { NextRequestWithValidBody, validateBody } from "../validateBody"
 import { validateSignature } from "../validateSignature"
 
-export const runtime = "edge"
-
 async function handleAlgoliaUnpublishWebhook(req: NextRequestWithValidBody<z.infer<typeof bodySchema>>) {
  const article = req.validBody.data
 

diff --git a/src/app/api/algolia-webhook/validateSignature.ts b/src/app/api/algolia-webhook/validateSignature.ts
@@ -1,5 +1,6 @@
 import { NextRequest } from "next/server"
 import { HttpError } from "./httpError"
+import { verifyWebhookSignature } from "@hygraph/utils"
 import { env } from "../../../env.mjs"
 
 export const validateSignature = async (req: NextRequest) => {
@@ -22,38 +23,3 @@ export type NextRequestWithBody = NextRequest & { parsedBody: unknown }
 
 export const hasParsedBody = (req: NextRequestWithBody | NextRequest): req is NextRequestWithBody =>
  Boolean((req as NextRequestWithBody).body)
-
-async function verifyWebhookSignature({
- body,
- signature,
- secret,
- rawPayload,
-}: {
- body?: unknown
- signature: string
- secret: string
- rawPayload?: string
-}) {
- const [rawSign, rawEnv, rawTimestamp] = signature.split(", ")
-
- const sign = rawSign.replace("sign=", "")
- const EnvironmentName = rawEnv.replace("env=", "")
- const Timestamp = parseInt(rawTimestamp.replace("t=", ""))
-
- const payload = JSON.stringify({
- Body: rawPayload || JSON.stringify(body),
- EnvironmentName,
- TimeStamp: Timestamp,
- })
-
- const encoder = new TextEncoder()
- const key = await crypto.subtle.importKey("raw", encoder.encode(secret), { name: "HMAC", hash: "SHA-256" }, false, [
- "sign",
- ])
-
- const signatureArrayBuffer = await crypto.subtle.sign("HMAC", key, encoder.encode(payload))
-
- const hash = btoa(String.fromCharCode(...Array.from(new Uint8Array(signatureArrayBuffer))))
-
- return sign === hash
-}