V14 Integrations (Semrush)

- Minor changes

Author: dtng95

src/Umbraco.Forms.Integrations.Crm.Hubspot/Client/src/lang/en.ts

@@ -5,7 +5,7 @@ export default {
         FieldMappingsDescription: `Map Umbraco Form fields to Hubspot contact fields`,
     },
     hubspotFormWorkflow:{
-        SelectHubspotField : `Select Hubspot field`,
+        SelectHubspotField : `Select HubSpot field`,
         SelectFormField: `Select Form field`,
     },
 } as UmbLocalizationDictionary;

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

@@ -8,7 +8,7 @@ public static class ManagementApi
 
             public const string ApiName = "hubspot-management";
 
-            public const string ApiTitle = "Hubspot Management API";
+            public const string ApiTitle = "HubSpot Management API";
 
             public const string ContactGroupName = "Contacts";
 

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

@@ -30,7 +30,7 @@ public void Compose(IUmbracoBuilder builder)
                     {
                         Title = Constants.ManagementApi.ApiTitle,
                         Version = "Latest",
-                        Description = $"Describes the {Constants.ManagementApi.ApiTitle} available for handling Hubspot-CRM automation and configuration."
+                        Description = $"Describes the {Constants.ManagementApi.ApiTitle} available for handling HubSpot CRM automation and configuration."
                     });
 
                 options.CustomOperationIds(e => $"{e.ActionDescriptor.RouteValues["action"]}");

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

@@ -1,6 +1,5 @@
 using Microsoft.Extensions.Logging;
-
-using Newtonsoft.Json;
+using System.Text.Json;
 using Umbraco.Forms.Core;
 using Umbraco.Forms.Core.Attributes;
 using Umbraco.Forms.Core.Enums;
