Merge pull request #16 from andyneil/feature/custom-values

Allow for additional fields to be passed from a custom workflow

Author: AndyButland

src/Umbraco.Forms.Integrations.Crm.Hubspot/App_Plugins/UmbracoForms.Integrations/Crm/Hubspot/hubspot-field-mapper-template.html

@@ -8,7 +8,7 @@
         <p>Umbraco Forms is not configured with a HubSpot CRM account.</p>
         <p>To do this you can either create and save an API key into the <i>UmbracoForms.config</i> file.</p>
         <p>Or you can click <a ng-click="vm.openAuth()" style="text-decoration: underline">here</a> to complete an OAuth connection.</p>
-        <p><em>If your browser is unable to process the automated connection, paste the provided authorization code below and click to complete the authentication.</em></dd>
+        <p><em>If your browser is unable to process the automated connection, paste the provided authorization code below and click to complete the authentication.</em>
         <input type="text" placeholder="Enter authorization code" ng-model="vm.authorizationCode" />
         <umb-button type="button" disabled="vm.authorizationCode === ''" action="vm.authorize()" label="Authorize"></umb-button>
     </div>

src/Umbraco.Forms.Integrations.Crm.Hubspot/HubspotWorkflow.cs

@@ -41,7 +41,7 @@ public override WorkflowExecutionStatus Execute(Record record, RecordEventArgs e
                 return WorkflowExecutionStatus.NotConfigured;
             }
 
-            var commandResult = _contactService.PostContactAsync(record, fieldMappings).GetAwaiter().GetResult();
+            var commandResult = _contactService.PostContactAsync(record, fieldMappings, null).GetAwaiter().GetResult();
             switch (commandResult)
             {
                 case CommandResult.NotConfigured:

src/Umbraco.Forms.Integrations.Crm.Hubspot/Services/HubspotContactService.cs

@@ -22,7 +22,7 @@ namespace Umbraco.Forms.Integrations.Crm.Hubspot.Services
     public class HubspotContactService : IContactService
     {
         // Using a static HttpClient (see: https://www.aspnetmonsters.com/2016/08/2016-08-27-httpclientwrong/).
-        private readonly static HttpClient s_client = new HttpClient();
+        private static readonly HttpClient s_client = new HttpClient();
 
         // Access to the client within the class is via ClientFactory(), allowing us to mock the responses in tests.
         internal static Func<HttpClient> ClientFactory = () => s_client;
@@ -35,7 +35,7 @@ public class HubspotContactService : IContactService
         private const string CrmApiBaseUrl = "https://api.hubapi.com/crm/v3/";
         private const string InstallUrlFormat = "https://app-eu1.hubspot.com/oauth/authorize?client_id={0}&redirect_uri={1}&scope={2}";
         private const string OAuthScopes = "oauth%20forms%20crm.objects.contacts.read%20crm.objects.contacts.write";
-        private const string OAauthClientId = "1a04f5bf-e99e-48e1-9d62-6c25bf2bdefe";
+        private const string OAuthClientId = "1a04f5bf-e99e-48e1-9d62-6c25bf2bdefe";
 
         private const string OAuthBaseUrl = "https://hubspot-forms-auth.umbraco.com/";  // For local testing: "https://localhost:44364/"
         private static string OAuthRedirectUrl = OAuthBaseUrl;
@@ -55,13 +55,13 @@ public HubspotContactService(IFacadeConfiguration configuration, ILogger logger,
 
         public AuthenticationMode IsAuthorizationConfigured() => GetConfiguredAuthenticationDetails().Mode;
 
-        public string GetAuthenticationUrl() => string.Format(InstallUrlFormat, OAauthClientId, OAuthRedirectUrl, OAuthScopes);
+        public string GetAuthenticationUrl() => string.Format(InstallUrlFormat, OAuthClientId, OAuthRedirectUrl, OAuthScopes);
 
         public async Task<AuthorizationResult> AuthorizeAsync(string code)
         {
             var tokenRequest = new GetTokenRequest
             {
-                ClientId = OAauthClientId,
+                ClientId = OAuthClientId,
                 RedirectUrl = OAuthRedirectUrl,
                 AuthorizationCode = code,
             };
@@ -127,7 +127,7 @@ public async Task<IEnumerable<Property>> GetContactPropertiesAsync()
             return properties.OrderBy(x => x.Label);
         }
 
-        public async Task<CommandResult> PostContactAsync(Record record, List<MappedProperty> fieldMappings)
+        public async Task<CommandResult> PostContactAsync(Record record, List<MappedProperty> fieldMappings, Dictionary<string, string> additionalFields = null)
         {
             var authenticationDetails = GetConfiguredAuthenticationDetails();
             if (authenticationDetails.Mode == AuthenticationMode.Unauthenticated)
@@ -155,6 +155,15 @@ public async Task<CommandResult> PostContactAsync(Record record, List<MappedProp
                 }
             }
 
+            if (additionalFields != null)
+            {
+                // Add any extra fields that got passed (from a custom workflow)
+                foreach (var additionalField in additionalFields)
+                {
+                    postData.Properties.Add(additionalField.Key, additionalField.Value);
+                }
+            }
+
             // POST data to hubspot
             // https://api.hubapi.com/crm/v3/objects/contacts?hapikey=YOUR_HUBSPOT_API_KEY
             var requestUrl = $"{CrmApiBaseUrl}objects/contacts";
@@ -223,7 +232,7 @@ private async Task RefreshOAuthAccessToken(string refreshToken)
         {
             var tokenRequest = new RefreshTokenRequest
             {
-                ClientId = OAauthClientId,
+                ClientId = OAuthClientId,
                 RedirectUrl = OAuthRedirectUrl,
                 RefreshToken = refreshToken,
             };

src/Umbraco.Forms.Integrations.Crm.Hubspot/Services/IContactService.cs

@@ -26,6 +26,6 @@ public interface IContactService
 
         Task<IEnumerable<Property>> GetContactPropertiesAsync();
 
-        Task<CommandResult> PostContactAsync(Record record, List<MappedProperty> fieldMappings);
+        Task<CommandResult> PostContactAsync(Record record, List<MappedProperty> fieldMappings, Dictionary<string, string> additionalFields);
     }
 }