Skip to content

[PM 34174]Do not show renewal reminder banners to exempt organizations#20201

Open
cyprain-okeke wants to merge 6 commits intomainfrom
billing/pm-34174/do-not-show-renewal-reminder-banners-to-exempt-organizations
Open

[PM 34174]Do not show renewal reminder banners to exempt organizations#20201
cyprain-okeke wants to merge 6 commits intomainfrom
billing/pm-34174/do-not-show-renewal-reminder-banners-to-exempt-organizations

Conversation

@cyprain-okeke
Copy link
Copy Markdown
Contributor

🎟️ Tracking

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

📔 Objective

Suppress billing renewal reminder banners and subscription status callouts for organizations that are exempt from billing
automation.

Reseller-managed organizations marked as exempt (exemptFromBillingAutomation = true) should not see renewal cycle notifications or
warning callouts related to past due, unpaid, pending cancellation, or canceled subscription statuses.

Changes

  • Added exemptFromBillingAutomation field to the organization model pipeline (ProfileOrganizationResponse → OrganizationData →
    Organization)
  • Gated getResellerRenewalWarning$() in OrganizationWarningsService to return null for exempt organizations, skipping the API call
    entirely
  • Added exempt input to SubscriptionStatusComponent to suppress warning callouts (past_due, unpaid, pending_cancellation, canceled)
    while preserving status and date display
  • Passed userOrg.exemptFromBillingAutomation to the SubscriptionStatusComponent from the cloud subscription template

Screenshots & Testing
Testing

  • Verified exempt organizations do not see reseller renewal banners
  • Verified exempt organizations do not see subscription status callouts
  • Verified non-exempt organizations continue to see all warnings as before
  • Unit tests added for both OrganizationWarningsService and SubscriptionStatusComponent

📸 Screenshots

Screenshot 2026-04-16 at 2 27 19 PM Screenshot 2026-04-16 at 2 26 57 PM Screenshot 2026-04-16 at 2 10 06 PM Screenshot 2026-04-16 at 2 09 41 PM Screenshot 2026-04-16 at 1 57 57 PM Screenshot 2026-04-16 at 1 57 08 PM Screenshot 2026-04-16 at 1 53 55 PM Screenshot 2026-04-16 at 1 46 14 PM

@cyprain-okeke cyprain-okeke requested review from a team as code owners April 16, 2026 14:14
@cyprain-okeke cyprain-okeke changed the title Add the exempt property [PM 34174]Do not show renewal reminder banners to exempt organizations Apr 16, 2026
@codecov
Copy link
Copy Markdown

codecov Bot commented Apr 16, 2026

Codecov Report

❌ Patch coverage is 83.33333% with 2 lines in your changes missing coverage. Please review.
✅ Project coverage is 47.34%. Comparing base (3acd6ea) to head (41f77d3).
✅ All tests successful. No failed tests found.

Files with missing lines Patch % Lines
...ing/organizations/subscription-status.component.ts 80.00% 0 Missing and 1 partial ⚠️
...e/models/response/profile-organization.response.ts 50.00% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main   #20201      +/-   ##
==========================================
+ Coverage   47.33%   47.34%   +0.01%     
==========================================
  Files        3956     3956              
  Lines      120391   120402      +11     
  Branches    18523    18528       +5     
==========================================
+ Hits        56988    57008      +20     
+ Misses      59076    59062      -14     
- Partials     4327     4332       +5     

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

🚀 New features to boost your workflow:
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@github-actions
Copy link
Copy Markdown
Contributor

Logo
Checkmarx One – Scan Summary & Details5597b977-4a27-42df-8b9b-fdb524b0c803

Great job! No new security vulnerabilities introduced in this pull request

JimmyVo16
JimmyVo16 previously approved these changes Apr 16, 2026
kdenney
kdenney previously approved these changes Apr 17, 2026
Copy link
Copy Markdown
Contributor

@kdenney kdenney left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

…ot-show-renewal-reminder-banners-to-exempt-organizations

# Conflicts:
#	libs/common/src/admin-console/models/data/organization.data.spec.ts
#	libs/common/src/admin-console/models/data/organization.data.ts
#	libs/common/src/admin-console/models/domain/organization.ts
#	libs/common/src/admin-console/models/response/profile-organization.response.ts
@cyprain-okeke cyprain-okeke dismissed stale reviews from kdenney and JimmyVo16 via b913dc3 May 7, 2026 15:33
@cyprain-okeke cyprain-okeke requested review from JimmyVo16 and kdenney May 7, 2026 16:25
@sonarqubecloud
Copy link
Copy Markdown

sonarqubecloud Bot commented May 7, 2026

Copy link
Copy Markdown
Contributor

@amorask-bitwarden amorask-bitwarden left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants