nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-05-29 15:24:51 -05:00
Code

[PM-4669] Fix SM subscription during free upgrade (#3407)

Browse Source 
* Formatting, no logic

* Pass upgrade.UseSecretsManager for free upgrade flow
This commit is contained in:
Alex Morask 2023-11-02 15:55:19 -04:00 committed by GitHub
parent a66528cf46
commit 629b37b7e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 54 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/Core/Models/Business/SubscriptionCreateOptions.cs
View File

@ -4,10 +4,18 @@ using Plan = Bit.Core.Models.StaticStore.Plan;
namespace Bit.Core.Models.Business; namespace Bit.Core.Models.Business;
public class OrganizationSubscriptionOptionsBase : Stripe.SubscriptionCreateOptions public class OrganizationSubscriptionOptionsBase : SubscriptionCreateOptions
{ {
public OrganizationSubscriptionOptionsBase(Organization org, StaticStore.Plan plan, TaxInfo taxInfo, int additionalSeats, public OrganizationSubscriptionOptionsBase(
int additionalStorageGb, bool premiumAccessAddon, int additionalSmSeats, int additionalServiceAccounts) Organization org,
Plan plan,
TaxInfo taxInfo,
int additionalSeats,
int additionalStorageGb,
bool premiumAccessAddon,
bool useSecretsManager,
int additionalSmSeats,
int additionalServiceAccounts)
{ {
Items = new List<SubscriptionItemOptions>(); Items = new List<SubscriptionItemOptions>();
Metadata = new Dictionary<string, string> Metadata = new Dictionary<string, string>
@ -17,7 +25,7 @@ public class OrganizationSubscriptionOptionsBase : Stripe.SubscriptionCreateOpti
AddPlanIdToSubscription(plan); AddPlanIdToSubscription(plan);
if (org.UseSecretsManager) if (useSecretsManager)
{ {
AddSecretsManagerSeat(plan, additionalSmSeats); AddSecretsManagerSeat(plan, additionalSmSeats);
AddServiceAccount(plan, additionalServiceAccounts); AddServiceAccount(plan, additionalServiceAccounts);
@ -38,7 +46,10 @@ public class OrganizationSubscriptionOptionsBase : Stripe.SubscriptionCreateOpti
if (additionalSmSeats > 0 && plan.SecretsManager.StripeSeatPlanId != null) if (additionalSmSeats > 0 && plan.SecretsManager.StripeSeatPlanId != null)
{ {
Items.Add(new SubscriptionItemOptions Items.Add(new SubscriptionItemOptions
{ Plan = plan.SecretsManager.StripeSeatPlanId, Quantity = additionalSmSeats }); {
Plan = plan.SecretsManager.StripeSeatPlanId,
Quantity = additionalSmSeats
});
} }
} }
@ -47,11 +58,14 @@ public class OrganizationSubscriptionOptionsBase : Stripe.SubscriptionCreateOpti
if (additionalSeats > 0 && plan.PasswordManager.StripeSeatPlanId != null) if (additionalSeats > 0 && plan.PasswordManager.StripeSeatPlanId != null)
{ {
Items.Add(new SubscriptionItemOptions Items.Add(new SubscriptionItemOptions
{ Plan = plan.PasswordManager.StripeSeatPlanId, Quantity = additionalSeats }); {
Plan = plan.PasswordManager.StripeSeatPlanId,
Quantity = additionalSeats
});
} }
} }
private void AddServiceAccount(StaticStore.Plan plan, int additionalServiceAccounts) private void AddServiceAccount(Plan plan, int additionalServiceAccounts)
{ {
if (additionalServiceAccounts > 0 && plan.SecretsManager.StripeServiceAccountPlanId != null) if (additionalServiceAccounts > 0 && plan.SecretsManager.StripeServiceAccountPlanId != null)
{ {
@ -63,7 +77,7 @@ public class OrganizationSubscriptionOptionsBase : Stripe.SubscriptionCreateOpti
} }
} }
private void AddAdditionalStorage(StaticStore.Plan plan, int additionalStorageGb) private void AddAdditionalStorage(Plan plan, int additionalStorageGb)
{ {
if (additionalStorageGb > 0) if (additionalStorageGb > 0)
{ {
@ -75,19 +89,27 @@ public class OrganizationSubscriptionOptionsBase : Stripe.SubscriptionCreateOpti
} }
} }
private void AddPremiumAccessAddon(StaticStore.Plan plan, bool premiumAccessAddon) private void AddPremiumAccessAddon(Plan plan, bool premiumAccessAddon)
{ {
if (premiumAccessAddon && plan.PasswordManager.StripePremiumAccessPlanId != null) if (premiumAccessAddon && plan.PasswordManager.StripePremiumAccessPlanId != null)
{ {
Items.Add(new SubscriptionItemOptions { Plan = plan.PasswordManager.StripePremiumAccessPlanId, Quantity = 1 }); Items.Add(new SubscriptionItemOptions
{
Plan = plan.PasswordManager.StripePremiumAccessPlanId,
Quantity = 1
});
} }
} }
private void AddPlanIdToSubscription(StaticStore.Plan plan) private void AddPlanIdToSubscription(Plan plan)
{ {
if (plan.PasswordManager.StripePlanId != null) if (plan.PasswordManager.StripePlanId != null)
{ {
Items.Add(new SubscriptionItemOptions { Plan = plan.PasswordManager.StripePlanId, Quantity = 1 }); Items.Add(new SubscriptionItemOptions
{
Plan = plan.PasswordManager.StripePlanId,
Quantity = 1
});
} }
} }
} }
@ -95,11 +117,18 @@ public class OrganizationSubscriptionOptionsBase : Stripe.SubscriptionCreateOpti
public class OrganizationPurchaseSubscriptionOptions : OrganizationSubscriptionOptionsBase public class OrganizationPurchaseSubscriptionOptions : OrganizationSubscriptionOptionsBase
{ {
public OrganizationPurchaseSubscriptionOptions( public OrganizationPurchaseSubscriptionOptions(
Organization org, StaticStore.Plan plan, Organization org,
TaxInfo taxInfo, int additionalSeats, Plan plan,
int additionalStorageGb, bool premiumAccessAddon, TaxInfo taxInfo,
int additionalSmSeats, int additionalServiceAccounts) : int additionalSeats,
base(org, plan, taxInfo, additionalSeats, additionalStorageGb, premiumAccessAddon, additionalSmSeats, additionalServiceAccounts) int additionalStorageGb,
bool premiumAccessAddon,
int additionalSmSeats,
int additionalServiceAccounts) :
base(org, plan, taxInfo, additionalSeats,
additionalStorageGb, premiumAccessAddon,
org.UseSecretsManager, additionalSmSeats,
additionalServiceAccounts)
{ {
OffSession = true; OffSession = true;
TrialPeriodDays = plan.TrialPeriodDays; TrialPeriodDays = plan.TrialPeriodDays;
@ -109,11 +138,14 @@ public class OrganizationPurchaseSubscriptionOptions : OrganizationSubscriptionO
public class OrganizationUpgradeSubscriptionOptions : OrganizationSubscriptionOptionsBase public class OrganizationUpgradeSubscriptionOptions : OrganizationSubscriptionOptionsBase
{ {
public OrganizationUpgradeSubscriptionOptions( public OrganizationUpgradeSubscriptionOptions(
string customerId, Organization org, string customerId,
StaticStore.Plan plan, OrganizationUpgrade upgrade) : Organization org,
base(org, plan, upgrade.TaxInfo, upgrade.AdditionalSeats, upgrade.AdditionalStorageGb, Plan plan,
upgrade.PremiumAccessAddon, upgrade.AdditionalSmSeats.GetValueOrDefault(), OrganizationUpgrade upgrade) :
upgrade.AdditionalServiceAccounts.GetValueOrDefault()) base(org, plan, upgrade.TaxInfo, upgrade.AdditionalSeats,
upgrade.AdditionalStorageGb, upgrade.PremiumAccessAddon,
upgrade.UseSecretsManager, upgrade.AdditionalSmSeats.GetValueOrDefault(),
upgrade.AdditionalServiceAccounts.GetValueOrDefault())
{ {
Customer = customerId; Customer = customerId;
} }