Updated functionality per CMS package changes.

Author: acoumb

src/Umbraco.Forms.Integrations.Automation.Zapier/Components/NewFormSubmittedComponent.cs

@@ -60,13 +60,13 @@ private void RecordStorage_RecordInserting(object sender, Core.RecordEventArgs e
             var umbracoPageId = e.Record.UmbracoPageId;
             var pageUrl = umbracoContext.UrlProvider.GetUrl(umbracoPageId, UrlMode.Absolute);
 
-            if (_zapierFormSubscriptionHookService.TryGetById(e.Form.Id.ToString(), out var zapFormConfigList))
+            if (_zapierFormSubscriptionHookService.TryGetById(e.Form.Id.ToString(), out var zapHookUrls))
             {
                 var content = e.Form.ToFormDictionary(e.Record, pageUrl);
 
-                foreach (var zapFormConfig in zapFormConfigList)
+                foreach (var hookUrl in zapHookUrls)
                 {
-                    var result = triggerHelper.FormExecute(zapFormConfig.HookUrl, content);
+                    var result = triggerHelper.FormExecute(hookUrl, content);
 
                     if (!string.IsNullOrEmpty(result))
                         _logger.Error<NewFormSubmittedComponent>(result);

src/Umbraco.Forms.Integrations.Automation.Zapier/Components/NewFormSubmittedNotification.cs

@@ -56,7 +56,7 @@ public void Handle(RecordCreatingNotification notification)
             {
                 var form = _formService.Get(notificationSavedEntity.Form);
 
-                if (_zapierFormSubscriptionHookService.TryGetById(form.Id.ToString(), out var zapFormConfigList))
+                if (_zapierFormSubscriptionHookService.TryGetById(form.Id.ToString(), out var zapHookUrls))
                 {
                     string pageUrl = string.Empty;
                     if (_umbracoHelperAccessor.TryGetUmbracoHelper(out UmbracoHelper umbracoHelper))
@@ -70,10 +70,10 @@ public void Handle(RecordCreatingNotification notification)
 
                     var content = form.ToFormDictionary(notificationSavedEntity, pageUrl);
 
-                    foreach (var formConfigDto in zapFormConfigList)
+                    foreach (var hookUrl in zapHookUrls)
                     {
                         var result =
-                            triggerHelper.FormExecute(formConfigDto.HookUrl, content);
+                            triggerHelper.FormExecute(hookUrl, content);
 
                         if(!string.IsNullOrEmpty(result))
                             _logger.LogError(result);

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

@@ -1,16 +1,13 @@
 using System.Collections.Generic;
 using System.Linq;
 
-using Umbraco.Cms.Integrations.Automation.Zapier.Models.Dtos;
-using Umbraco.Forms.Integrations.Automation.Zapier.Configuration;
+using Umbraco.Forms.Integrations.Automation.Zapier.Models.Dtos;
 using Umbraco.Forms.Integrations.Automation.Zapier.Services;
 
 #if NETCOREAPP
 using Microsoft.Extensions.Options;
 
-using Umbraco.Cms.Web.Common.Controllers;
-#else
-using System.Configuration;
+using Umbraco.Forms.Integrations.Automation.Zapier.Configuration;
 #endif
 
 namespace Umbraco.Forms.Integrations.Automation.Zapier.Controllers
@@ -20,10 +17,6 @@ namespace Umbraco.Forms.Integrations.Automation.Zapier.Controllers
     /// </summary>
     public class FormController : ZapierFormAuthorizedApiController
     {
-        private readonly ZapierSettings Options;
-
-        private readonly IUserValidationService _userValidationService;
-
         private readonly ZapierFormService _zapierFormService;
 
 #if NETCOREAPP
@@ -34,15 +27,7 @@ public FormController(ZapierFormService zapierFormService, IUserValidationServic
             : base(userValidationService)
 #endif
         {
-#if NETCOREAPP
-            Options = options.Value;
-#else
-            Options = new ZapierSettings(ConfigurationManager.AppSettings);
-#endif
-
             _zapierFormService = zapierFormService;
-
-            _userValidationService = userValidationService;
         }
 
         public IEnumerable<FormDto> GetForms()

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

@@ -2,16 +2,14 @@
 using System.Collections.Generic;
 using System.Linq;
 
-using Umbraco.Cms.Integrations.Automation.Zapier.Models.Dtos;
-
-using Umbraco.Forms.Integrations.Automation.Zapier.Configuration;
+using Umbraco.Forms.Integrations.Automation.Zapier.Models.Dtos;
 using Umbraco.Forms.Integrations.Automation.Zapier.Extensions;
 using Umbraco.Forms.Integrations.Automation.Zapier.Services;
 
 #if NETCOREAPP
 using Microsoft.Extensions.Options;
-#else
-using System.Configuration;
+
+using Umbraco.Forms.Integrations.Automation.Zapier.Configuration;
 #endif
 
 namespace Umbraco.Forms.Integrations.Automation.Zapier.Controllers
@@ -22,12 +20,8 @@ namespace Umbraco.Forms.Integrations.Automation.Zapier.Controllers
     /// </summary>
     public class FormPollingController : ZapierFormAuthorizedApiController
     {
-        private readonly ZapierSettings Options;
-
         private readonly ZapierFormService _zapierFormService;
 
-        private readonly IUserValidationService _userValidationService;
-
 #if NETCOREAPP
         public FormPollingController(IOptions<ZapierSettings> options, ZapierFormService zapierFormService, IUserValidationService userValidationService)
             : base(options, userValidationService)
@@ -36,15 +30,7 @@ public FormPollingController(ZapierFormService zapierFormService, IUserValidatio
             : base(userValidationService)
 #endif
         {
-#if NETCOREAPP
-            Options = options.Value;
-#else
-            Options = new ZapierSettings(ConfigurationManager.AppSettings);
-#endif
-
             _zapierFormService = zapierFormService;
-
-            _userValidationService = userValidationService;
         }
 
         [Obsolete("Used only for Umbraco Zapier app v1.0.0. For updated versions use GetFormById")]

src/Umbraco.Forms.Integrations.Automation.Zapier/Models/Dtos/FormConfigDto.cs

@@ -1,7 +1,7 @@
 
 using Newtonsoft.Json;
 
-namespace Umbraco.Cms.Integrations.Automation.Zapier.Models.Dtos
+namespace Umbraco.Forms.Integrations.Automation.Zapier.Models.Dtos
 {
     public class FormDto
     {

src/Umbraco.Forms.Integrations.Automation.Zapier/Models/Dtos/FormDto.cs

@@ -8,7 +8,7 @@
 using Umbraco.Forms.Core.Data.Storage;
 #endif
 
-using Umbraco.Cms.Integrations.Automation.Zapier.Models.Dtos;
+using Umbraco.Forms.Integrations.Automation.Zapier.Models.Dtos;
 using Umbraco.Forms.Core.Models;
 
 namespace Umbraco.Forms.Integrations.Automation.Zapier.Services

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

@@ -1,8 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
 
-using Umbraco.Forms.Integrations.Automation.Zapier.Models.Dtos;
-
 #if NETCOREAPP
 using Microsoft.Extensions.Logging;
 
@@ -38,18 +36,15 @@ public ZapierFormSubscriptionHookService(IScopeProvider scopeProvider, ILogger l
         }
 #endif
 
-        public bool TryGetById(string id, out IEnumerable<FormConfigDto> dto)
+        public bool TryGetById(string id, out IEnumerable<string> dto)
         {
             using (var scope = _scopeProvider.CreateScope())
             {
                 var entities =
                     scope.Database
-                        .Query<FormConfigDto>( "SELECT * FROM zapierSubscriptionHook where EntityId = @0", id)
-                        .ToList();
+                        .Query<string>( "SELECT HookUrl FROM zapierSubscriptionHook where EntityId = @0 and Type = 2", id).ToArray();
 
-                dto = entities.Any()
-                    ? entities.Select(p => new FormConfigDto { HookUrl = p.HookUrl })
-                    : null;
+                dto = entities;
 
                 return entities.Any();
             }