nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-01 08:02:49 -05:00
Code Activity

make payment method type required

Browse Source
This commit is contained in:
Kyle Spearrin
2019-02-26 12:45:34 -05:00
parent 91bbc3e8f9
commit 506fe28ee7
9 changed files with 19 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/Models/Api/Request/Accounts/PremiumRequestModel.cs
View File

@ -7,7 +7,7 @@ namespace Bit.Core.Models.Api
{
public class PremiumRequestModel : IValidatableObject
{
// TODO: Required in future
[Required]
public PaymentMethodType? PaymentMethodType { get; set; }
public string PaymentToken { get; set; }
[Range(0, 99)]

6
src/Core/Models/Api/Request/Organizations/OrganizationCreateRequestModel.cs
View File

@ -21,7 +21,6 @@ namespace Bit.Core.Models.Api
public PlanType PlanType { get; set; }
[Required]
public string Key { get; set; }
// TODO: Required in future if not free plan
public PaymentMethodType? PaymentMethodType { get; set; }
public string PaymentToken { get; set; }
[Range(0, double.MaxValue)]
@ -58,6 +57,11 @@ namespace Bit.Core.Models.Api
{
yield return new ValidationResult("Payment required.", new string[] { nameof(PaymentToken) });
}
if(PlanType != PlanType.Free && !PaymentMethodType.HasValue)
{
yield return new ValidationResult("Payment method type required.",
new string[] { nameof(PaymentMethodType) });
}
}
}
}

2
src/Core/Models/Api/Request/PaymentRequestModel.cs
View File

@ -5,7 +5,7 @@ namespace Bit.Core.Models.Api
{
public class PaymentRequestModel
{
// TODO: Required in future
[Required]
public PaymentMethodType? PaymentMethodType { get; set; }
[Required]
public string PaymentToken { get; set; }