@odla-ai/chapter 0.41.1 → 0.42.0

package/dist/worker/index.d.cts

@@ -44,7 +44,7 @@ interface ChapterCopy {
         payment: TextFields<"setupFailed" | "preparing" | "pending" | "processing" | "payAndContinue" | "incomplete" | "consent">;
         done: TextFields<"label" | "calendarInvite" | "memberArea">;
         accepted: TextFields<"label" | "body">;
-        gift: TextFields<"chooseSelf" | "optionsLabel" | "label" | "body" | "save" | "rotate" | "rotateFailed">;
+        gift: TextFields<"chooseSelf" | "optionsLabel" | "label" | "body" | "save" | "rotate" | "rotateFailed" | "claimTitle" | "claimBody" | "code" | "redeem" | "redeemed" | "redeemFailed">;
     };
     members: {
         loadFailed: string;

package/dist/worker/index.d.ts

@@ -44,7 +44,7 @@ interface ChapterCopy {
         payment: TextFields<"setupFailed" | "preparing" | "pending" | "processing" | "payAndContinue" | "incomplete" | "consent">;
         done: TextFields<"label" | "calendarInvite" | "memberArea">;
         accepted: TextFields<"label" | "body">;
-        gift: TextFields<"chooseSelf" | "optionsLabel" | "label" | "body" | "save" | "rotate" | "rotateFailed">;
+        gift: TextFields<"chooseSelf" | "optionsLabel" | "label" | "body" | "save" | "rotate" | "rotateFailed" | "claimTitle" | "claimBody" | "code" | "redeem" | "redeemed" | "redeemFailed">;
     };
     members: {
         loadFailed: string;

package/dist/worker/index.js

@@ -1981,7 +1981,12 @@ var handleMember = async (req, url, env, ctx) => {
     const group = Array.isArray(groups) ? groups[0] : void 0;
     if (!group) return json({ error: "not found" }, 404);
     const state = await continueJoin(db, ctx, env, url.origin, app, group);
-    if (state) return json({ state, applicationId, ...state === "gift" ? { claimId: app.giftClaimId } : {} });
+    if (state) return json({
+      state,
+      applicationId,
+      ...state === "gift" ? { claimId: app.giftClaimId } : {},
+      ...state === "payment" && typeof app.giftOfferId === "string" ? { giftPurchase: true } : {}
+    });
     return json({ error: `application cannot resume from status "${String(app.status ?? "")}"` }, 409);
   }
   if (req.method === "POST" && url.pathname === "/api/applications") {
@@ -2030,6 +2035,7 @@ var handleMember = async (req, url, env, ctx) => {
       duplicate: result.duplicate,
       status: result.status,
       ...state ? { state } : {},
+      ...state === "payment" && requestedGiftId ? { giftPurchase: true } : {},
       // Echoed so a site can see (and assert in an integration test) whether its
       // join page actually posted the ack. Absent consent is otherwise invisible.
       disclaimerAckAt: result.disclaimerAckAt
@@ -3728,9 +3734,15 @@ async function redeemGiftClaim(db, claim, beneficiary, now) {
   const target = claim.target;
   const ops = [];
   let result;
+  let applicationGuard;
   if (target.type === "tier") {
-    const apps = (await db.query({ applications: { $: { where: { emailNormalized }, limit: 20 } } })).applications;
-    const existing = apps?.filter((row) => row.groupId === chapterId).sort((a, b) => Number(b.createdAt ?? 0) - Number(a.createdAt ?? 0))[0];
+    const apps = beneficiary.applicationId ? (await db.query({ applications: { $: { where: { id: beneficiary.applicationId }, limit: 1 } } })).applications : (await db.query({ applications: { $: { where: { emailNormalized }, limit: 20 } } })).applications;
+    const existing = beneficiary.applicationId ? apps?.[0] : apps?.filter((row) => row.groupId === chapterId).sort((a, b) => Number(b.createdAt ?? 0) - Number(a.createdAt ?? 0))[0];
+    if (beneficiary.applicationId && (!existing || String(existing.groupId ?? "") !== chapterId || String(existing.emailNormalized ?? "") !== emailNormalized || String(existing.tierId ?? "") !== target.tierId || String(existing.status ?? "") !== "submitted" || typeof existing.stripeSubscriptionId === "string" || typeof existing.giftClaimId === "string" || typeof existing.clerkUserId === "string" && existing.clerkUserId !== beneficiary.userId)) return null;
+    if (beneficiary.applicationId) applicationGuard = {
+      tierId: target.tierId,
+      ...typeof existing?.clerkUserId === "string" ? { clerkUserId: existing.clerkUserId } : {}
+    };
     const id = existing ? String(existing.id) : `gift-application:${String(claim.id)}`;
     const status = existing && existing.status !== "submitted" ? String(existing.status) : "paid_pending_vetting";
     ops.push({ t: "update", ns: "applications", id, attrs: {
@@ -3747,6 +3759,7 @@ async function redeemGiftClaim(db, claim, beneficiary, now) {
     } });
     result = { kind: "application", id };
   } else {
+    if (beneficiary.applicationId) return null;
     const id = `gift-entitlement:${String(claim.id)}`;
     ops.push({ t: "update", ns: "giftEntitlements", id, attrs: {
       id,
@@ -3770,13 +3783,27 @@ async function redeemGiftClaim(db, claim, beneficiary, now) {
     attemptCount: Number(claim.attemptCount ?? 0) + 1
   } });
   try {
+    const guards = [{ ns: "giftClaims", id: String(claim.id), exists: true, equals: {
+      status: "pending",
+      codeVersion: Number(claim.codeVersion),
+      codeHash: String(claim.codeHash)
+    } }];
+    if (beneficiary.applicationId) guards.push({
+      ns: "applications",
+      id: beneficiary.applicationId,
+      exists: true,
+      equals: {
+        status: "submitted",
+        groupId: chapterId,
+        emailNormalized,
+        tierId: applicationGuard.tierId,
+        ...applicationGuard?.clerkUserId ? { clerkUserId: applicationGuard.clerkUserId } : {}
+      },
+      absent: ["stripeSubscriptionId", "giftClaimId"]
+    });
     await db.transact(ops, {
       mutationId: `gift-redeem:${String(claim.id)}:${beneficiary.userId}`,
-      guards: [{ ns: "giftClaims", id: String(claim.id), exists: true, equals: {
-        status: "pending",
-        codeVersion: Number(claim.codeVersion),
-        codeHash: String(claim.codeHash)
-      } }]
+      guards
     });
     return result;
   } catch {
@@ -4291,15 +4318,35 @@ var handleGifts = async (req, url, env, ctx) => {
       return json({ error: "too many attempts" }, 429);
     }
     let code = "";
+    let applicationId = "";
     try {
-      code = String(JSON.parse(await req.text()).code ?? "").trim();
+      const body = JSON.parse(await req.text());
+      code = String(body.code ?? "").trim();
+      applicationId = typeof body.applicationId === "string" ? body.applicationId : "";
     } catch {
       return invalid();
     }
-    if (!/^gift1_[A-Za-z0-9_-]{43}$/.test(code)) 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 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);
     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 state = current && group2 ? await continueJoin(db, ctx, env, url.origin, current, group2) : null;
+      return json({
+        ok: true,
+        kind: "application",
+        id: applicationId,
+        applicationId,
+        ...state ? { state } : {}
+      });
+    };
+    if (sameRedemption(claim)) return success();
     if (claim.status !== "pending" || Number(claim.codeExpiresAt) <= now) {
       await db.transact([{ t: "update", ns: "giftClaims", id: String(claim.id), attrs: {
         attemptCount: Number(claim.attemptCount ?? 0) + 1,
@@ -4307,8 +4354,18 @@ var handleGifts = async (req, url, env, ctx) => {
       } }]).catch(() => void 0);
       return invalid();
     }
-    const redeemed = await redeemGiftClaim(db, claim, { email: user.email, userId: user.userId }, now);
-    return redeemed ? json({ ok: true, ...redeemed }) : invalid();
+    const target = claim.target;
+    const group = first3((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, {
+      email: user.email,
+      userId: user.userId,
+      applicationId
+    }, now);
+    if (redeemed) return success();
+    const raced = await loadClaim(db, String(claim.id));
+    return raced && sameRedemption(raced) ? success() : invalid();
   }
   return null;
 };