V14: Integrations (ActiveCampaign/Forms)

- Fix pr comments
- Re generate api
- Create new form field dto

Author: dtng95

src/Umbraco.Forms.Integrations.Crm.ActiveCampaign/ActiveCampaignContactsWorkflow.cs

@@ -21,7 +21,6 @@ public class ActiveCampaignContactsWorkflow : WorkflowType
         private readonly IContactService _contactService;
 
         private readonly ILogger<ActiveCampaignContactsWorkflow> _logger;
-        private readonly IFormService _formService;
 
         [Core.Attributes.Setting("Account",
             Description = "Please select an account",
@@ -66,7 +65,7 @@ public override async Task<WorkflowExecutionStatus> ExecuteAsync(WorkflowExecuti
                     .ValuesAsString();
 
                 // Check if contact exists.
-                var contacts = _contactService.Get(email).ConfigureAwait(false).GetAwaiter().GetResult();
+                var contacts = await _contactService.Get(email).ConfigureAwait(false);
 
                 if(contacts.Contacts.Count > 0 && !_settings.AllowContactUpdate)
                 {
@@ -91,14 +90,13 @@ public override async Task<WorkflowExecutionStatus> ExecuteAsync(WorkflowExecuti
                     }).ToList();
                 }
 
-                var contactId = _contactService.CreateOrUpdate(requestDto, contacts.Contacts.Count > 0)
-                    .ConfigureAwait(false).GetAwaiter().GetResult();
+                var contactId = await _contactService.CreateOrUpdate(requestDto, contacts.Contacts.Count > 0).ConfigureAwait(false);
 
                 if (string.IsNullOrEmpty(contactId))
                 {
                     _logger.LogError($"Failed to create/update contact: {email}");
 
-                    return await Task.FromResult<WorkflowExecutionStatus>(WorkflowExecutionStatus.Failed);
+                    return WorkflowExecutionStatus.Failed;
                 }
 
                 // Associate contact with account if last one is specified.
@@ -108,13 +106,13 @@ public override async Task<WorkflowExecutionStatus> ExecuteAsync(WorkflowExecuti
                         .ConfigureAwait(false).GetAwaiter().GetResult();
                 }
 
-                return await Task.FromResult<WorkflowExecutionStatus>(WorkflowExecutionStatus.Completed);
+                return WorkflowExecutionStatus.Failed;
             }
             catch(Exception ex)
             {
                 _logger.LogError(ex, ex.Message);
 
-                return await Task.FromResult<WorkflowExecutionStatus>(WorkflowExecutionStatus.Failed);
+                return WorkflowExecutionStatus.Failed;
             }
         }
 

src/Umbraco.Forms.Integrations.Crm.ActiveCampaign/Api/Management/Controllers/Accounts/AccountControllerBase.cs

@@ -15,7 +15,6 @@ namespace Umbraco.Forms.Integrations.Crm.ActiveCampaign.Api.Management.Controlle
     [ApiVersion("1.0")]
     [BackOfficeRoute($"{Constants.ManagementApi.RootPath}/v{{version:apiVersion}}/accounts")]
     [ApiExplorerSettings(GroupName = Constants.ManagementApi.AccountsGroupName)]
