@odla-ai/chapter 0.48.0 → 0.48.1

package/dist/index.cjs

@@ -270,6 +270,13 @@ module.exports = __toCommonJS(src_exports);
 // src/config.ts
 var import_crm2 = require("@odla-ai/crm");
 
+// src/schema-account-policy.ts
+var chapterAccountPolicy = { attrs: {
+  id: { type: "string", unique: true, indexed: true, optional: false },
+  metadata: { type: "string", unique: false, indexed: false, optional: false },
+  roles: { type: "json", unique: false, indexed: false, optional: false }
+} };
+
 // src/member.ts
 var import_crm = require("@odla-ai/crm");
 
@@ -393,8 +400,10 @@ async function submitApplication(db, chapter, fields, opts) {
   if (fields.focus !== void 0) row2.focus = clampArray(fields.focus, app.maxArrayLen);
   if (opts.groupId) row2.groupId = opts.groupId;
   if (opts.runtime) row2.stripeRuntime = opts.runtime;
+  if (chapter.account !== "none") row2.clerkAccountPending = true;
   if (typeof fields.email === "string" && isValidEmail(fields.email.trim())) {
     row2.emailNormalized = normalizeChapterEmail(fields.email);
+    row2.signupEmailKey = row2.emailNormalized;
   }
   if (opts.admissionGrant?.decision === "waive_interview") {
     row2.admissionGrantId = opts.admissionGrant.id;
@@ -418,11 +427,21 @@ async function submitApplication(db, chapter, fields, opts) {
       consumedApplicationId: id10
     } });
   }
