nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-05-14 08:02:17 -05:00
Code

[PM-21418] Do not start organization on trial when request includes SkipTrial (#5793)

Browse Source 
* Do not start organization on a trial when createRequest.SkipTrial is true

* Run dotnet format
This commit is contained in:
Alex Morask 2025-05-13 09:31:42 -04:00 committed by GitHub
parent 53f7d9655e
commit ca40226380
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Api/AdminConsole/Models/Request/Organizations/OrganizationCreateRequestModel.cs
View File

@ -75,6 +75,8 @@ public class OrganizationCreateRequestModel : IValidatableObject
public string InitiationPath { get; set; }
public bool SkipTrial { get; set; }
public virtual OrganizationSignup ToOrganizationSignup(User user)
{
var orgSignup = new OrganizationSignup
@ -107,6 +109,7 @@ public class OrganizationCreateRequestModel : IValidatableObject
BillingAddressCountry = BillingAddressCountry,
},
InitiationPath = InitiationPath,
SkipTrial = SkipTrial
};
Keys?.ToOrganizationSignup(orgSignup);

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

@ -27,12 +27,21 @@ public class OrganizationSale
public static OrganizationSale From(
Organization organization,
OrganizationSignup signup) => new()
OrganizationSignup signup)
{
var customerSetup = string.IsNullOrEmpty(organization.GatewayCustomerId) ? GetCustomerSetup(signup) : null;
var subscriptionSetup = GetSubscriptionSetup(signup);
subscriptionSetup.SkipTrial = signup.SkipTrial;
return new OrganizationSale
{
Organization = organization,
CustomerSetup = string.IsNullOrEmpty(organization.GatewayCustomerId) ? GetCustomerSetup(signup) : null,
SubscriptionSetup = GetSubscriptionSetup(signup)
CustomerSetup = customerSetup,
SubscriptionSetup = subscriptionSetup
};
}
public static OrganizationSale From(
Organization organization,

1
src/Core/Models/Business/OrganizationSignup.cs
View File

@ -16,4 +16,5 @@ public class OrganizationSignup : OrganizationUpgrade
public string InitiationPath { get; set; }
public bool IsFromSecretsManagerTrial { get; set; }
public bool IsFromProvider { get; set; }
public bool SkipTrial { get; set; }
}