fix: language default, google OAuth cookie issue, add admin tier/usage controls
- ai-generate-dialog: useLocale() returns {locale,setLocale} object, not
string — was stringifying whole object as default language value
- auth/server: add trustedOrigins so session cookie survives reverse-proxy
deployments where BETTER_AUTH_URL differs from container's own view
- admin: add tier limit editor (/admin/tiers) and per-user usage reset
button, both audit-logged
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
@@ -3,13 +3,14 @@ import { headers } from "next/headers";
|
||||
import { auth } from "@/lib/auth/server";
|
||||
import { db, users, eq } from "@epicure/db";
|
||||
import Link from "next/link";
|
||||
import { Shield, Users, BookOpen, Settings, BarChart3, ClipboardList, HardDrive, Bot, ArrowLeft } from "lucide-react";
|
||||
import { Shield, Users, BookOpen, Settings, BarChart3, ClipboardList, HardDrive, Bot, ArrowLeft, Gauge } from "lucide-react";
|
||||
import { cn } from "@/lib/utils";
|
||||
|
||||
const adminNav = [
|
||||
{ href: "/admin", label: "Overview", icon: BarChart3 },
|
||||
{ href: "/admin/users", label: "Users", icon: Users },
|
||||
{ href: "/admin/recipes", label: "Recipes", icon: BookOpen },
|
||||
{ href: "/admin/tiers", label: "Tier Limits", icon: Gauge },
|
||||
{ href: "/admin/audit-logs", label: "Audit Logs", icon: ClipboardList },
|
||||
{ href: "/admin/storage", label: "Storage", icon: HardDrive },
|
||||
{ href: "/admin/ai-config", label: "AI Config", icon: Bot },
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
import type { Metadata } from "next";
|
||||
import { db, tierDefinitions } from "@epicure/db";
|
||||
import { TierLimitsForm } from "@/components/admin/tier-limits-form";
|
||||
|
||||
export const metadata: Metadata = { title: "Tier Limits – Admin" };
|
||||
|
||||
export default async function AdminTiersPage() {
|
||||
const tiers = await db.select().from(tierDefinitions);
|
||||
|
||||
return (
|
||||
<div className="space-y-8">
|
||||
<div>
|
||||
<h1 className="text-2xl font-bold tracking-tight">Tier Limits</h1>
|
||||
<p className="text-muted-foreground text-sm mt-1">
|
||||
Change monthly quotas per tier. Takes effect immediately for all users on that tier.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
{tiers.map((tierDefinition) => (
|
||||
<TierLimitsForm key={tierDefinition.tier} tierDefinition={tierDefinition} />
|
||||
))}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -6,6 +6,7 @@ import { Badge } from "@/components/ui/badge";
|
||||
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
|
||||
import { Separator } from "@/components/ui/separator";
|
||||
import { UserEditor } from "@/components/admin/user-editor";
|
||||
import { ResetUsageButton } from "@/components/admin/reset-usage-button";
|
||||
import Link from "next/link";
|
||||
import { ArrowLeft } from "lucide-react";
|
||||
|
||||
@@ -118,6 +119,9 @@ export default async function AdminUserDetailPage({ params }: PageProps) {
|
||||
<span className="text-muted-foreground">Storage Used</span>
|
||||
<span className="font-medium">{usage?.storageUsedMb ?? 0} MB</span>
|
||||
</div>
|
||||
<div className="pt-2">
|
||||
<ResetUsageButton userId={user.id} />
|
||||
</div>
|
||||
</CardContent>
|
||||
</Card>
|
||||
</div>
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
import { NextRequest, NextResponse } from "next/server";
|
||||
import { requireAdmin } from "@/lib/api-auth";
|
||||
import { db, tierDefinitions, auditLogs, eq } from "@epicure/db";
|
||||
import { randomUUID } from "crypto";
|
||||
|
||||
interface RouteContext {
|
||||
params: Promise<{ tier: string }>;
|
||||
}
|
||||
|
||||
const NUMERIC_FIELDS = ["maxRecipes", "aiCallsPerMonth", "storageMb", "maxPublicRecipes"] as const;
|
||||
type NumericField = (typeof NUMERIC_FIELDS)[number];
|
||||
|
||||
export async function PATCH(req: NextRequest, { params }: RouteContext) {
|
||||
const { session, response } = await requireAdmin();
|
||||
if (response) return response;
|
||||
|
||||
const { tier } = await params;
|
||||
if (tier !== "free" && tier !== "pro") {
|
||||
return NextResponse.json({ error: "Invalid tier" }, { status: 400 });
|
||||
}
|
||||
|
||||
const body = (await req.json()) as Partial<Record<NumericField, number>>;
|
||||
const updateData: Partial<Record<NumericField, number>> = {};
|
||||
|
||||
for (const field of NUMERIC_FIELDS) {
|
||||
const value = body[field];
|
||||
if (value === undefined) continue;
|
||||
if (!Number.isInteger(value) || value < 0) {
|
||||
return NextResponse.json({ error: `Invalid value for ${field}` }, { status: 400 });
|
||||
}
|
||||
updateData[field] = value;
|
||||
}
|
||||
|
||||
const [updated] = await db
|
||||
.update(tierDefinitions)
|
||||
.set(updateData)
|
||||
.where(eq(tierDefinitions.tier, tier))
|
||||
.returning();
|
||||
|
||||
if (!updated) {
|
||||
return NextResponse.json({ error: "Tier not found" }, { status: 404 });
|
||||
}
|
||||
|
||||
await db.insert(auditLogs).values({
|
||||
id: randomUUID(),
|
||||
userId: session!.user.id,
|
||||
action: "admin.tier.update",
|
||||
targetType: "tier_definition",
|
||||
targetId: tier,
|
||||
metadata: JSON.stringify(updateData),
|
||||
createdAt: new Date(),
|
||||
});
|
||||
|
||||
return NextResponse.json({ tierDefinition: updated });
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
import { NextRequest, NextResponse } from "next/server";
|
||||
import { requireAdmin } from "@/lib/api-auth";
|
||||
import { db, userUsage, auditLogs, eq, and } from "@epicure/db";
|
||||
import { randomUUID } from "crypto";
|
||||
|
||||
interface RouteContext {
|
||||
params: Promise<{ id: string }>;
|
||||
}
|
||||
|
||||
function currentMonth() {
|
||||
const now = new Date();
|
||||
return `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, "0")}`;
|
||||
}
|
||||
|
||||
export async function PATCH(req: NextRequest, { params }: RouteContext) {
|
||||
const { session, response } = await requireAdmin();
|
||||
if (response) return response;
|
||||
|
||||
const { id } = await params;
|
||||
const month = currentMonth();
|
||||
|
||||
const [updated] = await db
|
||||
.update(userUsage)
|
||||
.set({ aiCallsUsed: 0, recipeCount: 0, storageUsedMb: 0 })
|
||||
.where(and(eq(userUsage.userId, id), eq(userUsage.month, month)))
|
||||
.returning();
|
||||
|
||||
await db.insert(auditLogs).values({
|
||||
id: randomUUID(),
|
||||
userId: session!.user.id,
|
||||
action: "admin.user.reset_usage",
|
||||
targetType: "user",
|
||||
targetId: id,
|
||||
metadata: JSON.stringify({ month }),
|
||||
createdAt: new Date(),
|
||||
});
|
||||
|
||||
return NextResponse.json({ usage: updated ?? { userId: id, month, aiCallsUsed: 0, recipeCount: 0, storageUsedMb: 0 } });
|
||||
}
|
||||
@@ -0,0 +1,38 @@
|
||||
"use client";
|
||||
|
||||
import { useState } from "react";
|
||||
import { useRouter } from "next/navigation";
|
||||
import { toast } from "sonner";
|
||||
import { Button } from "@/components/ui/button";
|
||||
|
||||
export function ResetUsageButton({ userId }: { userId: string }) {
|
||||
const router = useRouter();
|
||||
const [resetting, setResetting] = useState(false);
|
||||
|
||||
async function handleReset() {
|
||||
if (!confirm("Reset this user's usage counters for the current month?")) return;
|
||||
setResetting(true);
|
||||
try {
|
||||
const res = await fetch(`/api/v1/admin/users/${userId}/usage`, { method: "PATCH" });
|
||||
if (!res.ok) throw new Error("Reset failed");
|
||||
toast.success("Usage reset");
|
||||
router.refresh();
|
||||
} catch {
|
||||
toast.error("Failed to reset usage");
|
||||
} finally {
|
||||
setResetting(false);
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<Button
|
||||
variant="outline"
|
||||
size="sm"
|
||||
onClick={() => { void handleReset(); }}
|
||||
disabled={resetting}
|
||||
className="text-destructive hover:text-destructive"
|
||||
>
|
||||
{resetting ? "Resetting…" : "Reset Usage"}
|
||||
</Button>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,79 @@
|
||||
"use client";
|
||||
|
||||
import { useState } from "react";
|
||||
import { toast } from "sonner";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { Input } from "@/components/ui/input";
|
||||
import { Label } from "@/components/ui/label";
|
||||
|
||||
const FIELDS = [
|
||||
{ key: "maxRecipes", label: "Max Recipes" },
|
||||
{ key: "aiCallsPerMonth", label: "AI Calls / Month" },
|
||||
{ key: "storageMb", label: "Storage (MB)" },
|
||||
{ key: "maxPublicRecipes", label: "Max Public Recipes" },
|
||||
] as const;
|
||||
|
||||
type TierDefinition = {
|
||||
tier: string;
|
||||
maxRecipes: number;
|
||||
aiCallsPerMonth: number;
|
||||
storageMb: number;
|
||||
maxPublicRecipes: number;
|
||||
};
|
||||
|
||||
export function TierLimitsForm({ tierDefinition }: { tierDefinition: TierDefinition }) {
|
||||
const [values, setValues] = useState<Record<string, number>>({
|
||||
maxRecipes: tierDefinition.maxRecipes,
|
||||
aiCallsPerMonth: tierDefinition.aiCallsPerMonth,
|
||||
storageMb: tierDefinition.storageMb,
|
||||
maxPublicRecipes: tierDefinition.maxPublicRecipes,
|
||||
});
|
||||
const [saving, setSaving] = useState(false);
|
||||
|
||||
async function handleSave() {
|
||||
setSaving(true);
|
||||
try {
|
||||
const res = await fetch(`/api/v1/admin/tiers/${tierDefinition.tier}`, {
|
||||
method: "PATCH",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify(values),
|
||||
});
|
||||
if (!res.ok) {
|
||||
const data = await res.json().catch(() => ({}));
|
||||
throw new Error((data as { error?: string }).error ?? "Save failed");
|
||||
}
|
||||
toast.success(`${tierDefinition.tier} tier limits saved`);
|
||||
} catch (err) {
|
||||
toast.error(err instanceof Error ? err.message : "Failed to save");
|
||||
} finally {
|
||||
setSaving(false);
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<section className="rounded-xl border p-6 space-y-4">
|
||||
<h2 className="font-semibold text-lg capitalize">{tierDefinition.tier}</h2>
|
||||
|
||||
<div className="grid grid-cols-2 gap-4">
|
||||
{FIELDS.map(({ key, label }) => (
|
||||
<div key={key} className="space-y-1.5">
|
||||
<Label htmlFor={`${tierDefinition.tier}-${key}`}>{label}</Label>
|
||||
<Input
|
||||
id={`${tierDefinition.tier}-${key}`}
|
||||
type="number"
|
||||
min={0}
|
||||
value={values[key]}
|
||||
onChange={(e) =>
|
||||
setValues((prev) => ({ ...prev, [key]: Number(e.target.value) }))
|
||||
}
|
||||
/>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
|
||||
<Button onClick={() => { void handleSave(); }} disabled={saving} size="sm">
|
||||
{saving ? "Saving…" : "Save"}
|
||||
</Button>
|
||||
</section>
|
||||
);
|
||||
}
|
||||
@@ -75,7 +75,7 @@ export function AiGenerateDialog({
|
||||
const tCommon = useTranslations("common");
|
||||
const tRecipe = useTranslations("recipe");
|
||||
const router = useRouter();
|
||||
const locale = useLocale();
|
||||
const { locale } = useLocale();
|
||||
const [tab, setTab] = useState<Tab>("describe");
|
||||
|
||||
// describe tab
|
||||
|
||||
@@ -5,6 +5,8 @@ import { db, users, sessions, accounts, verifications, eq, count } from "@epicur
|
||||
import { sendEmail, verifyEmailHtml, resetPasswordHtml, welcomeHtml } from "@/lib/email";
|
||||
|
||||
export const auth = betterAuth({
|
||||
trustedOrigins: [process.env["BETTER_AUTH_URL"] ?? "http://localhost:3000"],
|
||||
|
||||
database: drizzleAdapter(db, {
|
||||
provider: "pg",
|
||||
schema: { user: users, session: sessions, account: accounts, verification: verifications },
|
||||
|
||||
Reference in New Issue
Block a user