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

Revert the changes on GetSubscriptionSetup

Browse Source
This commit is contained in:
Cy Okeke 2025-06-17 18:13:25 +01:00
parent 1579a490fe
commit cd5997c9b9
No known key found for this signature in database
GPG Key ID: 88B341B55C84B45C
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,7 @@ public class OrganizationSale
var subscriptionSetup = GetSubscriptionSetup(signup); var subscriptionSetup = GetSubscriptionSetup(signup);
subscriptionSetup.SkipTrial = signup.SkipTrial; subscriptionSetup.SkipTrial = signup.SkipTrial;
subscriptionSetup.InitiationPath = organization.GatewayCustomerId;
return new OrganizationSale return new OrganizationSale
{ {
@ -87,29 +88,26 @@ public class OrganizationSale
private static SubscriptionSetup GetSubscriptionSetup(OrganizationUpgrade upgrade) private static SubscriptionSetup GetSubscriptionSetup(OrganizationUpgrade upgrade)
{ {
var subscriptionSetup = new SubscriptionSetup var passwordManagerOptions = new SubscriptionSetup.PasswordManager
{ {
PlanType = upgrade.Plan, Seats = upgrade.AdditionalSeats,
PasswordManagerOptions = new SubscriptionSetup.PasswordManager Storage = upgrade.AdditionalStorageGb,
{ PremiumAccess = upgrade.PremiumAccessAddon
Seats = upgrade.AdditionalSeats,
Storage = upgrade.AdditionalStorageGb,
PremiumAccess = upgrade.PremiumAccessAddon
},
SecretsManagerOptions = upgrade.UseSecretsManager
? new SubscriptionSetup.SecretsManager
{
Seats = upgrade.AdditionalSmSeats ?? 0,
ServiceAccounts = upgrade.AdditionalServiceAccounts
}
: null
}; };
if (upgrade is OrganizationSignup signup) var secretsManagerOptions = upgrade.UseSecretsManager
{ ? new SubscriptionSetup.SecretsManager
subscriptionSetup.InitiationPath = signup.InitiationPath; {
} Seats = upgrade.AdditionalSmSeats ?? 0,
ServiceAccounts = upgrade.AdditionalServiceAccounts
}
: null;
return subscriptionSetup; return new SubscriptionSetup
{
PlanType = upgrade.Plan,
PasswordManagerOptions = passwordManagerOptions,
SecretsManagerOptions = secretsManagerOptions
};
} }
} }