nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-16 07:50:49 -05:00
Code

Resolve the failing test

Browse Source
This commit is contained in:
Cy Okeke 2025-06-10 13:16:38 +01:00
parent 177326b63d
commit 9292f3810f
No known key found for this signature in database
GPG Key ID: 88B341B55C84B45C
1 changed files with 54 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/Core/Billing/Models/Sales/OrganizationSale.cs
View File

@ -45,7 +45,18 @@ public class OrganizationSale
public static OrganizationSale From(
Organization organization,
OrganizationUpgrade upgrade) => From(organization, (OrganizationSignup)upgrade);
OrganizationUpgrade upgrade)
{
var customerSetup = string.IsNullOrEmpty(organization.GatewayCustomerId) ? GetCustomerSetup(upgrade) : null;
var subscriptionSetup = GetSubscriptionSetup(upgrade);
return new OrganizationSale
{
Organization = organization,
CustomerSetup = customerSetup,
SubscriptionSetup = subscriptionSetup
};
}
private static CustomerSetup GetCustomerSetup(OrganizationSignup signup)
{
@ -81,6 +92,22 @@ public class OrganizationSale
return customerSetup;
}
private static CustomerSetup GetCustomerSetup(OrganizationUpgrade upgrade)
{
return new CustomerSetup
{
TaxInformation = new TaxInformation(
upgrade.TaxInfo.BillingAddressCountry,
upgrade.TaxInfo.BillingAddressPostalCode,
upgrade.TaxInfo.TaxIdNumber,
upgrade.TaxInfo.TaxIdType,
upgrade.TaxInfo.BillingAddressLine1,
upgrade.TaxInfo.BillingAddressLine2,
upgrade.TaxInfo.BillingAddressCity,
upgrade.TaxInfo.BillingAddressState)
};
}
private static SubscriptionSetup GetSubscriptionSetup(OrganizationSignup signup)
{
var passwordManagerOptions = new SubscriptionSetup.PasswordManager
@ -116,4 +143,30 @@ public class OrganizationSale
return subscriptionSetup;
}
private static SubscriptionSetup GetSubscriptionSetup(OrganizationUpgrade upgrade)
{
var passwordManagerOptions = new SubscriptionSetup.PasswordManager
{
Seats = upgrade.AdditionalSeats,
Storage = upgrade.AdditionalStorageGb,
PremiumAccess = upgrade.PremiumAccessAddon
};
var secretsManagerOptions = upgrade.UseSecretsManager
? new SubscriptionSetup.SecretsManager
{
Seats = upgrade.AdditionalSmSeats ?? 0,
ServiceAccounts = upgrade.AdditionalServiceAccounts
}
: null;
return new SubscriptionSetup
{
PlanType = upgrade.Plan,
PasswordManagerOptions = passwordManagerOptions,
SecretsManagerOptions = secretsManagerOptions,
SkipTrial = true // Upgrades should always skip trial
};
}
}