refactor: add HoF to route handlers

app/api/algolia-webhook/route.ts

@@ -1,30 +1,16 @@
-import { verifyWebhookSignature } from "@hygraph/utils"
 import algolia from "algoliasearch"
 import { env } from "env.mjs"
 import { NextRequest, NextResponse } from "next/server"
 import { slateToText } from "utils/slateToText"
 import { z } from "zod"
+import { NextRequestWithValidBody, withBodySchema } from "./withBodySchema"
+import { withValidSignature } from "./withValidSignature"
 
 const client = algolia(env.ALGOLIA_API_ID, env.ALGOLIA_API_KEY)
 
-export async function POST(req: NextRequest) {
- const authHeader = req.headers.get("gcms-signature")
- if (!authHeader) return NextResponse.json({ message: "Unauthorized" }, { status: 401 })
-
+async function handleAlgoliaWebhook(req: NextRequestWithValidBody<z.infer<typeof bodySchema>>) {
  try {
- const publishedData = await req.json()
-
- const isSignatureValid = verifyWebhookSignature({
- body: publishedData,
- signature: authHeader,
- secret: env.HYGRAPH_WEBOOK_SECRET,
- })
- if (!isSignatureValid) return NextResponse.json({ message: "Unauthorized" }, { status: 401 })
-
- const parseResult = bodySchema.safeParse(publishedData)
- if (!parseResult.success) return NextResponse.json({ message: "Bad Request" }, { status: 400 })
-
- const article = parseResult.data.data
+ const article = req.validBody.data
 
  const indexingResults = await Promise.allSettled(
  article.localizations.map(async ({ locale, title, content }) => {
@@ -51,3 +37,5 @@ const bodySchema = z.object({
  id: z.string(),
  }),
 })
+
+export const POST = withValidSignature(withBodySchema(handleAlgoliaWebhook, bodySchema))

app/api/algolia-webhook/withBodySchema.ts

@@ -0,0 +1,19 @@
+import { NextResponse, NextRequest } from "next/server"
+import { NextRequestWithBody, hasParsedBody } from "./withValidSignature"
+
+export const withBodySchema =
+ <T>(fun: (req: NextRequestWithValidBody<T>, context?: any) => Promise<NextResponse>, schema: Zod.Schema<T>) =>
+ async (req: NextRequest | NextRequestWithBody, context?: any) => {
+ try {
+ const hasBody = hasParsedBody(req)
+ const parseResult = schema.safeParse(hasBody ? req.body : await req.json())
+ if (!parseResult.success) return NextResponse.json({ message: "Bad Request" }, { status: 400 })
+
+ const reqWithBody: NextRequestWithValidBody<T> = Object.assign(req, { validBody: parseResult.data })
+ return fun(reqWithBody, context)
+ } catch {
+ return NextResponse.json({ message: "Bad Request" }, { status: 400 })
+ }
+ }
+
+export type NextRequestWithValidBody<T> = NextRequest & { validBody: T }

app/api/algolia-webhook/withValidSignature.ts

@@ -0,0 +1,26 @@
+import { verifyWebhookSignature } from "@hygraph/utils"
+import { env } from "env.mjs"
+import { NextRequest, NextResponse } from "next/server"
+
+export const withValidSignature =
+ (fun: (req: NextRequestWithBody, context?: any) => Promise<NextResponse>) =>
+ async (req: NextRequest, context?: any) => {
+ const authHeader = req.headers.get("gcms-signature")
+ if (!authHeader) return NextResponse.json({ message: "Unauthorized" }, { status: 401 })
+ const parsedBody = await req.json()
+
+ const isSignatureValid = verifyWebhookSignature({
+ body: parsedBody,
+ signature: authHeader,
+ secret: env.HYGRAPH_WEBOOK_SECRET,
+ })
+ if (!isSignatureValid) return NextResponse.json({ message: "Unauthorized" }, { status: 401 })
+
+ const reqWithBody: NextRequestWithBody = Object.assign(req, { parsedBody })
+ return fun(reqWithBody, context)
+ }
+
+export type NextRequestWithBody = NextRequest & { parsedBody: unknown }
+
+export const hasParsedBody = (req: NextRequestWithBody | NextRequest): req is NextRequestWithBody =>
+ Boolean((req as NextRequestWithBody).body)