[PM 29595]Implement : User that Upgraded from Premium Reverts an Organization Upgrade During the Trial Period #6849

cyprain-okeke · 2026-01-15T15:47:30Z

🎟️ Tracking

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

📔 Objective

Feature: Allow users to revert Premium-to-Organization upgrades during trial period

Summary
Enables users who upgraded from Premium to Organization to revert the upgrade during the trial period. If they cancel during trial, the subscription reverts to their original Premium plan instead of being canceled.

Key Changes

Reversion logic in SubscriberService:

Added TryRevertPremiumUpgradeAsync() that checks for premium upgrade metadata when an organization cancels
If metadata exists and the subscription is in trial, reverts to Premium instead of canceling
Restores the user's Premium status, storage, and subscription details

Metadata tracking:

Added metadata keys in StripeConstants to track upgrade info:
- PreviousPremiumPriceId
- PreviousPremiumUserId
- UpgradedOrganizationId
- PreviousPeriodEndDate
- PreviousAdditionalStorage
- PreviousStoragePriceId

Metadata cleanup:

Added CleanupPremiumUpgradeMetadataAfterTrialAsync() in SubscriptionUpdatedHandler to remove reversion metadata after the trial ends successfully

📸 Screenshots

⏰ Reminders before review

Contributor guidelines followed
All formatters and local linters executed and passed
Written new unit and / or integration tests where applicable
Protected functional changes with optionality (feature flags)
Used internationalization (i18n) for all UI strings
CI builds passed
Communicated to DevOps any deployment requirements
Updated any necessary documentation (Confluence, contributing docs) or informed the documentation team

🦮 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

codecov · 2026-01-15T16:03:35Z

Codecov Report

❌ Patch coverage is 85.63218% with 25 lines in your changes missing coverage. Please review.
✅ Project coverage is 56.06%. Comparing base (75a8570) to head (c7528df).

Files with missing lines	Patch %	Lines
...ling/Services/Implementations/SubscriberService.cs	90.15%	9 Missing and 4 partials ⚠️
...ices/Implementations/SubscriptionUpdatedHandler.cs	69.23%	10 Missing and 2 partials ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #6849      +/-   ##
==========================================
+ Coverage   56.00%   56.06%   +0.06%     
==========================================
  Files        1966     1966              
  Lines       86875    87047     +172     
  Branches     7737     7755      +18     
==========================================
+ Hits        48650    48805     +155     
- Misses      36426    36437      +11     
- Partials     1799     1805       +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.

…mium-reverts-an-organization-upgrade-during-the-trial-period

github-actions · 2026-01-16T09:44:20Z

Checkmarx One – Scan Summary & Details – 9c1cfc98-b947-48bc-8b74-fc4c5fb340d2

New Issues (2)

Checkmarx found the following issues in this Pull Request

#	Severity	Issue	Source File / Package	Checkmarx Insight
1		CSRF	/src/Api/Billing/Controllers/AccountsController.cs: 107	details Method at line 107 of /src/Api/Billing/Controllers/AccountsController.cs gets a parameter from a user request from subscriberService. This param... Attack Vector
2		CSRF	/src/Api/Billing/Controllers/VNext/AccountBillingVNextController.cs: 123	details Method at line 123 of /src/Api/Billing/Controllers/VNext/AccountBillingVNextController.cs gets a parameter from a user request from request. Thi... Attack Vector

amorask-bitwarden

Nice work here, just a few questions and thoughts on the logic.

amorask-bitwarden · 2026-01-16T13:53:10Z

src/Core/Billing/Services/Implementations/SubscriberService.cs

