[PM-26780] Save organization's customer ID before invoking HasPaymentMethodQuery
#6442
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
🎟️ Tracking
https://bitwarden.atlassian.net/browse/PM-26780
📔 Objective
There's a red herring here that we can't update a subscription when that subscription has
trial_settings.end_behavior.missing_payment_method
set to "cancel", because our remarkably over-complicated subscription update process temporarily changes the subscription tosend_invoice
, which is not allowed.However, the real problem here is the fact the end behavior was set to "cancel" in the first place as this should only ever be used for subscriptions that do not have a payment method.
The issue was the
HasPaymentMethodQuery
I introduced in a previous PR to determine the end behavior is fetching the organization's attached Stripe Customer. However, in theOrganizationBillingService.Finalize
method, that Customer hasn't been attached yet.This PR moves the attachment of the Customer to the Organization sooner in the Finalize process to resolve the issue.
📸 Screenshots
Screen.Recording.2025-10-10.at.9.21.14.AM.mov
⏰ Reminders before review
🦮 Reviewer guidelines
:+1:
) or similar for great changes:memo:
) or ℹ️ (:information_source:
) for notes or general info:question:
) for questions:thinking:
) or 💭 (:thought_balloon:
) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion:art:
) for suggestions / improvements:x:
) or:warning:
) for more significant problems or concerns needing attention:seedling:
) or ♻️ (:recycle:
) for future improvements or indications of technical debt:pick:
) for minor or nitpick changes