feat: self-serve developer access for paid tiers, split BYOK into its own permission (v0.72.0)
Splits what was one isDeveloper flag (gating webhooks, API keys, AND BYOK together) into two independent permissions: - isDeveloper (webhooks + self-serve API keys): admin-toggled as before, but now ALSO self-serve -- PATCH /api/v1/users/me/developer-access lets any paid-tier (tier !== "free") user turn it on themselves, no added fee. Free tier still needs an admin grant. Turning it off is always self-serve regardless of tier, since revoking your own access needs no gatekeeping. canSelfServeDeveloperAccess() in lib/permissions.ts is the single check for "is this tier eligible." - isByokEnabled (BYOK AI provider keys): new column, admin-only, no self-serve path at all -- routing real AI provider spend through Epicure on the user's own key warrants a manual admin check-in that webhooks/API access don't need. requireByok() replaces requireDeveloper() on the three ai-keys routes. Migration adds is_byok_enabled and grandfathers in anyone who already has a BYOK key configured (the earlier grandfather migration only covered the combined isDeveloper flag, which BYOK no longer reads). Settings UI: webhooks/API-keys pages show a self-serve "Enable" toggle for paid-tier non-developers instead of the locked notice (still shown to free-tier users), plus a "Disable developer access" link once enabled. Settings -> AI's BYOK section now checks isByokEnabled instead of isDeveloper -- unaffected by the self-serve change, still fully admin-gated. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
@@ -12,8 +12,8 @@ export async function PATCH(req: NextRequest, { params }: RouteContext) {
|
||||
if (response) return response;
|
||||
|
||||
const { id } = await params;
|
||||
const body = await req.json() as { role?: string; tier?: string; isDeveloper?: boolean };
|
||||
const { role, tier, isDeveloper } = body;
|
||||
const body = await req.json() as { role?: string; tier?: string; isDeveloper?: boolean; isByokEnabled?: boolean };
|
||||
const { role, tier, isDeveloper, isByokEnabled } = body;
|
||||
|
||||
const validRoles = ["user", "moderator", "admin"] as const;
|
||||
const validTiers = ["free", "pro", "family"] as const;
|
||||
@@ -27,19 +27,23 @@ export async function PATCH(req: NextRequest, { params }: RouteContext) {
|
||||
if (isDeveloper !== undefined && typeof isDeveloper !== "boolean") {
|
||||
return NextResponse.json({ error: "Invalid isDeveloper" }, { status: 400 });
|
||||
}
|
||||
if (isByokEnabled !== undefined && typeof isByokEnabled !== "boolean") {
|
||||
return NextResponse.json({ error: "Invalid isByokEnabled" }, { status: 400 });
|
||||
}
|
||||
|
||||
const updateData: Partial<{ role: "user" | "moderator" | "admin"; tier: "free" | "pro" | "family"; isDeveloper: boolean; updatedAt: Date }> = {
|
||||
const updateData: Partial<{ role: "user" | "moderator" | "admin"; tier: "free" | "pro" | "family"; isDeveloper: boolean; isByokEnabled: boolean; updatedAt: Date }> = {
|
||||
updatedAt: new Date(),
|
||||
};
|
||||
if (role) updateData.role = role as "user" | "moderator" | "admin";
|
||||
if (tier) updateData.tier = tier as "free" | "pro" | "family";
|
||||
if (isDeveloper !== undefined) updateData.isDeveloper = isDeveloper;
|
||||
if (isByokEnabled !== undefined) updateData.isByokEnabled = isByokEnabled;
|
||||
|
||||
const [updated] = await db
|
||||
.update(users)
|
||||
.set(updateData)
|
||||
.where(eq(users.id, id))
|
||||
.returning({ id: users.id, role: users.role, tier: users.tier, isDeveloper: users.isDeveloper });
|
||||
.returning({ id: users.id, role: users.role, tier: users.tier, isDeveloper: users.isDeveloper, isByokEnabled: users.isByokEnabled });
|
||||
|
||||
if (!updated) {
|
||||
return NextResponse.json({ error: "User not found" }, { status: 404 });
|
||||
@@ -52,7 +56,7 @@ export async function PATCH(req: NextRequest, { params }: RouteContext) {
|
||||
action: "admin.user.update",
|
||||
targetType: "user",
|
||||
targetId: id,
|
||||
metadata: JSON.stringify({ role, tier, isDeveloper }),
|
||||
metadata: JSON.stringify({ role, tier, isDeveloper, isByokEnabled }),
|
||||
createdAt: new Date(),
|
||||
});
|
||||
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
import { NextResponse } from "next/server";
|
||||
import { db, userAiKeys, eq, and } from "@epicure/db";
|
||||
import { requireDeveloper } from "@/lib/api-auth";
|
||||
import { requireByok } from "@/lib/api-auth";
|
||||
|
||||
type Params = { params: Promise<{ provider: string }> };
|
||||
|
||||
export async function DELETE(_req: Request, { params }: Params) {
|
||||
const { session, response } = await requireDeveloper();
|
||||
const { session, response } = await requireByok();
|
||||
if (response) return response;
|
||||
|
||||
const { provider } = await params;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { NextResponse } from "next/server";
|
||||
import { z } from "zod";
|
||||
import { db, userAiKeys, eq, and } from "@epicure/db";
|
||||
import { requireDeveloper } from "@/lib/api-auth";
|
||||
import { requireByok } from "@/lib/api-auth";
|
||||
import { encrypt } from "@/lib/encrypt";
|
||||
import { applyRateLimit } from "@/lib/rate-limit";
|
||||
|
||||
@@ -13,7 +13,7 @@ const PostSchema = z.object({
|
||||
});
|
||||
|
||||
export async function GET() {
|
||||
const { session, response } = await requireDeveloper();
|
||||
const { session, response } = await requireByok();
|
||||
if (response) return response;
|
||||
|
||||
const keys = await db.query.userAiKeys.findMany({
|
||||
@@ -25,7 +25,7 @@ export async function GET() {
|
||||
}
|
||||
|
||||
export async function POST(req: Request) {
|
||||
const { session, response } = await requireDeveloper();
|
||||
const { session, response } = await requireByok();
|
||||
if (response) return response;
|
||||
|
||||
const limited = await applyRateLimit(`rl:ai-keys:${session!.user.id}`, 5, 3600);
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
import { NextRequest, NextResponse } from "next/server";
|
||||
import { z } from "zod";
|
||||
import { db, users, eq } from "@epicure/db";
|
||||
import { requireSession } from "@/lib/api-auth";
|
||||
import { canSelfServeDeveloperAccess } from "@/lib/permissions";
|
||||
|
||||
const PatchSchema = z.object({ enabled: z.boolean() });
|
||||
|
||||
/** Self-serve on/off for the same isDeveloper flag admin/users/[id] can
|
||||
* also set — open to any paid tier, no added fee. Free tier still needs
|
||||
* an admin grant (requireAdmin's path, unchanged). */
|
||||
export async function PATCH(req: NextRequest) {
|
||||
const { session, response } = await requireSession();
|
||||
if (response) return response;
|
||||
|
||||
const parsed = PatchSchema.safeParse(await req.json());
|
||||
if (!parsed.success) {
|
||||
return NextResponse.json({ error: "Validation error", issues: parsed.error.issues }, { status: 400 });
|
||||
}
|
||||
|
||||
// Turning it off is always allowed, regardless of tier or who granted
|
||||
// it — only turning it ON self-serve requires a paid tier.
|
||||
if (parsed.data.enabled) {
|
||||
// Don't trust session.user.tier — up to 5-minute-stale cookieCache,
|
||||
// same reasoning as every other fresh-role/tier re-query in this codebase.
|
||||
const [dbUser] = await db.select({ tier: users.tier }).from(users).where(eq(users.id, session!.user.id)).limit(1);
|
||||
if (!dbUser || !canSelfServeDeveloperAccess(dbUser)) {
|
||||
return NextResponse.json({ error: "Upgrade to a paid plan to enable developer access yourself, or ask an admin" }, { status: 403 });
|
||||
}
|
||||
}
|
||||
|
||||
await db.update(users).set({ isDeveloper: parsed.data.enabled, updatedAt: new Date() }).where(eq(users.id, session!.user.id));
|
||||
|
||||
return NextResponse.json({ ok: true, isDeveloper: parsed.data.enabled });
|
||||
}
|
||||
Reference in New Issue
Block a user