@odla-ai/chapter 0.40.2 → 0.40.3

package/dist/worker/index.js

@@ -1827,12 +1827,16 @@ async function notifyAdminOfApplication(db, env, chapterId, applicationId, field
 }
 
 // src/worker-routes.ts
-async function memberSessionApplication(db, chapterId, email) {
+async function memberSessionApplication(db, chapterId, identity) {
   let apps = (await db.query({ applications: { $: {
-    where: { emailNormalized: normalizeChapterEmail(email) },
+    where: { clerkUserId: identity.userId },
     limit: 20
   } } })).applications;
-  if (!apps?.length) apps = (await db.query({ applications: { $: { where: { email }, limit: 20 } } })).applications;
+  if (!apps?.length && identity.email) apps = (await db.query({ applications: { $: {
+    where: { emailNormalized: normalizeChapterEmail(identity.email) },
+    limit: 20
+  } } })).applications;
+  if (!apps?.length && identity.email) apps = (await db.query({ applications: { $: { where: { email: identity.email }, limit: 20 } } })).applications;
   const app = Array.isArray(apps) ? [...apps].sort((a, b) => Number(b.createdAt ?? 0) - Number(a.createdAt ?? 0))[0] : void 0;
   if (!app) return null;
   const meetings = (await db.query({ meetings: { $: { where: { applicationId: app.id, status: "scheduled" }, order: { createdAt: "desc" }, limit: 1 } } })).meetings;
@@ -1863,8 +1867,8 @@ var handleMe = async (req, url, env, ctx) => {
   const role = await ctx.roleFor(db, u);
   const superAdmin = await ctx.isSuperAdminEmail(db, u.email);
   const base = { authorized: isAdminRole(role, ctx.auth), role, superAdmin, email: u.email ?? null };
-  if (ctx.chapter.mode !== "chapter" || !u.email) return json(base);
-  const member = await memberSessionApplication(db, ctx.chapter.id, u.email);
+  if (ctx.chapter.mode !== "chapter") return json(base);
+  const member = await memberSessionApplication(db, ctx.chapter.id, { userId: u.userId, email: u.email });
   let privateMetadataSynced = false;
   if (member && ctx.chapter.account !== "none" && typeof member.source.clerkPrivateMetadataSyncedAt !== "number") {
     privateMetadataSynced = await syncApplicantPrivateMetadata(
@@ -6055,8 +6059,8 @@ function validateBuilderLibraryDocument(value, options = {}) {
     if (sourceType === "chapter" && (resource.scope.kind !== "chapter" || resource.scope.chapterId !== sourceAppId)) {
       errors.push(`document.resources.${resource.id}: Chapter sources may author only their own chapter scope`);
     }
-    if (sourceType === "built_not_found" && resource.scope.kind === "chapter") {
-      errors.push(`document.resources.${resource.id}: Built Not Found sources may author only built_not_found or global scope`);
+    if (sourceType === "built_not_found" && resource.scope.kind === "chapter" && !(options.allowedChapterIds ?? []).includes(resource.scope.chapterId)) {
+      errors.push(`document.resources.${resource.id}: Built Not Found may target only configured Chapters`);
     }
   }
   if (errors.length) return { ok: false, errors };
@@ -6216,12 +6220,13 @@ var handleBuilderLibraryControl = async (req, url, env, ctx) => {
   const checked = validateBuilderLibraryDocument(input.document, {
     sourceType,
     sourceAppId: verified.source.sourceId,
-    targetAppId: ctx.chapter.id
+    targetAppId: ctx.chapter.id,
+    ...ctx.chapter.mode === "chapter" ? { allowedChapterIds: [ctx.chapter.id] } : {}
   });
   if (!checked.ok) return json({ ok: false, reason: "invalid_document", errors: checked.errors }, 400);
   const document = checked.value;
-  if (ctx.chapter.mode === "chapter" && document.resources.some((resource) => resource.scope.kind !== "global")) {
-    return json({ ok: false, reason: "invalid_document", errors: ["Built Not Found may deliver only global resources to a Chapter"] }, 400);
+  if (ctx.chapter.mode === "chapter" && document.resources.some((resource) => resource.scope.kind !== "global" && (resource.scope.kind !== "chapter" || resource.scope.chapterId !== ctx.chapter.id))) {
+    return json({ ok: false, reason: "invalid_document", errors: ["Built Not Found may deliver only global or this Chapter's resources"] }, 400);
   }
   if (!document.target || document.target.environment !== env.ODLA_ENV) return json({ ok: false, reason: "wrong_environment" }, 409);
   if (!digest || await builderLibraryDigest(document) !== digest) return json({ ok: false, reason: "invalid_digest" }, 400);
@@ -6327,7 +6332,11 @@ var handleAdminBuilderLibrary = async (req, url, env, ctx) => {
       source: { type: "built_not_found", appId: ctx.chapter.id },
       resources: [...local3?.document.resources ?? [], promoted]
     };
-    const checked2 = validateBuilderLibraryDocument(document, { sourceType: "built_not_found", sourceAppId: ctx.chapter.id });
+    const checked2 = validateBuilderLibraryDocument(document, {
+      sourceType: "built_not_found",
+      sourceAppId: ctx.chapter.id,
+      allowedChapterIds: ctx.chapter.builderLibrary.sources.map((source2) => source2.sourceId)
+    });
     if (!checked2.ok) return json({ error: "promoted resource is invalid", errors: checked2.errors }, 400);
     try {
       const saved = await saveLocalBuilderLibrary(db, checked2.value, env.ODLA_ENV, expectedRevision2, now2, actorFor(user));
@@ -6342,6 +6351,7 @@ var handleAdminBuilderLibrary = async (req, url, env, ctx) => {
       local: local3 ? { revision: local3.revision, document: local3.document } : null,
       sources: controls.map(({ sourceId, revision, digest, document, receivedAt }) => ({ sourceId, revision, digest, document, receivedAt })),
       localAuthoring: ctx.chapter.builderLibrary.localAuthoring,
+      chapterTargets: ctx.chapter.mode === "hub" ? ctx.chapter.builderLibrary.sources.map((source) => ({ chapterId: source.sourceId })) : [{ chapterId: ctx.chapter.id }],
       visibility: { builtNotFoundSeesChapterSources: ctx.chapter.mode === "hub", chaptersSeeSiblingSources: false }
     });
   }
@@ -6360,7 +6370,11 @@ var handleAdminBuilderLibrary = async (req, url, env, ctx) => {
   const now = Date.now();
   const actor = actorFor(user);
   const authoritative = withLocalAuthority2(input.document, ctx.chapter.mode, ctx.chapter.id, expectedRevision + 1, now, actor, local3?.document);
-  const checked = validateBuilderLibraryDocument(authoritative, { sourceType: ctx.chapter.mode === "hub" ? "built_not_found" : "chapter", sourceAppId: ctx.chapter.id });
+  const checked = validateBuilderLibraryDocument(authoritative, {
+    sourceType: ctx.chapter.mode === "hub" ? "built_not_found" : "chapter",
+    sourceAppId: ctx.chapter.id,
+    ...ctx.chapter.mode === "hub" ? { allowedChapterIds: ctx.chapter.builderLibrary.sources.map((source) => source.sourceId) } : {}
+  });
   if (!checked.ok) return json({ error: "invalid Builder Library", errors: checked.errors }, 400);
   try {
     const saved = await saveLocalBuilderLibrary(db, checked.value, env.ODLA_ENV, expectedRevision, now, actor);