Initial draft for Zapier 2.0.0

Author: acoumb

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

@@ -1,5 +1,4 @@
-#if NETCOREAPP
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models.PublishedContent;
@@ -67,5 +66,4 @@ public void Handle(RecordCreatingNotification notification)
             }
         }
     }
-}
-#endif
+}

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

@@ -1,6 +1,4 @@
-using System.Collections.Specialized;
-
-namespace Umbraco.Forms.Integrations.Automation.Zapier.Configuration
+namespace Umbraco.Forms.Integrations.Automation.Zapier.Configuration
 {
     public class ZapierSettings
     {
@@ -9,13 +7,6 @@ public ZapierSettings()
 
         }
 
-        public ZapierSettings(NameValueCollection appSettings)
-        {
-            UserGroupAlias = appSettings[Constants.UmbracoFormsIntegrationsAutomationZapierUserGroupAlias];
-
-            ApiKey = appSettings[Constants.UmbracoFormsIntegrationsAutomationZapierApiKey];
-        }
-
         public string UserGroupAlias { get; set; }
 
         public string ApiKey { get; set; }

src/Umbraco.Forms.Integrations.Automation.Zapier/Configuration/ZapierSettings.cs

@@ -3,10 +3,6 @@ namespace Umbraco.Forms.Integrations.Automation.Zapier
 {
     public class Constants
     {
-        public const string UmbracoFormsIntegrationsAutomationZapierUserGroupAlias = "Umbraco.Forms.Integrations.Automation.Zapier.UserGroupAlias";
-
-        public const string UmbracoFormsIntegrationsAutomationZapierApiKey = "Umbraco.Forms.Integrations.Automation.Zapier.ApiKey";
-
         public static class ZapierAppConfiguration
         {
             public const string UsernameHeaderKey = "X-USERNAME";

src/Umbraco.Forms.Integrations.Automation.Zapier/Constants.cs

@@ -4,11 +4,9 @@
 using Umbraco.Forms.Integrations.Automation.Zapier.Models.Dtos;
 using Umbraco.Forms.Integrations.Automation.Zapier.Services;
 
-#if NETCOREAPP
 using Microsoft.Extensions.Options;
 
 using Umbraco.Forms.Integrations.Automation.Zapier.Configuration;
-#endif
 
 namespace Umbraco.Forms.Integrations.Automation.Zapier.Controllers
 {
@@ -19,13 +17,8 @@ public class FormController : ZapierFormAuthorizedApiController
     {
         private readonly ZapierFormService _zapierFormService;
 
-#if NETCOREAPP
         public FormController(IOptions<ZapierSettings> options, IUserValidationService userValidationService, ZapierFormService zapierFormService)
             : base(options, userValidationService)
-#else
-        public FormController(ZapierFormService zapierFormService, IUserValidationService userValidationService)
-            : base(userValidationService)
-#endif
         {
             _zapierFormService = zapierFormService;
         }

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

@@ -5,11 +5,9 @@
 using Umbraco.Forms.Integrations.Automation.Zapier.Helpers;
 using Umbraco.Forms.Integrations.Automation.Zapier.Services;
 
-#if NETCOREAPP
 using Microsoft.Extensions.Options;
 
 using Umbraco.Forms.Integrations.Automation.Zapier.Configuration;
-#endif
 
 namespace Umbraco.Forms.Integrations.Automation.Zapier.Controllers
 {
@@ -25,17 +23,10 @@ public class FormPollingController : ZapierFormAuthorizedApiController
 
         private readonly UmbUrlHelper _umbUrlHelper;
 
-#if NETCOREAPP
         public FormPollingController(IOptions<ZapierSettings> options, ZapierFormService zapierFormService, IRecordStorage recordStorage, 
             UmbUrlHelper umbUrlHelper,
             IUserValidationService userValidationService)
             : base(options, userValidationService)
-#else
-        public FormPollingController(ZapierFormService zapierFormService, IRecordStorage recordStorage,
-            UmbUrlHelper umbUrlHelper,
-            IUserValidationService userValidationService)
-            : base(userValidationService)
-#endif
         {
             _zapierFormService = zapierFormService;
 

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

@@ -3,15 +3,9 @@
 using Umbraco.Forms.Integrations.Automation.Zapier.Configuration;
 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.Web.WebApi;
-#endif
 
 namespace Umbraco.Forms.Integrations.Automation.Zapier.Controllers
 {
@@ -21,17 +15,9 @@ public class ZapierFormAuthorizedApiController : UmbracoApiController
 
         private readonly IUserValidationService _userValidationService;
 
-#if NETCOREAPP
         public ZapierFormAuthorizedApiController(IOptions<ZapierSettings> options, IUserValidationService userValidationService)
-#else
-        public ZapierFormAuthorizedApiController(IUserValidationService userValidationService)
-#endif
         {
-#if NETCOREAPP
             Options = options.Value;
-#else
-            Options = new ZapierSettings(ConfigurationManager.AppSettings);
-#endif
 
             _userValidationService = userValidationService;
         }
@@ -42,7 +28,6 @@ public bool IsAccessValid()
             string password = string.Empty;
             string apiKey = string.Empty;
 
-#if NETCOREAPP
             if (Request.Headers.TryGetValue(Constants.ZapierAppConfiguration.UsernameHeaderKey,
                     out var usernameValues))
                 username = usernameValues.First();
@@ -52,17 +37,6 @@ public bool IsAccessValid()
             if (Request.Headers.TryGetValue(Constants.ZapierAppConfiguration.ApiKeyHeaderKey,
                     out var apiKeyValues))
                 apiKey = apiKeyValues.First();
-#else
-            if (Request.Headers.TryGetValues(Constants.ZapierAppConfiguration.UsernameHeaderKey,
-                    out var usernameValues))
-                username = usernameValues.First();
-            if (Request.Headers.TryGetValues(Constants.ZapierAppConfiguration.PasswordHeaderKey,
-                    out var passwordValues))
-                password = passwordValues.First();
-            if (Request.Headers.TryGetValues(Constants.ZapierAppConfiguration.ApiKeyHeaderKey,
-                    out var apiKeyValues))
-                apiKey = apiKeyValues.First();
-#endif
 
             if (string.IsNullOrEmpty(apiKey) && (string.IsNullOrEmpty(username) || string.IsNullOrEmpty(password))) return false;
 

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

@@ -1,18 +1,12 @@
-#if NETCOREAPP
-using Umbraco.Cms.Core.Models.PublishedContent;
+using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.Routing;
 using Umbraco.Cms.Web.Common;
 using Umbraco.Extensions;
-#else
-using Umbraco.Core.Models.PublishedContent;
-using Umbraco.Web;
-#endif
 
 namespace Umbraco.Forms.Integrations.Automation.Zapier.Helpers
 {
     public class UmbUrlHelper
     {
-#if NETCOREAPP
         private readonly IUmbracoHelperAccessor _umbracoHelperAccessor;
 
         private readonly IPublishedUrlProvider _publishedUrlProvider;
@@ -23,18 +17,9 @@ public UmbUrlHelper(IUmbracoHelperAccessor umbracoHelperAccessor, IPublishedUrlP
 
             _publishedUrlProvider = publishedUrlProvider;
         }
-#else
-        private readonly IUmbracoContextAccessor _umbracoContextAccessor;
-
-        public UmbUrlHelper(IUmbracoContextAccessor umbracoContextAccessor)
-        {
-            _umbracoContextAccessor = umbracoContextAccessor;
-        }
-#endif
 
         public string GetPageUrl(int umbracoPageId)
         {
-#if NETCOREAPP
             string pageUrl = string.Empty;
             if (_umbracoHelperAccessor.TryGetUmbracoHelper(out UmbracoHelper umbracoHelper))
             {
@@ -44,11 +29,6 @@ public string GetPageUrl(int umbracoPageId)
                     pageUrl = publishedContent.Url(_publishedUrlProvider, mode: UrlMode.Absolute);
                 }
             }
-#else
-            UmbracoContext umbracoContext = _umbracoContextAccessor.UmbracoContext;
-            
-            var pageUrl = umbracoContext.UrlProvider.GetUrl(umbracoPageId, UrlMode.Absolute);
-#endif
 
             return pageUrl;
         }

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

@@ -2,46 +2,24 @@
 using System.Collections.Generic;
 using System.Linq;
 
-#if NETCOREAPP
+using Umbraco.Forms.Core.Models;
 using Umbraco.Forms.Core.Services;
-#else
-using Umbraco.Forms.Core.Data.Storage;
-#endif
-
 using Umbraco.Forms.Integrations.Automation.Zapier.Models.Dtos;
-using Umbraco.Forms.Core.Models;
 
 namespace Umbraco.Forms.Integrations.Automation.Zapier.Services
 {
     public class ZapierFormService
     {
-#if NETCOREAPP
         private readonly IFormService _formService;
 
         public ZapierFormService(IFormService formService)
         {
             _formService = formService;
         }
-#else
-        private readonly IFormStorage _formStorage;
-
-        public ZapierFormService(IFormStorage formStorage)
-        {
-            _formStorage = formStorage;
-        }
-#endif
 
-        /// <summary>
-        /// for V8 use IFormStorage to retrieve forms saved on disk also
-        /// </summary>
-        /// <returns></returns>
         public IEnumerable<FormDto> GetAll()
         {
-#if NETCOREAPP
             var forms = _formService.Get();
-#else
-            var forms = _formStorage.GetAll();
-#endif
 
             return forms.Select(p => new FormDto
             {
@@ -50,13 +28,6 @@ public IEnumerable<FormDto> GetAll()
             });
         }
 
-        public Form GetById(string id)
-        {
-#if NETCOREAPP
-            return _formService.Get().FirstOrDefault(p => p.Id == Guid.Parse(id));
-#else
-            return _formStorage.GetAll().FirstOrDefault(p => p.Id == Guid.Parse(id));
-#endif
-        }
+        public Form GetById(string id) => _formService.Get().FirstOrDefault(p => p.Id == Guid.Parse(id));
     }
 }