arnaudne/Epicure
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add Team billing tier

Browse Source 
Widens the tier enum from free/pro to free/pro/team and every
"free" | "pro" cast that assumed exactly two tiers (~30 call sites:
every AI route's withAiQuota/checkAndIncrementTierLimit call, admin
user/invite management, upload quota checks, OpenAPI schemas). Team
sits above Pro with genuinely unlimited recipes/public-recipes (the
-1 sentinel, which Pro doesn't actually use — Pro uses large finite
numbers instead) and a higher AI-call/storage cap. Seeded via
db:seed, editable afterward from Admin > Tiers.

role (user/moderator/admin — permissions) and tier (free/pro/team —
billing limits) stay separate concepts, as they already were; this
does not touch role-based permissions.

Requires migration 0043 to run against a live DB — not applied in
this sandbox (no Docker here); run `pnpm db:migrate` then `pnpm db:seed`.

v0.44.0
This commit is contained in:
Arnaud
2026-07-17 17:34:13 +02:00
parent c5a8f94b26
commit c31ab8771a
46 changed files with 5271 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/web/app/admin/storage/page.tsx
+12 -1
View File
@@ -41,6 +41,7 @@ export default async function AdminStoragePage() {
const freePhotos = Number(photosByTier.find((r) => r.tier === "free")?.photoCount ?? 0);
const proPhotos = Number(photosByTier.find((r) => r.tier === "pro")?.photoCount ?? 0);
const teamPhotos = Number(photosByTier.find((r) => r.tier === "team")?.photoCount ?? 0);
return (
<div className="space-y-6">
@@ -51,7 +52,7 @@ export default async function AdminStoragePage() {
</p>
</div>
<div className="grid grid-cols-1 md:grid-cols-3 gap-4">
<div className="grid grid-cols-1 md:grid-cols-4 gap-4">
<Card>
<CardHeader className="flex flex-row items-center justify-between pb-2">
<CardTitle className="text-sm font-medium text-muted-foreground">Total Photos</CardTitle>
@@ -82,6 +83,16 @@ export default async function AdminStoragePage() {
<div className="text-2xl font-bold">{proPhotos.toLocaleString()}</div>
</CardContent>
</Card>
<Card>
<CardHeader className="flex flex-row items-center justify-between pb-2">
<CardTitle className="text-sm font-medium text-muted-foreground">Team Tier Photos</CardTitle>
<HardDrive className="h-4 w-4 text-muted-foreground" />
</CardHeader>
<CardContent>
<div className="text-2xl font-bold">{teamPhotos.toLocaleString()}</div>
</CardContent>
</Card>
</div>
<div>
apps/web/app/admin/users/[id]/page.tsx
+1
View File
@@ -25,6 +25,7 @@ const ROLE_COLORS = {
const TIER_COLORS = {
free: "secondary",
pro: "default",
team: "default",
} as const;
export default async function AdminUserDetailPage({ params }: PageProps) {
apps/web/app/admin/users/page.tsx
+1
View File
@@ -24,6 +24,7 @@ const ROLE_COLORS = {
const TIER_COLORS = {
free: "secondary",
pro: "default",
team: "default",
} as const;
export default async function AdminUsersPage({ searchParams }: PageProps) {
apps/web/app/api/v1/admin/invites/route.ts
+1 -1
View File
@@ -5,7 +5,7 @@ import { createInvite, listInvites } from "@/lib/invites";
import { randomUUID } from "crypto";
const VALID_ROLES = ["user", "moderator", "admin"] as const;
const VALID_TIERS = ["free", "pro"] as const;
const VALID_TIERS = ["free", "pro", "team"] as const;
export async function GET() {
const { response } = await requireAdmin();
apps/web/app/api/v1/admin/tiers/[tier]/route.ts
+1 -1
View File
@@ -16,7 +16,7 @@ export async function PATCH(req: NextRequest, { params }: RouteContext) {
if (response) return response;
const { tier } = await params;
if (tier !== "free" && tier !== "pro") {
if (tier !== "free" && tier !== "pro" && tier !== "team") {
return NextResponse.json({ error: "Invalid tier" }, { status: 400 });
}
apps/web/app/api/v1/admin/users/[id]/route.ts
+3 -3
View File
@@ -16,7 +16,7 @@ export async function PATCH(req: NextRequest, { params }: RouteContext) {
const { role, tier } = body;
const validRoles = ["user", "moderator", "admin"] as const;
const validTiers = ["free", "pro"] as const;
const validTiers = ["free", "pro", "team"] as const;
if (role !== undefined && !validRoles.includes(role as typeof validRoles[number])) {
return NextResponse.json({ error: "Invalid role" }, { status: 400 });
@@ -25,11 +25,11 @@ export async function PATCH(req: NextRequest, { params }: RouteContext) {
return NextResponse.json({ error: "Invalid tier" }, { status: 400 });
}
const updateData: Partial<{ role: "user" | "moderator" | "admin"; tier: "free" | "pro"; updatedAt: Date }> = {
const updateData: Partial<{ role: "user" | "moderator" | "admin"; tier: "free" | "pro" | "team"; updatedAt: Date }> = {
updatedAt: new Date(),
};
if (role) updateData.role = role as "user" | "moderator" | "admin";
if (tier) updateData.tier = tier as "free" | "pro";
if (tier) updateData.tier = tier as "free" | "pro" | "team";
const [updated] = await db
.update(users)
apps/web/app/api/v1/admin/users/route.ts
+1 -1
View File
@@ -7,7 +7,7 @@ import { randomBytes, randomUUID } from "crypto";
import { APIError } from "better-auth";
const VALID_ROLES = ["user", "moderator", "admin"] as const;
const VALID_TIERS = ["free", "pro"] as const;
const VALID_TIERS = ["free", "pro", "team"] as const;
export async function POST(req: NextRequest) {
const { session, response } = await requireAdmin();
apps/web/app/api/v1/ai/adapt/[id]/route.ts
+2 -2
View File
@@ -52,7 +52,7 @@ export async function POST(req: NextRequest, { params }: Params) {
if (!configResult.ok) return configResult.response;
const aiConfig = configResult.data;
const result = await withAiQuota(userId, session!.user.tier as "free" | "pro", () =>
const result = await withAiQuota(userId, session!.user.tier as "free" | "pro" | "team", () =>
adaptRecipe(
{
title: recipe.title,
@@ -80,7 +80,7 @@ export async function POST(req: NextRequest, { params }: Params) {
}
try {
await checkAndIncrementTierLimit(userId, session!.user.tier as "free" | "pro", "recipe");
await checkAndIncrementTierLimit(userId, session!.user.tier as "free" | "pro" | "team", "recipe");
} catch (err) {
if (err instanceof TierLimitError) {
return NextResponse.json({ error: "Recipe limit reached for your tier" }, { status: 403 });
apps/web/app/api/v1/ai/batch-cook/generate/route.ts
+1 -1
View File
@@ -43,7 +43,7 @@ export async function POST(req: NextRequest) {
if (!configResult.ok) return configResult.response;
const config = configResult.data;
const result = await withAiQuota(userId, session!.user.tier as "free" | "pro", () =>
const result = await withAiQuota(userId, session!.user.tier as "free" | "pro" | "team", () =>
generateBatchCook(
{
dinners: parsed.data.dinners,
apps/web/app/api/v1/ai/cooking-chat/route.ts
+1 -1
View File
@@ -40,7 +40,7 @@ export async function POST(req: NextRequest) {
const locale = (session!.user as { locale?: string }).locale ?? "en";
const lang = LANG[locale] ?? "English";
const result = await withAiQuota(session!.user.id, session!.user.tier as "free" | "pro", () =>
const result = await withAiQuota(session!.user.id, session!.user.tier as "free" | "pro" | "team", () =>
generateText({
model,
system: `You are Epicure, a helpful culinary assistant answering general cooking questions — not tied to any specific recipe (techniques, substitutions, timing, equipment, food safety, etc). If asked who you are or what model/AI you're built on, say you're Epicure — never name the underlying model or provider. If a question has nothing to do with cooking or food, politely redirect. Keep answers under 200 words. Respond in ${lang}.${bioContext}`,
apps/web/app/api/v1/ai/drinks/[id]/route.ts
+1 -1
View File
@@ -43,7 +43,7 @@ export async function POST(req: NextRequest, { params }: Params) {
if (!configResult.ok) return configResult.response;
const aiConfig = configResult.data;
const result = await withAiQuota(session!.user.id, session!.user.tier as "free" | "pro", () =>
const result = await withAiQuota(session!.user.id, session!.user.tier as "free" | "pro" | "team", () =>
suggestDrinks(
{
title: recipe.title,
apps/web/app/api/v1/ai/generate-from-idea/route.ts
+1 -1
View File
@@ -39,7 +39,7 @@ export async function POST(req: NextRequest) {
if (!configResult.ok) return configResult.response;
const aiConfig = configResult.data;
const result = await withAiQuota(session!.user.id, session!.user.tier as "free" | "pro", () =>
const result = await withAiQuota(session!.user.id, session!.user.tier as "free" | "pro" | "team", () =>
generateRecipe(parsed.data.title, {
...aiConfig,
userContext: privateBio ?? undefined,
apps/web/app/api/v1/ai/generate/route.ts
+1 -1
View File
@@ -36,7 +36,7 @@ export async function POST(req: NextRequest) {
if (!configResult.ok) return configResult.response;
const aiConfig = configResult.data;
const result = await withAiQuota(session!.user.id, session!.user.tier as "free" | "pro", () =>
const result = await withAiQuota(session!.user.id, session!.user.tier as "free" | "pro" | "team", () =>
generateRecipe(parsed.data.prompt, {
...aiConfig,
language: parsed.data.language,
apps/web/app/api/v1/ai/import-photo/route.ts
+1 -1
View File
@@ -42,7 +42,7 @@ export async function POST(req: NextRequest) {
if (!textConfigResult.ok) return textConfigResult.response;
const textConfig = textConfigResult.data;
const result = await withAiQuota(userId, session!.user.tier as "free" | "pro", () =>
const result = await withAiQuota(userId, session!.user.tier as "free" | "pro" | "team", () =>
importFromPhoto(parsed.data.imageBase64, parsed.data.mimeType, visionConfig, textConfig, locale),
{ skipQuota: visionConfig.isByok && textConfig.isByok }
);
apps/web/app/api/v1/ai/import-url/route.ts
+1 -1
View File
@@ -37,7 +37,7 @@ export async function POST(req: NextRequest) {
if (!configResult.ok) return configResult.response;
const aiConfig = configResult.data;
const result = await withAiQuota(session!.user.id, session!.user.tier as "free" | "pro", () =>
const result = await withAiQuota(session!.user.id, session!.user.tier as "free" | "pro" | "team", () =>
importFromUrl(parsed.data.url, aiConfig), { skipQuota: aiConfig.isByok }
);
if (!result.ok) return result.response;
apps/web/app/api/v1/ai/meal-plan/generate/route.ts
+2 -2
View File
@@ -75,7 +75,7 @@ export async function POST(req: NextRequest) {
}
}
const result = await withAiQuota(userId, session!.user.tier as "free" | "pro", () =>
const result = await withAiQuota(userId, session!.user.tier as "free" | "pro" | "team", () =>
generateMealPlan(
{
dietaryPrefs: parsed.data.dietaryPrefs,
@@ -99,7 +99,7 @@ export async function POST(req: NextRequest) {
let chargedRecipes = 0;
try {
for (let i = 0; i < plan.entries.length; i++) {
await checkAndIncrementTierLimit(userId, session!.user.tier as "free" | "pro", "recipe");
await checkAndIncrementTierLimit(userId, session!.user.tier as "free" | "pro" | "team", "recipe");
chargedRecipes++;
}
} catch (err) {
apps/web/app/api/v1/ai/pairings/[id]/route.ts
+1 -1
View File
@@ -44,7 +44,7 @@ export async function POST(req: NextRequest, { params }: Params) {
if (!configResult.ok) return configResult.response;
const aiConfig = configResult.data;
const result = await withAiQuota(session!.user.id, session!.user.tier as "free" | "pro", () =>
const result = await withAiQuota(session!.user.id, session!.user.tier as "free" | "pro" | "team", () =>
suggestPairings(
{
title: recipe.title,
apps/web/app/api/v1/ai/recipe-chat/route.ts
+1 -1
View File
@@ -74,7 +74,7 @@ ${stepList || "None listed"}
const locale = (session!.user as { locale?: string }).locale ?? "en";
const lang = LANG[locale] ?? "English";
const result = await withAiQuota(session!.user.id, session!.user.tier as "free" | "pro", () =>
const result = await withAiQuota(session!.user.id, session!.user.tier as "free" | "pro" | "team", () =>
generateText({
model,
system: `You are Epicure, a helpful culinary assistant. Answer questions about the following recipe concisely and accurately. If asked who you are or what model/AI you're built on, say you're Epicure — never name the underlying model or provider. If a question is not related to the recipe or cooking, politely redirect. Keep answers under 200 words. Respond in ${lang}.
apps/web/app/api/v1/ai/recipe-ideas/route.ts
+1 -1
View File
@@ -57,7 +57,7 @@ export async function POST(req: NextRequest) {
? `${userContext}Generate 6 diverse recipe ideas based on: "${parsed.data.prompt}". Include a mix of difficulty levels.`
: `${userContext}Generate 6 diverse, creative recipe ideas. Include different cuisines, difficulty levels, and meal types.`;
const result = await withAiQuota(session!.user.id, session!.user.tier as "free" | "pro", () =>
const result = await withAiQuota(session!.user.id, session!.user.tier as "free" | "pro" | "team", () =>
generateObject({
model,
schema: IdeasSchema,
apps/web/app/api/v1/ai/regenerate/route.ts
+1 -1
View File
@@ -47,7 +47,7 @@ export async function POST(req: NextRequest) {
const { instruction, language, ...current } = parsed.data;
const result = await withAiQuota(session!.user.id, session!.user.tier as "free" | "pro", () =>
const result = await withAiQuota(session!.user.id, session!.user.tier as "free" | "pro" | "team", () =>
regenerateRecipe(current, instruction, { ...aiConfig, language }), { skipQuota: aiConfig.isByok }
);
if (!result.ok) return result.response;
apps/web/app/api/v1/ai/scale/route.ts
+1 -1
View File
@@ -44,7 +44,7 @@ export async function POST(req: NextRequest) {
if (!configResult.ok) return configResult.response;
const aiConfig = configResult.data;
const result = await withAiQuota(session!.user.id, session!.user.tier as "free" | "pro", () =>
const result = await withAiQuota(session!.user.id, session!.user.tier as "free" | "pro" | "team", () =>
scaleRecipe(
{
title: recipe.title,
apps/web/app/api/v1/ai/substitute/route.ts
+1 -1
View File
@@ -40,7 +40,7 @@ export async function POST(req: NextRequest) {
const locale = (session!.user as { locale?: string }).locale ?? "en";
const result = await withAiQuota(session!.user.id, session!.user.tier as "free" | "pro", () =>
const result = await withAiQuota(session!.user.id, session!.user.tier as "free" | "pro" | "team", () =>
substituteIngredient(parsed.data.ingredient, context, aiConfig, locale),
{ skipQuota: aiConfig.isByok }
);
apps/web/app/api/v1/ai/translate/[id]/route.ts
+1 -1
View File
@@ -42,7 +42,7 @@ export async function POST(req: NextRequest, { params }: Params) {
if (!configResult.ok) return configResult.response;
const aiConfig = configResult.data;
const result = await withAiQuota(session!.user.id, session!.user.tier as "free" | "pro", () =>
const result = await withAiQuota(session!.user.id, session!.user.tier as "free" | "pro" | "team", () =>
translateRecipe(
{
title: recipe.title,
apps/web/app/api/v1/ai/variations/[id]/route.ts
+1 -1
View File
@@ -47,7 +47,7 @@ export async function POST(req: NextRequest, { params }: Params) {
if (!configResult.ok) return configResult.response;
const aiConfig = configResult.data;
const result = await withAiQuota(session!.user.id, session!.user.tier as "free" | "pro", () =>
const result = await withAiQuota(session!.user.id, session!.user.tier as "free" | "pro" | "team", () =>
suggestVariations(
{
title: recipe.title,
apps/web/app/api/v1/pantry/scan/photo/route.ts
+1 -1
View File
@@ -36,7 +36,7 @@ export async function POST(req: NextRequest) {
else if (aiConfig.provider === "anthropic") aiConfig.model = "claude-sonnet-4-6";
}
const result = await withAiQuota(userId, session!.user.tier as "free" | "pro", () =>
const result = await withAiQuota(userId, session!.user.tier as "free" | "pro" | "team", () =>
scanPantryPhoto(parsed.data.imageBase64, parsed.data.mimeType, aiConfig)
);
if (!result.ok) return result.response;
apps/web/app/api/v1/recipes/[id]/fork/route.ts
+1 -1
View File
@@ -24,7 +24,7 @@ export async function POST(req: NextRequest, { params }: Params) {
if (!source) return NextResponse.json({ error: "Not found" }, { status: 404 });
try {
await checkAndIncrementTierLimit(session!.user.id, session!.user.tier as "free" | "pro", "recipe");
await checkAndIncrementTierLimit(session!.user.id, session!.user.tier as "free" | "pro" | "team", "recipe");
} catch (err) {
if (err instanceof TierLimitError) {
return NextResponse.json({ error: "Recipe limit reached for your tier" }, { status: 403 });
apps/web/app/api/v1/recipes/[id]/nutrition/route.ts
+1 -1
View File
@@ -46,7 +46,7 @@ export async function POST(req: NextRequest, { params }: Params) {
if (!recipe) return NextResponse.json({ error: "Not found" }, { status: 404 });
const result = await withAiQuota(session!.user.id, session!.user.tier as "free" | "pro", () =>
const result = await withAiQuota(session!.user.id, session!.user.tier as "free" | "pro" | "team", () =>
estimateNutrition({
title: recipe.title,
baseServings: recipe.baseServings,
apps/web/app/api/v1/recipes/route.ts
+1 -1
View File
@@ -117,7 +117,7 @@ export async function POST(req: NextRequest) {
}
try {
await checkAndIncrementTierLimit(session!.user.id, session!.user.tier as "free" | "pro", "recipe");
await checkAndIncrementTierLimit(session!.user.id, session!.user.tier as "free" | "pro" | "team", "recipe");
} catch (err) {
if (err instanceof TierLimitError) {
return NextResponse.json({ error: "Recipe limit reached for your tier" }, { status: 403 });
apps/web/app/api/v1/upload/avatar-presign/route.ts
+1 -1
View File
@@ -29,7 +29,7 @@ export async function POST(req: NextRequest) {
try {
const sizeMb = Math.ceil(fileSize / (1024 * 1024));
await checkAndIncrementTierLimit(session!.user.id, session!.user.tier as "free" | "pro", "storage", sizeMb);
await checkAndIncrementTierLimit(session!.user.id, session!.user.tier as "free" | "pro" | "team", "storage", sizeMb);
} catch (err) {
if (err instanceof TierLimitError) {
return NextResponse.json({ error: "Storage limit reached for your tier" }, { status: 403 });
apps/web/app/api/v1/upload/presign/route.ts
+1 -1
View File
@@ -42,7 +42,7 @@ export async function POST(req: NextRequest) {
try {
const sizeMb = Math.ceil(fileSize / (1024 * 1024));
await checkAndIncrementTierLimit(session!.user.id, session!.user.tier as "free" | "pro", "storage", sizeMb);
await checkAndIncrementTierLimit(session!.user.id, session!.user.tier as "free" | "pro" | "team", "storage", sizeMb);
} catch (err) {
if (err instanceof TierLimitError) {
return NextResponse.json({ error: "Storage limit reached for your tier" }, { status: 403 });
apps/web/components/admin/create-user-dialog.tsx
+2 -1
View File
@@ -16,7 +16,7 @@ export function CreateUserDialog() {
const [email, setEmail] = useState("");
const [name, setName] = useState("");
const [role, setRole] = useState<"user" | "moderator" | "admin">("user");
const [tier, setTier] = useState<"free" | "pro">("free");
const [tier, setTier] = useState<"free" | "pro" | "team">("free");
const [saving, setSaving] = useState(false);
async function handleCreate() {
@@ -85,6 +85,7 @@ export function CreateUserDialog() {
<SelectContent>
<SelectItem value="free">Free</SelectItem>
<SelectItem value="pro">Pro</SelectItem>
<SelectItem value="team">Team</SelectItem>
</SelectContent>
</Select>
</div>
apps/web/components/admin/invites-manager.tsx
+3 -2
View File
@@ -24,7 +24,7 @@ type Invite = {
token: string;
email: string | null;
role: "user" | "moderator" | "admin";
tier: "free" | "pro";
tier: "free" | "pro" | "team";
createdAt: string;
expiresAt: string | null;
};
@@ -33,7 +33,7 @@ export function InvitesManager({ invites, appUrl }: { invites: Invite[]; appUrl:
const router = useRouter();
const [email, setEmail] = useState("");
const [role, setRole] = useState<"user" | "moderator" | "admin">("user");
const [tier, setTier] = useState<"free" | "pro">("free");
const [tier, setTier] = useState<"free" | "pro" | "team">("free");
const [creating, setCreating] = useState(false);
const [revokeId, setRevokeId] = useState<string | null>(null);
@@ -106,6 +106,7 @@ export function InvitesManager({ invites, appUrl }: { invites: Invite[]; appUrl:
<SelectContent>
<SelectItem value="free">Free</SelectItem>
<SelectItem value="pro">Pro</SelectItem>
<SelectItem value="team">Team</SelectItem>
</SelectContent>
</Select>
</div>
apps/web/components/admin/user-editor.tsx
+3 -2
View File
@@ -15,12 +15,12 @@ import { Label } from "@/components/ui/label";
interface UserEditorProps {
userId: string;
currentRole: "user" | "moderator" | "admin";
currentTier: "free" | "pro";
currentTier: "free" | "pro" | "team";
}
export function UserEditor({ userId, currentRole, currentTier }: UserEditorProps) {
const [role, setRole] = useState<"user" | "moderator" | "admin">(currentRole);
const [tier, setTier] = useState<"free" | "pro">(currentTier);
const [tier, setTier] = useState<"free" | "pro" | "team">(currentTier);
const [saving, setSaving] = useState(false);
async function handleSave() {
@@ -68,6 +68,7 @@ export function UserEditor({ userId, currentRole, currentTier }: UserEditorProps
<SelectContent>
<SelectItem value="free">Free</SelectItem>
<SelectItem value="pro">Pro</SelectItem>
<SelectItem value="team">Team</SelectItem>
</SelectContent>
</Select>
</div>
apps/web/lib/ai/ai-error.ts
+1 -1
View File
@@ -54,7 +54,7 @@ type QuotaResult<T> = { ok: true; data: T } | { ok: false; response: NextRespons
*/
export async function withAiQuota<T>(
userId: string,
tier: "free" | "pro",
tier: "free" | "pro" | "team",
fn: () => Promise<T>,
opts?: { skipQuota?: boolean }
): Promise<QuotaResult<T>> {
apps/web/lib/changelog.ts
+8 -1
View File
@@ -1,5 +1,5 @@
// Mirrors CHANGELOG.md at the repo root — update both together.
export const APP_VERSION = "0.43.0";
export const APP_VERSION = "0.44.0";
export type ChangelogEntry = {
version: string;
@@ -11,6 +11,13 @@ export type ChangelogEntry = {
};
export const CHANGELOG: ChangelogEntry[] = [
{
version: "0.44.0",
date: "2026-07-17 16:15",
added: [
"New \"Team\" billing tier, above Pro — higher AI-call, recipe, and storage limits, editable from Admin > Tiers like the existing tiers. (Moderator/admin remain separate account roles, unrelated to billing tier — unchanged by this.)",
],
},
{
version: "0.43.0",
date: "2026-07-17 15:45",
apps/web/lib/invites.ts
+1 -1
View File
@@ -27,7 +27,7 @@ export async function createInvite(opts: {
createdById: string;
email?: string | null;
role?: "user" | "moderator" | "admin";
tier?: "free" | "pro";
tier?: "free" | "pro" | "team";
expiresInDays?: number | null;
}) {
const [invite] = await db
apps/web/lib/openapi.ts
+6 -6
View File
@@ -685,14 +685,14 @@ export function generateOpenApiSpec(): object {
const InviteRef = registry.register("Invite", z.object({
id: z.string(), token: z.string(), email: z.string().nullable(),
role: z.enum(["user", "moderator", "admin"]), tier: z.enum(["free", "pro"]),
role: z.enum(["user", "moderator", "admin"]), tier: z.enum(["free", "pro", "team"]),
createdById: z.string(), createdAt: z.string().datetime(),
expiresAt: z.string().datetime().nullable(), usedAt: z.string().datetime().nullable(),
usedById: z.string().nullable(),
}));
const CreateInviteRef = registry.register("CreateInvite", z.object({
email: z.string().optional(), role: z.enum(["user", "moderator", "admin"]).default("user"),
tier: z.enum(["free", "pro"]).default("free"), expiresInDays: z.number().default(7),
tier: z.enum(["free", "pro", "team"]).default("free"), expiresInDays: z.number().default(7),
}));
const AdminReportRef = registry.register("AdminReport", z.object({
@@ -734,20 +734,20 @@ export function generateOpenApiSpec(): object {
storageMb: z.number().int().optional(), maxPublicRecipes: z.number().int().optional(),
}).describe("Each field must be a non-negative integer, or -1 for unlimited."));
const TierDefinitionRef = registry.register("TierDefinition", z.object({
tier: z.enum(["free", "pro"]), maxRecipes: z.number().int(), aiCallsPerMonth: z.number().int(),
tier: z.enum(["free", "pro", "team"]), maxRecipes: z.number().int(), aiCallsPerMonth: z.number().int(),
storageMb: z.number().int(), maxPublicRecipes: z.number().int(),
}));
const AdminCreateUserBodyRef = registry.register("AdminCreateUserBody", z.object({
email: z.string(), name: z.string(), role: z.enum(["user", "moderator", "admin"]).default("user"),
tier: z.enum(["free", "pro"]).default("free"),
tier: z.enum(["free", "pro", "team"]).default("free"),
}));
const AdminCreatedUserRef = registry.register("AdminCreatedUser", z.object({
user: z.object({ id: z.string(), email: z.string(), name: z.string(), role: z.string(), tier: z.string() }),
}));
const AdminUpdateUserBodyRef = registry.register("AdminUpdateUserBody", z.object({
role: z.enum(["user", "moderator", "admin"]).optional(), tier: z.enum(["free", "pro"]).optional(),
role: z.enum(["user", "moderator", "admin"]).optional(), tier: z.enum(["free", "pro", "team"]).optional(),
}));
const AdminUpdatedUserRef = registry.register("AdminUpdatedUser", z.object({
user: z.object({ id: z.string(), role: z.string(), tier: z.string() }),
@@ -758,7 +758,7 @@ export function generateOpenApiSpec(): object {
aiCallsUsed: z.number().int(), recipeCount: z.number().int(), storageUsedMb: z.number().int(),
}));
const tierParam = z.object({ tier: z.enum(["free", "pro"]) });
const tierParam = z.object({ tier: z.enum(["free", "pro", "team"]) });
registry.registerPath({ method: "get", path: "/api/v1/admin/invites", summary: "List invites", description: "Admin only.", security: adminSecurity, responses: { 200: { description: "Invites", content: { "application/json": { schema: z.object({ invites: z.array(InviteRef) }) } } }, 403: { description: "Forbidden", content: { "application/json": { schema: ApiErrorRef } } } } });
registry.registerPath({ method: "post", path: "/api/v1/admin/invites", summary: "Create an invite", description: "Admin only.", security: adminSecurity, request: { body: { content: { "application/json": { schema: CreateInviteRef } }, required: true } }, responses: { 200: { description: "Created", content: { "application/json": { schema: z.object({ invite: InviteRef }) } } }, 400: { description: "Invalid role or tier", content: { "application/json": { schema: ApiErrorRef } } }, 403: { description: "Forbidden", content: { "application/json": { schema: ApiErrorRef } } } } });
apps/web/lib/tiers.ts
+2 -2
View File
@@ -35,12 +35,12 @@ export class TierLimitError extends Error {
*/
export async function checkAndIncrementTierLimit(
userId: string,
fallbackTier: "free" | "pro",
fallbackTier: "free" | "pro" | "team",
key: "recipe" | "aiCall" | "storage",
amount = 1
): Promise<void> {
const [dbUser] = await db.select({ tier: users.tier }).from(users).where(eq(users.id, userId));
const userTier = (dbUser?.tier as "free" | "pro" | undefined) ?? fallbackTier;
const userTier = (dbUser?.tier as "free" | "pro" | "team" | undefined) ?? fallbackTier;
const [tierDef] = await db
.select()
apps/web/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@epicure/web",
"version": "0.43.0",
"version": "0.44.0",
"private": true,
"scripts": {
"dev": "next dev",