nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-15 23:40:48 -05:00
Code

Remove the CustomerSetup added

Browse Source
This commit is contained in:
Cy Okeke 2025-06-10 15:56:19 +01:00
parent 0d6646697e
commit 6515a59af0
No known key found for this signature in database
GPG Key ID: 88B341B55C84B45C
1 changed files with 1 additions and 54 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

@ -85,58 +85,6 @@ public class OrganizationSale
return customerSetup; 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
{
Seats = signup.AdditionalSeats,
Storage = signup.AdditionalStorageGb,
PremiumAccess = signup.PremiumAccessAddon
};
var secretsManagerOptions = signup.UseSecretsManager
? new SubscriptionSetup.SecretsManager
{
Seats = signup.AdditionalSmSeats ?? 0,
ServiceAccounts = signup.AdditionalServiceAccounts
}
: null;
var subscriptionSetup = new SubscriptionSetup
{
PlanType = signup.Plan,
PasswordManagerOptions = passwordManagerOptions,
SecretsManagerOptions = secretsManagerOptions,
SkipTrial = signup.SkipTrial
};
// Set trial source based on initiation path
if (!string.IsNullOrEmpty(signup.InitiationPath))
{
subscriptionSetup.TrialSource = signup.InitiationPath.Contains("trial from marketing website")
? "marketing-initiated"
: "product-initiated";
}
return subscriptionSetup;
}
private static SubscriptionSetup GetSubscriptionSetup(OrganizationUpgrade upgrade) private static SubscriptionSetup GetSubscriptionSetup(OrganizationUpgrade upgrade)
{ {
var passwordManagerOptions = new SubscriptionSetup.PasswordManager var passwordManagerOptions = new SubscriptionSetup.PasswordManager
@ -158,8 +106,7 @@ public class OrganizationSale
{ {
PlanType = upgrade.Plan, PlanType = upgrade.Plan,
PasswordManagerOptions = passwordManagerOptions, PasswordManagerOptions = passwordManagerOptions,
SecretsManagerOptions = secretsManagerOptions, SecretsManagerOptions = secretsManagerOptions
SkipTrial = true // Upgrades should always skip trial
}; };
} }
} }