Send content values to Zapier

acoumb · acoumb · commit ea704cc4c4e6 · 2022-05-10T09:56:46.000+03:00
diff --git a/src/Umbraco.Cms.Integrations.Automation.Zapier/Components/NewContentPublishedComponent.cs b/src/Umbraco.Cms.Integrations.Automation.Zapier/Components/NewContentPublishedComponent.cs
@@ -1,6 +1,7 @@
 ﻿#if NETFRAMEWORK
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Umbraco.Cms.Integrations.Automation.Zapier.Helpers;
 using Umbraco.Cms.Integrations.Automation.Zapier.Services;
@@ -53,9 +54,21 @@ private void ContentServiceOnPublished(IContentService sender, ContentPublishedE
             {
                 if (_zapierSubscriptionHookService.TryGetByAlias(node.ContentType.Alias, out var zapContentConfigList))
                 {
+                    var content = new Dictionary<string, string>
+                    {
+                        {Constants.Content.Id, node.Id.ToString() },
+                        {Constants.Content.Name, node.Name },
+                        {Constants.Content.PublishDate, DateTime.UtcNow.ToString("s") }
+                    };
+
+                    foreach (var nodeProperty in node.Properties)
+                    {
+                        content.Add(nodeProperty.Alias, nodeProperty.Id == 0 || nodeProperty.Values.Count == 0 ? string.Empty : nodeProperty.GetValue().ToString());
+                    }
+
                     foreach (var zapContentConfig in zapContentConfigList)
                     {
-                        var result = triggerHelper.Execute(zapContentConfig.HookUrl, node.Id.ToString(), node.Name);
+                        var result = triggerHelper.Execute(zapContentConfig.HookUrl, content);
 
                         if (!string.IsNullOrEmpty(result))
                             _logger.Error<NewContentPublishedComponent>(result);
diff --git a/src/Umbraco.Cms.Integrations.Automation.Zapier/Components/NewContentPublishedNotification.cs b/src/Umbraco.Cms.Integrations.Automation.Zapier/Components/NewContentPublishedNotification.cs
@@ -1,4 +1,6 @@
 ﻿#if NETCOREAPP
+using System;
+using System.Collections.Generic;
 using Microsoft.Extensions.Logging;
 
 using Umbraco.Cms.Core.Events;
@@ -33,9 +35,16 @@ public void Handle(ContentPublishedNotification notification)
             {
                 if (_zapierSubscriptionHookService.TryGetByAlias(node.ContentType.Alias, out var zapContentConfigList))
                 {
+                    var content = new Dictionary<string, string>
+                    {
+                        {Constants.Content.Id, node.Id.ToString() },
+                        {Constants.Content.Name, node.Name },
+                        {Constants.Content.PublishDate, DateTime.UtcNow.ToString("s") }
+                    };
+
                     foreach (var zapContentConfig in zapContentConfigList)
                     {
-                        var result = triggerHelper.Execute(zapContentConfig.HookUrl, node.Id.ToString(), node.Name);
+                        var result = triggerHelper.Execute(zapContentConfig.HookUrl, content);
 
                         if (!string.IsNullOrEmpty(result))
                             _logger.LogError(result);
diff --git a/src/Umbraco.Cms.Integrations.Automation.Zapier/Components/NewFormSubmittedComponent.cs b/src/Umbraco.Cms.Integrations.Automation.Zapier/Components/NewFormSubmittedComponent.cs
diff --git a/src/Umbraco.Cms.Integrations.Automation.Zapier/Constants.cs b/src/Umbraco.Cms.Integrations.Automation.Zapier/Constants.cs
@@ -33,16 +33,5 @@ public static class Content
 
             public const string PublishDate = "publishDate";
         }
-
-        public static class Form
-        {
-            public const string Id = "formId";
-
-            public const string Name = "formName";
-
-            public const string SubmissionDate = "submissionDate";
-
-            public const string PageUrl = "pageUrl";
-        }
     }
 }
diff --git a/src/Umbraco.Cms.Integrations.Automation.Zapier/Helpers/TriggerHelper.cs b/src/Umbraco.Cms.Integrations.Automation.Zapier/Helpers/TriggerHelper.cs
@@ -1,7 +1,6 @@
-﻿using System;
-using System.Collections.Generic;
+﻿using System.Collections.Generic;
 using System.Threading.Tasks;
-using Umbraco.Cms.Integrations.Automation.Zapier.Models.Dtos;
+
 using Umbraco.Cms.Integrations.Automation.Zapier.Services;
 
 namespace Umbraco.Cms.Integrations.Automation.Zapier.Helpers
@@ -15,31 +14,8 @@ public TriggerHelper(ZapierService zapierService)
             _zapierService = zapierService;
         }
 
-        public string Execute(string hookUrl, string contentId, string contentName)
-        {
-            var content = new Dictionary<string, string>
-            {
-                {Constants.Content.Id, contentId},
-                {Constants.Content.Name, contentName},
-                {Constants.Content.PublishDate, DateTime.UtcNow.ToString("s")}
-            };
-
-            var t = Task.Run(
-                async () => await _zapierService.TriggerAsync(hookUrl, content));
-
-            return t.Result;
-        }
-
-        public string FormExecute(string hookUrl, string formId, string formName, string pageUrl)
+        public string Execute(string hookUrl, Dictionary<string, string> content)
         {
-            var content = new Dictionary<string, string>
-            {
-                {Constants.Form.Id, formId},
-                {Constants.Form.Name, formName},
-                {Constants.Form.SubmissionDate, DateTime.UtcNow.ToString("s")},
-                {Constants.Form.PageUrl, pageUrl}
-            };
-
             var t = Task.Run(
                 async () => await _zapierService.TriggerAsync(hookUrl, content));
 
diff --git a/src/Umbraco.Cms.Integrations.Automation.Zapier/Services/ZapierFormService.cs b/src/Umbraco.Cms.Integrations.Automation.Zapier/Services/ZapierFormService.cs
@@ -1,13 +1,12 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
-using Umbraco.Cms.Integrations.Automation.Zapier.Helpers;
 
-#if NETCOREAPP
-#else
+#if NETFRAMEWORK
 using System.Web.Mvc;
 #endif
+
+using Umbraco.Cms.Integrations.Automation.Zapier.Helpers;
 using Umbraco.Cms.Integrations.Automation.Zapier.Models.Dtos;
 
 namespace Umbraco.Cms.Integrations.Automation.Zapier.Services
@@ -28,9 +27,6 @@ public ZapierFormService(IServiceProvider serviceProvider)
         private Type FormStorageType =>
             Type.GetType("Umbraco.Forms.Core.Data.Storage.IFormStorage, Umbraco.Forms.Core");
 
-        private Type RecordStorageType =>
-            Type.GetType("Umbraco.Forms.Core.Data.Storage.IRecordStorage, Umbraco.Forms.Core");
-
         public bool TryResolveFormService(out object formService)
         {
 #if NETCOREAPP
@@ -50,7 +46,11 @@ public IEnumerable<FormDto> GetAll()
 
             var forms = (IEnumerable<object>) getAllFormsMethod.Invoke(formService, null);
 
-            return Enumerable.Empty<FormDto>();
+            return forms.Select(p => new FormDto
+            {
+                Id = p.GetType().GetProperty("Id").GetValue(p, null).ToString(),
+                Name = p.GetType().GetProperty("Name").GetValue(p, null).ToString()
+            });
         }
 #else
         /// <summary>
@@ -88,49 +88,5 @@ public IEnumerable<FormDto> GetAll()
             
         }
 #endif
-
-        public bool TryResolveRecordStorage(out object recordStorage)
-        {
-#if NETCOREAPP
-            recordStorage = _serviceProvider.GetService(RecordStorageType);
-#else
-            recordStorage = DependencyResolver.Current.GetService(RecordStorageType);
-#endif
-
-            return recordStorage != null;
-        }
-
-        public void AddEventHandler(object target, Action<object, object> handler)
-        {
-            var eventInfo = RecordStorageType.GetEvent("RecordInserting");
-
-            if (eventInfo == null && RecordStorageType.IsInterface)
-            {
-                eventInfo = GetAllEventsForInterface(RecordStorageType)
-                    .FirstOrDefault(x => x.Name == "RecordInserting");
-            }
-
-            if (eventInfo == null)
-            {
-                throw new ArgumentOutOfRangeException("RecordInserting",
-                    $"Couldn't find event RecordInserting in type {RecordStorageType.FullName}");
-            }
-
-            Delegate convertedHandler = ConvertDelegate(handler, eventInfo.EventHandlerType);
-            eventInfo.AddEventHandler(target, convertedHandler);
-        }
-
-        private IEnumerable<EventInfo> GetAllEventsForInterface(Type interfaceType) =>
-            (new Type[] {interfaceType})
-            .Concat(interfaceType.GetInterfaces())
-            .SelectMany(i => i.GetEvents());
-
-        private Delegate ConvertDelegate(Delegate originalDelegate, Type targetDelegateType)
-        {
-            return Delegate.CreateDelegate(
-                targetDelegateType,
-                originalDelegate.Target,
-                originalDelegate.Method);
-        }
     }
 }
diff --git a/src/Umbraco.Cms.Integrations.Automation.Zapier/Services/ZapierSubscriptionHookService.cs b/src/Umbraco.Cms.Integrations.Automation.Zapier/Services/ZapierSubscriptionHookService.cs
@@ -40,8 +40,6 @@ public ZapierSubscriptionHookService(IScopeProvider scopeProvider, ILogger logge
         }
 #endif
 
-
-
         public IEnumerable<ContentConfigDto> GetAll()
         {
             using (var scope = _scopeProvider.CreateScope())
diff --git a/src/Umbraco.Cms.Integrations.Automation.Zapier/ZapierComposer.cs b/src/Umbraco.Cms.Integrations.Automation.Zapier/ZapierComposer.cs
@@ -30,25 +30,17 @@ public void Compose(IUmbracoBuilder builder)
 
             builder.Services.AddSingleton<ZapierSubscriptionHookService>();
 
-            builder.Services.AddSingleton<ZapierFormSubscriptionHookService>();
-
             builder.Services.AddSingleton<ZapierService>();
 
-            builder.Services.AddSingleton<ZapierFormService>();
-
             builder.Services.AddScoped<IUserValidationService, UserValidationService>();
         }
 #else
         public void Compose(Composition composition)
         {
             composition.Register<ZapierSubscriptionHookService>(Lifetime.Singleton);
 
-            composition.Register<ZapierFormSubscriptionHookService>(Lifetime.Singleton);
-
             composition.Register<ZapierService>(Lifetime.Singleton);
 
-            composition.Register<ZapierFormService>(Lifetime.Singleton);
-
             composition.Register<IUserValidationService, UserValidationService>(Lifetime.Scope);
         }
 #endif

Original file line number	Diff line number	Diff line change
`@@ -33,16 +33,5 @@ public static class Content`
`33`	`33`
`34`	`34`	`public const string PublishDate = "publishDate";`
`35`	`35`	`}`
`36`		`-`
`37`		`- public static class Form`
`38`		`- {`
`39`		`- public const string Id = "formId";`
`40`		`-`
`41`		`- public const string Name = "formName";`
`42`		`-`
`43`		`- public const string SubmissionDate = "submissionDate";`
`44`		`-`
`45`		`- public const string PageUrl = "pageUrl";`
`46`		`- }`
`47`	`36`	`}`
`48`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,6 @@ public ZapierSubscriptionHookService(IScopeProvider scopeProvider, ILogger logge`
`40`	`40`	`}`
`41`	`41`	`#endif`
`42`	`42`
`43`		`-`
`44`		`-`
`45`	`43`	`public IEnumerable<ContentConfigDto> GetAll()`
`46`	`44`	`{`
`47`	`45`	`using (var scope = _scopeProvider.CreateScope())`