[AC-1486] Feature: SM Billing Round 1 #5747

vvolkgang · 2023-07-05T20:35:40Z

Type of change

- [ ] Bug fix
- [x] New feature development
- [ ] Tech debt (refactoring, code cleanup, dependency upgrades, etc)
- [ ] Build/deploy pipeline (DevOps)
- [ ] Other

Objective

Long-lived feature branch to support billing for Secrets Manager.

Requires server PR: bitwarden/server#3073

Screenshots

Before you submit

Please add unit tests where it makes sense to do so (encouraged but not required)
If this change requires a documentation update - notify the documentation team
If this change has particular deployment requirements - notify the DevOps team
Ensure that all UI additions follow WCAG AA requirements

* [AC-1423] Add ProgressModule to shared.module.ts * [AC-1423] Update cloud subscription page styles - Remove bootstrap styles - Use CL components where applicable - Use CL typography directives - Update heading levels to prepare for new SM sections * [AC-1423] Add usePasswordManager boolean to organization domain * [AC-1423] Introduce BitwardenProductType enum * [AC-1423] Update Organization subscription line items - Add product type prefix - Indent addon services like additional storage and service accounts - Show line items for free plans * [AC-1423] Simply sort function * [AC-1423] Remove header border * [AC-1423] Make "Password Manager" the default fallback for product name

* [AC-1423] Add minWidth input to bit-progress component * [AC-1423] Add ProgressModule to shared.module.ts * [AC-1423] Update cloud subscription page styles - Remove bootstrap styles - Use CL components where applicable - Use CL typography directives - Update heading levels to prepare for new SM sections * [AC-1423] Add usePasswordManager boolean to organization domain * [AC-1423] Introduce BitwardenProductType enum * [AC-1423] Update Organization subscription line items - Add product type prefix - Indent addon services like additional storage and service accounts - Show line items for free plans * [AC-1423] Simply sort function * [AC-1423] Remove header border * [AC-1423] Remove redundant condition * [AC-1423] Remove ineffective div * [AC-1423] Make "Password Manager" the default fallback for product name * Revert "[AC-1423] Add minWidth input to bit-progress component" This reverts commit 95b2223. * [AC-1423] Remove minWidth attribute * [AC-1423] Switch to AddonProductType enum instead of boolean * Revert "[AC-1423] Switch to AddonProductType enum instead of boolean" This reverts commit 204f64b. * [AC-1423] Tweak sorting comment * [AC-1418] Add initial SecretsManagerAdjustSubscription component * [AC-1418] Add initial SM adjustment form * [AC-1418] Adjust organization-subscription-update.request.ts to support both PM and SM * [AC-1418] Rename service account fields in the options interface * [AC-1418] Add api service call to update SM subscription * [AC-1418] Cleanup form html * [AC-1418] Add missing SM plan properties * [AC-1418] Add SM subscription adjust form and logic to hide it * [AC-1418] Add better docs to options interface * [AC-1418] Fix conflicting required/optional labels for auto-scaling limits * [AC-1418] Adjust labels and appearance to better match design * [AC-1418] Use the SM plan for billing interval * [AC-1418] Hide SM billing adjustment component behind feature flag * [AC-1418] Update request model to match server * [AC-1418] Cleanup BitwardenProductType after merge Add to barrel file and update applicable imports. * [AC-1418] Revert change to update PM subscription request model * [AC-1418] Add new update SM subscription request model * [AC-1418] Add new service method to update SM subscription * [AC-1418] Use new model and service method * [AC-1418] Cleanup SM subscription UI flags * [AC-1418] Move SM adjust subscription component into SM billing module * [AC-1418] Update SM seat count minimum to 1 * [AC-1418] Add missing currency codes * [AC-1418] Simplify monthly price calculation * [AC-1418] Increase PM adjust subscription form input width * [AC-1418] Add check for null subscription --------- Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com>

bitwarden-bot · 2023-07-10T16:09:55Z

Checkmarx One – Scan Summary & Details – c1b900e1-5b73-4aea-8165-1fb39f8ac8a5

No New Or Fixed Issues Found

#5784) * Allow autoscale limits to be removed, update naming * Display additional service accounts only --------- Co-authored-by: Shane Melton <smelton@bitwarden.com>

Hinton

Platform changes looks good. Some confusion around how the billing portions are implemented. In some places we reference a SM plan, but not in create or update? And plans seems to be a union between PM and SM.

Hinton · 2023-07-12T13:59:48Z

libs/common/src/billing/models/response/subscription.response.ts

@@ -62,6 +63,8 @@ export class BillingSubscriptionItemResponse extends BaseResponse {
  quantity: number;
  interval: string;
  sponsoredSubscriptionItem: boolean;
+  addonSubscriptionItem: boolean;
+  bitwardenProduct: BitwardenProductType;


Reason we prefix this with bitwarden?

We already have a ProductType enum, which is basically the same as the PlanType but without any reference to monthly/annually billing cycle or the year:

export enum ProductType { Free = 0, Families = 1, Teams = 2, Enterprise = 3, }

We might be able to reduce the duplication between PlanType/ProductType (which in turn would reduce this confusion) when we refactor plans.

Hinton · 2023-07-12T14:18:55Z

libs/common/src/billing/models/response/plan.response.ts

+  additionalPricePerServiceAccount: number;
+  baseServiceAccount: number;
+  maxServiceAccount: number;
+  hasAdditionalServiceAccountOption: boolean;
+  maxProjects: number;
+  maxAdditionalServiceAccounts: number;
+  stripeServiceAccountPlanId: string;


I would kind of have expected there to be two plan models, one for PM and another for SM. That both extends a common model?

Yes, the plan models are the biggest thing we need to refactor post GA. I actually think there should be 1 plan object per subscription level (e.g. teams/enterprise/families/free) showing what features and products that subscription level supports. Given that an org can only ever have 1 subscription level. Happy to discuss further if you like, but in any case this is top of my list for followup.

Hinton · 2023-07-12T14:20:50Z

libs/common/src/admin-console/models/response/organization.response.ts

@@ -27,6 +28,11 @@ export class OrganizationResponse extends BaseResponse {
  useResetPassword: boolean;
  useSecretsManager: boolean;
  hasPublicAndPrivateKeys: boolean;
+  usePasswordManager: boolean;


Do we need this if we have the plan from which we can deduct that they use pm? (Same for useSecretsManager)

The plan object shows what the plan supports (in general, e.g. enterprise plans support different features to teams plans), not what this particular organization is using.

…tab (#5848) Also: * Fix spacing in layout * Send zero values for free plans

eliykat

Approved in principle, but I've done some of this work so I will ask for a final review and merge from either @cyprain-okeke or @r-tome.

✅ each commit is approved in a separate PR or has otherwise been reviewed & approved now
✅ list of change files does not show any unexpected changes

cyprain-okeke

Looks Great

MGibson1 · 2023-07-24T23:03:04Z

libs/common/src/billing/enums/bitwarden-product-type.enum.ts

@@ -0,0 +1,4 @@
+export enum BitwardenProductType {


ProductType is an existing enum that defines free, teams, enterprise, etc.

Can we rename this to BitwardenProduct? Type really isn't adding anything to this name anyway.

MGibson1 · 2023-07-24T23:06:52Z

libs/common/src/billing/models/request/organization-subscription-update.request.ts

yay for docs! boo that we lose our inline properties

shane-melton and others added 7 commits June 23, 2023 09:17

[AC-1420] Add Secrets Manager subscribe component (#5617)

86ccff7

Merge branch 'master' into feature/sm-billing

49b6519

Merge branch 'master' into feature/sm-billing

5d196ec

Merge remote-tracking branch 'origin/master' into feature/sm-billing

0307973

add the additional properties (#5743)

20264d5

vvolkgang changed the title ~~Feature: SM Billing~~ [AC-1486] Feature: SM Billing Jul 5, 2023

Merge branch 'master' into feature/sm-billing

21a49d7

eliykat and others added 3 commits July 11, 2023 20:01

Merge remote-tracking branch 'origin/master' into feature/sm-billing

362a4e4

Allow autoscale limits to be removed, update naming (#5781)

239f500

[AC-1488] Store Organization.SmServiceAccounts as total not additional (

e0b04b6

#5784) * Allow autoscale limits to be removed, update naming * Display additional service accounts only --------- Co-authored-by: Shane Melton <smelton@bitwarden.com>

vvolkgang changed the title ~~[AC-1486] Feature: SM Billing~~ [AC-1486] Feature: SM Billing Round 1 Jul 11, 2023

Merge branch 'master' into feature/sm-billing

ff2f1b2

eliykat marked this pull request as ready for review July 12, 2023 00:28

eliykat requested review from a team as code owners July 12, 2023 00:28

Hinton previously approved these changes Jul 12, 2023

View reviewed changes

eliykat added 2 commits July 13, 2023 10:57

Merge branch 'master' into feature/sm-billing

616b2fe

Merge branch 'master' into feature/sm-billing

3d5310c

github-actions bot temporarily deployed to Web Vault - QA July 14, 2023 12:45 Inactive

Merge branch 'master' into feature/sm-billing

e6e91e7

github-actions bot temporarily deployed to Web Vault - QA July 14, 2023 21:18 Inactive

github-actions bot temporarily deployed to Web Vault - QA July 17, 2023 15:00 Inactive

github-actions bot temporarily deployed to Web Vault - QA July 17, 2023 17:01 Inactive

Merge remote-tracking branch 'origin/master' into feature/sm-billing

bfd267c

eliykat dismissed Hinton’s stale review via bfd267c July 19, 2023 00:05

[AC-1531] Fix SM subscribe component not showing in free org billing …

85aafa3

…tab (#5848) Also: * Fix spacing in layout * Send zero values for free plans

github-actions bot temporarily deployed to Web Vault - QA July 20, 2023 11:26 Inactive

Fix: properly delete enroll component

6229c4a

eliykat reviewed Jul 24, 2023

View reviewed changes

eliykat mentioned this pull request Jul 21, 2023

[AC-1486] Feature: SM Billing bitwarden/server#3073

Merged

eliykat requested review from cyprain-okeke and r-tome July 24, 2023 00:47

r-tome approved these changes Jul 24, 2023

View reviewed changes

cyprain-okeke approved these changes Jul 24, 2023

View reviewed changes

eliykat enabled auto-merge (squash) July 24, 2023 22:34

eliykat approved these changes Jul 24, 2023

View reviewed changes

MGibson1 approved these changes Jul 24, 2023

View reviewed changes

eliykat merged commit 34533f6 into master Jul 24, 2023
56 checks passed

eliykat deleted the feature/sm-billing branch July 24, 2023 23:07

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[AC-1486] Feature: SM Billing Round 1 #5747

[AC-1486] Feature: SM Billing Round 1 #5747

vvolkgang commented Jul 5, 2023 •

edited by eliykat

Loading

bitwarden-bot commented Jul 10, 2023 •

edited

Loading

Hinton left a comment

Hinton Jul 12, 2023

eliykat Jul 12, 2023

Hinton Jul 12, 2023

eliykat Jul 12, 2023

Hinton Jul 12, 2023

eliykat Jul 12, 2023

eliykat left a comment •

edited

Loading

cyprain-okeke left a comment

MGibson1 Jul 24, 2023

MGibson1 Jul 24, 2023

[AC-1486] Feature: SM Billing Round 1 #5747

[AC-1486] Feature: SM Billing Round 1 #5747

Conversation

vvolkgang commented Jul 5, 2023 • edited by eliykat Loading

Type of change

Objective

Screenshots

Before you submit

bitwarden-bot commented Jul 10, 2023 • edited Loading

No New Or Fixed Issues Found

Hinton left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

eliykat left a comment • edited Loading

Choose a reason for hiding this comment

cyprain-okeke left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vvolkgang commented Jul 5, 2023 •

edited by eliykat

Loading

bitwarden-bot commented Jul 10, 2023 •

edited

Loading

eliykat left a comment •

edited

Loading