[AC-2313] Add Gateway fields to Provider edit in Admin (#4057)

* Formatting

* Add Gateway fields to provider edit

* Remove unnecessary usings

* Thomas' feedback

* Removing unnecessary using for linter

* Removing unused file

* Removing unused file

bitwarden_license/src/Commercial.Core/AdminConsole/Providers/CreateProviderCommand.cs

@@ -46,6 +46,13 @@ public class CreateProviderCommand : ICreateProviderCommand
             throw new BadRequestException("Invalid owner. Owner must be an existing Bitwarden user.");
         }
 
+        var isConsolidatedBillingEnabled = _featureService.IsEnabled(FeatureFlagKeys.EnableConsolidatedBilling);
+
+        if (isConsolidatedBillingEnabled)
+        {
+            provider.Gateway = GatewayType.Stripe;
+        }
+
         await ProviderRepositoryCreateAsync(provider, ProviderStatusType.Pending);
 
         var providerUser = new ProviderUser
@@ -56,8 +63,6 @@ public class CreateProviderCommand : ICreateProviderCommand
             Status = ProviderUserStatusType.Confirmed,
         };
 
-        var isConsolidatedBillingEnabled = _featureService.IsEnabled(FeatureFlagKeys.EnableConsolidatedBilling);
-
         if (isConsolidatedBillingEnabled)
         {
             var providerPlans = new List<ProviderPlan>

src/Admin/AdminConsole/Controllers/ProvidersController.cs

@@ -17,7 +17,6 @@ using Bit.Core.Exceptions;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;
-using Bit.Core.Tools.Services;
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -36,7 +35,6 @@ public class ProvidersController : Controller
     private readonly GlobalSettings _globalSettings;
     private readonly IApplicationCacheService _applicationCacheService;
     private readonly IProviderService _providerService;
-    private readonly IReferenceEventService _referenceEventService;
     private readonly IUserService _userService;
     private readonly ICreateProviderCommand _createProviderCommand;
     private readonly IFeatureService _featureService;
@@ -51,7 +49,6 @@ public class ProvidersController : Controller
         IProviderService providerService,
         GlobalSettings globalSettings,
         IApplicationCacheService applicationCacheService,
-        IReferenceEventService referenceEventService,
         IUserService userService,
         ICreateProviderCommand createProviderCommand,
         IFeatureService featureService,
@@ -65,7 +62,6 @@ public class ProvidersController : Controller
         _providerService = providerService;
         _globalSettings = globalSettings;
         _applicationCacheService = applicationCacheService;
-        _referenceEventService = referenceEventService;
         _userService = userService;
         _createProviderCommand = createProviderCommand;
         _featureService = featureService;
@@ -104,8 +100,8 @@ public class ProvidersController : Controller
         return View(new CreateProviderModel
         {
             OwnerEmail = ownerEmail,
-            TeamsMinimumSeats = teamsMinimumSeats,
+            TeamsMonthlySeatMinimum = teamsMinimumSeats,
-            EnterpriseMinimumSeats = enterpriseMinimumSeats
+            EnterpriseMonthlySeatMinimum = enterpriseMinimumSeats
         });
     }
 
@@ -123,8 +119,11 @@ public class ProvidersController : Controller
         switch (provider.Type)
         {
             case ProviderType.Msp:
-                await _createProviderCommand.CreateMspAsync(provider, model.OwnerEmail, model.TeamsMinimumSeats,
+                await _createProviderCommand.CreateMspAsync(
-                    model.EnterpriseMinimumSeats);
+                    provider,
+                    model.OwnerEmail,
+                    model.TeamsMonthlySeatMinimum,
+                    model.EnterpriseMonthlySeatMinimum);
                 break;
             case ProviderType.Reseller:
                 await _createProviderCommand.CreateResellerAsync(provider);
@@ -167,8 +166,9 @@ public class ProvidersController : Controller
             return View(new ProviderEditModel(provider, users, providerOrganizations, new List<ProviderPlan>()));
         }
 
-        var providerPlan = await _providerPlanRepository.GetByProviderId(id);
+        var providerPlans = await _providerPlanRepository.GetByProviderId(id);
-        return View(new ProviderEditModel(provider, users, providerOrganizations, providerPlan));
+
+        return View(new ProviderEditModel(provider, users, providerOrganizations, providerPlans.ToList()));
     }
 
     [HttpPost]
