@odla-ai/chapter 0.47.7 → 0.47.9

package/dist/worker/index.js

@@ -1495,12 +1495,12 @@ function validateControlledApplication(chapter, document) {
   return [...document.application.required, ...document.application.optional].filter((field) => !declared.has(field)).map((field) => `document.application field "${field}" is not declared by this chapter schema`);
 }
 function groupAttrs(document) {
-  const first4 = [...document.tiers].filter((tier) => tier.available).sort((a, b) => a.sortOrder - b.sortOrder)[0];
+  const first5 = [...document.tiers].filter((tier) => tier.available).sort((a, b) => a.sortOrder - b.sortOrder)[0];
   const firstPaid = [...document.tiers].find((tier) => tier.available && tier.priceCents > 0);
   return {
-    ...first4 ? { standardPriceCents: first4.priceCents } : {},
-    currency: first4?.currency ?? "usd",
-    interval: first4?.interval ?? "year",
+    ...first5 ? { standardPriceCents: first5.priceCents } : {},
+    currency: first5?.currency ?? "usd",
+    interval: first5?.interval ?? "year",
     foundingDiscountCents: 0,
     ...firstPaid?.stripePriceId ? { stripePriceId: firstPaid.stripePriceId } : {},
     ...document.policy ?? {},
@@ -4468,12 +4468,130 @@ async function resolveStripeWebhookSecret(db, runtime) {
 
 // src/payments-route-support.ts
 var paymentErrorCode = (error) => error && typeof error === "object" && typeof error.code === "string" ? error.code : "unknown";
-function paymentLineItems(group) {
+function paymentLineItems(group, tier) {
   const standard = Number(group.standardPriceCents ?? 0);
   const discount = Number(group.foundingDiscountCents ?? 0);
+  const legacyTier = !tier || tier.id === "standard" && tier.priceCents === standard && tier.stripePriceId === group.stripePriceId;
+  if (!legacyTier) {
+    return { standardCents: tier.priceCents, discountCents: 0, dueTodayCents: tier.priceCents };
+  }
   return { standardCents: standard, discountCents: discount, dueTodayCents: standard - discount };
 }
 
+// src/subscription-checkout.ts
+var first3 = (value) => Array.isArray(value) ? value[0] : void 0;
+function mismatch() {
+  const error = new Error("subscription checkout intent does not match this checkout");
+  error.code = "checkout_intent_mismatch";
+  throw error;
+}
+function intentAttrs(input) {
+  return {
+    id: input.applicationId,
+    applicationId: input.applicationId,
+    appId: input.appId,
+    chapterId: input.chapterId,
+    environment: input.environment,
+    ...input.runtime ? { runtime: input.runtime } : {},
+    groupId: input.groupId,
+    tierId: input.tierId,
+    priceId: input.priceId,
+    priceCents: input.priceCents,
+    currency: input.currency,
+    interval: input.interval,
+    purchaserEmailNormalized: input.emailNormalized,
+    ...input.existingCustomerId ? { requestedCustomerId: input.existingCustomerId } : {},
+    status: "created",
+    createdAt: input.now,
+    updatedAt: input.now
+  };
+}
+function matchesIntent(stored, expected) {
+  return [
+    "id",
+    "applicationId",
+    "appId",
+    "chapterId",
+    "environment",
+    "runtime",
+    "groupId",
+    "tierId",
+    "priceId",
+    "priceCents",
+    "currency",
+    "interval",
+    "purchaserEmailNormalized",
+    "requestedCustomerId"
+  ].every((key) => stored[key] === expected[key]);
+}
+async function loadIntent(db, id) {
+  return first3((await db.query({
+    subscriptionCheckoutIntents: { $: { where: { id }, limit: 1 } }
+  })).subscriptionCheckoutIntents);
+}
+async function startSubscriptionCheckout(db, provider, input) {
+  const expected = intentAttrs(input);
+  let stored = await loadIntent(db, input.applicationId);
+  if (!stored) {
+    const write = await db.transact([{
+      t: "update",
+      ns: "subscriptionCheckoutIntents",
+      id: input.applicationId,
+      attrs: expected
+    }], {
+      mutationId: `subscription-checkout-intent:${input.applicationId}`,
+      guards: [{ ns: "subscriptionCheckoutIntents", id: input.applicationId, exists: false }]
+    });
+    stored = write.duplicate ? await loadIntent(db, input.applicationId) : expected;
+  }
+  if (!stored || !matchesIntent(stored, expected)) mismatch();
+  if (stored.status !== "created" && stored.status !== "checkout_ready") mismatch();
+  const result = await provider.createSubscription({
+    appId: input.appId,
+    chapterId: input.chapterId,
+    environment: input.environment,
+    ...input.runtime ? { runtime: input.runtime } : {},
+    applicationId: input.applicationId,
+    groupId: input.groupId,
+    email: input.email,
+    name: input.name,
+    priceId: input.priceId,
+    existingCustomerId: typeof stored.providerCustomerId === "string" ? stored.providerCustomerId : input.existingCustomerId
+  });
+  if (stored.providerCustomerId && stored.providerCustomerId !== result.customerId || stored.providerSubscriptionId && stored.providerSubscriptionId !== result.subscriptionId) mismatch();
+  await db.transact([
+    {
+      t: "update",
+      ns: "subscriptionCheckoutIntents",
+      id: input.applicationId,
+      attrs: {
+        status: "checkout_ready",
+        providerCustomerId: result.customerId,
+        providerSubscriptionId: result.subscriptionId,
+        updatedAt: input.now
+      }
+    },
+    {
+      t: "update",
+      ns: "applications",
+      id: input.applicationId,
+      attrs: {
+        stripeCustomerId: result.customerId,
+        stripeSubscriptionId: result.subscriptionId,
+        ...input.runtime ? { stripeRuntime: input.runtime } : {},
+        refundPolicyAckAt: input.now
+      }
+    }
+  ], {
+    mutationId: `subscription-checkout-ready:${input.applicationId}:${result.subscriptionId}`,
+    guards: [
+      { ns: "subscriptionCheckoutIntents", id: input.applicationId, exists: true, equals: { status: stored.status } },
+      { ns: "applications", id: input.applicationId, exists: true, equals: { status: "submitted" } }
+    ]
+  });
+  return result;
+}
+
 // src/member-system-contract.ts
 function classifyMemberStripeEvent(identity, target, hasProvenLegacyLocalLink) {
   const keys = ["appId", "environment", "dataEnvironment", "runtime", "chapterId"];
@@ -4642,35 +4760,29 @@ async function startSubscription(req, env, ctx) {
   const provider = createStripeProvider({ secretKey });
   let result;
   try {
-    result = await provider.createSubscription({
+    result = await startSubscriptionCheckout(db, provider, {
       appId: env.ODLA_APP_ID,
       chapterId: ctx.chapter.id,
       environment: env.ODLA_ENV,
       runtime: stripeRuntimeIdentity(env.ODLA_RUNTIME),
       applicationId,
       groupId: String(group.id),
+      tierId: tier.id,
+      priceCents: tier.priceCents,
+      currency: tier.currency ?? String(group.currency ?? "usd"),
+      interval: tier.interval ?? (group.interval === "month" ? "month" : "year"),
       email: String(app.email ?? ""),
+      emailNormalized: normalizeChapterEmail(String(app.email ?? "")),
       name: `${app.firstName ?? ""} ${app.lastName ?? ""}`.trim(),
       priceId: String(priceId),
-      existingCustomerId: typeof app.stripeCustomerId === "string" ? app.stripeCustomerId : void 0
+      existingCustomerId: typeof app.stripeCustomerId === "string" ? app.stripeCustomerId : void 0,
+      now: Date.now()
     });
   } catch (err) {
-    return json({ error: "payment setup failed", code: paymentErrorCode(err) }, 502);
+    const code = paymentErrorCode(err);
+    return json({ error: "payment setup failed", code }, code === "checkout_intent_mismatch" ? 409 : 502);
   }
-  await db.transact([
-    {
-      t: "update",
-      ns: "applications",
-      id: applicationId,
-      attrs: {
-        stripeCustomerId: result.customerId,
-        stripeSubscriptionId: result.subscriptionId,
-        stripeRuntime: stripeRuntimeIdentity(env.ODLA_RUNTIME),
-        refundPolicyAckAt: Date.now()
-      }
-    }
-  ]);
-  return json({ clientSecret: result.clientSecret, publishableKey: group.stripePublishableKey ?? null, lineItems: paymentLineItems(group) });
+  return json({ clientSecret: result.clientSecret, publishableKey: group.stripePublishableKey ?? null, lineItems: paymentLineItems(group, tier) });
 }
 async function ingestWebhook(req, env, ctx) {
   const db = ctx.makeDb(env);
@@ -4782,18 +4894,18 @@ var handlePayments = async (req, url, env, ctx) => {
 };
 
 // src/worker-routes-gifts.ts
-var first3 = (value) => Array.isArray(value) ? value[0] : void 0;
+var first4 = (value) => Array.isArray(value) ? value[0] : void 0;
 var rows2 = (value) => Array.isArray(value) ? value : [];
 var invalid = () => json({ error: "gift code is invalid or unavailable" }, 400);
 var userFor = async (req, env, ctx) => {
   const user = await ctx.verifyUser(req, env);
   return user?.email ? user : null;
 };
-var loadClaim = async (db, id) => first3((await db.query({ giftClaims: { $: { where: { id }, limit: 1 } } })).giftClaims);
+var loadClaim = async (db, id) => first4((await db.query({ giftClaims: { $: { where: { id }, limit: 1 } } })).giftClaims);
 async function consumeRateLimit(db, chapterId, requester, now) {
   const bucket = await giftRequesterBucket(chapterId, requester);
   const id = `gift-rate:${chapterId}:${bucket}`;
-  const current = first3((await db.query({ giftRedemptionAttempts: { $: { where: { id }, limit: 1 } } })).giftRedemptionAttempts);
+  const current = first4((await db.query({ giftRedemptionAttempts: { $: { where: { id }, limit: 1 } } })).giftRedemptionAttempts);
   const within = Boolean(current && now - Number(current.windowStartedAt) < 15 * 6e4);
   const attemptCount = within ? Number(current?.attemptCount ?? 0) + 1 : 1;
   if (attemptCount > 10) return false;
@@ -4818,7 +4930,7 @@ var handleGifts = async (req, url, env, ctx) => {
       purchaserEmailNormalized: normalizeChapterEmail(user.email),
       chapterId: ctx.chapter.id
     }, limit: 200 } } });
-    const group = first3((await db.query({ groups: { $: { where: { id: ctx.chapter.id }, limit: 1 } } })).groups);
+    const group = first4((await db.query({ groups: { $: { where: { id: ctx.chapter.id }, limit: 1 } } })).groups);
     return json({
       offers: publicGiftOffers(control3?.document.giftOffers, Date.now()),
       claims: buyerGiftClaims(rows2(found.giftClaims).sort((a, b) => Number(b.createdAt) - Number(a.createdAt)), Date.now()),
@@ -4840,7 +4952,7 @@ var handleGifts = async (req, url, env, ctx) => {
     const control3 = await loadActiveSignupControl(db, ctx.chapter.id, env.ODLA_ENV);
     const offer = findGiftOffer(control3?.document.giftOffers, typeof body.offerId === "string" ? body.offerId : "", Date.now());
     if (!offer) return json({ error: "gift offer is unavailable" }, 409);
-    const group = first3((await db.query({ groups: { $: { where: { id: ctx.chapter.id }, limit: 1 } } })).groups);
+    const group = first4((await db.query({ groups: { $: { where: { id: ctx.chapter.id }, limit: 1 } } })).groups);
     const stripeSecret = await getVaultSecret(db, "stripe_secret_key");
     if (!group || !stripeSecret || typeof group.stripePublishableKey !== "string") return json({ error: "payments not configured" }, 503);
     const emailNormalized = normalizeChapterEmail(user.email);
@@ -4909,16 +5021,16 @@ var handleGifts = async (req, url, env, ctx) => {
       return invalid();
     }
     if (!/^gift1_[A-Za-z0-9_-]{43}$/.test(code) || !applicationId) return invalid();
-    const app = first3((await db.query({ applications: { $: { where: { id: applicationId }, limit: 1 } } })).applications);
+    const app = first4((await db.query({ applications: { $: { where: { id: applicationId }, limit: 1 } } })).applications);
     const emailNormalized = normalizeChapterEmail(user.email);
     if (!app || String(app.groupId ?? "") !== ctx.chapter.id || String(app.emailNormalized ?? "") !== emailNormalized || typeof app.clerkUserId === "string" && app.clerkUserId !== user.userId) return invalid();
     const codeHash = await hashGiftCode(ctx.chapter.id, code);
-    const claim = first3((await db.query({ giftClaims: { $: { where: { codeHash }, limit: 1 } } })).giftClaims);
+    const claim = first4((await db.query({ giftClaims: { $: { where: { codeHash }, limit: 1 } } })).giftClaims);
     if (!claim || claim.chapterId !== ctx.chapter.id) return invalid();
     const sameRedemption = (candidate) => candidate.status === "redeemed" && candidate.applicationId === applicationId && candidate.beneficiaryEmailNormalized === emailNormalized && candidate.beneficiaryUserId === user.userId;
     const success = async () => {
-      const current = first3((await db.query({ applications: { $: { where: { id: applicationId }, limit: 1 } } })).applications);
-      const group2 = first3((await db.query({ groups: { $: { where: { id: ctx.chapter.id }, limit: 1 } } })).groups);
+      const current = first4((await db.query({ applications: { $: { where: { id: applicationId }, limit: 1 } } })).applications);
+      const group2 = first4((await db.query({ groups: { $: { where: { id: ctx.chapter.id }, limit: 1 } } })).groups);
       const state = current && group2 ? await continueJoin(db, ctx, env, url.origin, current, group2) : null;
       return json({
         ok: true,
@@ -4937,7 +5049,7 @@ var handleGifts = async (req, url, env, ctx) => {
       return invalid();
     }
     const target = claim.target;
-    const group = first3((await db.query({ groups: { $: { where: { id: ctx.chapter.id }, limit: 1 } } })).groups);
+    const group = first4((await db.query({ groups: { $: { where: { id: ctx.chapter.id }, limit: 1 } } })).groups);
     const tier = group ? findTier(await loadTiers(db, group), typeof app.tierId === "string" ? app.tierId : null) : void 0;
     if (String(app.status ?? "") !== "submitted" || typeof app.stripeSubscriptionId === "string" || typeof app.giftClaimId === "string" || !tier || tierIsFree(tier) || target?.type !== "tier" || target.tierId !== app.tierId) return invalid();
     const redeemed = await redeemGiftClaim(db, claim, {