+    private async Task<bool> TryRevertPremiumUpgradeAsync(Subscription subscription, Organization organization)
+    {
+        // Extract all metadata once
+        var metadata = subscription.Metadata ?? new Dictionary<string, string>();


subscription.metadata is not a nullable property: https://docs.stripe.com/api/subscriptions/object?api-version=2025-08-27.basil&lang=cli#subscription_object-metadata

src/Core/Billing/Services/Implementations/SubscriberService.cs

amorask-bitwarden · 2026-01-16T13:56:45Z

src/Core/Billing/Services/Implementations/SubscriberService.cs

+
+            // STEP 2: Get the current Premium plan details from pricing client
+            var premiumPlan = await pricingClient.GetAvailablePremiumPlan();
+            if (premiumPlan == null || !premiumPlan.Available)


pricingClient.GetAvailablePremiumPlan throws a NotFoundException. It does not return null which is why the result isn't nullable.

amorask-bitwarden · 2026-01-16T13:59:40Z

src/Core/Billing/Services/Implementations/SubscriberService.cs

+            updatedMetadata.Remove(MetadataKeys.OrganizationId);
+
+            // STEP 6: Update Stripe subscription
+            var updateOptions = new SubscriptionUpdateOptions


What's the periodEnd variable for? Is that supposed to go somewhere in here?

❓ Same question.

src/Core/Billing/Services/Implementations/SubscriberService.cs

amorask-bitwarden · 2026-01-16T14:03:58Z

src/Billing/Services/Implementations/SubscriptionUpdatedHandler.cs

+    {
+        // STEP 1: Fastest check first - check if subscription has premium upgrade metadata
+        // This avoids expensive deserialization for subscriptions without this metadata
+        if (subscription.Metadata == null ||


subscription.metadata is not a nullable property.

…mium-reverts-an-organization-upgrade-during-the-trial-period

amorask-bitwarden · 2026-01-21T14:53:43Z

src/Core/Billing/Services/Implementations/SubscriberService.cs

        if (cancelImmediately)
        {
-            if (subscription.Metadata != null && subscription.Metadata.ContainsKey("organizationId"))
+            if (subscription.Metadata.ContainsKey("organizationId"))


⛏️ Let's use StripeConstants.MetadataKeys here.

amorask-bitwarden · 2026-01-21T14:54:23Z

src/Core/Billing/Services/Implementations/SubscriberService.cs

+        // rather than "reversion failed" - the cancellation should proceed normally.
+
+        // Check if metadata exists
+        if (metadata == null)


⛏️ Mentioned this a couple of times - a Subscription's metadata is not a nullable property in Stripe's API so this check is not necessary.

amorask-bitwarden · 2026-01-21T14:56:29Z

src/Core/Billing/Services/Implementations/SubscriberService.cs

+        // Check if this is a Premium-to-Organization upgrade that can be reverted
+        if (subscriber is Organization organization)
+        {
+            var canRevert = await TryRevertPremiumUpgradeAsync(subscription, organization);


❌ This is confusing. Your method that actually does the reversion of the premium upgrade returns a boolean that indicates whether the organization can revert in the first place? I think these should be 2 methods: 1 to check of an organization can revert and another to do the reversion.

amorask-bitwarden · 2026-01-21T14:57:38Z

src/Core/Billing/Services/Implementations/SubscriberService.cs

+            updatedMetadata.Remove(MetadataKeys.OrganizationId);
+
+            // STEP 6: Update Stripe subscription
+            var updateOptions = new SubscriptionUpdateOptions


❓ Same question.

src/Core/Billing/Services/Implementations/SubscriberService.cs

amorask-bitwarden · 2026-01-21T15:00:45Z

src/Billing/Services/Implementations/SubscriptionUpdatedHandler.cs

        var premiumPlans = await _pricingClient.ListPremiumPlans();
-        var premiumPriceIds = premiumPlans.SelectMany(p => new[] { p.Seat.StripePriceId, p.Storage.StripePriceId }).ToHashSet();
-        return subscription.Items.Any(i => premiumPriceIds.Contains(i.Price.Id));
+        if (premiumPlans == null || !premiumPlans.Any())


The response from ListPremiumPlans is also not nullable.

amorask-bitwarden · 2026-01-21T15:01:11Z

src/Billing/Services/Implementations/SubscriptionUpdatedHandler.cs

+        }
+
+        var premiumPriceIds = premiumPlans
+            .Where(p => p.Seat != null && p.Storage != null)


Neither of these are nullable.

amorask-bitwarden · 2026-01-21T15:02:14Z

src/Billing/Services/Implementations/SubscriptionUpdatedHandler.cs

+            .SelectMany(p => new[] { p.Seat.StripePriceId, p.Storage.StripePriceId })
+            .ToHashSet();
+
+        return subscription.Items.Any(i => i.Price != null && premiumPriceIds.Contains(i.Price.Id));


Price is not nullable.

amorask-bitwarden · 2026-01-21T15:02:57Z

src/Billing/Services/Implementations/SubscriptionUpdatedHandler.cs

        // Get all plan IDs that include Secrets Manager support to check if the organization has secret manager in the
        // previous and/or current subscriptions.
-        var planIdsOfPlansWithSecretManager = (await _pricingClient.ListPlans())
+        var plans = await _pricingClient.ListPlans();


Why are we making changes to the RemovePasswordManagerCouponIfRemovingSecretsManagerTrialAsync as part of this work?

amorask-bitwarden · 2026-01-21T15:04:08Z

src/Billing/Services/Implementations/SubscriptionUpdatedHandler.cs

+
+        // STEP 5: Check if subscription still has OrganizationId (race condition check)
+        // If reversion already happened, OrganizationId would be removed and we should skip cleanup
+        if (!subscription.Metadata.ContainsKey(StripeConstants.MetadataKeys.OrganizationId))


Can you explain this logic here?

…mium-reverts-an-organization-upgrade-during-the-trial-period

amorask-bitwarden

Just a couple small things then we're good to go.

amorask-bitwarden · 2026-01-21T21:13:03Z

src/Core/Billing/Services/Implementations/SubscriberService.cs

+    /// <param name="subscription">The Stripe subscription to check</param>
+    /// <param name="organization">The organization attempting to cancel</param>
+    /// <returns>True if the reversion is possible, false otherwise</returns>
+    private Task<bool> CanRevertPremiumUpgradeAsync(Subscription subscription, Organization organization)


❓ Why is this returning a Task? Also, can we rename it to something more aligned with the process? Something along the lines of IsRevertingPremiumUpgrade?

amorask-bitwarden · 2026-01-21T21:17:17Z

src/Core/Billing/Services/Implementations/SubscriberService.cs

+        // Check if this is a Premium-to-Organization upgrade that can be reverted
+        if (subscriber is Organization organization)
+        {
+            var canRevert = await CanRevertPremiumUpgradeAsync(subscription, organization);


⛏️ canRevert is unnecessary.

if (IsRevertingPremiumUpgrade(subscription, organization)) { await RevertPremiumUpgradeAsync(subscription, organization); return; }

amorask-bitwarden

Nice work - thank you for handling the feedback.

Add the reversion implementation and unit test

bbce95d

cyprain-okeke requested a review from a team as a code owner January 15, 2026 15:47

cyprain-okeke requested a review from amorask-bitwarden January 15, 2026 15:47

cyprain-okeke and others added 3 commits January 15, 2026 17:39

Resolve the lint issue

a800c00

Merge branch 'main' into billing/pm-29595/user-that-upgraded-from-pre…

cf3c860

…mium-reverts-an-organization-upgrade-during-the-trial-period

Merge branch 'main' into billing/pm-29595/user-that-upgraded-from-pre…

a1d7c46

…mium-reverts-an-organization-upgrade-during-the-trial-period

amorask-bitwarden requested changes Jan 16, 2026

View reviewed changes

Address the review comments

5f5f177

cyprain-okeke requested a review from amorask-bitwarden January 19, 2026 11:24

cyprain-okeke and others added 3 commits January 19, 2026 12:24

Merge branch 'main' into billing/pm-29595/user-that-upgraded-from-pre…

5772b46

…mium-reverts-an-organization-upgrade-during-the-trial-period

Fix the unit test

f6bae83

Fix the failing unit test

4ad8369

amorask-bitwarden requested changes Jan 21, 2026

View reviewed changes

cyprain-okeke and others added 7 commits January 21, 2026 17:06

Resolve null checks

74178c1

Merge branch 'main' into billing/pm-29595/user-that-upgraded-from-pre…

25b178f

…mium-reverts-an-organization-upgrade-during-the-trial-period

Merge branch 'main' into billing/pm-29595/user-that-upgraded-from-pre…

949c01a

…mium-reverts-an-organization-upgrade-during-the-trial-period

Revert the metadata deletion

7007767

fix the failing test

417c803

Fix the failing test

ba05d49

Fix the subscribe unit test

4ae7ea0

cyprain-okeke requested a review from amorask-bitwarden January 21, 2026 21:07

amorask-bitwarden requested changes Jan 21, 2026

View reviewed changes

remove canRevert that unnecessary

c7528df

cyprain-okeke requested a review from amorask-bitwarden January 22, 2026 08:24

amorask-bitwarden approved these changes Jan 22, 2026

View reviewed changes

[PM 29595]Implement : User that Upgraded from Premium Reverts an Organization Upgrade During the Trial Period #6849

Are you sure you want to change the base?

[PM 29595]Implement : User that Upgraded from Premium Reverts an Organization Upgrade During the Trial Period #6849

Conversation

cyprain-okeke commented Jan 15, 2026

🎟️ Tracking

📔 Objective

📸 Screenshots

⏰ Reminders before review

🦮 Reviewer guidelines

Uh oh!

codecov bot commented Jan 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

github-actions bot commented Jan 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

amorask-bitwarden left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

amorask-bitwarden left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

amorask-bitwarden left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

codecov bot commented Jan 15, 2026 •

edited

Loading

github-actions bot commented Jan 16, 2026 •

edited

Loading