Repository navigation
FE-2642 fix(billing-web): show the reason the server gave for a refused quote or subscribe - #19185
Conversation
…ason, as the app does
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Repository: Comfy-Org/ComfyUI_frontend/.coderabbit.yaml Review profile: ASSERTIVE Plan: Advanced Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
Comment |
🌾 Fallow: ✅ PassedFallow audits the diff for duplication, complexity and dead code. It gates on new findings only, so when the audit completes, a red is something this PR introduced or moved — never inherited backlog. A red can also mean the audit itself did not finish; the details below say which happened. No new findings in the changed files. Reproduce locally# the base the gate compared against
npx fallow audit --root . --quiet --format json \
--changed-since 02380de424f3857e552d6a7b21758ccb32af439b
Full docs: ADR-DEVEX-LINT-0015 🧩 Custom Nodes Ecosystem Matrix: 🟡 Withheld — could not measureExecutes the frontend JS of every registry pack that ships any, against this change, in both renderers. The eight This candidate changes nothing the matrix measures, so every expensive stage was skipped. Reproduce locally# build one shard's fixture, then run it
python3 scripts/registry-census/build_matrix.py --shard 1/4
MATRIX_RENDERER=vue MATRIX_VUE=1 \
npx vitest run --config vitest.matrix.config.mts
Full docs: scripts/registry-census/README.md 📦 Bundle Size
|
|
Red: |
Codecov Report❌ Patch coverage is
@@ Coverage Diff @@
## jaewon/checkout-quote-stale-recovery #19185 +/- ##
========================================================================
+ Coverage 84.09% 85.02% +0.93%
========================================================================
Files 3188 2374 -814
Lines 155025 134452 -20573
Branches 40131 34375 -5756
========================================================================
- Hits 130365 114318 -16047
+ Misses 23011 19722 -3289
+ Partials 1649 412 -1237
Flags with carried forward coverage won't be shown. Click here to find out more.
... and 814 files with indirect coverage changes 🚀 New features to boost your workflow:
|
christian-byrne
left a comment
There was a problem hiding this comment.
Reviewed the two-commit delta against its declared stacked base. The shared billing contract explicitly sanctions serverMessage for customer display; machine serverCode remains unrendered, and semantic error codes retain billing-web's localized copy. Focused billing-web validation passed: CheckoutView, InvoicesView, and SubscriptionView (69 tests), plus billing-web typecheck. CI is green and the reviewed head is 67b7990. The configured cross-model cascade was unavailable, so this verdict uses the documented lead-review fallback.
d94ceb3
into
jaewon/checkout-quote-stale-recovery
) Manual backport of #19185. Preserves the 1.55 checkout implementation while applying the server-refusal formatting behavior.\n\nVerification: billing-web typecheck passed; focused CheckoutView suite passed (29/29). Co-authored-by: Dante <bunggl@naver.com>
…9304) Manual backport of #19185. Preserves the 1.55 checkout implementation while applying the server-refusal formatting behavior.\n\nVerification: identical patch to the locally verified core/1.55 backport (billing-web typecheck and focused CheckoutView suite 29/29). Co-authored-by: Dante <bunggl@naver.com>
…9099, #19100, #19101, #19104) (#19442) ## Why Backport of the FE-3046 billing-web shared-checkout stack to `core/1.55`. The auto-backport bot hit cherry-pick conflicts on each of these. The 1.55 release needs billing-web to render the same checkout as the app, including the team invite on success. ## How ### Cherry-picked (in order, `-x`) | PR | main squash | | |---|---|---| | #19098 (A) | | skipped: already on `core/1.55` via #19231 | | #19099 (B) | | skipped: already on `core/1.55` via #19308 | | #19100 (C) | `4bfdc8a68c` | render the subscription checkout steps from account-ui | | #19101 (D) | `d5cf71ce27` | billing-web renders the shared embedded checkout | | #19104 (E) | `592588bdd6` | team invite on the checkout success step (squash includes #19105, #19106, #19115) | No other prerequisite was cherry-picked. ### Conflicts and resolutions - **C, `SubscriptionAddPaymentPreviewWorkspace.stripe.test.ts`** (renamed from `UnifiedStripePaymentSelector.test.ts`). 1.55 mocks telemetry with an explicit factory because it lacks #18497; main automocks it. Took C's file as is. `src/platform/telemetry/__mocks__/index.ts` exists on 1.55, so the automock resolves and the test passes. - **D, `apps/billing-web/src/views/CheckoutView.vue`**. 1.55 has #19305 (backport of #19185, show the server's refusal reason), which main does not have yet. Kept D's checkout and kept 1.55's `refusal()` on the subscribe failure and the quote-failure panel. Also used `refusal()` for D's new promotion-code re-quote failure, as the upstream `jaewon/checkout-quote-stale-recovery` stack does. Dropped the now-unused `coded`. - **E, `apps/billing-web/src/session/billingWebAuth.ts`** (modify/delete). The file does not exist on 1.55 because the unified web session work (#18880, #18881) is not backported. Deleted it and applied E's change to what 1.55 has: `billingWebClient.ts` gains the `BillingWebClient` type (`BillingClient & { invites }`) and `invites: createWorkspaceInviteCommands({ transport })` on its single `createBillingWebClient`. - **E, `BillingShell.vue`**. Kept 1.55's `createBillingWebClient(billingWebSessionClient())` and added E's `provideWorkspaceInvites(client.invites)`. - **E, `HostedSurface.vue`**. Kept 1.55's `useBillingWebSession` and added E's `returnToHost` import (the return link now closes the tab, from #19106). - **E, `CheckoutView.vue`**. Kept `refusal` as above and took E's `inviteCopy` and `useWorkspaceInvites()`. - **E, `useSubscriptionCheckout.ts`**. Kept 1.55's `useEventListener` import and added E's `watch` and `ToastMessageOptions`. 1.55 does not use `onScopeDispose`, so it is not imported. - **E, `useSubscriptionCheckout.test.ts`**. The toast mock gains E's `remove`. 1.55 has no `removeGroup` usage, so `mockToastRemoveGroup` is not added. One extra commit updates a #19305 test case. For a refused subscribe with `OPERATION_ALREADY_PENDING`, it expected the generic failure copy because 1.55 had no copy for that code. D adds that copy, so the case now expects billing-web's own wording, matching the upstream stack. ## Verification - `pnpm typecheck` (app, account-core, billing-web, account-ui, billing-contract): pass - billing-web unit tests: 277/277 - account-ui unit tests: 224/224 - account-core unit tests: 1227/1227 - `src/platform/workspace` + `src/platform/cloud/subscription`: 2320 passed, 1 expected fail - oxfmt, oxlint and eslint on the changed files: clean ## AS IS / TO BE Same UI as the original PRs; see the AS IS / TO BE media in #19101 and #19104. --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…19099, #19100, #19101, #19104) (#19443) ## Why Backport of the FE-3046 billing-web shared-checkout stack to `cloud/1.55`. The auto-backport bot hit cherry-pick conflicts on each of these. The 1.55 release needs billing-web to render the same checkout as the app, including the team invite on success. ## How ### Cherry-picked (in order, `-x`) | PR | main squash | | |---|---|---| | #19098 (A) | | skipped: already on `cloud/1.55` via #19232 | | #19099 (B) | | skipped: already on `cloud/1.55` via #19309 | | #19100 (C) | `4bfdc8a68c` | render the subscription checkout steps from account-ui | | #19101 (D) | `d5cf71ce27` | billing-web renders the shared embedded checkout | | #19104 (E) | `592588bdd6` | team invite on the checkout success step (squash includes #19105, #19106, #19115) | No other prerequisite was cherry-picked. ### Conflicts and resolutions - **C, `SubscriptionAddPaymentPreviewWorkspace.stripe.test.ts`** (renamed from `UnifiedStripePaymentSelector.test.ts`). 1.55 mocks telemetry with an explicit factory because it lacks #18497; main automocks it. Took C's file as is. `src/platform/telemetry/__mocks__/index.ts` exists on 1.55, so the automock resolves and the test passes. - **D, `apps/billing-web/src/views/CheckoutView.vue`**. 1.55 has #19304 (backport of #19185, show the server's refusal reason), which main does not have yet. Kept D's checkout and kept 1.55's `refusal()` on the subscribe failure and the quote-failure panel. Also used `refusal()` for D's new promotion-code re-quote failure, as the upstream `jaewon/checkout-quote-stale-recovery` stack does. Dropped the now-unused `coded`. - **E, `apps/billing-web/src/session/billingWebAuth.ts`** (modify/delete). The file does not exist on 1.55 because the unified web session work (#18880, #18881) is not backported. Deleted it and applied E's change to what 1.55 has: `billingWebClient.ts` gains the `BillingWebClient` type (`BillingClient & { invites }`) and `invites: createWorkspaceInviteCommands({ transport })` on its single `createBillingWebClient`. - **E, `BillingShell.vue`**. Kept 1.55's `createBillingWebClient(billingWebSessionClient())` and added E's `provideWorkspaceInvites(client.invites)`. - **E, `HostedSurface.vue`**. Kept 1.55's `useBillingWebSession` and added E's `returnToHost` import (the return link now closes the tab, from #19106). - **E, `CheckoutView.vue`**. Kept `refusal` as above and took E's `inviteCopy` and `useWorkspaceInvites()`. - **E, `useSubscriptionCheckout.ts`**. Kept 1.55's `useEventListener` import and added E's `watch` and `ToastMessageOptions`. 1.55 does not use `onScopeDispose`, so it is not imported. - **E, `useSubscriptionCheckout.test.ts`**. The toast mock gains E's `remove`. 1.55 has no `removeGroup` usage, so `mockToastRemoveGroup` is not added. The cloud branch takes the same resolved commits from the core backport; they applied without further conflicts. One extra commit updates a #19304 test case. For a refused subscribe with `OPERATION_ALREADY_PENDING`, it expected the generic failure copy because 1.55 had no copy for that code. D adds that copy, so the case now expects billing-web's own wording, matching the upstream stack. ## Verification - `pnpm typecheck` (app, account-core, billing-web, account-ui, billing-contract): pass - billing-web unit tests: 277/277 - account-ui unit tests: 224/224 - account-core unit tests: 1226/1226 - `src/platform/workspace` + `src/platform/cloud/subscription`: 2325 passed, 1 expected fail - oxfmt, oxlint and eslint on the changed files: clean ## AS IS / TO BE Same UI as the original PRs; see the AS IS / TO BE media in #19101 and #19104. --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Why
When the server refuses a quote or a subscribe and says why, billing-web shows "We couldn't reach the billing service. Please try again." The app shows the server's sentence for the same refusal (
projectFailureinsubscriptionOperationView.ts). A customer who pays on billing-web should read what they would have read in the app. Found in M2 verification case B5, where a400 TRANSITION_NOT_ALLOWEDquote refusal was reported as a network failure.Root cause
codeForHttpStatusfolds every 400/422/5xx intoREQUEST_FAILEDand every 409 intoCONFLICT, so the code no longer says what went wrong. account-core already carries the server's sentence onBillingFailure.serverMessagefor hosts to show. The app shows it. billing-web'scoded('failure', code)never reads it.How
useHostedCopygainsrefusal(failure). For the two status buckets (REQUEST_FAILED,CONFLICT) it showsserverMessagewhen the server sent one. Every code billing-web words itself (OPERATION_ALREADY_PENDING,QUOTE_STALE, auth codes) keeps its own copy. The checkout, subscription, payment-method and invoice surfaces use it wherever they hold a failure.AS IS / TO BE
Live against testcloud,
/v1/checkout?plan=team_per_credit_monthlyfor a Metronome-billed team workspace:POST /api/billing/preview-subscribeanswered400with the message "Per-credit Team plans require Stripe billing; migration from Metronome billing is not yet supported".Plan position