Merge pull request #27 from umbraco/v10/dev

V10/dev

Author: acoumb

.gitignore

@@ -398,6 +398,8 @@ src/Umbraco.Forms.Integrations.TestSite/Umbraco
 src/Umbraco.Forms.Integrations.TestSite/Views
 src/Umbraco.Forms.Integrations.TestSite.V9/App_Plugins
 src/Umbraco.Forms.Integrations.TestSite.V9/Views
+src/Umbraco.Forms.Integrations.TestSite.V10/App_Plugins
+src/Umbraco.Forms.Integrations.TestSite.V10/Views
 *.zip
 appsettings.Local.json
 src/Umbraco.Forms.Integrations.Automation.Zapier/app.config

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

@@ -1,11 +1,6 @@
-#if NETCOREAPP
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 
 using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.Models.PublishedContent;
-using Umbraco.Cms.Core.Routing;
-using Umbraco.Cms.Web.Common;
-using Umbraco.Extensions;
 using Umbraco.Forms.Core.Services;
 using Umbraco.Forms.Core.Services.Notifications;
 using Umbraco.Forms.Integrations.Automation.Zapier.Extensions;
@@ -54,18 +49,17 @@ public void Handle(RecordCreatingNotification notification)
                 if (_zapierFormSubscriptionHookService.TryGetById(form.Id.ToString(), out var subscriptionHooks))
                 {
                     var content = form.ToFormDictionary(notificationSavedEntity, _umbUrlHelper.GetPageUrl(notificationSavedEntity.UmbracoPageId));
-                    
+
                     foreach (var subscriptionHook in subscriptionHooks)
                     {
                         var result =
                             triggerHelper.FormExecute(subscriptionHook.HookUrl, content);
 
-                        if(!string.IsNullOrEmpty(result))
+                        if (!string.IsNullOrEmpty(result))
                             _logger.LogError(result);
                     }
                 }
             }
         }
     }
-}
-#endif
+}

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

@@ -1,21 +1,7 @@
-using System.Collections.Specialized;
-
-namespace Umbraco.Forms.Integrations.Automation.Zapier.Configuration
+namespace Umbraco.Forms.Integrations.Automation.Zapier.Configuration
 {
     public class ZapierSettings
     {
-        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

@@ -3,13 +3,10 @@
 
 using Umbraco.Forms.Integrations.Automation.Zapier.Models.Dtos;
 using Umbraco.Forms.Integrations.Automation.Zapier.Services;
+using Umbraco.Forms.Integrations.Automation.Zapier.Configuration;
 
-#if NETCOREAPP
 using Microsoft.Extensions.Options;
 
-using Umbraco.Forms.Integrations.Automation.Zapier.Configuration;
-#endif
-
 namespace Umbraco.Forms.Integrations.Automation.Zapier.Controllers
 {
     /// <summary>
@@ -19,13 +16,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

@@ -1,15 +1,13 @@
 using System.Collections.Generic;
 using System.Linq;
+
+using Microsoft.Extensions.Options;
+
 using Umbraco.Forms.Core.Data.Storage;
 using Umbraco.Forms.Integrations.Automation.Zapier.Extensions;
 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

@@ -1,17 +1,10 @@
 using System.Linq;
 
-using Umbraco.Forms.Integrations.Automation.Zapier.Configuration;
-using Umbraco.Forms.Integrations.Automation.Zapier.Services;
-
-#if NETCOREAPP
 using Microsoft.Extensions.Options;
 
+using Umbraco.Forms.Integrations.Automation.Zapier.Configuration;
+using Umbraco.Forms.Integrations.Automation.Zapier.Services;
 using Umbraco.Cms.Web.Common.Controllers;
-#else
-using System.Configuration;
-
-using Umbraco.Web.WebApi;
-#endif
 
 namespace Umbraco.Forms.Integrations.Automation.Zapier.Controllers
 {
@@ -21,17 +14,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 +27,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 +36,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

@@ -1,5 +1,4 @@
-
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Umbraco.Forms.Integrations.Automation.Zapier.Models.Dtos
 {