362f65656b
Full audit (bugs/UI-UX/backend/feature-gap) turned up a money-leak AI quota bypass, webhook SSRF, and a long tail of missing pagination/auth/a11y work. Fixes land together since HANDOFF.md tracked them as one backlog. - AI routes charge tier quota before generating; nutrition POST is author-only - Webhook dispatch re-validates URL per delivery (SSRF/DNS-rebinding), treats redirects as failures; recipe.published now actually dispatches - New indexes/unique constraints on recipes, meal-planning, comments FK cascade - Recipe PUT/restore snapshot only inside the transaction, after validation - Recipe DELETE cleans up S3 objects (recipe + review photos) - Optimistic UI (favorite/star/follow/shopping-list) rolls back on failure - Upload presign enforces file size cap + per-tier storage quota - Route-level loading/error/not-found states across (app), admin, and root - middleware.ts guards (app)/admin; requireAdmin checks DB role, not cached session; rate limiting applied to both session and API-key branches, bucketed per key; Stripe webhook dedupes by event id - Pagination added to recipes, feed, profile, comments, pantry, admin tables - Nav shows real avatar + profile link + dark-mode toggle; destructive actions standardized on AlertDialog - Unsaved-changes guard + real ingredient/step validation on recipe form; canonical /recipes/[id] used in-app; next/image migration; aria-labels and alt text across icon buttons, avatars, recipe photos - packages/api-types removed (zero callers, too drifted to safely rewire); openapi.ts and ai-keys error shape drift fixed; BYOK decrypt failures now surface instead of silently falling back to the platform key Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
208 lines
8.2 KiB
TypeScript
208 lines
8.2 KiB
TypeScript
import { NextRequest, NextResponse } from "next/server";
|
|
import { db, recipes, recipeIngredients, recipeSteps, recipeSnapshots, ratings } from "@epicure/db";
|
|
import { eq, and, max, isNotNull } from "@epicure/db";
|
|
import { z } from "zod";
|
|
import { requireSessionOrApiKey } from "@/lib/api-auth";
|
|
import { deleteObject } from "@/lib/storage";
|
|
import { dispatchWebhook } from "@/lib/webhooks";
|
|
import { parseQuantity } from "@/lib/parse-quantity";
|
|
|
|
const UpdateRecipeSchema = z.object({
|
|
title: z.string().min(1).max(200).optional(),
|
|
description: z.string().max(2000).optional(),
|
|
baseServings: z.number().int().min(1).max(100).optional(),
|
|
visibility: z.enum(["private", "unlisted", "public"]).optional(),
|
|
difficulty: z.enum(["easy", "medium", "hard"]).nullable().optional(),
|
|
prepMins: z.number().int().min(0).max(1440).nullable().optional(),
|
|
cookMins: z.number().int().min(0).max(1440).nullable().optional(),
|
|
tags: z.array(z.string().min(1).max(50)).max(20).optional(),
|
|
dietaryTags: z.object({
|
|
vegan: z.boolean().optional(),
|
|
vegetarian: z.boolean().optional(),
|
|
glutenFree: z.boolean().optional(),
|
|
dairyFree: z.boolean().optional(),
|
|
nutFree: z.boolean().optional(),
|
|
halal: z.boolean().optional(),
|
|
kosher: z.boolean().optional(),
|
|
}).optional(),
|
|
ingredients: z.array(z.object({
|
|
rawName: z.string().min(1).max(200),
|
|
quantity: z.union([z.number(), z.string().max(50)]).optional().transform(parseQuantity),
|
|
unit: z.string().max(50).optional(),
|
|
note: z.string().max(500).optional(),
|
|
order: z.number().int().default(0),
|
|
})).max(100).optional(),
|
|
steps: z.array(z.object({
|
|
instruction: z.string().min(1).max(2000),
|
|
timerSeconds: z.number().int().min(0).max(86400).optional(),
|
|
order: z.number().int(),
|
|
})).max(100).optional(),
|
|
});
|
|
|
|
type Params = { params: Promise<{ id: string }> };
|
|
|
|
async function getOwnedRecipe(recipeId: string, userId: string) {
|
|
return db.query.recipes.findFirst({
|
|
where: and(eq(recipes.id, recipeId), eq(recipes.authorId, userId)),
|
|
with: { ingredients: { orderBy: (t, { asc }) => asc(t.order) }, steps: { orderBy: (t, { asc }) => asc(t.order) }, photos: true },
|
|
});
|
|
}
|
|
|
|
export async function GET(req: NextRequest, { params }: Params) {
|
|
const { session, response } = await requireSessionOrApiKey(req, { rateLimit: { limit: 60, windowSeconds: 60 } });
|
|
if (response) return response;
|
|
const { id } = await params;
|
|
|
|
const recipe = await getOwnedRecipe(id, session!.user.id);
|
|
if (!recipe) return NextResponse.json({ error: "Not found" }, { status: 404 });
|
|
|
|
return NextResponse.json(recipe);
|
|
}
|
|
|
|
export async function PUT(req: NextRequest, { params }: Params) {
|
|
const { session, response } = await requireSessionOrApiKey(req, { rateLimit: { limit: 60, windowSeconds: 60 } });
|
|
if (response) return response;
|
|
const { id } = await params;
|
|
|
|
const existing = await db.query.recipes.findFirst({
|
|
where: and(eq(recipes.id, id), eq(recipes.authorId, session!.user.id)),
|
|
with: { ingredients: { orderBy: (t, { asc }) => asc(t.order) }, steps: { orderBy: (t, { asc }) => asc(t.order) } },
|
|
});
|
|
if (!existing) return NextResponse.json({ error: "Not found" }, { status: 404 });
|
|
|
|
const body = await req.json() as unknown;
|
|
const parsed = UpdateRecipeSchema.safeParse(body);
|
|
if (!parsed.success) {
|
|
return NextResponse.json({ error: "Validation error", issues: parsed.error.issues }, { status: 400 });
|
|
}
|
|
|
|
const data = parsed.data;
|
|
|
|
await db.transaction(async (tx) => {
|
|
// Create a snapshot of the current state before updating
|
|
const [maxVersionRow] = await tx
|
|
.select({ v: max(recipeSnapshots.version) })
|
|
.from(recipeSnapshots)
|
|
.where(eq(recipeSnapshots.recipeId, id));
|
|
const nextVersion = (maxVersionRow?.v ?? 0) + 1;
|
|
await tx.insert(recipeSnapshots).values({
|
|
id: crypto.randomUUID(),
|
|
recipeId: id,
|
|
authorId: session!.user.id,
|
|
version: nextVersion,
|
|
title: existing.title,
|
|
snapshotData: {
|
|
title: existing.title,
|
|
description: existing.description,
|
|
baseServings: existing.baseServings,
|
|
difficulty: existing.difficulty,
|
|
prepMins: existing.prepMins,
|
|
cookMins: existing.cookMins,
|
|
dietaryTags: existing.dietaryTags ?? {},
|
|
ingredients: existing.ingredients.map((i) => ({
|
|
rawName: i.rawName,
|
|
quantity: i.quantity,
|
|
unit: i.unit,
|
|
note: i.note,
|
|
order: i.order,
|
|
})),
|
|
steps: existing.steps.map((s) => ({
|
|
instruction: s.instruction,
|
|
timerSeconds: s.timerSeconds,
|
|
order: s.order,
|
|
})),
|
|
},
|
|
});
|
|
|
|
const updates: Partial<typeof recipes.$inferInsert> = { updatedAt: new Date() };
|
|
if (data.title !== undefined) updates.title = data.title;
|
|
if (data.description !== undefined) updates.description = data.description;
|
|
if (data.baseServings !== undefined) updates.baseServings = data.baseServings;
|
|
if (data.visibility !== undefined) updates.visibility = data.visibility;
|
|
if (data.difficulty !== undefined) updates.difficulty = data.difficulty ?? undefined;
|
|
if (data.prepMins !== undefined) updates.prepMins = data.prepMins ?? undefined;
|
|
if (data.cookMins !== undefined) updates.cookMins = data.cookMins ?? undefined;
|
|
if (data.tags !== undefined) updates.tags = data.tags;
|
|
if (data.dietaryTags !== undefined) updates.dietaryTags = data.dietaryTags;
|
|
|
|
await tx.update(recipes).set(updates).where(eq(recipes.id, id));
|
|
|
|
if (data.ingredients !== undefined) {
|
|
await tx.delete(recipeIngredients).where(eq(recipeIngredients.recipeId, id));
|
|
if (data.ingredients.length > 0) {
|
|
await tx.insert(recipeIngredients).values(
|
|
data.ingredients.map((ing, i) => ({
|
|
id: crypto.randomUUID(),
|
|
recipeId: id,
|
|
rawName: ing.rawName,
|
|
quantity: ing.quantity,
|
|
unit: ing.unit,
|
|
note: ing.note,
|
|
order: ing.order ?? i,
|
|
}))
|
|
);
|
|
}
|
|
}
|
|
|
|
if (data.steps !== undefined) {
|
|
await tx.delete(recipeSteps).where(eq(recipeSteps.recipeId, id));
|
|
if (data.steps.length > 0) {
|
|
await tx.insert(recipeSteps).values(
|
|
data.steps.map((step, i) => ({
|
|
id: crypto.randomUUID(),
|
|
recipeId: id,
|
|
instruction: step.instruction,
|
|
timerSeconds: step.timerSeconds,
|
|
order: step.order ?? i,
|
|
}))
|
|
);
|
|
}
|
|
}
|
|
});
|
|
|
|
const updated = await getOwnedRecipe(id, session!.user.id);
|
|
void dispatchWebhook(session!.user.id, "recipe.updated", { id, title: updated?.title });
|
|
if (existing.visibility === "private" && data.visibility === "public") {
|
|
void dispatchWebhook(session!.user.id, "recipe.published", { id, title: updated?.title });
|
|
}
|
|
return NextResponse.json(updated);
|
|
}
|
|
|
|
export async function DELETE(req: NextRequest, { params }: Params) {
|
|
const { session, response } = await requireSessionOrApiKey(req, { rateLimit: { limit: 60, windowSeconds: 60 } });
|
|
if (response) return response;
|
|
const { id } = await params;
|
|
|
|
const existing = await db.query.recipes.findFirst({
|
|
where: and(eq(recipes.id, id), eq(recipes.authorId, session!.user.id)),
|
|
with: { photos: true },
|
|
});
|
|
if (!existing) return NextResponse.json({ error: "Not found" }, { status: 404 });
|
|
|
|
// Collect storage keys before the cascade delete removes the rows.
|
|
// recipeSteps.photoUrl stores a full URL rather than a storage key, so it
|
|
// is intentionally not deleted here — only objects this app stored by key.
|
|
const reviewPhotos = await db
|
|
.select({ photoKey: ratings.photoKey })
|
|
.from(ratings)
|
|
.where(and(eq(ratings.recipeId, id), isNotNull(ratings.photoKey)));
|
|
const storageKeys = [
|
|
...existing.photos.map((p) => p.storageKey),
|
|
...reviewPhotos.map((r) => r.photoKey).filter((k): k is string => k !== null),
|
|
];
|
|
|
|
await db.delete(recipes).where(eq(recipes.id, id));
|
|
|
|
// Best-effort object cleanup: a storage failure must not fail the response.
|
|
for (const key of storageKeys) {
|
|
try {
|
|
await deleteObject(key);
|
|
} catch (err) {
|
|
console.error(`Failed to delete storage object ${key} for recipe ${id}`, err);
|
|
}
|
|
}
|
|
|
|
void dispatchWebhook(session!.user.id, "recipe.deleted", { id });
|
|
return new NextResponse(null, { status: 204 });
|
|
}
|