@frigear-nu/subscriptions 0.1.1 → 0.1.3

package/dist/runtime/app/pages/membership.vue

@@ -4,30 +4,55 @@ import SubscriptionStatus from "../components/SubscriptionStatus.vue";
 import { useSubscription } from "../composables/useSubscription";
 defineOptions({ name: "SubscriptionMembershipPage" });
 const t = useModuleT("subscriptions");
-const { isActive, cancelsAt } = useSubscription();
+const tm = useModuleT("subscriptions.menu.membership");
+const { isActive, cancelsAt, loading, loadError, refresh } = await useSubscription();
 const { loggedIn } = useUserSession();
 </script>
 
 <template>
-  <div class="flex flex-col gap-6">
-    <SubscriptionStatus v-if="isActive" />
-    <div
+  <div class="flex flex-col gap-4">
+    <PageHeading
+      :title="tm('label', 'Membership')"
+      :description="tm('description', 'Manage your plan and billing.')"
+    />
+
+    <!-- Until the subscription is known, a placeholder the size of the status card: never the "join" empty state. -->
+    <SectionCard
+      v-if="loading"
+      :title="t('status.title', 'Your membership')"
+      icon="i-lucide-credit-card"
+      loading
+    />
+    <SubscriptionStatus v-else-if="isActive" />
+    <UEmpty
+      v-else-if="loadError"
+      icon="i-lucide-circle-alert"
+      :title="t('status.loadFailed', 'Your membership could not be loaded')"
+      :description="errorMessage(loadError, '')"
+      :actions="[{ label: t('status.tryAgain', 'Try again'), icon: 'i-lucide-rotate-ccw', color: 'neutral', variant: 'outline', onClick: () => refresh() }]"
+    />
+    <SectionCard
       v-else-if="loggedIn"
-      class="flex flex-col gap-1"
+      :title="t('status.title', 'Your membership')"
+      icon="i-lucide-credit-card"
     >
-      <h2 class="text-highlighted text-lg font-semibold">
-        {{ t("status.heroTitle", "Join the team today") }}
-      </h2>
-      <p class="text-muted text-sm">
-        {{ t("status.heroDescription", "Set up your membership to get started!") }}
-      </p>
-    </div>
-    <h2
+      <UEmpty
+        variant="naked"
+        icon="i-lucide-badge-check"
+        :title="t('status.emptyTitle', 'No membership yet')"
+        :description="t('status.emptyDescription', 'Set up your membership to get started!')"
+      />
+    </SectionCard>
+
+    <SectionCard
       v-if="cancelsAt"
-      class="text-highlighted text-lg font-semibold"
+      :title="t('plans.resubscribe', 'Resubscribe')"
     >
-      {{ t("plans.resubscribe", "Resubscribe") }}
-    </h2>
-    <SubscriptionPlans confirm-change />
+      <SubscriptionPlans confirm-change />
+    </SectionCard>
+    <SubscriptionPlans
+      v-else
+      confirm-change
+    />
   </div>
 </template>

package/dist/runtime/app/pages/success.vue

@@ -2,9 +2,14 @@
 import { useSubscription } from "../composables/useSubscription";
 defineOptions({ name: "SubscriptionSuccessPage" });
 const t = useModuleT("subscriptions.success");
-const { refresh, isActive } = useSubscription();
+const { refresh, isActive } = await useSubscription();
 const { localize } = useLocaleLink();
+const tm = useModuleT("subscriptions.menu.membership");
 const membership = useRuntimeConfig().public.subscriptions?.pages?.membership;
+const breadcrumb = computed(() => [
+  ...membership ? [{ label: tm("label", "Membership"), to: localize(membership) }] : [],
+  { label: t("crumb", "Checkout complete") }
+]);
 const MAX_ATTEMPTS = 40;
 const INTERVAL_MS = 3e3;
 let stopped = false;