@@ -177,14 +177,15 @@ public class ProvidersController : Controller
     [RequirePermission(Permission.Provider_Edit)]
     public async Task<IActionResult> Edit(Guid id, ProviderEditModel model)
     {
-        var providerPlans = await _providerPlanRepository.GetByProviderId(id);
         var provider = await _providerRepository.GetByIdAsync(id);
+
         if (provider == null)
         {
             return RedirectToAction("Index");
         }
 
         model.ToProvider(provider);
+
         await _providerRepository.ReplaceAsync(provider);
         await _applicationCacheService.UpsertProviderAbilityAsync(provider);
 
@@ -195,13 +196,14 @@ public class ProvidersController : Controller
             return RedirectToAction("Edit", new { id });
         }
 
-        model.ToProviderPlan(providerPlans);
+        var providerPlans = await _providerPlanRepository.GetByProviderId(id);
+
         if (providerPlans.Count == 0)
         {
             var newProviderPlans = new List<ProviderPlan>
             {
-                new() {ProviderId = provider.Id, PlanType = PlanType.TeamsMonthly, SeatMinimum= model.TeamsMinimumSeats, PurchasedSeats = 0, AllocatedSeats = 0},
+                new () { ProviderId = provider.Id, PlanType = PlanType.TeamsMonthly, SeatMinimum = model.TeamsMonthlySeatMinimum, PurchasedSeats = 0, AllocatedSeats = 0 },
-                new() {ProviderId = provider.Id, PlanType = PlanType.EnterpriseMonthly, SeatMinimum= model.EnterpriseMinimumSeats, PurchasedSeats = 0, AllocatedSeats = 0}
+                new () { ProviderId = provider.Id, PlanType = PlanType.EnterpriseMonthly, SeatMinimum = model.EnterpriseMonthlySeatMinimum, PurchasedSeats = 0, AllocatedSeats = 0 }
             };
 
             foreach (var newProviderPlan in newProviderPlans)
@@ -213,6 +215,15 @@ public class ProvidersController : Controller
         {
             foreach (var providerPlan in providerPlans)
             {
+                if (providerPlan.PlanType == PlanType.EnterpriseMonthly)
+                {
+                    providerPlan.SeatMinimum = model.EnterpriseMonthlySeatMinimum;
+                }
+                else if (providerPlan.PlanType == PlanType.TeamsMonthly)
+                {
+                    providerPlan.SeatMinimum = model.TeamsMonthlySeatMinimum;
+                }
+
                 await _providerPlanRepository.ReplaceAsync(providerPlan);
             }
         }

src/Admin/AdminConsole/Models/CreateProviderModel.cs

@@ -24,11 +24,11 @@ public class CreateProviderModel : IValidatableObject
     [Display(Name = "Primary Billing Email")]
     public string BillingEmail { get; set; }
 
-    [Display(Name = "Teams minimum seats")]
+    [Display(Name = "Teams (Monthly) Seat Minimum")]
-    public int TeamsMinimumSeats { get; set; }
+    public int TeamsMonthlySeatMinimum { get; set; }
 
-    [Display(Name = "Enterprise minimum seats")]
+    [Display(Name = "Enterprise (Monthly) Seat Minimum")]
-    public int EnterpriseMinimumSeats { get; set; }
+    public int EnterpriseMonthlySeatMinimum { get; set; }
 
     public virtual Provider ToProvider()
     {
@@ -51,14 +51,14 @@ public class CreateProviderModel : IValidatableObject
                     var ownerEmailDisplayName = nameof(OwnerEmail).GetDisplayAttribute<CreateProviderModel>()?.GetName() ?? nameof(OwnerEmail);
                     yield return new ValidationResult($"The {ownerEmailDisplayName} field is required.");
                 }
-                if (TeamsMinimumSeats < 0)
+                if (TeamsMonthlySeatMinimum < 0)
                 {
-                    var teamsMinimumSeatsDisplayName = nameof(TeamsMinimumSeats).GetDisplayAttribute<CreateProviderModel>()?.GetName() ?? nameof(TeamsMinimumSeats);
+                    var teamsMinimumSeatsDisplayName = nameof(TeamsMonthlySeatMinimum).GetDisplayAttribute<CreateProviderModel>()?.GetName() ?? nameof(TeamsMonthlySeatMinimum);
                     yield return new ValidationResult($"The {teamsMinimumSeatsDisplayName} field can not be negative.");
                 }
-                if (EnterpriseMinimumSeats < 0)
+                if (EnterpriseMonthlySeatMinimum < 0)
                 {
-                    var enterpriseMinimumSeatsDisplayName = nameof(EnterpriseMinimumSeats).GetDisplayAttribute<CreateProviderModel>()?.GetName() ?? nameof(EnterpriseMinimumSeats);
+                    var enterpriseMinimumSeatsDisplayName = nameof(EnterpriseMonthlySeatMinimum).GetDisplayAttribute<CreateProviderModel>()?.GetName() ?? nameof(EnterpriseMonthlySeatMinimum);
                     yield return new ValidationResult($"The {enterpriseMinimumSeatsDisplayName} field can not be negative.");
                 }
                 break;

src/Admin/AdminConsole/Models/ProviderEditModel.cs

@@ -10,16 +10,21 @@ public class ProviderEditModel : ProviderViewModel
 {
     public ProviderEditModel() { }
 
-    public ProviderEditModel(Provider provider, IEnumerable<ProviderUserUserDetails> providerUsers,
+    public ProviderEditModel(
-        IEnumerable<ProviderOrganizationOrganizationDetails> organizations, IEnumerable<ProviderPlan> providerPlans)
+        Provider provider,
-        : base(provider, providerUsers, organizations)
+        IEnumerable<ProviderUserUserDetails> providerUsers,
+        IEnumerable<ProviderOrganizationOrganizationDetails> organizations,
+        IReadOnlyCollection<ProviderPlan> providerPlans) : base(provider, providerUsers, organizations)
     {
         Name = provider.DisplayName();
         BusinessName = provider.DisplayBusinessName();
         BillingEmail = provider.BillingEmail;
         BillingPhone = provider.BillingPhone;
-        TeamsMinimumSeats = GetMinimumSeats(providerPlans, PlanType.TeamsMonthly);
+        TeamsMonthlySeatMinimum = GetSeatMinimum(providerPlans, PlanType.TeamsMonthly);
-        EnterpriseMinimumSeats = GetMinimumSeats(providerPlans, PlanType.EnterpriseMonthly);
+        EnterpriseMonthlySeatMinimum = GetSeatMinimum(providerPlans, PlanType.EnterpriseMonthly);
+        Gateway = provider.Gateway;
+        GatewayCustomerId = provider.GatewayCustomerId;
+        GatewaySubscriptionId = provider.GatewaySubscriptionId;
     }
 
     [Display(Name = "Billing Email")]
@@ -29,38 +34,28 @@ public class ProviderEditModel : ProviderViewModel
     [Display(Name = "Business Name")]
     public string BusinessName { get; set; }
     public string Name { get; set; }
-    [Display(Name = "Teams minimum seats")]
+    [Display(Name = "Teams (Monthly) Seat Minimum")]
-    public int TeamsMinimumSeats { get; set; }
+    public int TeamsMonthlySeatMinimum { get; set; }
 
-    [Display(Name = "Enterprise minimum seats")]
+    [Display(Name = "Enterprise (Monthly) Seat Minimum")]
-    public int EnterpriseMinimumSeats { get; set; }
+    public int EnterpriseMonthlySeatMinimum { get; set; }
-    [Display(Name = "Events")]
+    [Display(Name = "Gateway")]
+    public GatewayType? Gateway { get; set; }
+    [Display(Name = "Gateway Customer Id")]
+    public string GatewayCustomerId { get; set; }
+    [Display(Name = "Gateway Subscription Id")]
+    public string GatewaySubscriptionId { get; set; }
 
-    public IEnumerable<ProviderPlan> ToProviderPlan(IEnumerable<ProviderPlan> existingProviderPlans)
+    public virtual Provider ToProvider(Provider existingProvider)
     {
-        var providerPlans = existingProviderPlans.ToList();
+        existingProvider.BillingEmail = BillingEmail?.ToLowerInvariant().Trim();
-        foreach (var existingProviderPlan in providerPlans)
+        existingProvider.BillingPhone = BillingPhone?.ToLowerInvariant().Trim();
-        {
+        existingProvider.Gateway = Gateway;
-            existingProviderPlan.SeatMinimum = existingProviderPlan.PlanType switch
+        existingProvider.GatewayCustomerId = GatewayCustomerId;
-            {
+        existingProvider.GatewaySubscriptionId = GatewaySubscriptionId;
-                PlanType.TeamsMonthly => TeamsMinimumSeats,
-                PlanType.EnterpriseMonthly => EnterpriseMinimumSeats,
-                _ => existingProviderPlan.SeatMinimum
-            };
-        }
-        return providerPlans;
-    }
-
-    public Provider ToProvider(Provider existingProvider)
-    {
-        existingProvider.BillingEmail = BillingEmail?.ToLowerInvariant()?.Trim();
-        existingProvider.BillingPhone = BillingPhone?.ToLowerInvariant()?.Trim();
         return existingProvider;
     }
 
-
+    private static int GetSeatMinimum(IEnumerable<ProviderPlan> providerPlans, PlanType planType)
-    private int GetMinimumSeats(IEnumerable<ProviderPlan> providerPlans, PlanType planType)
+        => providerPlans.FirstOrDefault(providerPlan => providerPlan.PlanType == planType)?.SeatMinimum ?? 0;
-    {
-        return (from providerPlan in providerPlans where providerPlan.PlanType == planType select (int)providerPlan.SeatMinimum).FirstOrDefault();
-    }
 }

src/Admin/AdminConsole/Views/Providers/Create.cshtml

@@ -46,14 +46,14 @@
             <div class="row">
                 <div class="col-sm">
                     <div class="form-group">
-                        <label asp-for="TeamsMinimumSeats"></label>
+                        <label asp-for="TeamsMonthlySeatMinimum"></label>
-                        <input type="number" class="form-control" asp-for="TeamsMinimumSeats">
+                        <input type="number" class="form-control" asp-for="TeamsMonthlySeatMinimum">
                     </div>
                 </div>
                 <div class="col-sm">
                     <div class="form-group">
-                        <label asp-for="EnterpriseMinimumSeats"></label>
+                        <label asp-for="EnterpriseMonthlySeatMinimum"></label>
-                        <input type="number" class="form-control" asp-for="EnterpriseMinimumSeats">
+                        <input type="number" class="form-control" asp-for="EnterpriseMonthlySeatMinimum">
                     </div>
                 </div>
             </div>

src/Admin/AdminConsole/Views/Providers/Edit.cshtml

@@ -48,14 +48,54 @@
         <div class="row">
             <div class="col-sm">
                 <div class="form-group">
-                    <label asp-for="TeamsMinimumSeats"></label>
+                    <label asp-for="TeamsMonthlySeatMinimum"></label>
-                    <input type="number" class="form-control" asp-for="TeamsMinimumSeats">
+                    <input type="number" class="form-control" asp-for="TeamsMonthlySeatMinimum">
                 </div>
             </div>
             <div class="col-sm">
                 <div class="form-group">
-                    <label asp-for="EnterpriseMinimumSeats"></label>
+                    <label asp-for="EnterpriseMonthlySeatMinimum"></label>
-                    <input type="number" class="form-control" asp-for="EnterpriseMinimumSeats">
+                    <input type="number" class="form-control" asp-for="EnterpriseMonthlySeatMinimum">
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-sm">
+                <div class="form-group">
+                    <div class="form-group">
+                        <label asp-for="Gateway"></label>
+                        <select class="form-control" asp-for="Gateway" asp-items="Html.GetEnumSelectList<Bit.Core.Enums.GatewayType>()">
+                            <option value="">--</option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-sm">
+                <div class="form-group">
+                    <label asp-for="GatewayCustomerId"></label>
+                    <div class="input-group">
+                        <input type="text" class="form-control" asp-for="GatewayCustomerId">
+                        <div class="input-group-append">
+                            <button class="btn btn-secondary" type="button" id="gateway-customer-link">
+                                <i class="fa fa-external-link"></i>
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm">
+                <div class="form-group">
+                    <label asp-for="GatewaySubscriptionId"></label>
+                    <div class="input-group">
+                        <input type="text" class="form-control" asp-for="GatewaySubscriptionId">
+                        <div class="input-group-append">
+                            <button class="btn btn-secondary" type="button" id="gateway-subscription-link">
+                                <i class="fa fa-external-link"></i>
+                            </button>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
@@ -146,5 +186,4 @@
             </div>
         }
     </div>
-
 }