[AC-2471] Prevent calls to Stripe when unlinking client org has no Stripe objects #3999
+103
−13
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
New Issues
Fixed Issues
|
eliykat
reviewed
Apr 18, 2024
..._license/src/Commercial.Core/AdminConsole/Providers/RemoveOrganizationFromProviderCommand.cs
Outdated
Show resolved
Hide resolved
..._license/src/Commercial.Core/AdminConsole/Providers/RemoveOrganizationFromProviderCommand.cs
Outdated
Show resolved
Hide resolved
Comment on lines
63
to
67
| if (!string.IsNullOrEmpty(organization.GatewayCustomerId) && | ||
| !string.IsNullOrEmpty(organization.GatewaySubscriptionId)) | ||
| { | ||
| await _removePaymentMethodCommand.RemovePaymentMethod(organization); | ||
| } |
There was a problem hiding this comment.
Should this be part of the command? Or are you trying to avoid calling a command from within a command?
There was a problem hiding this comment.
Yeah, originally I had RemoveOrganizationFromProviderCommand invoke RemovePaymentMethodCommand, but I was told not to do so when this was originally implemented.
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #3999 +/- ##
=======================================
Coverage 38.33% 38.33%
=======================================
Files 1209 1209
Lines 58686 58703 +17
Branches 5589 5594 +5
=======================================
+ Hits 22495 22503 +8
- Misses 35147 35156 +9
Partials 1044 1044 ☔ View full report in Codecov by Sentry. |
eliykat
previously approved these changes
Apr 19, 2024
cturnbull-bitwarden
previously approved these changes
Apr 19, 2024
amorask-bitwarden
dismissed stale reviews from cturnbull-bitwarden and eliykat
via
6003d10
|
@eliykat @cturnbull-bitwarden Thank you both for the reviews - had to resolve a conflict unfortunately. Would you both mind re-stamping whenever you have a chance? |
cturnbull-bitwarden
previously approved these changes
Apr 19, 2024
eliykat
previously approved these changes
Apr 22, 2024
# Conflicts: # bitwarden_license/src/Commercial.Core/AdminConsole/Providers/RemoveOrganizationFromProviderCommand.cs # bitwarden_license/test/Commercial.Core.Test/AdminConsole/ProviderFeatures/RemoveOrganizationFromProviderCommandTests.cs
cturnbull-bitwarden
approved these changes
May 8, 2024
eliykat
approved these changes
May 8, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Type of change
Objective
In our
RemoveOrganizationFromProviderCommand, we make calls to Stripe to update theCustomerandSubscription. However, client organizations in a sales-enabled trial do not have any associated Stripe objects, resulting in a cryptic error.This PR only invokes the Stripe API if both the
GatewayCustomerIdandGatewaySubscriptionIdare present on the client organization being unlinked.