@@ -20,10 +25,17 @@ onMounted(async () => {
 </script>
 
 <template>
-  <UEmpty
-    :icon="isActive ? 'i-lucide-circle-check' : 'i-lucide-loader-circle'"
-    :title="t('title', 'Thank you!')"
-    :description="isActive ? t('activeBody', 'Your subscription is now active.') : t('body', 'Your subscription is being activated. This can take a few seconds.')"
-    :actions="membership ? [{ label: t('back', 'Back to membership'), to: localize(membership) }] : []"
-  />
+  <div class="flex flex-col gap-4">
+    <PageHeading
+      :title="tm('label', 'Membership')"
+      :description="tm('description', 'Manage your plan and billing.')"
+      :breadcrumb="breadcrumb"
+    />
+    <UEmpty
+      :icon="isActive ? 'i-lucide-circle-check' : 'i-lucide-loader-circle'"
+      :title="t('title', 'Thank you!')"
+      :description="isActive ? t('activeBody', 'Your membership is now active.') : t('body', 'Your membership is being activated. This can take a few seconds.')"
+      :actions="membership ? [{ label: t('back', 'Back to membership'), to: localize(membership) }] : []"
+    />
+  </div>
 </template>

package/dist/runtime/app/tabs/Membership.vue

@@ -1,4 +1,5 @@
 <script setup>
+import { subscriptionsApi } from "../../utils/api";
 defineOptions({ name: "UsersAdminMembershipTab" });
 const props = defineProps({
   user: { type: Object, required: true }
@@ -6,15 +7,16 @@ const props = defineProps({
 const emit = defineEmits(["refresh"]);
 const t = useModuleT("subscriptions.admin");
 const format = useFormat();
-const UBadge = resolveComponent("UBadge");
-const { data: history, refresh: refreshHistory, status } = useLazyFetch(
-  () => `/api/admin/users/${props.user.id}/subscriptions`,
+const StatusBadge = resolveComponent("StatusBadge");
+const { data: history, refresh: refreshHistory, status, error } = useLazyFetch(
+  () => subscriptionsApi.admin.history(props.user.id),
   { key: () => `admin-subscriptions-${props.user.id}` }
 );
-const date = (value) => format.date(value) || "\u2013";
+const loading = computed(() => status.value === "pending" && !history.value);
+const date = (value) => format.date(value) || emptyCell();
 const columns = computed(() => [
   { accessorKey: "planKey", header: t("history.plan", "Plan"), cell: ({ row }) => row.original.planKey ?? row.original.priceId },
-  { accessorKey: "status", header: t("history.status", "Status"), cell: ({ row }) => h(UBadge, { label: row.original.status, variant: "subtle", color: statusColor(row.original.status) }) },
+  { accessorKey: "status", header: t("history.status", "Status"), cell: ({ row }) => h(StatusBadge, { status: row.original.status }) },
   { accessorKey: "source", header: t("history.source", "Source"), cell: ({ row }) => row.original.source === "manual" ? t("free", "Free of charge") : t("paid", "Paid (Stripe)") },
   { accessorKey: "currentPeriodStart", header: t("history.started", "Started"), cell: ({ row }) => date(row.original.currentPeriodStart) },
   { accessorKey: "currentPeriodEnd", header: t("history.periodEnd", "Period end"), cell: ({ row }) => date(row.original.currentPeriodEnd) },
@@ -35,24 +37,32 @@ async function changed() {
       />
     </SectionCard>
 
-    <SectionCard
+    <TableCard
       :title="t('history.title', 'Subscription history')"
-      flush
+      :loading="loading"
+      :refreshing="status === 'pending' && !loading"
     >
       <UTable
         :data="history?.subscriptions ?? []"
         :columns="columns"
-        :loading="status === 'pending'"
         :ui="tableUi({ tr: '' })"
       >
         <template #empty>
           <UEmpty
+            v-if="error"
+            variant="naked"
+            icon="i-lucide-circle-alert"
+            :title="t('history.loadFailed', 'The subscription history could not be loaded')"
+            :description="errorMessage(error, '')"
+          />
+          <UEmpty
+            v-else
             variant="naked"
             icon="i-lucide-badge-check"
             :title="t('history.empty', 'No subscriptions yet.')"
           />
         </template>
       </UTable>
-    </SectionCard>
+    </TableCard>
   </div>
 </template>

package/dist/runtime/app/widgets/MembershipSummary.vue

@@ -8,7 +8,7 @@ const tp = useModuleT("subscriptions.catalog");
 const format = useFormat();
 const { localize } = useLocaleLink();
 const { plans } = usePlans();
-const { subscription, plan, status, isActive, cancelsAt } = useSubscription();
+const { subscription, plan, isActive, cancelsAt, loading } = useSubscription();
 const membership = useRuntimeConfig().public.subscriptions?.pages?.membership;
 const planLabel = computed(() => {
   if (!plan.value) return "";
@@ -28,7 +28,7 @@ const hint = computed(() => {
     :label="t('label', 'Membership')"
     icon="i-lucide-credit-card"
     :to="membership ? localize(membership) : void 0"
-    :loading="status === 'pending' && !subscription"
+    :loading="loading"
     :value="isActive ? planLabel : void 0"
     :hint="isActive ? hint : void 0"
     :empty="t('none', 'No active membership')"

package/dist/runtime/i18n/lang/da.json

@@ -19,7 +19,7 @@
       "confirmUpgrade": "Hvis du opgraderer, flyttes du straks til den højere plan. Resterende kredit fratrækkes, og du opkræves differencen med det samme.",
       "confirmDowngrade": "Hvis du nedgraderer, kører dit nuværende abonnement til næste forfaldsdato, hvorefter det skifter.",
       "subscribeTo": "Du abonnerer nu på:",
-      "changeTitle": "Opdatér abonnement",
+      "changeTitle": "Opdatér medlemskab",
       "checkoutTitle": "Bliv medlem",
       "confirmResume": "Dit medlemskab fornyes som hidtil."
     },
@@ -48,24 +48,28 @@
       "canceled": "Annulleret",
       "other": "Inaktiv",
       "currentPlan": "Nuværende plan",
-      "cancelling": "Abonnementet udløber",
+      "cancelling": "Medlemskabet udløber",
       "cancelsAt": "Slutter {date}",
       "renewsAutomaticallyAt": "Fornyes automatisk {date}",
       "cancel": "Opsig medlemskab",
       "changePaymentMethod": "Skift betalingsmetode",
       "free": "Gratis medlemskab",
       "freeUntil": "Gratis medlemskab til {date}",
-      "heroTitle": "Bliv en del af holdet i dag",
-      "heroDescription": "Opret dit medlemskab for at komme i gang!"
+      "emptyTitle": "Intet medlemskab endnu",
+      "emptyDescription": "Opret dit medlemskab for at komme i gang!",
+      "loadFailed": "Dit medlemskab kunne ikke indlæses",
+      "tryAgain": "Prøv igen"
     },
     "success": {
       "title": "Tak!",
-      "body": "Dit abonnement bliver aktiveret. Det kan tage et par sekunder.",
-      "activeBody": "Dit abonnement er aktiveret.",
+      "crumb": "Betaling gennemført",
+      "body": "Dit medlemskab bliver aktiveret. Det kan tage et par sekunder.",
+      "activeBody": "Dit medlemskab er aktiveret.",
       "back": "Tilbage til medlemskab"
     },
     "cancel": {
       "title": "Betaling annulleret",
+      "crumb": "Betaling annulleret",
       "body": "Der blev ikke foretaget ændringer, og du er ikke blevet opkrævet.",
       "back": "Tilbage til medlemskab"
     },
@@ -74,9 +78,9 @@
       "portal": "Kunne ikke åbne betalingsportalen."
     },
     "menu": {
-      "subscription": {
-        "label": "Abonnement",
-        "description": "Administrer dit abonnement og din betaling."
+      "membership": {
+        "label": "Medlemskab",
+        "description": "Administrer dit medlemskab og din betaling."
       }
     },
     "admin": {
@@ -102,11 +106,12 @@
       "linkHint": "Linket er gyldigt i 24 timer.",
       "paidHint": "Betalte abonnementer administreres i Stripe.",
       "error": "Noget gik galt.",
-      "tab": "Abonnement",
+      "tab": "Medlemskab",
       "membership": "Medlemskab",
-      "currentSubscription": "Nuværende abonnement",
+      "currentSubscription": "Nuværende medlemskab",
       "history": {
         "title": "Abonnementshistorik",
+        "loadFailed": "Abonnementshistorikken kunne ikke hentes",
         "empty": "Ingen abonnementer endnu.",
         "plan": "Plan",
         "status": "Status",

package/dist/runtime/i18n/lang/en.json

@@ -19,7 +19,7 @@
       "confirmUpgrade": "If you upgrade, you are moved to the higher plan immediately. Any remaining credit is deducted and you are charged the difference right away.",
       "confirmDowngrade": "If you downgrade, your current subscription runs until the next due date, then switches.",
       "subscribeTo": "You will now subscribe to:",
-      "changeTitle": "Update subscription",
+      "changeTitle": "Update membership",
       "checkoutTitle": "Get a membership",
       "confirmResume": "Your membership will keep renewing as before."
     },
@@ -35,9 +35,9 @@
       "quarter": "quarter"
     },
     "status": {
-      "loading": "Loading subscription…",
-      "title": "Your subscription",
-      "none": "You do not have an active subscription.",
+      "loading": "Loading membership…",
+      "title": "Your membership",
+      "none": "You do not have an active membership.",
       "renews": "Renews on {date}",
       "cancels": "Ends on {date}",
       "manage": "Manage billing",
@@ -48,24 +48,28 @@
       "canceled": "Canceled",
       "other": "Inactive",
       "currentPlan": "Current plan",
-      "cancelling": "Subscription is ending",
+      "cancelling": "Membership is ending",
       "cancelsAt": "Ending at {date}",
       "renewsAutomaticallyAt": "Renews automatically on {date}",
       "cancel": "Cancel membership",
       "changePaymentMethod": "Change payment method",
       "free": "Free membership",
       "freeUntil": "Free membership until {date}",
-      "heroTitle": "Join the team today",
-      "heroDescription": "Set up your membership to get started!"
+      "emptyTitle": "No membership yet",
+      "emptyDescription": "Set up your membership to get started!",
+      "loadFailed": "Your membership could not be loaded",
+      "tryAgain": "Try again"
     },
     "success": {
       "title": "Thank you!",
-      "body": "Your subscription is being activated. This can take a few seconds.",
-      "activeBody": "Your subscription is now active.",
+      "crumb": "Checkout complete",
+      "body": "Your membership is being activated. This can take a few seconds.",
+      "activeBody": "Your membership is now active.",
       "back": "Back to membership"
     },
     "cancel": {
       "title": "Checkout canceled",
+      "crumb": "Checkout canceled",
       "body": "No changes were made and you have not been charged.",
       "back": "Back to membership"
     },
@@ -74,8 +78,8 @@
       "portal": "Failed to open the billing portal."
     },
     "menu": {
-      "subscription": {
-        "label": "Subscription",
+      "membership": {
+        "label": "Membership",
         "description": "Manage your plan and billing."
       }
     },
@@ -102,11 +106,12 @@
       "linkHint": "The link is valid for 24 hours.",
       "paidHint": "Paid subscriptions are managed in Stripe.",
       "error": "Something went wrong.",
-      "tab": "Subscription",
+      "tab": "Membership",
       "membership": "Membership",
-      "currentSubscription": "Current subscription",
+      "currentSubscription": "Current membership",
       "history": {
         "title": "Subscription history",
+        "loadFailed": "The subscription history could not be loaded",
         "empty": "No subscriptions yet.",
         "plan": "Plan",
         "status": "Status",

package/dist/runtime/menus.js

@@ -3,11 +3,11 @@ export default defineMenuSource(() => {
   const config = useRuntimeConfig().public.subscriptions;
   if (config?.pages?.membership) {
     extendMenuItem("account", defineMenuItem({
-      id: "subscription",
-      label: "Subscription",
-      labelKey: "subscriptions.menu.subscription.label",
+      id: "membership",
+      label: "Membership",
+      labelKey: "subscriptions.menu.membership.label",
       description: "Manage your plan and billing.",
-      descriptionKey: "subscriptions.menu.subscription.description",
+      descriptionKey: "subscriptions.menu.membership.description",
       icon: "i-lucide-credit-card",
       to: config.pages.membership,
       order: 15

package/dist/runtime/server/bootstrap/my-subscriptions.d.ts

@@ -0,0 +1,7 @@
+import type { H3Event } from 'h3';
+import type { MeResponse } from '../../../types.js';
+/**
+ * The caller's subscriptions: the body of `GET /api/subscriptions/me` and the account bootstrap's `subscriptions:me`
+ * (the key `useSubscription()` reads), so both always return the same thing.
+ */
+export default function mySubscriptions(event: H3Event): Promise<MeResponse>;

package/dist/runtime/server/bootstrap/my-subscriptions.js

@@ -0,0 +1,4 @@
+export default async function mySubscriptions(event) {
+  const user = await requireUser(event, { scopes: ["subscriptions:read"] });
+  return listUserSubscriptions(user.id);
+}

package/dist/runtime/server/routes/admin/{subscription.delete.js → membership.delete.js}

@@ -1,5 +1,6 @@
 import { db, schema } from "@nuxthub/db";
 import { and, eq, isNull } from "drizzle-orm";
+import { noContent, notFound } from "@frigear-nu/module-kit/server";
 export default defineEventHandler(async (event) => {
   const { target } = await loadUsersAdminTarget(event, "update");
   const revoked = await db.update(schema.subscriptions).set({ status: "canceled", endedAt: /* @__PURE__ */ new Date() }).where(and(
@@ -8,7 +9,7 @@ export default defineEventHandler(async (event) => {
     isNull(schema.subscriptions.endedAt)
   )).returning({ id: schema.subscriptions.id });
   if (!revoked.length) {
-    throw createError({ statusCode: 404, statusMessage: "The user has no free membership to revoke." });
+    throw notFound("The user has no free membership to revoke.");
   }
-  return { revoked: revoked.length };
+  return noContent(event);
 });

package/dist/runtime/server/routes/admin/{subscription.get.js → membership.get.js}

@@ -1,7 +1,7 @@
+import { isoDate } from "@frigear-nu/module-kit/server";
 export default defineEventHandler(async (event) => {
   const { target } = await loadUsersAdminTarget(event, "view");
   const current = currentEntitledRow(await listUserSubscriptionRows(target.id));
-  const iso = (date) => date ? date.toISOString() : null;
   const plans = useRuntimeConfig().subscriptions?.plans ?? {};
   return {
     plans: Object.entries(plans).map(([key, plan]) => ({ key, label: plan.label ?? key, rank: plan.rank })).sort((a, b) => a.rank - b.rank),
@@ -10,7 +10,7 @@ export default defineEventHandler(async (event) => {
       planKey: current.planKey,
       status: current.status,
       source: current.source === "manual" ? "manual" : "stripe",
-      currentPeriodEnd: iso(current.currentPeriodEnd),
+      currentPeriodEnd: isoDate(current.currentPeriodEnd),
       cancelAtPeriodEnd: current.cancelAtPeriodEnd
     } : null
   };

package/dist/runtime/server/routes/admin/{subscription.post.js → membership.post.js}

@@ -1,34 +1,29 @@
 import { db, schema } from "@nuxthub/db";
 import { and, eq, isNull } from "drizzle-orm";
 import { z } from "zod";
+import { badRequest, conflict, created } from "@frigear-nu/module-kit/server";
 const bodySchema = z.object({
   planKey: z.string().min(1),
-  /** Optional end of the free membership (ISO date); the grant is open-ended without it. */
-  endsAt: z.string().nullish()
+  /** Optional end of the free membership (ISO date, in the future); the grant is open-ended without it. */
+  endsAt: z.coerce.date().refine((date) => date.getTime() > Date.now(), "The end date must be in the future.").nullish()
 });
 export default defineEventHandler(async (event) => {
   const { target } = await loadUsersAdminTarget(event, "update");
   const body = await readValidatedBody(event, bodySchema.parse);
   const plans = useRuntimeConfig().subscriptions?.plans ?? {};
   if (Object.keys(plans).length && !plans[body.planKey]) {
-    throw createError({ statusCode: 400, statusMessage: "Unknown plan." });
-  }
-  let endsAt = null;
-  if (body.endsAt) {
-    endsAt = new Date(body.endsAt);
-    if (Number.isNaN(endsAt.getTime()) || endsAt.getTime() <= Date.now()) {
-      throw createError({ statusCode: 400, statusMessage: "The end date must be in the future." });
-    }
+    throw badRequest("Unknown plan.");
   }
+  const endsAt = body.endsAt ?? null;
   const rows = await listUserSubscriptionRows(target.id);
   const current = currentEntitledRow(rows);
   if (current && current.source !== "manual") {
-    throw createError({ statusCode: 409, statusMessage: "The user already has a paid subscription." });
+    throw conflict("The user already has a paid subscription.");
   }
   const now = /* @__PURE__ */ new Date();
   await db.update(schema.subscriptions).set({ status: "canceled", endedAt: now }).where(and(eq(schema.subscriptions.userId, target.id), eq(schema.subscriptions.source, "manual"), isNull(schema.subscriptions.endedAt)));
   const id = `manual_${crypto.randomUUID()}`;
-  await db.insert(schema.subscriptions).values({
+  const [row] = await db.insert(schema.subscriptions).values({
     id,
     userId: target.id,
     planKey: body.planKey,
@@ -39,6 +34,6 @@ export default defineEventHandler(async (event) => {
     currentPeriodEnd: endsAt,
     endedAt: null,
     source: "manual"
-  });
-  return { id, planKey: body.planKey, endsAt: endsAt?.toISOString() ?? null };
+  }).returning();
+  return created(event, toSubscriptionDto(row));
 });

package/dist/runtime/server/routes/admin/payment-link.post.js

@@ -1,4 +1,5 @@
 import { z } from "zod";
+import { apiError, conflict } from "@frigear-nu/module-kit/server";
 const bodySchema = z.object({
   planKey: z.string().min(1).optional(),
   priceId: z.string().min(1).optional(),
@@ -14,7 +15,7 @@ export default defineEventHandler(async (event) => {
   const stripe = useStripe();
   const current = currentEntitledRow(await listUserSubscriptionRows(target.id));
   if (current && current.source !== "manual") {
-    throw createError({ statusCode: 409, statusMessage: "The user already has a paid subscription." });
+    throw conflict("The user already has a paid subscription.");
   }
   const { priceId, planKey } = await resolveCheckoutTarget(stripe, await getResolvedPlans(), body);
   const customer = await ensureStripeCustomer(target.id);
@@ -27,7 +28,7 @@ export default defineEventHandler(async (event) => {
     client_reference_id: String(target.id),
     subscription_data: { metadata: { userId: String(target.id), ...planKey ? { planKey } : {} } }
   });
-  if (!session.url) throw createError({ statusCode: 502, statusMessage: "Stripe did not return a checkout URL." });
+  if (!session.url) throw apiError(502, "bad_gateway", "Stripe did not return a checkout URL.");
   let emailed = false;
   if (body.email) {
     const plan = (useRuntimeConfig().subscriptions?.plans ?? {})[planKey ?? ""];

package/dist/runtime/server/routes/{subscriptions → me}/checkout.post.js

@@ -1,7 +1,7 @@
 import { db, schema } from "@nuxthub/db";
 import { desc, eq } from "drizzle-orm";
 import { z } from "zod";
-import { resolveSameOriginUrl } from "@frigear-nu/stripe/utils";
+import { apiError, conflict, resolveSameOriginUrl } from "@frigear-nu/module-kit/server";
 import { LIVE_STATUSES, decideChangeKind } from "../../../utils/plans.js";
 const bodySchema = z.object({
   planKey: z.string().min(1).optional(),
@@ -10,23 +10,14 @@ const bodySchema = z.object({
   cancelUrl: z.string().optional()
 }).refine((body) => body.planKey || body.priceId, { message: "Provide `planKey` or `priceId`." });
 export default defineEventHandler(async (event) => {
-  const user = await requireUser(event, { scopes: ["subscriptions:write"] });
+  const user = await requireUser(event, { sessionOnly: true });
   const body = await readValidatedBody(event, bodySchema.parse);
-  const origin = getRequestURL(event).origin;
   const config = useRuntimeConfig();
   const pages = config.public.subscriptions?.pages ?? {};
   const configuredPlans = config.subscriptions?.plans ?? {};
   const stripe = useStripe();
-  const safeUrl = (input, fallbackPath, name) => {
-    if (input) {
-      const safe = resolveSameOriginUrl(input, origin);
-      if (!safe) throw createError({ statusCode: 400, statusMessage: `${name} must be a relative path or an URL on the same origin.` });
-      return safe;
-    }
-    return `${origin}${fallbackPath ?? pages.membership ?? "/"}`;
-  };
-  const successUrl = safeUrl(body.successUrl, pages.success, "successUrl");
-  const cancelUrl = safeUrl(body.cancelUrl, pages.cancel, "cancelUrl");
+  const successUrl = resolveSameOriginUrl(event, body.successUrl, { fallback: pages.success ?? pages.membership, name: "successUrl" });
+  const cancelUrl = resolveSameOriginUrl(event, body.cancelUrl, { fallback: pages.cancel ?? pages.membership, name: "cancelUrl" });
   const { priceId, planKey } = await resolveCheckoutTarget(stripe, await getAvailablePlans(event), body);
   const rows = await db.select().from(schema.subscriptions).where(eq(schema.subscriptions.userId, user.id)).orderBy(desc(schema.subscriptions.createdAt));
   const existing = rows.find((row) => row.source !== "manual" && LIVE_STATUSES.includes(row.status) && !row.endedAt);
@@ -35,7 +26,7 @@ export default defineEventHandler(async (event) => {
     return { updated: true, kind: "resume" };
   }
   if (existing?.priceId === priceId) {
-    throw createError({ statusCode: 409, statusMessage: "You are already subscribed to this price." });
+    throw conflict("You are already subscribed to this price.");
   }
   const kind = existing ? decideChangeKind(existing.planKey ? configuredPlans[existing.planKey]?.rank : null, planKey ? configuredPlans[planKey].rank : Number.POSITIVE_INFINITY) : "checkout";
   const hookContext = {
@@ -65,7 +56,7 @@ export default defineEventHandler(async (event) => {
   }
   const customer = await ensureStripeCustomer(user.id);
   const session = await stripe.checkout.sessions.create({ ...hookContext.params, customer });
-  if (!session.url) throw createError({ statusCode: 502, statusMessage: "Stripe did not return a checkout URL." });
+  if (!session.url) throw apiError(502, "bad_gateway", "Stripe did not return a checkout URL.");
   return { url: session.url };
 });
 async function resumeSubscription(stripe, subscriptionId) {
@@ -77,7 +68,7 @@ async function resumeSubscription(stripe, subscriptionId) {
 async function upgradeSubscription(stripe, subscriptionId, priceId) {
   const subscription = await stripe.subscriptions.retrieve(subscriptionId);
   const item = subscription.items.data[0];
-  if (!item) throw createError({ statusCode: 409, statusMessage: "The subscription has no items to change." });
+  if (!item) throw conflict("The subscription has no items to change.");
   const scheduleId = typeof subscription.schedule === "string" ? subscription.schedule : subscription.schedule?.id;
   if (scheduleId) await stripe.subscriptionSchedules.release(scheduleId);
   await stripe.subscriptions.update(subscriptionId, {
@@ -89,11 +80,11 @@ async function upgradeSubscription(stripe, subscriptionId, priceId) {
 async function scheduleDowngrade(stripe, subscriptionId, priceId) {
   const subscription = await stripe.subscriptions.retrieve(subscriptionId);
   const item = subscription.items.data[0];
-  if (!item) throw createError({ statusCode: 409, statusMessage: "The subscription has no items to change." });
+  if (!item) throw conflict("The subscription has no items to change.");
   const scheduleId = typeof subscription.schedule === "string" ? subscription.schedule : subscription.schedule?.id;
   const schedule = scheduleId ? await stripe.subscriptionSchedules.retrieve(scheduleId) : await stripe.subscriptionSchedules.create({ from_subscription: subscriptionId });
   const current = schedule.phases[0];
-  if (!current) throw createError({ statusCode: 409, statusMessage: "Could not read the current billing phase." });
+  if (!current) throw conflict("Could not read the current billing phase.");
   await stripe.subscriptionSchedules.update(schedule.id, {
     end_behavior: "release",
     phases: [

package/dist/runtime/server/routes/{subscriptions → me}/portal.post.js

@@ -1,16 +1,13 @@
 import { z } from "zod";
-import { resolveSameOriginUrl } from "@frigear-nu/stripe/utils";
+import { resolveSameOriginUrl } from "@frigear-nu/module-kit/server";
 const bodySchema = z.object({ returnUrl: z.string().optional() });
 export default defineEventHandler(async (event) => {
   const user = await requireUser(event, { sessionOnly: true });
   const { returnUrl } = await readValidatedBody(event, bodySchema.parse);
-  const origin = getRequestURL(event).origin;
-  let returnTo = `${origin}${useRuntimeConfig().public.subscriptions?.pages?.membership ?? "/"}`;
-  if (returnUrl) {
-    const safe = resolveSameOriginUrl(returnUrl, origin);
-    if (!safe) throw createError({ statusCode: 400, statusMessage: "returnUrl must be on the same origin." });
-    returnTo = safe;
-  }
+  const returnTo = resolveSameOriginUrl(event, returnUrl, {
+    fallback: useRuntimeConfig().public.subscriptions?.pages?.membership ?? "/",
+    name: "returnUrl"
+  });
   const customer = await ensureStripeCustomer(user.id);
   const session = await useStripe().billingPortal.sessions.create({ customer, return_url: returnTo });
   return { url: session.url };

package/dist/runtime/server/routes/subscriptions/me.get.js

@@ -1,4 +1,2 @@
-export default defineEventHandler(async (event) => {
-  const user = await requireUser(event, { scopes: ["subscriptions:read"] });
-  return listUserSubscriptions(user.id);
-});
+import mySubscriptions from "../../bootstrap/my-subscriptions.js";
+export default defineEventHandler(mySubscriptions);

package/dist/runtime/server/utils/checkout.js

@@ -1,22 +1,23 @@
+import { badRequest } from "@frigear-nu/module-kit/server";
 import { findPrice } from "../../utils/plans.js";
 export async function resolveCheckoutTarget(stripe, plans, body) {
   const configured = Object.keys(useRuntimeConfig().subscriptions?.plans ?? {}).length > 0;
   if (!configured) {
-    if (!body.priceId) throw createError({ statusCode: 400, statusMessage: "`priceId` is required when no plans are configured." });
+    if (!body.priceId) throw badRequest("`priceId` is required when no plans are configured.");
     const price = await stripe.prices.retrieve(body.priceId).catch(() => null);
-    if (!price?.recurring || !price.active) throw createError({ statusCode: 400, statusMessage: "Unknown or non-recurring price." });
+    if (!price?.recurring || !price.active) throw badRequest("Unknown or non-recurring price.");
     return { priceId: price.id, planKey: null };
   }
   if (body.planKey) {
     const plan = plans.find((item) => item.key === body.planKey);
-    if (!plan) throw createError({ statusCode: 400, statusMessage: "Unknown or unavailable plan." });
+    if (!plan) throw badRequest("Unknown or unavailable plan.");
     const price = body.priceId ? plan.prices.find((item) => item.id === body.priceId) : plan.prices.length === 1 ? plan.prices[0] : void 0;
     if (!price) {
-      throw createError({ statusCode: 400, statusMessage: body.priceId ? "That price does not belong to the plan." : "This plan has several prices; provide `priceId`." });
+      throw badRequest(body.priceId ? "That price does not belong to the plan." : "This plan has several prices; provide `priceId`.");
     }
     return { priceId: price.id, planKey: plan.key };
   }
   const found = findPrice(plans, body.priceId);
-  if (!found) throw createError({ statusCode: 400, statusMessage: "Unknown or unavailable price." });
+  if (!found) throw badRequest("Unknown or unavailable price.");
   return { priceId: found.price.id, planKey: found.plan.key };
 }