Merge branch 'main-v14' into v14/feature/42961-V14-Integrations-(HubSpot/Forms)

Author: dtng95

.gitignore

@@ -17,6 +17,7 @@ src/Umbraco.Forms.Integrations.Testsite.V14/Views
 src/Umbraco.Forms.Integrations.Testsite.V14/wwwroot
 src/Umbraco.Forms.Integrations.Automation.Zapier/wwwroot
 src/Umbraco.Forms.Integrations.Crm.Hubspot/wwwroot
+src/Umbraco.Forms.Integrations.Crm.ActiveCampaign/wwwroot
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs

README.md

@@ -8,7 +8,7 @@ This repository houses open-source extensions, created for Umbraco Forms, that i
 
 [Hubspot](./src/Umbraco.Forms.Integrations.Crm.Hubspot/) - a custom workflow allowing form form entries to be mapped to a HubSpot contact record, and stored within the CRM platform.
 
-[ActiveCampaign](./src/Umbraco.Forms.Integrations.Crm.ActiveCampaign/) - a custom workflow allowing form entries to be mapped to an ActiveCampaign contact, and stored withing the CRM platform.
+[ActiveCampaign](./src/Umbraco.Forms.Integrations.Crm.ActiveCampaign/) - a custom workflow allowing form entries to be mapped to an ActiveCampaign contact, and stored within the CRM platform.
 
 ### Automation
 

src/Umbraco.Forms.Integrations.Automation.Zapier/Api/Management/Controllers/FormsControllerBase.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Api.Common.Attributes;
 using Umbraco.Cms.Web.Common.Routing;
 using Umbraco.Forms.Integrations.Automation.Zapier.Services;

src/Umbraco.Forms.Integrations.Automation.Zapier/Api/Management/Controllers/GetFormPropertiesByIdController.cs

@@ -1,11 +1,6 @@
 using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Umbraco.Forms.Integrations.Automation.Zapier.Extensions;
 using Umbraco.Forms.Integrations.Automation.Zapier.Services;
 
@@ -15,17 +10,20 @@ namespace Umbraco.Forms.Integrations.Automation.Zapier.Api.Management.Controller
     [ApiExplorerSettings(GroupName = Constants.ManagementApi.GroupName)]
     public class GetFormPropertiesByIdController : FormsControllerBase
     {
-        public GetFormPropertiesByIdController(IUserValidationService userValidationService, ZapierFormService zapierFormService) : base(userValidationService, zapierFormService)
+        public GetFormPropertiesByIdController(IUserValidationService userValidationService, ZapierFormService zapierFormService) 
+            : base(userValidationService, zapierFormService)
         {
         }
 
         [HttpGet("forms/{id}")]
         [ProducesResponseType(typeof(List<Dictionary<string, string>>), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
         public IActionResult GetFormPropertiesById(string id)
         {
             var emptyList = new List<Dictionary<string, string>>();
 
-            if (!IsAccessValid()) return Ok(emptyList);
+            if (!IsAccessValid())
+                return Unauthorized();
 
             var form = ZapierFormService.GetById(id);
 

src/Umbraco.Forms.Integrations.Automation.Zapier/Api/Management/Controllers/GetFormsController.cs

@@ -1,11 +1,6 @@
 using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Umbraco.Forms.Integrations.Automation.Zapier.Models.Dtos;
 using Umbraco.Forms.Integrations.Automation.Zapier.Services;
 
@@ -15,16 +10,19 @@ namespace Umbraco.Forms.Integrations.Automation.Zapier.Api.Management.Controller
     [ApiExplorerSettings(GroupName = Constants.ManagementApi.GroupName)]
     public class GetFormsController : FormsControllerBase
     {
-        public GetFormsController(IUserValidationService userValidationService, ZapierFormService zapierFormService) : base(userValidationService, zapierFormService)
+        public GetFormsController(IUserValidationService userValidationService, ZapierFormService zapierFormService) 
+            : base(userValidationService, zapierFormService)
         {
 
         }
 
         [HttpGet("forms")]
         [ProducesResponseType(typeof(IEnumerable<FormDto>), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
         public IActionResult GetForms()
         {
-            if (!IsAccessValid()) return Ok(Enumerable.Empty<FormDto>());
+            if (!IsAccessValid())
+                return Unauthorized();
 
             return Ok(ZapierFormService.GetAll());
         }

src/Umbraco.Forms.Integrations.Automation.Zapier/Extensions/FormExtensions.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-
-using Umbraco.Forms.Core.Models;
+using Umbraco.Forms.Core.Models;
 using Umbraco.Forms.Core.Persistence.Dtos;
 
 namespace Umbraco.Forms.Integrations.Automation.Zapier.Extensions

src/Umbraco.Forms.Integrations.Automation.Zapier/Helpers/TriggerHelper.cs

@@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-using Umbraco.Forms.Integrations.Automation.Zapier.Services;
+using Umbraco.Forms.Integrations.Automation.Zapier.Services;
 
 namespace Umbraco.Forms.Integrations.Automation.Zapier.Helpers
 {

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

@@ -1,6 +1,4 @@
-using System.Threading.Tasks;
-
-namespace Umbraco.Forms.Integrations.Automation.Zapier.Services
+namespace Umbraco.Forms.Integrations.Automation.Zapier.Services
 {
     public interface IUserValidationService
     {

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

@@ -1,11 +1,7 @@
-using System.Linq;
-using System.Threading.Tasks;
-
-using Microsoft.Extensions.Options;
-
-using Umbraco.Forms.Integrations.Automation.Zapier.Configuration;
+using Microsoft.Extensions.Options;
 using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Core.Services;
+using Umbraco.Forms.Integrations.Automation.Zapier.Configuration;
 
 namespace Umbraco.Forms.Integrations.Automation.Zapier.Services
 {

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

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-using Umbraco.Forms.Core.Models;
+using Umbraco.Forms.Core.Models;
 using Umbraco.Forms.Core.Services;
 using Umbraco.Forms.Integrations.Automation.Zapier.Models.Dtos;