From 678d85f57d60a7f6364a92e9bc6a07a8f3f0eafa Mon Sep 17 00:00:00 2001
From: Rui Tome <rtome@bitwarden.com>
Date: Thu, 3 Aug 2023 12:00:56 +0100
Subject: [PATCH] =?UTF-8?q?[AC-1360]=C2=A0Added=20Name=20field=20to=20view?=
 =?UTF-8?q?=20for=20creating=20a=20Reseller=20Provider?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Admin/Models/CreateProviderModel.cs |  9 +++++++++
 src/Admin/Views/Providers/Create.cshtml | 12 ++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/Admin/Models/CreateProviderModel.cs b/src/Admin/Models/CreateProviderModel.cs
index a9a2f4ac43..9cad80ea11 100644
--- a/src/Admin/Models/CreateProviderModel.cs
+++ b/src/Admin/Models/CreateProviderModel.cs
@@ -15,6 +15,9 @@ public class CreateProviderModel : IValidatableObject
     [Display(Name = "Owner Email")]
     public string OwnerEmail { get; set; }
 
+    [Display(Name = "Name")]
+    public string Name { get; set; }
+
     [Display(Name = "Business Name")]
     public string BusinessName { get; set; }
 
@@ -26,6 +29,7 @@ public class CreateProviderModel : IValidatableObject
         return new Provider()
         {
             Type = Type,
+            Name = Name,
             BusinessName = BusinessName,
             BillingEmail = BillingEmail?.ToLowerInvariant().Trim()
         };
@@ -43,6 +47,11 @@ public class CreateProviderModel : IValidatableObject
                 }
                 break;
             case ProviderType.Reseller:
+                if (string.IsNullOrWhiteSpace(Name))
+                {
+                    var nameDisplayName = nameof(Name).GetDisplayAttribute<CreateProviderModel>()?.GetName();
+                    yield return new ValidationResult($"The {nameDisplayName} field is required.");
+                }
                 if (string.IsNullOrWhiteSpace(BusinessName))
                 {
                     var businessNameDisplayName = nameof(BusinessName).GetDisplayAttribute<CreateProviderModel>()?.GetName();
diff --git a/src/Admin/Views/Providers/Create.cshtml b/src/Admin/Views/Providers/Create.cshtml
index 2263da06e1..107e93150b 100644
--- a/src/Admin/Views/Providers/Create.cshtml
+++ b/src/Admin/Views/Providers/Create.cshtml
@@ -17,7 +17,7 @@
 
 <form method="post">
     <div asp-validation-summary="All" class="alert alert-danger"></div>
-    
+
     <div class="form-group">
         <label asp-for="Type" class="h2"></label>
         @foreach(ProviderType providerType in Enum.GetValues(typeof(ProviderType)))
@@ -31,7 +31,7 @@
             </div>
         }
     </div>
-    
+
     <div id="@($"info-{(int)ProviderType.Msp}")" class="form-group @(Model.Type != ProviderType.Msp ? "d-none" : string.Empty)">
         <h2>MSP Info</h2>
         <div class="form-group">
@@ -39,9 +39,13 @@
             <input type="text" class="form-control" asp-for="OwnerEmail">
         </div>
     </div>
-    
+
     <div id="@($"info-{(int)ProviderType.Reseller}")" class="form-group @(Model.Type != ProviderType.Reseller ? "d-none" : string.Empty)">
         <h2>Reseller Info</h2>
+        <div class="form-group">
+            <label asp-for="Name"></label>
+            <input type="text" class="form-control" asp-for="Name">
+        </div>
         <div class="form-group">
             <label asp-for="BusinessName"></label>
             <input type="text" class="form-control" asp-for="BusinessName">
@@ -51,6 +55,6 @@
             <input type="text" class="form-control" asp-for="BillingEmail">
         </div>
     </div>
-    
+
     <button type="submit" class="btn btn-primary mb-2">Create Provider</button>
 </form>