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>
95 lines
3.1 KiB
TypeScript
95 lines
3.1 KiB
TypeScript
import { db, userAiKeys, userModelPrefs, eq, and } from "@epicure/db";
|
|
import { decrypt } from "@/lib/encrypt";
|
|
import { getSiteSetting } from "@/lib/site-settings";
|
|
import type { AiConfig, AiProvider } from "./factory";
|
|
|
|
export type ModelUseCase = "text" | "vision" | "mealPlan";
|
|
|
|
/**
|
|
* Thrown when a user's saved BYOK key exists but fails to decrypt (e.g. the
|
|
* encryption secret rotated, or the stored ciphertext is corrupt). Callers
|
|
* must surface this to the user instead of silently falling back to the
|
|
* platform key — otherwise the user believes their own key/billing is being
|
|
* used when it is not.
|
|
*/
|
|
export class ByokDecryptError extends Error {
|
|
constructor(public readonly provider: string) {
|
|
super(`Failed to decrypt saved API key for provider "${provider}". Please re-enter it in Settings.`);
|
|
this.name = "ByokDecryptError";
|
|
}
|
|
}
|
|
|
|
export async function withUserKey(userId: string, config: AiConfig): Promise<AiConfig> {
|
|
const provider = config.provider;
|
|
if (!provider) return config;
|
|
|
|
const row = await db.query.userAiKeys.findFirst({
|
|
where: and(eq(userAiKeys.userId, userId), eq(userAiKeys.provider, provider)),
|
|
});
|
|
|
|
if (!row) return config;
|
|
|
|
try {
|
|
const apiKey = decrypt(row.encryptedKey);
|
|
return { ...config, apiKey };
|
|
} catch {
|
|
throw new ByokDecryptError(provider);
|
|
}
|
|
}
|
|
|
|
export async function getModelConfigForUseCase(userId: string, useCase: ModelUseCase): Promise<AiConfig> {
|
|
const prefs = await db.query.userModelPrefs.findFirst({
|
|
where: eq(userModelPrefs.userId, userId),
|
|
});
|
|
|
|
const providerField = `${useCase}Provider` as keyof typeof prefs;
|
|
const modelField = `${useCase}Model` as keyof typeof prefs;
|
|
const provider = prefs?.[providerField] as AiProvider | null | undefined;
|
|
const model = prefs?.[modelField] as string | null | undefined;
|
|
|
|
if (provider) {
|
|
const config: AiConfig = { provider, model: model ?? undefined };
|
|
return withUserKey(userId, config);
|
|
}
|
|
|
|
return getDefaultProviderWithKey(userId);
|
|
}
|
|
|
|
export async function getDefaultProviderWithKey(userId: string): Promise<AiConfig> {
|
|
const keys = await db.query.userAiKeys.findMany({
|
|
where: eq(userAiKeys.userId, userId),
|
|
columns: { provider: true, encryptedKey: true },
|
|
});
|
|
|
|
const order: AiProvider[] = ["openrouter", "openai", "anthropic", "ollama"];
|
|
|
|
// 1. User BYOK key takes highest priority
|
|
for (const p of order) {
|
|
const row = keys.find((k) => k.provider === p);
|
|
if (row) {
|
|
try {
|
|
return { provider: p, apiKey: decrypt(row.encryptedKey) };
|
|
} catch {
|
|
throw new ByokDecryptError(p);
|
|
}
|
|
}
|
|
}
|
|
|
|
// 2. Admin site-setting overrides (DB → env fallback handled inside getSiteSetting)
|
|
const providerEnvKeys: Record<AiProvider, string | null> = {
|
|
openrouter: "OPENROUTER_API_KEY",
|
|
openai: "OPENAI_API_KEY",
|
|
anthropic: "ANTHROPIC_API_KEY",
|
|
ollama: null,
|
|
};
|
|
for (const p of order) {
|
|
const envKey = providerEnvKeys[p];
|
|
if (!envKey) continue;
|
|
const apiKey = await getSiteSetting(envKey as Parameters<typeof getSiteSetting>[0]);
|
|
if (apiKey) return { provider: p, apiKey };
|
|
}
|
|
|
|
// 3. Let factory use raw env vars
|
|
return {};
|
|
}
|