make payment method type required

src/Api/Controllers/AccountsController.cs

@@ -463,7 +463,7 @@ namespace Bit.Api.Controllers
                 throw new BadRequestException("Invalid license.");
             }
 
-            await _userService.SignUpPremiumAsync(user, model.PaymentToken, model.PaymentMethodType,
+            await _userService.SignUpPremiumAsync(user, model.PaymentToken, model.PaymentMethodType.Value,
                 model.AdditionalStorageGb.GetValueOrDefault(0), license);
             return new ProfileResponseModel(user, null, await _userService.TwoFactorIsEnabledAsync(user));
         }
@@ -518,7 +518,7 @@ namespace Bit.Api.Controllers
                 throw new UnauthorizedAccessException();
             }
 
-            await _userService.ReplacePaymentMethodAsync(user, model.PaymentToken, model.PaymentMethodType);
+            await _userService.ReplacePaymentMethodAsync(user, model.PaymentToken, model.PaymentMethodType.Value);
         }
 
         [HttpPost("storage")]

src/Api/Controllers/OrganizationsController.cs

@@ -210,7 +210,7 @@ namespace Bit.Api.Controllers
             }
 
             await _organizationService.ReplacePaymentMethodAsync(orgIdGuid, model.PaymentToken,
-                model.PaymentMethodType);
+                model.PaymentMethodType.Value);
         }
 
         [HttpPost("{id}/upgrade")]

src/Core/Models/Api/Request/Accounts/PremiumRequestModel.cs

@@ -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)]

src/Core/Models/Api/Request/Organizations/OrganizationCreateRequestModel.cs

@@ -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) });
+            }
         }
     }
 }

src/Core/Models/Api/Request/PaymentRequestModel.cs

@@ -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; }

src/Core/Services/IOrganizationService.cs

@@ -10,7 +10,7 @@ namespace Bit.Core.Services
 {
     public interface IOrganizationService
     {
-        Task ReplacePaymentMethodAsync(Guid organizationId, string paymentToken, PaymentMethodType? paymentMethodType);
+        Task ReplacePaymentMethodAsync(Guid organizationId, string paymentToken, PaymentMethodType paymentMethodType);
         Task CancelSubscriptionAsync(Guid organizationId, bool? endOfPeriod = null);
         Task ReinstateSubscriptionAsync(Guid organizationId);
         Task UpgradePlanAsync(Guid organizationId, PlanType plan, int additionalSeats);

src/Core/Services/IUserService.cs

@@ -43,11 +43,11 @@ namespace Bit.Core.Services
         Task<IdentityResult> DeleteAsync(User user);
         Task<IdentityResult> DeleteAsync(User user, string token);
         Task SendDeleteConfirmationAsync(string email);
-        Task SignUpPremiumAsync(User user, string paymentToken, PaymentMethodType? paymentMethodType,
+        Task SignUpPremiumAsync(User user, string paymentToken, PaymentMethodType paymentMethodType,
             short additionalStorageGb, UserLicense license);
         Task UpdateLicenseAsync(User user, UserLicense license);
         Task AdjustStorageAsync(User user, short storageAdjustmentGb);
-        Task ReplacePaymentMethodAsync(User user, string paymentToken, PaymentMethodType? paymentMethodType);
+        Task ReplacePaymentMethodAsync(User user, string paymentToken, PaymentMethodType paymentMethodType);
         Task CancelPremiumAsync(User user, bool? endOfPeriod = null);
         Task ReinstatePremiumAsync(User user);
         Task DisablePremiumAsync(Guid userId, DateTime? expirationDate);

src/Core/Services/Implementations/OrganizationService.cs

@@ -72,7 +72,7 @@ namespace Bit.Core.Services
         }
 
         public async Task ReplacePaymentMethodAsync(Guid organizationId, string paymentToken,
-            PaymentMethodType? paymentMethodType)
+            PaymentMethodType paymentMethodType)
         {
             var organization = await GetOrgById(organizationId);
             if(organization == null)
@@ -80,24 +80,8 @@ namespace Bit.Core.Services
                 throw new NotFoundException();
             }
 
-            if(!paymentMethodType.HasValue)
-            {
-                if(paymentToken.StartsWith("tok_"))
-                {
-                    paymentMethodType = PaymentMethodType.Card;
-                }
-                else if(paymentToken.StartsWith("btok_"))
-                {
-                    paymentMethodType = PaymentMethodType.BankAccount;
-                }
-                else
-                {
-                    paymentMethodType = PaymentMethodType.PayPal;
-                }
-            }
-
             var updated = await _paymentService.UpdatePaymentMethodAsync(organization,
-                paymentMethodType.Value, paymentToken);
+                paymentMethodType, paymentToken);
             if(updated)
             {
                 await ReplaceAndUpdateCache(organization);
@@ -550,22 +534,6 @@ namespace Bit.Core.Services
             }
             else
             {
-                if(!signup.PaymentMethodType.HasValue && !string.IsNullOrWhiteSpace(signup.PaymentToken))
-                {
-                    if(signup.PaymentToken.StartsWith("btok_"))
-                    {
-                        signup.PaymentMethodType = PaymentMethodType.BankAccount;
-                    }
-                    else if(signup.PaymentToken.StartsWith("tok_"))
-                    {
-                        signup.PaymentMethodType = PaymentMethodType.Card;
-                    }
-                    else
-                    {
-                        signup.PaymentMethodType = PaymentMethodType.PayPal;
-                    }
-                }
-
                 await _paymentService.PurchaseOrganizationAsync(organization, signup.PaymentMethodType.Value,
                     signup.PaymentToken, plan, signup.AdditionalStorageGb, signup.AdditionalSeats,
                     signup.PremiumAccessAddon);

src/Core/Services/Implementations/UserService.cs

@@ -678,7 +678,7 @@ namespace Bit.Core.Services
             return true;
         }
 