-  const { duplicate } = await db.transact(
-    ops,
-    opts.submissionId ? { mutationId: `join:${opts.submissionId}` } : void 0
-  );
-  return { ok: true, id: id10, duplicate, status: chapter.pipeline.initial, disclaimerAckAt: acked ? opts.now : null };
+  try {
+    const { duplicate } = await db.transact(
+      ops,
+      opts.submissionId ? { mutationId: `join:${opts.submissionId}` } : void 0
+    );
+    return { ok: true, id: id10, duplicate, status: chapter.pipeline.initial, disclaimerAckAt: acked ? opts.now : null };
+  } catch (error) {
+    if (error.code === "unique_violation") return {
+      ok: false,
+      code: "account_already_exists",
+      status: 409,
+      error: "An account or application already exists for this email. Please sign in to continue."
+    };
+    throw error;
+  }
 }
 function joinConfig(group, paymentsReady2, tiers2 = [], conditions = {}) {
   return {
@@ -497,6 +516,9 @@ var applicationAttrs = {
   refundPolicyAckAt: attr("number", { optional: true }),
   prepEmailSentAt: attr("number", { optional: true }),
   canceled: attr("boolean", { optional: true }),
+  signupEmailKey: attr("string", { unique: true, indexed: true, optional: true }),
+  clerkInvitationSentAt: attr("number", { optional: true }),
+  clerkAccountPending: attr("boolean", { optional: true }),
   emailNormalized: attr("string", { indexed: true, optional: true }),
   admissionGrantId: attr("string", { unique: true, indexed: true, optional: true }),
   admissionSource: attr("string", { indexed: true, optional: true }),
@@ -1169,6 +1191,7 @@ function chapterDb(mode, auth, includeNetworkNotes = false, application = resolv
       entities.memberContentLocal = memberContentLocal;
     }
   }
+  if (auth.source !== "table") entities.chapterAccountPolicy = chapterAccountPolicy;
   if (auth.source === "table") entities.admins = admins;
   if (auth.superAdminSource === "table") entities.superAdmins = superAdmins;
   if (includeNetworkNotes) entities.networkNotes = networkNotes;
@@ -3248,6 +3271,12 @@ function createChapterIntegration(chapter, options = {}) {
     ...emails?.debugEmail ? { debugEmail: emails.debugEmail } : {}
   });
   const seeds = [...crmDesc.seeds ?? []];
+  if (chapter.auth.source !== "table") seeds.push({
+    id: "account-policy",
+    ns: "chapterAccountPolicy",
+    key: { attr: "id", value: chapter.id },
+    attrs: { metadata: chapter.auth.source === "clerk" ? "private" : "public", roles: [...chapter.auth.ladder] }
+  });
   const group = chapter.groupSeed();
   if (group) {
     seeds.push({ id: "group", ns: "groups", key: { attr: "id", value: chapter.id }, attrs: { ...group, createdAt: now } });
@@ -7411,8 +7440,30 @@ async function stripeCall(sk, method, path, params, idempotencyKey) {
   );
 }
 
+// src/clerk-signup.ts
+async function findSignupAccount(secret, email, fetchImpl = fetch) {
+  const response = await fetchImpl(`https://api.clerk.com/v1/users?email_address=${encodeURIComponent(normalizeChapterEmail(email))}&limit=2`, {
+    headers: { authorization: `Bearer ${secret}` },
+    redirect: "manual",
+    signal: AbortSignal.timeout(5e3)
+  });
+  if (!response.ok) throw new Error("signup account lookup unavailable");
+  const users = await response.json();
+  if (!Array.isArray(users) || users.length > 1 || users.length === 1 && (typeof users[0]?.id !== "string" || !users[0].id)) {
+    throw new Error("signup account lookup unavailable");
+  }
+  return users[0] ?? null;
+}
+function belongsToSignup(account, applicationId) {
+  return typeof applicationId === "string" && applicationId.length > 0 && account.private_metadata?.applicationId === applicationId;
+}
+
 // src/clerk.ts
-var heal = (status2) => status2 === 422 ? { ok: true, status: status2, existed: true } : { ok: false, status: status2 };
+async function rejectedCreate(res) {
+  const body = typeof res.json === "function" ? await res.json().catch(() => null) : null;
+  const existed = Array.isArray(body?.errors) && body.errors.some((error) => error?.code === "form_identifier_exists" || error?.code === "duplicate_record");
+  return { ok: false, status: res.status, ...existed ? { existed: true } : {} };
+}
 function clerkInviteRequest(input) {
   return {
     path: "/v1/invitations",
@@ -7431,7 +7482,7 @@ async function createClerkInvitation(secretKey, input, fetchImpl = fetch) {
     headers: { authorization: `Bearer ${secretKey}`, "content-type": "application/json" },
     body: JSON.stringify(body)
   });
-  return res.ok ? { ok: true, status: res.status } : heal(res.status);
+  return res.ok ? { ok: true, status: res.status } : rejectedCreate(res);
 }
 function clerkUserRequest(input) {
   return {
@@ -7483,20 +7534,10 @@ async function createClerkUser(secretKey, input, fetchImpl = fetch) {
       ...typeof body2?.id === "string" && body2.id ? { userId: body2.id } : {}
     };
   }
-  const errorBody = res.status === 400 && typeof res.json === "function" ? await res.json().catch(() => null) : null;
-  const existingIdentifier = Array.isArray(errorBody?.errors) && errorBody.errors.some((error) => error.code === "form_identifier_exists");
-  const healed = existingIdentifier ? { ok: true, status: res.status, existed: true } : heal(res.status);
-  const repair = input.repairMetadata ?? {
-    ...input.publicMetadata !== void 0 ? { publicMetadata: input.publicMetadata } : {},
-    ...input.privateMetadata !== void 0 ? { privateMetadata: input.privateMetadata } : {}
-  };
-  if (!healed.existed || repair.publicMetadata === void 0 && repair.privateMetadata === void 0) return healed;
-  const userId = await existingClerkUserId(secretKey, input.email, fetchImpl).catch(() => null);
-  const refreshed = userId ? await updateClerkUserMetadata(secretKey, userId, {
-    ...repair.publicMetadata !== void 0 ? { publicMetadata: repair.publicMetadata } : {},
-    ...repair.privateMetadata !== void 0 ? { privateMetadata: repair.privateMetadata } : {}
-  }, fetchImpl).catch(() => false) : false;
-  return { ...healed, refreshed, ...refreshed && userId ? { userId } : {} };
+  const failure = await rejectedCreate(res);
+  if (!failure.existed) return failure;
+  const account = await findSignupAccount(secretKey, input.email, fetchImpl).catch(() => null);
+  return account && belongsToSignup(account, input.privateMetadata?.applicationId) ? { ok: true, status: res.status, existed: true, userId: account.id } : failure;
 }
 
 // src/clerk-roles.ts