[PM-31905] Remove m2 flag definition#7353
Merged
cturnbull-bitwarden merged 9 commits intomainfrom Apr 2, 2026
Merged
Conversation
…rUserAsync Always call AlignPremiumUsersSubscriptionConcernsAsync instead of gating it behind the feature flag.
…tionResponseModel Remove includeMilestone2Discount parameter from both SubscriptionResponseModel constructors. Rename ShouldIncludeMilestone2Discount to ShouldIncludeDiscount and always evaluate the discount (coupon ID match + active check).
Remove feature flag mock setup lines and delete test methods that verified flag-disabled behavior. Rename tests to remove flag references.
Remove includeMilestone2Discount parameter from all constructor calls. Delete tests that verified flag-disabled behavior.
Remove all feature flag mock setup lines for PM23341_Milestone_2.
The constructor parameter became unused after removing the flag check.
Contributor
|
New Issues (121)Checkmarx found the following issues in this Pull Request
|
cturnbull-bitwarden
changed the title
After removing the m2 flag guard, AlignPremiumUsersSubscriptionConcernsAsync is always called and needs ListPremiumPlans to return a non-null value. Add a default empty list in the test constructor setup.
cturnbull-bitwarden
force-pushed
the
billing/PM-31905/remove-m2-flag-definition-server
branch
from
7b5f1b2 to
924b9c6
Compare
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #7353 +/- ##
=======================================
Coverage 58.22% 58.22%
=======================================
Files 2060 2060
Lines 90945 90945
Branches 8080 8080
=======================================
Hits 52954 52954
Misses 36119 36119
Partials 1872 1872 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
amorask-bitwarden
previously approved these changes
Mar 31, 2026
Base automatically changed from
billing/PM-31902/remove-m2-flagged-logic-server
to
main
April 1, 2026 18:05
cturnbull-bitwarden
dismissed
amorask-bitwarden’s stale review
The base branch was changed.
…ve-m2-flag-definition-server # Conflicts: # src/Api/Billing/Controllers/AccountsController.cs # test/Api.Test/Billing/Controllers/AccountsControllerTests.cs
|
amorask-bitwarden
approved these changes
Apr 2, 2026
cturnbull-bitwarden
deleted the
billing/PM-31905/remove-m2-flag-definition-server
branch
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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-31905
https://bitwarden.atlassian.net/browse/PM-31891
📔 Objective
Remove the
PM23341_Milestone_2constant fromFeatureFlagKeysinConstants.cs. All flagged logic was removed in the parent PR.