mirror of
https://github.com/bitwarden/server.git
synced 2025-05-14 08:02:17 -05:00
[PM-21418] Do not start organization on trial when request includes SkipTrial
(#5793)
* Do not start organization on a trial when createRequest.SkipTrial is true * Run dotnet format
This commit is contained in:
parent
53f7d9655e
commit
ca40226380
@ -75,6 +75,8 @@ public class OrganizationCreateRequestModel : IValidatableObject
|
|||||||
|
|
||||||
public string InitiationPath { get; set; }
|
public string InitiationPath { get; set; }
|
||||||
|
|
||||||
|
public bool SkipTrial { get; set; }
|
||||||
|
|
||||||
public virtual OrganizationSignup ToOrganizationSignup(User user)
|
public virtual OrganizationSignup ToOrganizationSignup(User user)
|
||||||
{
|
{
|
||||||
var orgSignup = new OrganizationSignup
|
var orgSignup = new OrganizationSignup
|
||||||
@ -107,6 +109,7 @@ public class OrganizationCreateRequestModel : IValidatableObject
|
|||||||
BillingAddressCountry = BillingAddressCountry,
|
BillingAddressCountry = BillingAddressCountry,
|
||||||
},
|
},
|
||||||
InitiationPath = InitiationPath,
|
InitiationPath = InitiationPath,
|
||||||
|
SkipTrial = SkipTrial
|
||||||
};
|
};
|
||||||
|
|
||||||
Keys?.ToOrganizationSignup(orgSignup);
|
Keys?.ToOrganizationSignup(orgSignup);
|
||||||
|
@ -27,12 +27,21 @@ public class OrganizationSale
|
|||||||
|
|
||||||
public static OrganizationSale From(
|
public static OrganizationSale From(
|
||||||
Organization organization,
|
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,
|
Organization = organization,
|
||||||
CustomerSetup = string.IsNullOrEmpty(organization.GatewayCustomerId) ? GetCustomerSetup(signup) : null,
|
CustomerSetup = customerSetup,
|
||||||
SubscriptionSetup = GetSubscriptionSetup(signup)
|
SubscriptionSetup = subscriptionSetup
|
||||||
};
|
};
|
||||||
|
}
|
||||||
|
|
||||||
public static OrganizationSale From(
|
public static OrganizationSale From(
|
||||||
Organization organization,
|
Organization organization,
|
||||||
|
@ -16,4 +16,5 @@ public class OrganizationSignup : OrganizationUpgrade
|
|||||||
public string InitiationPath { get; set; }
|
public string InitiationPath { get; set; }
|
||||||
public bool IsFromSecretsManagerTrial { get; set; }
|
public bool IsFromSecretsManagerTrial { get; set; }
|
||||||
public bool IsFromProvider { get; set; }
|
public bool IsFromProvider { get; set; }
|
||||||
|
public bool SkipTrial { get; set; }
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user