-    [Authorize(Policy = AuthorizationPolicies.BackOfficeAccess)]
     public class AccountControllerBase : ActiveCampaignControllerBase
     {
         protected readonly IAccountService _accountService;

src/Umbraco.Forms.Integrations.Crm.ActiveCampaign/Api/Management/Controllers/ActiveCampaignControllerBase.cs

@@ -7,6 +7,7 @@
 using System.Threading.Tasks;
 using Umbraco.Cms.Api.Common.Attributes;
 using Umbraco.Cms.Web.Common.Authorization;
+using Umbraco.Cms.Web.Common.Routing;
 
 namespace Umbraco.Forms.Integrations.Crm.ActiveCampaign.Api.Management.Controllers
 {

src/Umbraco.Forms.Integrations.Crm.ActiveCampaign/Api/Management/Controllers/Contacts/CheckApiAccessController.cs

@@ -23,6 +23,6 @@ public CheckApiAccessController(IOptions<ActiveCampaignSettings> options, IConta
 
         [HttpGet("api-access")]
         [ProducesResponseType(typeof(ApiAccessDto), StatusCodes.Status200OK)]
-        public IActionResult CheckApiAccess() => Ok(new JsonResult(new ApiAccessDto(_settings.BaseUrl, _settings.ApiKey)));
+        public IActionResult CheckApiAccess() => Ok(new ApiAccessDto(_settings.BaseUrl, _settings.ApiKey));
     }
 }

src/Umbraco.Forms.Integrations.Crm.ActiveCampaign/Api/Management/Controllers/Contacts/ContactControllerBase.cs

@@ -17,7 +17,6 @@ namespace Umbraco.Forms.Integrations.Crm.ActiveCampaign.Api.Management.Controlle
     [ApiVersion("1.0")]
     [BackOfficeRoute($"{Constants.ManagementApi.RootPath}/v{{version:apiVersion}}/contacts")]
     [ApiExplorerSettings(GroupName = Constants.ManagementApi.ContactGroupName)]
-    [Authorize(Policy = AuthorizationPolicies.BackOfficeAccess)]
     public class ContactControllerBase : ActiveCampaignControllerBase
     {
         protected readonly ActiveCampaignSettings _settings;

src/Umbraco.Forms.Integrations.Crm.ActiveCampaign/Api/Management/Controllers/Contacts/GetCustomFieldsController.cs

@@ -23,7 +23,7 @@ public GetCustomFieldsController(IOptions<ActiveCampaignSettings> options, ICont
 
         [HttpGet("custom")]
         [ProducesResponseType(typeof(CustomFieldCollectionResponseDto), StatusCodes.Status200OK)]
-        public IActionResult GetCustomFields() =>
-            Ok(_contactService.GetCustomFields().ConfigureAwait(false).GetAwaiter().GetResult());
+        public async Task<IActionResult> GetCustomFields() =>
+            Ok(await _contactService.GetCustomFields().ConfigureAwait(false));
     }
 }

src/Umbraco.Forms.Integrations.Crm.ActiveCampaign/Api/Management/Controllers/Forms/FormControllerBase.cs

@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Authorization;
+using Asp.Versioning;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using System;
 using System.Collections.Generic;
@@ -11,9 +12,9 @@
 
 namespace Umbraco.Forms.Integrations.Crm.ActiveCampaign.Api.Management.Controllers.Forms
 {
+    [ApiVersion("1.0")]
     [BackOfficeRoute($"{Constants.ManagementApi.RootPath}/v{{version:apiVersion}}/forms")]
-    [ApiExplorerSettings(GroupName = Constants.ManagementApi.AccountsGroupName)]
-    [Authorize(Policy = AuthorizationPolicies.BackOfficeAccess)]
+    [ApiExplorerSettings(GroupName = Constants.ManagementApi.FormsGroupName)]
     public class FormControllerBase : ActiveCampaignControllerBase
     {
         protected readonly IFormService FormService;

src/Umbraco.Forms.Integrations.Crm.ActiveCampaign/Api/Management/Controllers/Forms/GetFormFieldsController.cs

@@ -6,9 +6,9 @@
 using System.Text;
 using System.Threading.Tasks;
 using Umbraco.Cms.Core.Actions;
-using Umbraco.Forms.Core.Models;
 using Umbraco.Forms.Core.Services;
 using Umbraco.Forms.Integrations.Crm.ActiveCampaign.Configuration;
+using Umbraco.Forms.Integrations.Crm.ActiveCampaign.Models.Dtos;
 
 
 namespace Umbraco.Forms.Integrations.Crm.ActiveCampaign.Api.Management.Controllers.Forms
@@ -20,14 +20,14 @@ public GetFormFieldsController(IFormService formService) : base(formService)
         }
 
         [HttpGet("fields")]
-        [ProducesResponseType(typeof(List<Field>), StatusCodes.Status200OK)]
+        [ProducesResponseType(typeof(List<ActiveCampaignFormFieldDto>), StatusCodes.Status200OK)]
         public IActionResult GetFormFields(string formId)
         {
-            List<Field> formFields = new List<Field>();
+            List<ActiveCampaignFormFieldDto> formFields = new List<ActiveCampaignFormFieldDto>();
             var result = FormService.Get(new Guid(formId));
             if (result != null)
             {
-                formFields = result.AllFields;
+                formFields = result.AllFields.Select(s => new ActiveCampaignFormFieldDto { Caption = s.Caption, Id = s.Id }).ToList();
             }
             return Ok(formFields);
         }