@@ -33,15 +32,10 @@ public HubspotWorkflow(ILogger<HubspotWorkflow> logger, IContactService contactS
         [Setting("Field Mappings", Description = "Map Umbraco Form fields to HubSpot contact fields", View = "Hubspot.PropertyEditorUi.Mapping")]
         public string FieldMappings { get; set; }
 
-        public WorkflowExecutionStatus Execute(WorkflowExecutionContext context)
-        {
-            throw new NotImplementedException();
-        }
-
         public override async Task<WorkflowExecutionStatus> ExecuteAsync(WorkflowExecutionContext context)
         {
             var fieldMappingsRawJson = FieldMappings;
-            var fieldMappings = JsonConvert.DeserializeObject<List<MappedProperty>>(fieldMappingsRawJson);
+            var fieldMappings = JsonSerializer.Deserialize<List<MappedProperty>>(fieldMappingsRawJson);
             if (fieldMappings.Count == 0)
             {
                 _logger.LogWarning("Save Contact to HubSpot: Missing HubSpot field mappings for workflow for the form {FormName} ({FormId})", context.Form.Name, context.Form.Id);

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

@@ -68,7 +68,7 @@ public async Task<AuthorizationResult> AuthorizeAsync(string code)
                 AuthorizationCode = code,
             };
             var response = await GetResponse(OAuthTokenProxyUrl, 
-                HttpMethod.Post, content: tokenRequest, contentType: "application/x-www-form-urlencoded").ConfigureAwait(false);
+                HttpMethod.Post, content: tokenRequest, contentType: "application/x-www-form-urlencoded");
             if (response.IsSuccessStatusCode)
             {
                 var responseContent = await response.Content.ReadAsStringAsync();
@@ -108,7 +108,7 @@ public async Task<IEnumerable<Property>> GetContactPropertiesAsync()
 
             var requestUrl = $"{CrmV3ApiBaseUrl}properties/contacts";
             var httpMethod = HttpMethod.Get;
-            var response = await GetResponse(requestUrl, httpMethod, authenticationDetails).ConfigureAwait(false);
+            var response = await GetResponse(requestUrl, httpMethod, authenticationDetails);
             if (response.IsSuccessStatusCode == false)
             {
                 var retryResult = await HandleFailedRequest(response.StatusCode, requestUrl, httpMethod, authenticationDetails);
@@ -190,7 +190,7 @@ public async Task<CommandResult> PostContactAsync(Record record, List<MappedProp
             // https://api.hubapi.com/crm/v3/objects/contacts?hapikey=YOUR_HUBSPOT_API_KEY
             var requestUrl = $"{CrmV3ApiBaseUrl}objects/contacts";
             var httpMethod = HttpMethod.Post;
-            var response = await GetResponse(requestUrl, httpMethod, authenticationDetails, propertiesRequestV3, JsonContentType).ConfigureAwait(false);
+            var response = await GetResponse(requestUrl, httpMethod, authenticationDetails, propertiesRequestV3, JsonContentType);
 
             // Depending on POST status fail or mark workflow as completed
             if (response.IsSuccessStatusCode == false)
@@ -235,7 +235,7 @@ private async Task<CommandResult> UpdateContactAsync(Record record, Authenticati
                 // It uses the V1 API but support suggests it will be added to V3 before being depreciated so we can use safely:
                 // https://community.hubspot.com/t5/APIs-Integrations/Get-Contacts-from-contact-list-using-email/m-p/419493/highlight/true#M41567
                 var requestUrl = $"{CrmApiHost}/contacts/v1/contact/email/{email}/profile";
-                var response = await GetResponse(requestUrl, HttpMethod.Post, authenticationDetails, postData, JsonContentType).ConfigureAwait(false);
+                var response = await GetResponse(requestUrl, HttpMethod.Post, authenticationDetails, postData, JsonContentType);
                 if (response.IsSuccessStatusCode == false)
                 {
                     var retryResult = await HandleFailedRequest(response.StatusCode, requestUrl, HttpMethod.Post, authenticationDetails, postData, JsonContentType);
@@ -308,7 +308,7 @@ private async Task<string> GetOAuthAccessTokenFromCacheOrRefreshToken(string ref
             if (accessToken != null)
             {
                 // No access token in the cache, so get a new one from the refresh token.
-                await RefreshOAuthAccessToken(refreshToken).ConfigureAwait(false);
+                await RefreshOAuthAccessToken(refreshToken);
                 accessToken = _appCaches.RuntimeCache.Get(AccessTokenCacheKey).ToString();
             }
 
@@ -323,7 +323,7 @@ private async Task RefreshOAuthAccessToken(string refreshToken)
                 RedirectUrl = OAuthRedirectUrl,
                 RefreshToken = refreshToken,
             };
-            var response = await GetResponse(OAuthTokenProxyUrl, HttpMethod.Post, content: tokenRequest, contentType: "application/x-www-form-urlencoded").ConfigureAwait(false);
+            var response = await GetResponse(OAuthTokenProxyUrl, HttpMethod.Post, content: tokenRequest, contentType: "application/x-www-form-urlencoded");
             if (response.IsSuccessStatusCode)
             {
                 var responseContent = await response.Content.ReadAsStringAsync();
@@ -382,12 +382,12 @@ private async Task<HttpResponseMessage> GetResponse(
                     case AuthenticationMode.OAuth:
                         requestMessage.Headers.Authorization =
                             new AuthenticationHeaderValue("Bearer", 
-                                await GetOAuthAccessTokenFromCacheOrRefreshToken(authenticationDetails.RefreshToken).ConfigureAwait(false));
+                                await GetOAuthAccessTokenFromCacheOrRefreshToken(authenticationDetails.RefreshToken));
                         break;
                 }
             }
 
-            return await httpClient.SendAsync(requestMessage).ConfigureAwait(false);
+            return await httpClient.SendAsync(requestMessage);
         }
 
         private static HttpContent CreateRequestContent(object data, string contentType)
@@ -430,7 +430,7 @@ private async Task<HandleFailedRequestResult> HandleFailedRequest(
                     await RefreshOAuthAccessToken(authenticationDetails.RefreshToken);
 
                     // Repeat the operation using the refreshed token.
-                    var response = await GetResponse(requestUrl, httpMethod, authenticationDetails, content, contentType).ConfigureAwait(false);
+                    var response = await GetResponse(requestUrl, httpMethod, authenticationDetails, content, contentType);
                     if (response.IsSuccessStatusCode)
                     {
                         result.Success = true;