@odla-ai/chapter 0.40.0 → 0.40.2

package/dist/worker/index.d.cts

@@ -273,6 +273,8 @@ interface ChapterPrices {
 interface ChapterPolicy {
     disclaimerText?: string;
     refundPolicyText?: string;
+    /** Plain-language merchant identity shown immediately before payment consent. */
+    merchantDisclosureText?: string;
     trustCopy?: string;
     commitmentText?: string;
     normsText?: string;
@@ -877,6 +879,8 @@ interface SignupControlApplication {
 interface SignupControlPolicy {
     disclaimerText: string;
     refundPolicyText: string;
+    /** Plain-language merchant identity displayed before payment consent. */
+    merchantDisclosureText?: string;
     trustCopy?: string;
     commitmentText?: string;
     normsText?: string;

package/dist/worker/index.d.ts

@@ -273,6 +273,8 @@ interface ChapterPrices {
 interface ChapterPolicy {
     disclaimerText?: string;
     refundPolicyText?: string;
+    /** Plain-language merchant identity shown immediately before payment consent. */
+    merchantDisclosureText?: string;
     trustCopy?: string;
     commitmentText?: string;
     normsText?: string;
@@ -877,6 +879,8 @@ interface SignupControlApplication {
 interface SignupControlPolicy {
     disclaimerText: string;
     refundPolicyText: string;
+    /** Plain-language merchant identity displayed before payment consent. */
+    merchantDisclosureText?: string;
     trustCopy?: string;
     commitmentText?: string;
     normsText?: string;

package/dist/worker/index.js

@@ -317,6 +317,7 @@ function joinConfig(group, paymentsReady, tiers = [], conditions = {}) {
     conditions,
     disclaimerText: group.disclaimerText ?? "",
     refundPolicyText: group.refundPolicyText ?? "",
+    merchantDisclosureText: group.merchantDisclosureText ?? "",
     trustCopy: group.trustCopy ?? "",
     commitmentText: group.commitmentText ?? "",
     normsText: group.normsText ?? "",
@@ -1647,7 +1648,14 @@ async function createClerkUser(secretKey, input, fetchImpl = fetch) {
     headers: { authorization: `Bearer ${secretKey}`, "content-type": "application/json" },
     body: JSON.stringify(body)
   });
-  if (res.ok) return { ok: true, status: res.status };
+  if (res.ok) {
+    const body2 = typeof res.json === "function" ? await res.json().catch(() => null) : null;
+    return {
+      ok: true,
+      status: res.status,
+      ...typeof body2?.id === "string" && body2.id ? { userId: body2.id } : {}
+    };
+  }
   const healed = heal(res.status);
   const repair = input.repairMetadata ?? {
     ...input.publicMetadata !== void 0 ? { publicMetadata: input.publicMetadata } : {},
@@ -1697,6 +1705,34 @@ async function syncApplicantPrivateMetadata(db, chapter, applicationId, fields,
     return false;
   }
 }
+var AccountProvisioningError = class extends Error {
+  constructor(code, status) {
+    super(code);
+    this.code = code;
+    this.status = status;
+  }
+  code;
+  status;
+  name = "AccountProvisioningError";
+};
+async function provisionApplicantForRoute(db, chapter, applicationId, fields) {
+  try {
+    await provisionApplicant(db, chapter, applicationId, fields);
+    return null;
+  } catch (error) {
+    if (!(error instanceof AccountProvisioningError)) throw error;
+    return {
+      status: error.status,
+      body: {
+        error: {
+          code: error.code,
+          message: error.code === "clerk_secret_unavailable" ? "account provisioning credential is unavailable" : "account provisioning failed"
+        },
+        applicationId
+      }
+    };
+  }
+}
 async function provisionApplicant(db, chapter, applicationId, fields) {
   const email = typeof fields.email === "string" ? fields.email : "";
   if (!email) return;
@@ -1721,9 +1757,9 @@ async function provisionApplicant(db, chapter, applicationId, fields) {
   } catch {
   }
   if (chapter.account === "none") return;
+  const secret = await getVaultSecret(db, "clerk_secret_key");
+  if (!secret) throw new AccountProvisioningError("clerk_secret_unavailable", 503);
   try {
-    const secret = await getVaultSecret(db, "clerk_secret_key");
-    if (!secret) return;
     const privateMetadata = applicantPrivateMetadata(chapter, applicationId, fields);
     if (chapter.account === "create") {
       const result = await createClerkUser(secret, {
@@ -1736,11 +1772,13 @@ async function provisionApplicant(db, chapter, applicationId, fields) {
           privateMetadata: applicantPrivateMetadata(chapter, applicationId, fields, true)
         }
       });
-      if (result.ok && (!result.existed || result.refreshed)) {
-        await markPrivateMetadataSynced(db, applicationId);
+      if (!result.ok || result.existed && !result.refreshed) {
+        throw new AccountProvisioningError("clerk_account_provisioning_failed", 502);
       }
+      await markPrivateMetadataSynced(db, applicationId, result.userId);
     } else {
       const result = await createClerkInvitation(secret, { email });
+      if (!result.ok) throw new AccountProvisioningError("clerk_account_provisioning_failed", 502);
       if (result.existed) {
         const refreshed = await updateClerkUserMetadataByEmail(secret, email, {
           publicMetadata: publicProfileRemoval,
@@ -1749,7 +1787,9 @@ async function provisionApplicant(db, chapter, applicationId, fields) {
         if (refreshed) await markPrivateMetadataSynced(db, applicationId);
       }
     }
-  } catch {
+  } catch (error) {
+    if (error instanceof AccountProvisioningError) throw error;
+    throw new AccountProvisioningError("clerk_account_provisioning_failed", 502);
   }
 }
 async function notifyAdminOfApplication(db, env, chapterId, applicationId, fields) {
@@ -1973,8 +2013,9 @@ var handleMember = async (req, url, env, ctx) => {
       if (effectiveChapter.sends.adminNotification === "submit") {
         await notifyAdminOfApplication(db, env, chapter.id, result.id, parsed);
       }
-      await provisionApplicant(db, effectiveChapter, result.id, parsed);
     }
+    const provisioningFailure = await provisionApplicantForRoute(db, effectiveChapter, result.id, parsed);
+    if (provisioningFailure) return json(provisioningFailure.body, provisioningFailure.status);
     const apps = (await db.query({ applications: { $: { where: { id: result.id }, limit: 1 } } })).applications;
     const canonical2 = Array.isArray(apps) ? apps[0] : void 0;
     const groups = (await db.query({ groups: { $: { where: { id: chapter.id }, limit: 1 } } })).groups;
@@ -2325,7 +2366,14 @@ function policyOf(value, errors) {
     errors.push("document.policy must be an object");
     return void 0;
   }
-  const allowed2 = /* @__PURE__ */ new Set(["disclaimerText", "refundPolicyText", "trustCopy", "commitmentText", "normsText"]);
+  const allowed2 = /* @__PURE__ */ new Set([
+    "disclaimerText",
+    "refundPolicyText",
+    "merchantDisclosureText",
+    "trustCopy",
+    "commitmentText",
+    "normsText"
+  ]);
   unknownKeys(input, allowed2, "document.policy", errors);
   const result = {};
   for (const key of allowed2) {
@@ -4162,7 +4210,8 @@ var handleGifts = async (req, url, env, ctx) => {
     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()),
-      refundPolicyText: typeof group?.refundPolicyText === "string" ? group.refundPolicyText : ""
+      refundPolicyText: typeof group?.refundPolicyText === "string" ? group.refundPolicyText : "",
+      merchantDisclosureText: typeof group?.merchantDisclosureText === "string" ? group.merchantDisclosureText : ""
     });
   }
   if (req.method === "POST" && url.pathname === "/api/gifts/checkout") {