PR feedback updates: min version for Umbraco Forms, fluent mapping builder; mapping updates.

Author: acoumb

src/Umbraco.Forms.Integrations.Automation.Zapier/Controllers/AuthController.cs

@@ -19,7 +19,7 @@ public bool ValidateUser([FromBody] UserModel userModel)
 
             var user = userService.GetByUsername(userModel.Username);
 
-            return user != null && user.Groups.Any(p => p.Alias == "admin");
+            return user != null && user.Groups.Any(p => p.Name == userModel.UserGroup);
         }
     }
 }

src/Umbraco.Forms.Integrations.Automation.Zapier/Models/UserModel.cs

@@ -6,5 +6,7 @@ public class UserModel
         public string Username { get; set; }
 
         public string Password  { get; set; }
+
+        public string UserGroup { get; set; }
     }
 }

src/Umbraco.Forms.Integrations.Automation.Zapier/Services/MappingService.cs renamed to src/Umbraco.Forms.Integrations.Automation.Zapier/Services/FieldMappingBuilder.cs

@@ -11,20 +11,26 @@
 
 namespace Umbraco.Forms.Integrations.Automation.Zapier.Services
 {
-    public class MappingService: IMappingService
+    public class FieldMappingBuilder: IFieldMappingBuilder
     {
         private readonly Dictionary<string, string> _content;
 
         private readonly IUmbracoContextAccessor _umbracoContextAccessor;
 
-        public MappingService(IUmbracoContextAccessor umbracoContextAccessor)
+        public FieldMappingBuilder(IUmbracoContextAccessor umbracoContextAccessor)
         {
             _umbracoContextAccessor = umbracoContextAccessor;
 
             _content = new Dictionary<string, string>();
         }
 
-        public IMappingService IncludeFieldsMappings(string mappings, RecordEventArgs e)
+        /// <summary>
+        /// Add form fields to the request content sent to Zapier. If no propery is mapped, all fields will be included by their alias.
+        /// </summary>
+        /// <param name="mappings">Serialized details of the form fields</param>
+        /// <param name="e">Form record details</param>
+        /// <returns></returns>
+        public IFieldMappingBuilder IncludeFieldsMappings(string mappings, RecordEventArgs e)
         {
             var mappingsList = JsonConvert.DeserializeObject<List<FieldMapping>>(mappings);
             if (mappingsList.Any())
@@ -35,17 +41,29 @@ public IMappingService IncludeFieldsMappings(string mappings, RecordEventArgs e)
                     _content.Add(mapping.Alias, string.IsNullOrEmpty(mapping.StaticValue) ? fieldRecord.ValuesAsString() : mapping.StaticValue);
                 }
             }
+            else
+            {
+                foreach (var recordField in e.Record.RecordFields)
+                {
+                    _content.Add(recordField.Value.Alias, recordField.Value.ValuesAsString());
+                }
+            }
 
             return this;
         }
 
-        public IMappingService IncludeStandardFieldsMappings(string mappings, RecordEventArgs e)
+        /// <summary>
+        /// Add form standard fields - that are set as Included in the settings of the workflow - to the request content sent to Zapier.
+        /// </summary>
+        /// <param name="mappings">Serialized details of the form standard fields</param>
+        /// <param name="e">Form record details</param>
+        /// <returns></returns>
+        public IFieldMappingBuilder IncludeStandardFieldsMappings(string mappings, RecordEventArgs e)
         {
             if (!string.IsNullOrEmpty(mappings))
             {
                 var standardFieldMappings =
-                    JsonConvert.DeserializeObject<IEnumerable<StandardFieldMapping>>(mappings,
-                        FormsJsonSerializerSettings.Default).ToList();
+                    JsonConvert.DeserializeObject<IEnumerable<StandardFieldMapping>>(mappings).ToList();
 
                 foreach (StandardFieldMapping fieldMapping in standardFieldMappings.Where(x => x.Include))
                 {

src/Umbraco.Forms.Integrations.Automation.Zapier/Services/IFieldMappingBuilder.cs

@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+
+using Umbraco.Forms.Core;
+
+namespace Umbraco.Forms.Integrations.Automation.Zapier.Services
+{
+    public interface IFieldMappingBuilder
+    {
+        IFieldMappingBuilder IncludeFieldsMappings(string mappings, RecordEventArgs e);
+
+        IFieldMappingBuilder IncludeStandardFieldsMappings(string mappings, RecordEventArgs e);
+
+        Dictionary<string, string> Map();
+    }
+}

src/Umbraco.Forms.Integrations.Automation.Zapier/Services/IMappingService.cs

@@ -19,7 +19,7 @@
   <ItemGroup>
     <PackageReference Include="UmbracoCms.Web" Version="8.1.0" />
 	<PackageReference Include="UmbracoCms.Core" Version="8.1.0" />
-    <PackageReference Include="UmbracoForms.Core" Version="8.11.0" />
+    <PackageReference Include="UmbracoForms.Core" Version="8.9.1" />
   </ItemGroup>
 
   <ItemGroup>

src/Umbraco.Forms.Integrations.Automation.Zapier/Umbraco.Forms.Integrations.Automation.Zapier.csproj

@@ -26,12 +26,12 @@ public ZapierWorkflow(IUmbracoContextAccessor umbracoContextAccessor)
         }
 
         [Core.Attributes.Setting("Fields Mappings",
-            Description = "Please map fields of the form against Zap ones",
+            Description = "Please map form information to the Zap ones.",
             View = "FieldMapper")]
         public string Mappings { get; set; }
 
         [Core.Attributes.Setting("Standard Fields Mappings",
-            Description = "Please map fields of the form against Zap ones",
+            Description = "Please map any standard form information to send.",
             View = "StandardFieldMapper")]
         public string StandardFieldsMappings { get; set; }
 
@@ -50,14 +50,14 @@ public override WorkflowExecutionStatus Execute(Record record, RecordEventArgs e
         {
             try
             {
-                IMappingService mappingService = new MappingService(_umbracoContextAccessor);
+                IFieldMappingBuilder builder = new FieldMappingBuilder(_umbracoContextAccessor);
 
-                var content = mappingService
+                var content = builder
                     .IncludeFieldsMappings(Mappings, e)
                     .IncludeStandardFieldsMappings(StandardFieldsMappings, e)
                     .Map();
 
-                var result = ClientFactory().PostAsync(WebHookUri, new FormUrlEncodedContent(content)).Result;
+                var result = ClientFactory().PostAsync(WebHookUri, new FormUrlEncodedContent(content)).GetAwaiter().GetResult();
 
                 return result.IsSuccessStatusCode ? WorkflowExecutionStatus.Completed : WorkflowExecutionStatus.Failed;
             }