-        public async Task SignUpPremiumAsync(User user, string paymentToken, PaymentMethodType? paymentMethodType,
+        public async Task SignUpPremiumAsync(User user, string paymentToken, PaymentMethodType paymentMethodType,
             short additionalStorageGb, UserLicense license)
         {
             if(user.Premium)
@@ -710,24 +710,7 @@ namespace Bit.Core.Services
             }
             else
             {
-                if(!paymentMethodType.HasValue)
+                await _paymentService.PurchasePremiumAsync(user, paymentMethodType, paymentToken, additionalStorageGb);
-                {
-                    if(paymentToken.StartsWith("tok_"))
-                    {
-                        paymentMethodType = PaymentMethodType.Card;
-                    }
-                    else if(paymentToken.StartsWith("btok_"))
-                    {
-                        paymentMethodType = PaymentMethodType.BankAccount;
-                    }
-                    else
-                    {
-                        paymentMethodType = PaymentMethodType.PayPal;
-                    }
-                }
-
-                await _paymentService.PurchasePremiumAsync(user, paymentMethodType.Value,
-                    paymentToken, additionalStorageGb);
             }
 
             user.Premium = true;
@@ -802,31 +785,14 @@ namespace Bit.Core.Services
             await SaveUserAsync(user);
         }
 
-        public async Task ReplacePaymentMethodAsync(User user, string paymentToken,
+        public async Task ReplacePaymentMethodAsync(User user, string paymentToken, PaymentMethodType paymentMethodType)
-            PaymentMethodType? paymentMethodType)
         {
             if(paymentToken.StartsWith("btok_"))
             {
                 throw new BadRequestException("Invalid token.");
             }
 
-            if(!paymentMethodType.HasValue)
+            var updated = await _paymentService.UpdatePaymentMethodAsync(user, paymentMethodType, paymentToken);
-            {
-                if(paymentToken.StartsWith("tok_"))
-                {
-                    paymentMethodType = PaymentMethodType.Card;
-                }
-                else if(paymentToken.StartsWith("btok_"))
-                {
-                    paymentMethodType = PaymentMethodType.BankAccount;
-                }
-                else
-                {
-                    paymentMethodType = PaymentMethodType.PayPal;
-                }
-            }
-
-            var updated = await _paymentService.UpdatePaymentMethodAsync(user, paymentMethodType.Value, paymentToken);
             if(updated)
             {
                 await SaveUserAsync(user);