Skip to content

[PM-33473] Remove pm-29594-update-individual-subscription-page feature flag#7519

Open
amorask-bitwarden wants to merge 3 commits intomainfrom
billing/PM-33473/remove-pm29594-feature-flag
Open

[PM-33473] Remove pm-29594-update-individual-subscription-page feature flag#7519
amorask-bitwarden wants to merge 3 commits intomainfrom
billing/PM-33473/remove-pm29594-feature-flag

Conversation

@amorask-bitwarden
Copy link
Copy Markdown
Contributor

@amorask-bitwarden amorask-bitwarden commented Apr 21, 2026

🎟️ Tracking

https://bitwarden.atlassian.net/browse/PM-33473

📔 Objective

Remove the pm-29594-update-individual-subscription-page feature flag and its flagged code paths per the Feature Flags Lifecycle process.

Changes:

  • Delete the PM29594_UpdateIndividualSubscriptionPage constant from Constants.cs.
  • Strip three [RequireFeature(FeatureFlagKeys.PM29594_UpdateIndividualSubscriptionPage)] attributes from AccountBillingVNextController on GetSubscriptionAsync, ReinstateSubscriptionAsync, and UpdateSubscriptionStorageAsync — the vNext endpoints become unconditional for cloud.
  • Delete cloud-only PostStorageAsync and PostReinstateAsync from AccountsController along with their tests.
  • Delete AdjustStorageAsync and ReinstatePremiumAsync from UserService and IUserService along with their tests. IPricingClient injection is removed from UserService since those were its only consumers.
  • Reduce AccountsController.GetSubscriptionAsync to a self-hosted-only endpoint ([SelfHosted(SelfHostedOnly = true)]) because SelfHostedAccountSubscriptionComponent on the clients side still needs it — the vNext replacement is cloud-only ([SelfHosted(NotSelfHostedOnly = true)]). The response model SubscriptionResponseModel is simplified to only the fields self-hosted requires: StorageName, StorageGb, MaxStorageGb, Expiration.
  • Extract three shared types (BillingCustomerDiscount, BillingSubscription, BillingSubscriptionUpcomingInvoice) from the former SubscriptionResponseModel.cs into standalone files under src/Api/Models/Response/ in the same namespace. OrganizationResponseModel.cs still consumes them via using Bit.Api.Models.Response; and needs no changes.

Paired with the companion clients PR that removes the flag + dead code on the client side.

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 21, 2026

Logo
Checkmarx One – Scan Summary & Detailsa37ca2c9-97d2-422c-a6d2-480d409c312b


New Issues (1) Checkmarx found the following issues in this Pull Request
# Severity Issue Source File / Package Checkmarx Insight
1 MEDIUM CSRF src/Api/AdminConsole/Controllers/OrganizationUsersController.cs: 512
detailsMethod at line 512 of /src/Api/AdminConsole/Controllers/OrganizationUsersController.cs gets a parameter from a user request from orgId. This par...
Attack Vector

@amorask-bitwarden amorask-bitwarden changed the title [PM-33473] Remove pm-29594-update-individual-subscription-page feature flag [PM-33473] Remove pm-29594-update-individual-subscription-page feature flag Apr 21, 2026
@codecov
Copy link
Copy Markdown

codecov Bot commented Apr 21, 2026

Codecov Report

❌ Patch coverage is 0% with 72 lines in your changes missing coverage. Please review.
✅ Project coverage is 59.03%. Comparing base (0b1c22e) to head (0609577).

Files with missing lines Patch % Lines
src/Api/Models/Response/BillingSubscription.cs 0.00% 49 Missing ⚠️
src/Api/Models/Response/BillingCustomerDiscount.cs 0.00% 14 Missing ⚠️
...els/Response/BillingSubscriptionUpcomingInvoice.cs 0.00% 7 Missing ⚠️
src/Api/Billing/Controllers/AccountsController.cs 0.00% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #7519      +/-   ##
==========================================
- Coverage   59.13%   59.03%   -0.11%     
==========================================
  Files        2077     2080       +3     
  Lines       91848    91740     -108     
  Branches     8175     8155      -20     
==========================================
- Hits        54315    54156     -159     
- Misses      35601    35658      +57     
+ Partials     1932     1926       -6     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@sonarqubecloud
Copy link
Copy Markdown

@amorask-bitwarden amorask-bitwarden added the ai-review Request a Claude code review label Apr 21, 2026
@amorask-bitwarden amorask-bitwarden marked this pull request as ready for review April 21, 2026 20:34
@amorask-bitwarden amorask-bitwarden requested a review from a team as a code owner April 21, 2026 20:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ai-review Request a Claude code review

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants