1
0
mirror of https://github.com/bitwarden/server.git synced 2025-07-03 09:02:48 -05:00

Organization autoscaling (#1585)

* Add autoscale fields to Organization

* Add autoscale setting changes

* Autoscale organizations

updates InviteUsersAsync to support all invite sources.

sends an email to org owners when organization autoscaled

* All organizations autoscale

Disabling autoscaling can be done by setting max seats to current seats.

We only warn about autoscaling on the first autoscaling event.

* Fix tests

* Bug fixes

* Simplify subscription update logic

* Void invoices that fail to delete

Stripe no longer allows deletion of draft invoices that were created as part of subscription updates. It's necessary to void out these invoices without sending tem to the client.

* Notify org owners when their subscription runs out of seats

* Use datetime for notifications

Allows for later re-sending email if we want to periodically remind
owners

* Do not update subscription if it already matches new quatity

* Include all migrations

* Remove unnecessary inline styling

* SubscriptionUpdate handles update decisions

* Remove unnecessary html setter

* PR review

* Use minimum access for class methods
This commit is contained in:
Matt Gibson
2021-09-23 06:36:08 -04:00
committed by GitHub
parent c2d5106a4d
commit d39f45c81c
46 changed files with 4113 additions and 231 deletions

View File

@ -0,0 +1,45 @@
{{#>FullHtmlLayout}}
<table width="100%" cellpadding="0" cellspacing="0"
style="margin: 0; box-sizing: border-box;">
<tr
style="margin: 0; box-sizing: border-box;">
<td class="content-block"
style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; margin: 0; -webkit-font-smoothing: antialiased; padding: 0 0 10px; -webkit-text-size-adjust: none;"
valign="top">
To accommodate new user invitations, your seat count has increased from {{InitialSeatCount}} to {{CurrentSeatCount}}. A
prorated charge has been immediately applied to your subscription for the new users. This notification will only be sent
once.
</td>
</tr>
<tr
style="margin: 0; box-sizing: border-box;">
<td class="content-block"
style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; margin: 0; -webkit-font-smoothing: antialiased; padding: 0 0 10px; -webkit-text-size-adjust: none;"
valign="top">
To manage your subscription:
<ol>
<li>Log in to your
<a href="https://vault.bitwarden.com/#/organizations/{{{OrganizationId}}}/settings/subscription">
Web Vault
</a>
and open your Organization.
</li>
<li>Open the <b>Settings</b> tab and select <b>Subscription</b> from the left-hand menu.</li>
<li>Update your subscription.</li>
<li>Click <b>Save</b>.</li>
</ol>
</td>
</tr>
<tr
style="margin: 0; box-sizing: border-box;">
<td class="content-block last"
style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; margin: 0; -webkit-font-smoothing: antialiased; padding: 0; -webkit-text-size-adjust: none;"
valign="top">
For more information, please refer to
<a href="https://bitwarden.com/help/article/managing-users/#subscription">
our help article.
</a>
</td>
</tr>
</table>
{{/FullHtmlLayout}}

View File

@ -0,0 +1,13 @@
{{#>BasicTextLayout}}
To accommodate new user invitations, your seat count has increased from {{InitialSeatCount}} to {{CurrentSeatCount}}. A
prorated charge has been immediately applied to your subscription for the new users. This notification will only be sent
once.
To manage your subscription:
1. Log in to your Web Vault and open your Organization.
2. Open the Settings tab and select Subscription from the left-hand menu.
4. Update your subscription.
5. Click Save.
For more information, please refer to the following help article: https://bitwarden.com/help/article/managing-user/#subscription
{{/BasicTextLayout}}

View File

@ -0,0 +1,38 @@
{{#>FullHtmlLayout}}
<table width="100%" cellpadding="0" cellspacing="0"
style="margin: 0; box-sizing: border-box; ">
<tr
style="margin: 0; box-sizing: border-box; ">
<td class="content-block"
style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; margin: 0; -webkit-font-smoothing: antialiased; padding: 0 0 10px; -webkit-text-size-adjust: none;"
valign="top">
Your organization has reached the seat limit of {{MaxSeatCount}} and new users cannot be invited.
</td>
</tr>
<tr
style="margin: 0; box-sizing: border-box; ">
<td class="content-block"
style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; margin: 0; -webkit-font-smoothing: antialiased; padding: 0 0 10px; -webkit-text-size-adjust: none;"
valign="top">
To increase your subscription:
<ol>
<li>Log in to your <a
href="https://vault.bitwarden.com/#/organizations/{{{OrganizationId}}}/settings/subscription">Web
Vault</a> and open your Organization.</li>
<li>Open the <b>Settings</b> tab and select <b>Subscription</b> from the left-hand menu.</li>
<li>Update your subscription.</li>
<li>Click <b>Save</b>.</li>
</ol>
</td>
</tr>
<tr
style="margin: 0; box-sizing: border-box; ">
<td class="content-block last"
style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; margin: 0; -webkit-font-smoothing: antialiased; padding: 0; -webkit-text-size-adjust: none;"
valign="top">
For more information, please refer to the following help article: <a
href="https://bitwarden.com/help/article/managing-users/#subscription">https://bitwarden.com/help/article/managing-users/#subscription</a>
</td>
</tr>
</table>
{{/FullHtmlLayout}}

View File

@ -0,0 +1,11 @@
{{#>BasicTextLayout}}
Your organization has reached the seat limit of {{MaxSeatCount}} and new users cannot be invited.
To increase your subscription:
1. Log in to your Web Vault and open your Organization.
2. Open the Settings tab and select Subscription from the left-hand menu.
4. Update your subscription.
5. Click Save.
For more information, please refer to the following help article: https://bitwarden.com/help/article/managing-user/#subscription
{{/BasicTextLayout}}