create-ailk 0.22.0 → 0.23.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/component-catalog.json +149 -5
- package/component-catalog.md +7 -6
- package/dist/add-module.js +11 -9
- package/dist/add-route.d.ts +55 -1
- package/dist/add-route.js +294 -12
- package/dist/cli.js +27 -10
- package/dist/derive-architecture.d.ts +7 -5
- package/dist/derive-architecture.js +9 -32
- package/dist/lib/design-checks.js +4 -2
- package/dist/lib/env-catalog.js +0 -4
- package/dist/lib/npm-auth.d.ts +9 -0
- package/dist/lib/npm-auth.js +48 -0
- package/dist/lib/scaffold-render-sweep.d.ts +3 -2
- package/dist/lib/scaffold-render-sweep.js +5 -8
- package/dist/module-architecture.js +98 -10
- package/dist/paid-sections.d.ts +21 -2
- package/dist/paid-sections.js +69 -7
- package/dist/seed-flows.d.ts +4 -1
- package/dist/seed-flows.js +50 -4
- package/dist/spoke-checkout.d.ts +38 -35
- package/dist/spoke-checkout.js +66 -229
- package/dist/starter-grid.d.ts +0 -3
- package/dist/starter-grid.js +24 -14
- package/dist/surfaces.js +33 -12
- package/dist/sync-routes.d.ts +38 -1
- package/dist/sync-routes.js +184 -11
- package/dist/template-record.d.ts +1 -1
- package/dist/template-record.js +3 -2
- package/dist/update.js +10 -0
- package/package.json +3 -3
- package/site-templates/_base/content/en/NewsletterSignup/newsletter.mdx +4 -49
- package/site-templates/_base/content/en/Pricing/pricing.mdx +3 -21
- package/site-templates/marketing-site/TEMPLATE-MANIFEST.json +23 -20
- package/site-templates/marketing-site/TEMPLATE-MANIFEST.md +28 -14
- package/site-templates/marketing-site-free/TEMPLATE-MANIFEST.json +15 -39
- package/site-templates/marketing-site-free/TEMPLATE-MANIFEST.md +38 -34
- package/site-templates/marketing-site-free/content/en/NewsletterSignup/newsletter.mdx +6 -43
- package/site-templates/shapes/local-business-service/TEMPLATE-MANIFEST.json +14 -31
- package/site-templates/shapes/local-business-service/TEMPLATE-MANIFEST.md +26 -25
- package/site-templates/shapes/local-business-service/content/en/NewsletterSignup/newsletter.mdx +6 -43
- package/site-templates/shapes/organization-service/TEMPLATE-MANIFEST.json +14 -31
- package/site-templates/shapes/organization-service/TEMPLATE-MANIFEST.md +26 -25
- package/site-templates/shapes/organization-service/content/en/NewsletterSignup/newsletter.mdx +6 -43
- package/site-templates/shapes/person-service/TEMPLATE-MANIFEST.json +14 -31
- package/site-templates/shapes/person-service/TEMPLATE-MANIFEST.md +26 -25
- package/site-templates/shapes/person-service/content/en/NewsletterSignup/newsletter.mdx +6 -43
- package/templates/.env.example +9 -7
- package/templates/.github/workflows/ci.yml +13 -0
- package/templates/README.md +1 -0
- package/templates/_gitignore +4 -0
- package/templates/apps/api/.env.example +27 -0
- package/templates/apps/api/CLAUDE.md +77 -16
- package/templates/apps/api/package.json +1 -0
- package/templates/apps/api/src/__tests__/factories/in-memory-prisma.ts +2 -0
- package/templates/apps/api/src/bin/stripe-connections-rekey.ts +45 -0
- package/templates/apps/api/src/config/__tests__/stripe-connection-key.test.ts +185 -0
- package/templates/apps/api/src/config/index.ts +109 -0
- package/templates/apps/api/src/lib/__mocks__/prisma.ts +3 -0
- package/templates/apps/api/src/lib/__tests__/flow-rename-race.db.test.ts +116 -0
- package/templates/apps/api/src/lib/error-serializer.ts +74 -7
- package/templates/apps/api/src/lib/stripe.ts +74 -4
- package/templates/apps/api/src/lib/webhook-idempotency.ts +66 -2
- package/templates/apps/api/src/middleware/__tests__/rate-limit.test.ts +218 -0
- package/templates/apps/api/src/middleware/__tests__/write-budget.test.ts +174 -0
- package/templates/apps/api/src/middleware/rate-limit.ts +226 -4
- package/templates/apps/api/src/openapi/spec.ts +10 -7
- package/templates/apps/api/src/routes/billing/plan-checkout.ts +325 -0
- package/templates/apps/api/src/routes/checkout/__tests__/live-key.test.ts +11 -0
- package/templates/apps/api/src/routes/checkout/__tests__/offerings-authorization.test.ts +1300 -0
- package/templates/apps/api/src/routes/checkout/__tests__/session.test.ts +11 -0
- package/templates/apps/api/src/routes/checkout/__tests__/sessions.test.ts +49 -0
- package/templates/apps/api/src/routes/checkout/session.ts +57 -25
- package/templates/apps/api/src/routes/checkout/sessions.ts +232 -82
- package/templates/apps/api/src/routes/consent/__tests__/account.test.ts +5 -5
- package/templates/apps/api/src/routes/consent/__tests__/sign-up-rate-limit.test.ts +160 -0
- package/templates/apps/api/src/routes/consent/account.ts +4 -2
- package/templates/apps/api/src/routes/content/__tests__/get-page.test.ts +2 -2
- package/templates/apps/api/src/routes/content/__tests__/offerings.test.ts +731 -0
- package/templates/apps/api/src/routes/content/__tests__/pricing.test.ts +753 -0
- package/templates/apps/api/src/routes/content/__tests__/shown-offerings.test.ts +762 -0
- package/templates/apps/api/src/routes/content/index.ts +16 -2
- package/templates/apps/api/src/routes/content/offerings.ts +184 -0
- package/templates/apps/api/src/routes/content/pricing.ts +176 -0
- package/templates/apps/api/src/routes/content/shown-offerings.ts +229 -0
- package/templates/apps/api/src/routes/leads/index.ts +17 -14
- package/templates/apps/api/src/routes/webhooks/README.md +66 -0
- package/templates/apps/api/src/routes/webhooks/__tests__/stripe-offerings.test.ts +814 -0
- package/templates/apps/api/src/routes/webhooks/__tests__/stripe-org-billing.test.ts +80 -68
- package/templates/apps/api/src/routes/webhooks/__tests__/stripe-site-filter.test.ts +5 -5
- package/templates/apps/api/src/routes/webhooks/__tests__/stripe.test.ts +8 -2
- package/templates/apps/api/src/routes/webhooks/index.ts +23 -0
- package/templates/apps/api/src/routes/webhooks/stripe-offerings.ts +384 -0
- package/templates/apps/api/src/routes/webhooks/stripe.ts +91 -17
- package/templates/apps/api/src/server.ts +140 -51
- package/templates/apps/api/src/services/__tests__/checkout-plan.test.ts +313 -0
- package/templates/apps/api/src/services/__tests__/deliverable-fulfillment.test.ts +51 -2
- package/templates/apps/api/src/services/__tests__/keyless-workspace-predicate.test.ts +234 -0
- package/templates/apps/api/src/services/__tests__/lead-routing.test.ts +374 -44
- package/templates/apps/api/src/services/__tests__/person.test.ts +232 -1
- package/templates/apps/api/src/services/__tests__/plan-offerings.test.ts +444 -0
- package/templates/apps/api/src/services/deliverable-fulfillment.ts +13 -5
- package/templates/apps/api/src/services/entitlements.ts +157 -1
- package/templates/apps/api/src/services/lead-routing.ts +113 -58
- package/templates/apps/api/src/services/offerings/__tests__/catalog.test.ts +295 -0
- package/templates/apps/api/src/services/offerings/__tests__/checkout-session-record.test.ts +268 -0
- package/templates/apps/api/src/services/offerings/__tests__/connection.test.ts +868 -0
- package/templates/apps/api/src/services/offerings/__tests__/fixtures.ts +416 -0
- package/templates/apps/api/src/services/offerings/__tests__/org-products.test.ts +396 -0
- package/templates/apps/api/src/services/offerings/__tests__/readers.test.ts +681 -0
- package/templates/apps/api/src/services/offerings/__tests__/source.test.ts +231 -0
- package/templates/apps/api/src/services/offerings/catalog.ts +308 -0
- package/templates/apps/api/src/services/offerings/checkout-authorization.ts +385 -0
- package/templates/apps/api/src/services/offerings/checkout-session-record.ts +192 -0
- package/templates/apps/api/src/services/offerings/connection.ts +1003 -0
- package/templates/apps/api/src/services/offerings/index.ts +614 -0
- package/templates/apps/api/src/services/offerings/source.ts +140 -0
- package/templates/apps/api/src/services/offerings/store.ts +150 -0
- package/templates/apps/api/src/services/person.ts +124 -9
- package/templates/apps/api/src/services/plan-offerings.ts +96 -30
- package/templates/apps/api/src/services/public-site-resolver.ts +19 -14
- package/templates/apps/mcp/CLAUDE.md +22 -14
- package/templates/apps/mcp/__tests__/catalog-drift.test.ts +9 -4
- package/templates/apps/mcp/__tests__/get_offerings.test.ts +358 -0
- package/templates/apps/mcp/__tests__/get_pricing.test.ts +364 -0
- package/templates/apps/mcp/__tests__/http-transport.test.ts +4 -4
- package/templates/apps/mcp/__tests__/module-exclusion.test.ts +2 -2
- package/templates/apps/mcp/__tests__/server.test.ts +13 -11
- package/templates/apps/mcp/__tests__/start_purchase.test.ts +208 -12
- package/templates/apps/mcp/__tests__/tools/purchase.test.ts +11 -11
- package/templates/apps/mcp/src/lib/shown-offerings.ts +105 -0
- package/templates/apps/mcp/src/server.ts +5 -0
- package/templates/apps/mcp/src/tools/get_offerings.ts +47 -30
- package/templates/apps/mcp/src/tools/get_pricing.ts +40 -40
- package/templates/apps/mcp/src/tools/purchase.ts +30 -2
- package/templates/apps/mcp/src/workspace-server.ts +15 -0
- package/templates/apps/web/.env.example +10 -31
- package/templates/apps/web/CLAUDE.md +315 -42
- package/templates/apps/web/app/[locale]/(authed)/account/__tests__/agreements-prompt.test.tsx +3 -3
- package/templates/apps/web/app/[locale]/(authed)/account/__tests__/layout.test.tsx +3 -3
- package/templates/apps/web/app/[locale]/(authed)/account/__tests__/privacy.test.tsx +3 -3
- package/templates/apps/web/app/[locale]/careers/[slug]/[action]/page.tsx +189 -0
- package/templates/apps/web/app/[locale]/careers/[slug]/apply.actions.ts +4 -2
- package/templates/apps/web/app/[locale]/careers/[slug]/job-application-form.ts +8 -3
- package/templates/apps/web/app/[locale]/careers/[slug]/page.tsx +22 -144
- package/templates/apps/web/app/[locale]/careers/__tests__/apply.actions.test.ts +9 -0
- package/templates/apps/web/app/[locale]/careers/__tests__/careers-hub.test.tsx +172 -0
- package/templates/apps/web/app/[locale]/careers/__tests__/careers-set.test.tsx +149 -0
- package/templates/apps/web/app/[locale]/careers/__tests__/job-application-form.test.ts +22 -24
- package/templates/apps/web/app/[locale]/careers/__tests__/job-apply-page.test.tsx +140 -66
- package/templates/apps/web/app/[locale]/careers/__tests__/page-renderer-migration.test.tsx +57 -22
- package/templates/apps/web/app/[locale]/careers/page.tsx +129 -5
- package/templates/apps/web/app/[locale]/contact/__tests__/contact-magnet-page.test.tsx +119 -11
- package/templates/apps/web/app/[locale]/contact/__tests__/contact.actions.test.ts +28 -5
- package/templates/apps/web/app/[locale]/contact/contact.actions.ts +6 -2
- package/templates/apps/web/app/[locale]/contact/page.tsx +99 -92
- package/templates/apps/web/app/[locale]/flows/[slug]/FlowStepperClient.tsx +237 -5
- package/templates/apps/web/app/[locale]/flows/[slug]/__tests__/FlowStepperClient.count.test.tsx +43 -0
- package/templates/apps/web/app/[locale]/flows/[slug]/__tests__/FlowStepperClient.deliverable.test.tsx +200 -0
- package/templates/apps/web/app/[locale]/flows/[slug]/__tests__/FlowStepperClient.ending.test.tsx +197 -0
- package/templates/apps/web/app/[locale]/flows/[slug]/__tests__/magnet-page.test.tsx +430 -0
- package/templates/apps/web/app/[locale]/flows/[slug]/__tests__/two-route-tool.test.tsx +21 -9
- package/templates/apps/web/app/[locale]/flows/[slug]/magnet-page.tsx +352 -0
- package/templates/apps/web/app/[locale]/flows/[slug]/page.tsx +12 -73
- package/templates/apps/web/app/[locale]/flows/[slug]/start/page.tsx +10 -31
- package/templates/apps/web/app/[locale]/layout.tsx +55 -4
- package/templates/apps/web/app/[locale]/newsletter/__tests__/page.test.tsx +174 -104
- package/templates/apps/web/app/[locale]/newsletter/page.tsx +95 -58
- package/templates/apps/web/app/[locale]/pricing/__tests__/__snapshots__/unconnected.test.tsx.snap +7 -0
- package/templates/apps/web/app/[locale]/pricing/__tests__/offerings.test.tsx +599 -0
- package/templates/apps/web/app/[locale]/pricing/__tests__/page.test.tsx +216 -0
- package/templates/apps/web/app/[locale]/pricing/__tests__/unconnected.test.tsx +236 -0
- package/templates/apps/web/app/[locale]/pricing/page.tsx +367 -6
- package/templates/apps/web/app/[locale]/team/__tests__/team-routes.test.tsx +4 -1
- package/templates/apps/web/app/[locale]/unsubscribe/__tests__/unsubscribe-rsc-boundary.test.tsx +17 -0
- package/templates/apps/web/app/[locale]/unsubscribe/__tests__/unsubscribe.test.tsx +62 -3
- package/templates/apps/web/app/[locale]/unsubscribe/page.tsx +70 -18
- package/templates/apps/web/app/[locale]/unsubscribe/unsubscribe-button.tsx +30 -9
- package/templates/apps/web/app/api/offerings/checkout/[lookupKey]/route.ts +316 -0
- package/templates/apps/web/app/api/offerings/checkout/__tests__/route.test.ts +810 -0
- package/templates/apps/web/lib/__tests__/auth-routes.test.ts +27 -1
- package/templates/apps/web/lib/__tests__/deck-page.test.ts +2 -1
- package/templates/apps/web/lib/__tests__/in-page-magnet.test.ts +265 -0
- package/templates/apps/web/lib/__tests__/magnet-routes.test.ts +57 -0
- package/templates/apps/web/lib/__tests__/newsletter.actions.test.ts +293 -0
- package/templates/apps/web/lib/__tests__/offerings-pricing.test.ts +601 -0
- package/templates/apps/web/lib/__tests__/structured-data.test.tsx +67 -8
- package/templates/apps/web/lib/auth-routes.ts +36 -2
- package/templates/apps/web/lib/checkout-config.ts +9 -20
- package/templates/apps/web/lib/deck-page.ts +1 -0
- package/templates/apps/web/lib/deliverable-grant.ts +18 -0
- package/templates/apps/web/lib/in-page-magnet.ts +416 -0
- package/templates/apps/web/lib/magnet-routes.ts +42 -0
- package/templates/apps/web/lib/modules.generated.ts +9 -0
- package/templates/apps/web/lib/newsletter.actions.ts +202 -0
- package/templates/apps/web/lib/offerings-pricing.ts +326 -0
- package/templates/apps/web/lib/posting-title.ts +17 -0
- package/templates/apps/web/lib/sign-up-agreements.ts +4 -2
- package/templates/apps/web/messages/en.json +49 -15
- package/templates/apps/web/middleware.ts +12 -2
- package/templates/apps/web/security-headers.config.ts +17 -0
- package/templates/content/en/BlogList/blog.mdx +4 -71
- package/templates/content/en/BookCall/book-a-call.mdx +1 -41
- package/templates/content/en/BookCall/onsite-estimate.mdx +1 -17
- package/templates/content/en/BookCall/onsite-service.mdx +1 -17
- package/templates/content/en/BookCall/start-project.mdx +1 -17
- package/templates/content/en/ContactPage/contact.mdx +6 -63
- package/templates/content/en/HomePage/home.mdx +3 -21
- package/templates/database/CHANGELOG.md +31 -0
- package/templates/database/__tests__/in-page-magnets-migration.test.ts +161 -0
- package/templates/database/__tests__/offerings-checkout-session.db.test.ts +270 -0
- package/templates/database/__tests__/offerings-migration.test.ts +197 -0
- package/templates/database/__tests__/offerings-shown-price-ids-migration.test.ts +86 -0
- package/templates/database/__tests__/offerings.db.test.ts +303 -0
- package/templates/database/__tests__/seed.test.ts +31 -1
- package/templates/database/auth/schema.prisma +4 -0
- package/templates/database/config/schema.prisma +91 -0
- package/templates/database/migrations/20261020120000_offerings_data_model/migration.sql +146 -0
- package/templates/database/migrations/20261021120000_offerings_checkout_session/migration.sql +77 -0
- package/templates/database/migrations/20261022120000_in_page_magnets/migration.sql +45 -0
- package/templates/database/migrations/20261023120000_offerings_shown_price_ids/migration.sql +47 -0
- package/templates/database/migrations/20261024120000_organization_plan_checkout_session/migration.sql +16 -0
- package/templates/database/package.json +1 -1
- package/templates/database/seed.ts +30 -2
- package/versions.json +35 -35
- package/site-templates/marketing-site-free/content/en/Pricing/pricing.mdx +0 -199
- package/templates/apps/web/app/[locale]/downloads/__tests__/page-renderer-migration.test.tsx +0 -93
- package/templates/apps/web/app/[locale]/downloads/page.tsx +0 -37
- package/templates/apps/web/app/[locale]/newsletter/__tests__/newsletter.actions.test.ts +0 -139
- package/templates/apps/web/app/[locale]/newsletter/newsletter.actions.ts +0 -93
- package/templates/apps/web/app/api/checkout/[offering]/route.ts +0 -48
- package/templates/apps/web/app/api/checkout/__tests__/route.test.ts +0 -120
- package/templates/apps/web/app/api/checkout/__tests__/success-path.test.ts +0 -86
- package/templates/apps/web/app/api/webhooks/stripe/__tests__/route.test.ts +0 -92
- package/templates/apps/web/app/api/webhooks/stripe/route.ts +0 -31
- package/templates/apps/web/lib/__tests__/checkout.test.ts +0 -243
- package/templates/apps/web/lib/__tests__/meeting-slugs.test.ts +0 -120
- package/templates/apps/web/lib/checkout.ts +0 -93
- package/templates/apps/web/lib/meeting-slugs.ts +0 -63
|
@@ -0,0 +1,384 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* POST /v1/webhooks/stripe/:connectionToken — the per-Organization Stripe
|
|
3
|
+
* webhook (#8932; spec docs/specs/8932-the-per-organization-stripe-webhook-spec.md;
|
|
4
|
+
* contract docs/specs/8879-the-offerings-security-contract-key-spec.md W1,
|
|
5
|
+
* W3–W11, G5, T8).
|
|
6
|
+
*
|
|
7
|
+
* The token names ONE StripeConnection row (#8907 D11): that row's decrypted
|
|
8
|
+
* secret verifies the signature, with no env key (W3, the key-less verify),
|
|
9
|
+
* and its `organizationId` is the only Organization the event can act for —
|
|
10
|
+
* nothing in the body, query or headers changes it. The event acts only for a
|
|
11
|
+
* Checkout Session the hub's own checkout recorded (#8930's record, A11) for
|
|
12
|
+
* that Organization, whose signed `metadata.site` is the record's workspace
|
|
13
|
+
* (W5), whose paid line item is the record's Price (W6), once per session, as
|
|
14
|
+
* one lead whose offering is the record's FULL lookup key (G5) and which — for
|
|
15
|
+
* a live session — carries the held-plan marker #8793's release reads (W7).
|
|
16
|
+
*
|
|
17
|
+
* THE LADDER (D2). One handler; the first step that answers ends the request:
|
|
18
|
+
*
|
|
19
|
+
* 1 token lookup `not-found` (or a non-string param) → 404, no line
|
|
20
|
+
* 1a token lookup rejects → 503 webhook-unavailable
|
|
21
|
+
* 2 `not-configured` / `unreadable` → 503 webhook-not-configured
|
|
22
|
+
* 3 settle the signature (held as a value, as the legacy route does)
|
|
23
|
+
* 4 commerce claim `undetermined` → 503 + Retry-After
|
|
24
|
+
* 5 `unclaimed`: signed → 200 dropped; unsigned → the module-disabled 404
|
|
25
|
+
* 6 the held rejection → 400
|
|
26
|
+
* 7 W4 livemode ≠ the row's mode → 200 livemode_mismatch
|
|
27
|
+
* 8 W5 not a completed / async-paid session → 200 ignored_type
|
|
28
|
+
* 9–11 W5 the record: rejects → 503, `"unreadable"` → 500, none → 200 unrecorded
|
|
29
|
+
* 12 another Organization's record, or `metadata.site` ≠ the record's
|
|
30
|
+
* workspace → 200 foreign_organization
|
|
31
|
+
* 13 the record's mode ≠ the row's → 200 livemode_mismatch
|
|
32
|
+
* 14 W10 seen for this Organization → 200 duplicate
|
|
33
|
+
* 15 W6 a completed session not paid → 200 unpaid (seen)
|
|
34
|
+
* 16 W6 the line items cannot be read → 503 stripe-unavailable
|
|
35
|
+
* 17 W6 not exactly the record's Price → 200 offering_mismatch (seen)
|
|
36
|
+
* 18 W7 fulfil through `routeLead` → 200 fulfilled / already_fulfilled /
|
|
37
|
+
* unfulfillable (seen), else 503 fulfilment-unavailable
|
|
38
|
+
*
|
|
39
|
+
* Every 200 body is `{ received: true }` — the outcome is the log line's,
|
|
40
|
+
* never the body's, because Stripe shows the seller every response body
|
|
41
|
+
* (C1, SEC-8932-13). No non-2xx answer is ever marked seen, so Stripe's retry
|
|
42
|
+
* reaches a corrected deployment (SEC-8930-1). Dedup is this endpoint's own
|
|
43
|
+
* per-Organization store (D8), checked after attribution, so a foreign or
|
|
44
|
+
* unrecorded event is in no store at all (W10).
|
|
45
|
+
*
|
|
46
|
+
* LOGGING (W9, C6). Each line carries exactly the keys D2 names for its step:
|
|
47
|
+
* `organizationId`, `eventType`, an 8-character `eventIdPrefix` and `outcome`
|
|
48
|
+
* — never the token, the secret, a full Stripe id, the buyer's email, the
|
|
49
|
+
* lookup key, a metadata value, line-item text or an error message. Every
|
|
50
|
+
* rejection the handler awaits is caught here, so none reaches Fastify's
|
|
51
|
+
* error handler. The token never reaches a request line either: the shared
|
|
52
|
+
* path redactor (`lib/error-serializer.ts`'s `redactLogPath`, D10) replaces
|
|
53
|
+
* it whole.
|
|
54
|
+
*
|
|
55
|
+
* W11. No billing identity is bound from a connection's event: this file
|
|
56
|
+
* imports none of the legacy route's billing functions and its only write is
|
|
57
|
+
* the one lead.
|
|
58
|
+
*/
|
|
59
|
+
import type { FastifyReply, FastifyRequest } from "fastify";
|
|
60
|
+
|
|
61
|
+
import {
|
|
62
|
+
commerceDisabledResponse,
|
|
63
|
+
LICENSE_UNDETERMINED_BODY,
|
|
64
|
+
LICENSE_UNDETERMINED_RETRY_AFTER_SECONDS,
|
|
65
|
+
LICENSE_UNDETERMINED_STATUS,
|
|
66
|
+
resolveCommerceClaim,
|
|
67
|
+
} from "../../lib/require-commerce-claim.js";
|
|
68
|
+
import {
|
|
69
|
+
StripeWebhookSignatureError,
|
|
70
|
+
verifyWebhookSignatureKeyless,
|
|
71
|
+
} from "../../lib/stripe.js";
|
|
72
|
+
import {
|
|
73
|
+
hasSeenForOrganization,
|
|
74
|
+
markSeenForOrganization,
|
|
75
|
+
} from "../../lib/webhook-idempotency.js";
|
|
76
|
+
import { routeLead, type RouteLeadResult } from "../../services/lead-routing.js";
|
|
77
|
+
import {
|
|
78
|
+
readCheckoutSessionRecord,
|
|
79
|
+
type CheckoutSessionRecord,
|
|
80
|
+
} from "../../services/offerings/checkout-session-record.js";
|
|
81
|
+
import {
|
|
82
|
+
findStripeConnectionByWebhookToken,
|
|
83
|
+
stripeClientForOrganization,
|
|
84
|
+
type StripeWebhookConnection,
|
|
85
|
+
} from "../../services/offerings/connection.js";
|
|
86
|
+
|
|
87
|
+
/** A space: no `Idempotency-Key` header can carry one, so no request can pre-seed this key (NFR6). */
|
|
88
|
+
const OFFERINGS_LEAD_KEY_PREFIX = "stripe-offerings ";
|
|
89
|
+
|
|
90
|
+
/** The two session events that can fulfil (W5). */
|
|
91
|
+
const FULFILLING_EVENT_TYPES = new Set([
|
|
92
|
+
"checkout.session.completed",
|
|
93
|
+
"checkout.session.async_payment_succeeded",
|
|
94
|
+
]);
|
|
95
|
+
|
|
96
|
+
/** The server-written terms stamp the hub's checkout puts in `metadata` (#8765 D14). */
|
|
97
|
+
const TERMS_STAMP_KEY = "ailk_terms";
|
|
98
|
+
|
|
99
|
+
type VerifiedEvent = ReturnType<typeof verifyWebhookSignatureKeyless>;
|
|
100
|
+
type Connection = Extract<StripeWebhookConnection, { kind: "ok" }>;
|
|
101
|
+
|
|
102
|
+
type SettledSignature =
|
|
103
|
+
| { ok: true; event: VerifiedEvent }
|
|
104
|
+
| { ok: false; status: number; body: { error: string }; verifyThrew: boolean };
|
|
105
|
+
|
|
106
|
+
/** The fields of a signed Checkout Session this route reads — read, never trusted beyond the signature. */
|
|
107
|
+
type SessionObject = {
|
|
108
|
+
object?: unknown;
|
|
109
|
+
id?: unknown;
|
|
110
|
+
payment_status?: unknown;
|
|
111
|
+
amount_total?: unknown;
|
|
112
|
+
currency?: unknown;
|
|
113
|
+
customer_details?: { email?: unknown } | null;
|
|
114
|
+
consent?: { terms_of_service?: unknown } | null;
|
|
115
|
+
metadata?: Record<string, unknown> | null;
|
|
116
|
+
};
|
|
117
|
+
|
|
118
|
+
/** Step 3: the signature as a value, so the claim can be read before any rejection is sent (D-64). */
|
|
119
|
+
function settleSignature(request: FastifyRequest, secret: string): SettledSignature {
|
|
120
|
+
const rawBody = request.body;
|
|
121
|
+
if (!Buffer.isBuffer(rawBody)) {
|
|
122
|
+
return { ok: false, status: 400, body: { error: "invalid-request" }, verifyThrew: false };
|
|
123
|
+
}
|
|
124
|
+
const signature = request.headers["stripe-signature"];
|
|
125
|
+
if (typeof signature !== "string" || signature.length === 0) {
|
|
126
|
+
return { ok: false, status: 400, body: { error: "signature-missing" }, verifyThrew: false };
|
|
127
|
+
}
|
|
128
|
+
try {
|
|
129
|
+
return { ok: true, event: verifyWebhookSignatureKeyless(rawBody, signature, secret) };
|
|
130
|
+
} catch (err) {
|
|
131
|
+
if (err instanceof StripeWebhookSignatureError) {
|
|
132
|
+
return { ok: false, status: 400, body: { error: "signature-invalid" }, verifyThrew: true };
|
|
133
|
+
}
|
|
134
|
+
throw err;
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
|
|
138
|
+
/** The event keys every line from step 7 on carries (W9). */
|
|
139
|
+
function eventKeys(organizationId: string, event: VerifiedEvent) {
|
|
140
|
+
return {
|
|
141
|
+
organizationId,
|
|
142
|
+
eventType: event.type,
|
|
143
|
+
eventIdPrefix: event.id.slice(0, 8),
|
|
144
|
+
};
|
|
145
|
+
}
|
|
146
|
+
|
|
147
|
+
function objectOf(value: unknown): Record<string, unknown> | null {
|
|
148
|
+
return typeof value === "object" && value !== null
|
|
149
|
+
? (value as Record<string, unknown>)
|
|
150
|
+
: null;
|
|
151
|
+
}
|
|
152
|
+
|
|
153
|
+
export const stripeOfferingsWebhookHandler = async (
|
|
154
|
+
request: FastifyRequest,
|
|
155
|
+
reply: FastifyReply,
|
|
156
|
+
): Promise<void> => {
|
|
157
|
+
// ── Steps 1, 1a, 2 — the token selects the connection (W1, W2) ───────────
|
|
158
|
+
const token = (request.params as { connectionToken?: unknown } | undefined)
|
|
159
|
+
?.connectionToken;
|
|
160
|
+
let connection: StripeWebhookConnection;
|
|
161
|
+
try {
|
|
162
|
+
connection =
|
|
163
|
+
typeof token === "string"
|
|
164
|
+
? await findStripeConnectionByWebhookToken(token)
|
|
165
|
+
: { kind: "not-found" };
|
|
166
|
+
} catch {
|
|
167
|
+
request.log.error(
|
|
168
|
+
{ outcome: "connection_unavailable" },
|
|
169
|
+
"stripe offerings webhook: the connection store could not be read",
|
|
170
|
+
);
|
|
171
|
+
await reply.code(503).send({ error: "webhook-unavailable" });
|
|
172
|
+
return;
|
|
173
|
+
}
|
|
174
|
+
if (connection.kind === "not-found") {
|
|
175
|
+
await reply.code(404).send({ error: "not-found" });
|
|
176
|
+
return;
|
|
177
|
+
}
|
|
178
|
+
if (connection.kind !== "ok") {
|
|
179
|
+
request.log.warn(
|
|
180
|
+
{ organizationId: connection.organizationId, outcome: "webhook_not_configured" },
|
|
181
|
+
"stripe offerings webhook: the connection has no usable webhook secret",
|
|
182
|
+
);
|
|
183
|
+
await reply.code(503).send({ error: "webhook-not-configured" });
|
|
184
|
+
return;
|
|
185
|
+
}
|
|
186
|
+
const { organizationId } = connection;
|
|
187
|
+
|
|
188
|
+
// ── Steps 3–6 — signature first, claim second (D-64) ─────────────────────
|
|
189
|
+
const settled = settleSignature(request, connection.webhookSecret);
|
|
190
|
+
const claim = await resolveCommerceClaim();
|
|
191
|
+
|
|
192
|
+
if (claim === "undetermined") {
|
|
193
|
+
request.log.warn(
|
|
194
|
+
settled.ok
|
|
195
|
+
? { ...eventKeys(organizationId, settled.event), outcome: "license_undetermined" }
|
|
196
|
+
: { organizationId, outcome: "license_undetermined" },
|
|
197
|
+
"stripe offerings webhook held: the commerce licence could not be read",
|
|
198
|
+
);
|
|
199
|
+
await reply
|
|
200
|
+
.code(LICENSE_UNDETERMINED_STATUS)
|
|
201
|
+
.header("Retry-After", String(LICENSE_UNDETERMINED_RETRY_AFTER_SECONDS))
|
|
202
|
+
.send(LICENSE_UNDETERMINED_BODY);
|
|
203
|
+
return;
|
|
204
|
+
}
|
|
205
|
+
|
|
206
|
+
if (claim === "unclaimed") {
|
|
207
|
+
if (settled.ok) {
|
|
208
|
+
request.log.warn(
|
|
209
|
+
{ ...eventKeys(organizationId, settled.event), outcome: "dropped_no_commerce_claim" },
|
|
210
|
+
"stripe offerings webhook event dropped: no commerce claim",
|
|
211
|
+
);
|
|
212
|
+
await reply.code(200).send({ received: true });
|
|
213
|
+
return;
|
|
214
|
+
}
|
|
215
|
+
const err = commerceDisabledResponse();
|
|
216
|
+
await reply.code(err.status).send(err.body);
|
|
217
|
+
return;
|
|
218
|
+
}
|
|
219
|
+
|
|
220
|
+
if (!settled.ok) {
|
|
221
|
+
if (settled.verifyThrew) {
|
|
222
|
+
request.log.warn(
|
|
223
|
+
{ organizationId, outcome: "signature_invalid" },
|
|
224
|
+
"stripe offerings webhook signature verification failed",
|
|
225
|
+
);
|
|
226
|
+
}
|
|
227
|
+
await reply.code(settled.status).send(settled.body);
|
|
228
|
+
return;
|
|
229
|
+
}
|
|
230
|
+
|
|
231
|
+
await processVerifiedEvent(request, reply, connection, settled.event);
|
|
232
|
+
};
|
|
233
|
+
|
|
234
|
+
/** Steps 7–18, for an event signed with the connection's own secret. */
|
|
235
|
+
async function processVerifiedEvent(
|
|
236
|
+
request: FastifyRequest,
|
|
237
|
+
reply: FastifyReply,
|
|
238
|
+
connection: Connection,
|
|
239
|
+
event: VerifiedEvent,
|
|
240
|
+
): Promise<void> {
|
|
241
|
+
const { organizationId } = connection;
|
|
242
|
+
const keys = eventKeys(organizationId, event);
|
|
243
|
+
const ack = async (
|
|
244
|
+
level: "info" | "warn",
|
|
245
|
+
outcome: string,
|
|
246
|
+
message: string,
|
|
247
|
+
seen: boolean,
|
|
248
|
+
): Promise<void> => {
|
|
249
|
+
if (seen) markSeenForOrganization(organizationId, event.id);
|
|
250
|
+
request.log[level]({ ...keys, outcome }, message);
|
|
251
|
+
await reply.code(200).send({ received: true });
|
|
252
|
+
};
|
|
253
|
+
const fail = async (status: number, error: string, outcome: string, message: string) => {
|
|
254
|
+
request.log.error({ ...keys, outcome }, message);
|
|
255
|
+
await reply.code(status).send({ error });
|
|
256
|
+
};
|
|
257
|
+
|
|
258
|
+
// ── Step 7 — W4 ──────────────────────────────────────────────────────────
|
|
259
|
+
if ((event.livemode === true) !== (connection.mode === "live")) {
|
|
260
|
+
await ack("warn", "livemode_mismatch", "stripe offerings webhook event dropped: livemode differs from the connection", false);
|
|
261
|
+
return;
|
|
262
|
+
}
|
|
263
|
+
|
|
264
|
+
// ── Step 8 — W5, the type ────────────────────────────────────────────────
|
|
265
|
+
const session = objectOf(objectOf(event.data)?.["object"]) as SessionObject | null;
|
|
266
|
+
if (!FULFILLING_EVENT_TYPES.has(event.type) || session?.object !== "checkout.session") {
|
|
267
|
+
await ack("info", "ignored_type", "stripe offerings webhook event ignored", false);
|
|
268
|
+
return;
|
|
269
|
+
}
|
|
270
|
+
|
|
271
|
+
// ── Steps 9–11 — W5, the hub's own record (A11) ──────────────────────────
|
|
272
|
+
let record: CheckoutSessionRecord | "unreadable" | null;
|
|
273
|
+
try {
|
|
274
|
+
record = await readCheckoutSessionRecord(session.id);
|
|
275
|
+
} catch {
|
|
276
|
+
await fail(503, "record-unavailable", "record_unavailable", "stripe offerings webhook: the session record could not be read");
|
|
277
|
+
return;
|
|
278
|
+
}
|
|
279
|
+
if (record === "unreadable") {
|
|
280
|
+
await fail(500, "record-unreadable", "record_unreadable", "stripe offerings webhook: the session record is unreadable");
|
|
281
|
+
return;
|
|
282
|
+
}
|
|
283
|
+
if (record === null) {
|
|
284
|
+
await ack("info", "unrecorded", "stripe offerings webhook: no hub record for the session", false);
|
|
285
|
+
return;
|
|
286
|
+
}
|
|
287
|
+
|
|
288
|
+
// ── Step 12 — W5, this Organization and this workspace (C2) ──────────────
|
|
289
|
+
const site = session.metadata?.["site"];
|
|
290
|
+
if (record.organizationId !== organizationId || typeof site !== "string" || site !== record.workspaceId) {
|
|
291
|
+
await ack("warn", "foreign_organization", "stripe offerings webhook: the session is not this Organization's", false);
|
|
292
|
+
return;
|
|
293
|
+
}
|
|
294
|
+
|
|
295
|
+
// ── Step 13 — the record's mode ──────────────────────────────────────────
|
|
296
|
+
if (record.mode !== connection.mode) {
|
|
297
|
+
await ack("warn", "livemode_mismatch", "stripe offerings webhook event dropped: the record's mode differs from the connection", false);
|
|
298
|
+
return;
|
|
299
|
+
}
|
|
300
|
+
|
|
301
|
+
// ── Step 14 — W10, per-Organization dedup ────────────────────────────────
|
|
302
|
+
if (hasSeenForOrganization(organizationId, event.id)) {
|
|
303
|
+
await ack("info", "duplicate", "stripe offerings webhook: duplicate event", false);
|
|
304
|
+
return;
|
|
305
|
+
}
|
|
306
|
+
|
|
307
|
+
// ── Step 15 — W6, payment ────────────────────────────────────────────────
|
|
308
|
+
if (
|
|
309
|
+
event.type === "checkout.session.completed" &&
|
|
310
|
+
session.payment_status !== "paid" &&
|
|
311
|
+
session.payment_status !== "no_payment_required"
|
|
312
|
+
) {
|
|
313
|
+
await ack("info", "unpaid", "stripe offerings webhook: the session is not paid", true);
|
|
314
|
+
return;
|
|
315
|
+
}
|
|
316
|
+
|
|
317
|
+
// ── Steps 16–17 — W6, the paid Price is the record's (D5) ────────────────
|
|
318
|
+
let paidPriceIds: unknown[];
|
|
319
|
+
try {
|
|
320
|
+
const resolved = await stripeClientForOrganization(organizationId);
|
|
321
|
+
if (resolved.kind !== "ok") throw new Error("connection unusable");
|
|
322
|
+
const items = await resolved.client.checkout.sessions.listLineItems(record.sessionId, { limit: 2 });
|
|
323
|
+
paidPriceIds = items.data.map((item) => item.price?.id);
|
|
324
|
+
} catch {
|
|
325
|
+
await fail(503, "stripe-unavailable", "stripe_unavailable", "stripe offerings webhook: the line items could not be read");
|
|
326
|
+
return;
|
|
327
|
+
}
|
|
328
|
+
if (paidPriceIds.length !== 1 || paidPriceIds[0] !== record.priceId) {
|
|
329
|
+
await ack("warn", "offering_mismatch", "stripe offerings webhook: the paid Price is not the recorded one", true);
|
|
330
|
+
return;
|
|
331
|
+
}
|
|
332
|
+
|
|
333
|
+
// ── Step 18 — W7, one held lead per session (D6) ─────────────────────────
|
|
334
|
+
const metadata = session.metadata ?? {};
|
|
335
|
+
const terms = metadata[TERMS_STAMP_KEY];
|
|
336
|
+
let result: RouteLeadResult;
|
|
337
|
+
try {
|
|
338
|
+
result = await routeLead(
|
|
339
|
+
{
|
|
340
|
+
kind: "submit",
|
|
341
|
+
siteId: record.workspaceId,
|
|
342
|
+
source: "web",
|
|
343
|
+
email: typeof session.customer_details?.email === "string" ? session.customer_details.email : "",
|
|
344
|
+
payload: {
|
|
345
|
+
page: "checkout",
|
|
346
|
+
// The record's full key (G5) — never `metadata.ailk_offering`.
|
|
347
|
+
offering: record.lookupKey,
|
|
348
|
+
site: record.workspaceId,
|
|
349
|
+
amountTotal: typeof session.amount_total === "number" ? session.amount_total : null,
|
|
350
|
+
currency: typeof session.currency === "string" ? session.currency : null,
|
|
351
|
+
termsAccepted:
|
|
352
|
+
session.consent?.terms_of_service === "accepted" && typeof terms === "string" ? terms : null,
|
|
353
|
+
},
|
|
354
|
+
},
|
|
355
|
+
{
|
|
356
|
+
ip: request.ip,
|
|
357
|
+
userAgent: request.headers["user-agent"],
|
|
358
|
+
receivedAt: new Date().toISOString(),
|
|
359
|
+
},
|
|
360
|
+
{ idempotencyKey: OFFERINGS_LEAD_KEY_PREFIX + record.sessionId, offeringsCheckout: true },
|
|
361
|
+
);
|
|
362
|
+
} catch {
|
|
363
|
+
await fail(503, "fulfilment-unavailable", "fulfilment_unavailable", "stripe offerings webhook: the lead could not be written");
|
|
364
|
+
return;
|
|
365
|
+
}
|
|
366
|
+
|
|
367
|
+
if (result.ok && result.persisted === "db") {
|
|
368
|
+
if (result.replayed === true) {
|
|
369
|
+
await ack("info", "already_fulfilled", "stripe offerings webhook: the session was already fulfilled", true);
|
|
370
|
+
} else {
|
|
371
|
+
await ack("info", "fulfilled", "stripe offerings webhook: the session was fulfilled", true);
|
|
372
|
+
}
|
|
373
|
+
return;
|
|
374
|
+
}
|
|
375
|
+
if (!result.ok && result.error.kind === "idempotency_conflict") {
|
|
376
|
+
await ack("info", "already_fulfilled", "stripe offerings webhook: the session was already fulfilled", true);
|
|
377
|
+
return;
|
|
378
|
+
}
|
|
379
|
+
if (!result.ok && result.error.kind === "invalid_input") {
|
|
380
|
+
await ack("warn", "unfulfillable", "stripe offerings webhook: the session has no storable email", true);
|
|
381
|
+
return;
|
|
382
|
+
}
|
|
383
|
+
await fail(503, "fulfilment-unavailable", "fulfilment_unavailable", "stripe offerings webhook: the lead could not be written");
|
|
384
|
+
}
|
|
@@ -48,12 +48,17 @@
|
|
|
48
48
|
*
|
|
49
49
|
* Billing upsert (customer.created / checkout.session.completed):
|
|
50
50
|
* Billing-entity routing (org-scoped billing, #3601, spec D2): a checkout
|
|
51
|
-
* carrying metadata.organizationId
|
|
51
|
+
* carrying metadata.organizationId takes the Organization path (multi-tenant
|
|
52
52
|
* module); absent → the User path (single-tenant).
|
|
53
53
|
*
|
|
54
|
-
* Organization path (metadata.organizationId present)
|
|
54
|
+
* Organization path (metadata.organizationId present) — proof-based since
|
|
55
|
+
* #9067 D13: the metadata names the target, the recorded session proves it.
|
|
55
56
|
* 1. Typed composite match already pointing at this org → idempotent no-op
|
|
56
|
-
* 2.
|
|
57
|
+
* 2. A checkout.session.completed binds only when the Organization's
|
|
58
|
+
* `planCheckoutSessionId` is this session's id and no customer is
|
|
59
|
+
* bound yet (one guarded updateMany, which also clears the session)
|
|
60
|
+
* 3. Anything else — an unrecorded session, a bound customer, any
|
|
61
|
+
* customer.created — logs org_bind_unproven and writes nothing
|
|
57
62
|
*
|
|
58
63
|
* User path (no organizationId):
|
|
59
64
|
* 1. Typed composite match: (billingProvider="stripe", billingCustomerId=customer)
|
|
@@ -331,6 +336,23 @@ export const stripeWebhookHandler = async (
|
|
|
331
336
|
return;
|
|
332
337
|
}
|
|
333
338
|
|
|
339
|
+
// #8932 D9 (contract W8) — an Offerings-stamped event belongs to the
|
|
340
|
+
// per-Organization endpoint, which must still be able to act on it, so it
|
|
341
|
+
// is acked here BEFORE `markSeen` and nothing is written. Presence decides,
|
|
342
|
+
// whatever the value; any other event takes the path below unchanged.
|
|
343
|
+
if (
|
|
344
|
+
offeringsStampSourcesOf(event).some((source) =>
|
|
345
|
+
Object.hasOwn(source, OFFERINGS_STAMP_KEY),
|
|
346
|
+
)
|
|
347
|
+
) {
|
|
348
|
+
request.log.info(
|
|
349
|
+
{ eventType: event.type, eventIdPrefix, outcome: "offerings_path" },
|
|
350
|
+
"stripe webhook event left to the per-Organization endpoint",
|
|
351
|
+
);
|
|
352
|
+
await reply.code(200).send({ received: true });
|
|
353
|
+
return;
|
|
354
|
+
}
|
|
355
|
+
|
|
334
356
|
request.log.info(
|
|
335
357
|
{ eventType: event.type, eventIdPrefix },
|
|
336
358
|
"stripe webhook event received",
|
|
@@ -370,15 +392,16 @@ export const stripeWebhookHandler = async (
|
|
|
370
392
|
email?: string | null;
|
|
371
393
|
metadata?: Record<string, string> | null;
|
|
372
394
|
};
|
|
373
|
-
// Billing-entity routing (spec D2):
|
|
374
|
-
//
|
|
375
|
-
//
|
|
376
|
-
// User path (single-tenant, degrade-clean).
|
|
395
|
+
// Billing-entity routing (spec D2): metadata.organizationId present →
|
|
396
|
+
// the Organization path, which a customer's own metadata can never
|
|
397
|
+
// prove (#9067 D13: only a recorded plan session binds), so it writes
|
|
398
|
+
// nothing; absent → the User path (single-tenant, degrade-clean).
|
|
377
399
|
const organizationId = customer.metadata?.["organizationId"] ?? null;
|
|
378
400
|
if (organizationId) {
|
|
379
401
|
await upsertOrgBillingIdentity(request, {
|
|
380
402
|
organizationId,
|
|
381
403
|
customerId: customer.id,
|
|
404
|
+
sessionId: null,
|
|
382
405
|
eventIdPrefix,
|
|
383
406
|
});
|
|
384
407
|
} else {
|
|
@@ -421,6 +444,7 @@ export const stripeWebhookHandler = async (
|
|
|
421
444
|
? upsertOrgBillingIdentity(request, {
|
|
422
445
|
organizationId,
|
|
423
446
|
customerId: session.customer,
|
|
447
|
+
sessionId: session.id ?? null,
|
|
424
448
|
eventIdPrefix,
|
|
425
449
|
})
|
|
426
450
|
: upsertBillingIdentity(request, {
|
|
@@ -646,6 +670,28 @@ function siteStampSourcesOf(event: {
|
|
|
646
670
|
.filter((source) => source !== null) as Record<string, string>[];
|
|
647
671
|
}
|
|
648
672
|
|
|
673
|
+
/** The metadata key the hub's Offerings checkout stamps on its sessions (contract A6, #8932 D9). */
|
|
674
|
+
const OFFERINGS_STAMP_KEY = "ailk_offering";
|
|
675
|
+
|
|
676
|
+
/**
|
|
677
|
+
* Where an Offerings stamp may sit (#8932 D9): every site-stamp source
|
|
678
|
+
* (`siteStampSourcesOf` — the Subscription, the Customer and an invoice's
|
|
679
|
+
* three) plus, for a `checkout.session.*` event whose object is a session,
|
|
680
|
+
* the session's own metadata.
|
|
681
|
+
*/
|
|
682
|
+
function offeringsStampSourcesOf(event: {
|
|
683
|
+
type: string;
|
|
684
|
+
data?: unknown;
|
|
685
|
+
}): Record<string, string>[] {
|
|
686
|
+
const sources = siteStampSourcesOf(event);
|
|
687
|
+
const object = objectOrNull(objectOrNull(event.data)?.["object"]);
|
|
688
|
+
if (event.type.startsWith("checkout.session.") && object?.["object"] === "checkout.session") {
|
|
689
|
+
const metadata = objectOrNull(object["metadata"]);
|
|
690
|
+
if (metadata !== null) sources.push(metadata as Record<string, string>);
|
|
691
|
+
}
|
|
692
|
+
return sources;
|
|
693
|
+
}
|
|
694
|
+
|
|
649
695
|
/**
|
|
650
696
|
* Minimal projected shape of a Stripe Invoice object for the dunning arms
|
|
651
697
|
* (#6034 FR-1). `subscription` and `customer` are EXPANDABLE Stripe fields —
|
|
@@ -1331,14 +1377,19 @@ async function upsertBillingIdentity(
|
|
|
1331
1377
|
|
|
1332
1378
|
/**
|
|
1333
1379
|
* Link Organization.billingProvider + billingCustomerId for a Stripe customer
|
|
1334
|
-
* (org-scoped billing, #3601, spec D2/D3)
|
|
1335
|
-
* metadata.organizationId
|
|
1336
|
-
*
|
|
1380
|
+
* (org-scoped billing, #3601, spec D2/D3), only on proof (#9067 D13,
|
|
1381
|
+
* SEC-9067-1 to -3). `metadata.organizationId` names the target; the proof
|
|
1382
|
+
* is the session id POST /v1/billing/plan-checkout recorded on that
|
|
1383
|
+
* Organization. The bind is one guarded `updateMany` on `{ id,
|
|
1384
|
+
* planCheckoutSessionId: sessionId, billingCustomerId: null }`, which also
|
|
1385
|
+
* clears the recorded session — so a session no route recorded, a session
|
|
1386
|
+
* recorded by another deployment's database, a re-point of a bound customer
|
|
1387
|
+
* and a `customer.created` (`sessionId` null: a customer's metadata proves
|
|
1388
|
+
* nothing) all bind nothing and log `org_bind_unproven`.
|
|
1337
1389
|
*
|
|
1338
1390
|
* Idempotent: a typed-composite match (billingProvider="stripe",
|
|
1339
1391
|
* billingCustomerId=customerId) already pointing at THIS org is a no-op on
|
|
1340
|
-
* replay.
|
|
1341
|
-
* linked.
|
|
1392
|
+
* replay.
|
|
1342
1393
|
*
|
|
1343
1394
|
* DB failures are caught and logged (never re-thrown) — a broken link must not
|
|
1344
1395
|
* make Stripe retry (which would re-fire analytics + billing on eventual
|
|
@@ -1349,9 +1400,24 @@ async function upsertOrgBillingIdentity(
|
|
|
1349
1400
|
{
|
|
1350
1401
|
organizationId,
|
|
1351
1402
|
customerId,
|
|
1403
|
+
sessionId,
|
|
1352
1404
|
eventIdPrefix,
|
|
1353
|
-
}: {
|
|
1405
|
+
}: {
|
|
1406
|
+
organizationId: string;
|
|
1407
|
+
customerId: string;
|
|
1408
|
+
sessionId: string | null;
|
|
1409
|
+
eventIdPrefix: string;
|
|
1410
|
+
},
|
|
1354
1411
|
): Promise<void> {
|
|
1412
|
+
const unproven = () =>
|
|
1413
|
+
request.log.warn(
|
|
1414
|
+
{ eventIdPrefix, outcome: "org_bind_unproven" },
|
|
1415
|
+
"org billing identity not linked — no recorded plan checkout proves it",
|
|
1416
|
+
);
|
|
1417
|
+
if (sessionId === null) {
|
|
1418
|
+
unproven();
|
|
1419
|
+
return;
|
|
1420
|
+
}
|
|
1355
1421
|
try {
|
|
1356
1422
|
const existingByBilling = await prisma.organization.findFirst({
|
|
1357
1423
|
where: {
|
|
@@ -1368,22 +1434,30 @@ async function upsertOrgBillingIdentity(
|
|
|
1368
1434
|
return;
|
|
1369
1435
|
}
|
|
1370
1436
|
|
|
1371
|
-
await prisma.organization.
|
|
1372
|
-
where: { id: organizationId },
|
|
1437
|
+
const { count } = await prisma.organization.updateMany({
|
|
1438
|
+
where: { id: organizationId, planCheckoutSessionId: sessionId, billingCustomerId: null },
|
|
1373
1439
|
data: {
|
|
1374
1440
|
billingProvider: "stripe",
|
|
1375
1441
|
billingCustomerId: customerId,
|
|
1442
|
+
planCheckoutSessionId: null,
|
|
1376
1443
|
},
|
|
1377
1444
|
});
|
|
1445
|
+
if (count !== 1) {
|
|
1446
|
+
unproven();
|
|
1447
|
+
return;
|
|
1448
|
+
}
|
|
1378
1449
|
request.log.info(
|
|
1379
1450
|
{ eventIdPrefix },
|
|
1380
|
-
"org billing identity linked from checkout
|
|
1451
|
+
"org billing identity linked from the recorded plan checkout",
|
|
1381
1452
|
);
|
|
1382
1453
|
} catch (err) {
|
|
1454
|
+
// #9067 FR-6 — the name and Prisma code only: some Prisma messages
|
|
1455
|
+
// print the call's arguments, which here carry the session and customer ids.
|
|
1383
1456
|
request.log.error(
|
|
1384
1457
|
{
|
|
1385
1458
|
eventIdPrefix,
|
|
1386
|
-
|
|
1459
|
+
errName: err instanceof Error ? err.name : "unknown",
|
|
1460
|
+
code: (err as { code?: unknown } | null)?.code,
|
|
1387
1461
|
},
|
|
1388
1462
|
"org billing identity upsert failed — continuing",
|
|
1389
1463
|
);
|