@odla-ai/chapter 0.38.1 → 0.39.0

package/dist/worker/index.cjs

@@ -3373,9 +3373,21 @@ function webhookMutationId(eventId) {
 function findApplicationRef(obj) {
   const metaOf = (v) => v && typeof v === "object" ? v.metadata ?? {} : {};
   const pick = (m) => typeof m.applicationId === "string" ? m.applicationId : void 0;
-  const applicationId = pick(metaOf(obj)) ?? pick(metaOf(obj.subscription_details)) ?? pick(metaOf(obj.parent?.subscription_details));
+  const candidates = [
+    metaOf(obj),
+    metaOf(obj.subscription_details),
+    metaOf(obj.parent?.subscription_details)
+  ];
+  const applicationId = candidates.map(pick).find(Boolean);
+  const appId = candidates.map((metadata) => typeof metadata.odlaAppId === "string" ? metadata.odlaAppId : void 0).find(Boolean);
+  const environment = candidates.map((metadata) => typeof metadata.odlaEnvironment === "string" ? metadata.odlaEnvironment : void 0).find(Boolean);
   const customerId = typeof obj.customer === "string" ? obj.customer : void 0;
-  return { ...applicationId ? { applicationId } : {}, ...customerId ? { customerId } : {} };
+  return {
+    ...applicationId ? { applicationId } : {},
+    ...customerId ? { customerId } : {},
+    ...appId ? { appId } : {},
+    ...environment ? { environment } : {}
+  };
 }
 function findGiftRef(obj) {
   const metaOf = (value) => value && typeof value === "object" ? value.metadata ?? {} : {};
@@ -3466,7 +3478,13 @@ function createStripeProvider(config) {
   return {
     async createSubscription(input) {
       const sk = requireSecret(secretKey);
-      const meta = { applicationId: input.applicationId, groupId: input.groupId, email: input.email };
+      const meta = {
+        applicationId: input.applicationId,
+        groupId: input.groupId,
+        email: input.email,
+        odlaAppId: input.appId,
+        odlaEnvironment: input.environment
+      };
       let customerId = input.existingCustomerId;
       if (!customerId) {
         const cust = await stripeCall(
@@ -3986,6 +4004,8 @@ async function startSubscription(req, env, ctx) {
   let result;
   try {
     result = await provider.createSubscription({
+      appId: env.ODLA_APP_ID,
+      environment: env.ODLA_ENV,
       applicationId,
       groupId: String(group.id),
       email: String(app.email ?? ""),
@@ -4015,6 +4035,10 @@ async function ingestWebhook(req, env, ctx) {
   if (!ingest.ok) return json({ error: "invalid signature" }, 400);
   const { eventId, event } = ingest;
   if (event.kind === "ignored") return json({ ok: true, ignored: event.type });
+  const identifiedEnvironment = event.appId !== void 0 || event.environment !== void 0;
+  if (env.ODLA_APP_ID && identifiedEnvironment && (event.appId !== env.ODLA_APP_ID || event.environment !== env.ODLA_ENV)) {
+    return json({ ok: true, matched: false });
+  }
   if (event.kind === "gift_paid" || event.kind === "gift_revoked") {
     const intent = await firstRow2(db, "giftPurchaseIntents", { where: { id: event.giftIntentId }, limit: 1 });
     if (!intent || intent.chapterId !== ctx.chapter.id || intent.environment !== env.ODLA_ENV) {