Merge pull request #13 from umbraco/feature/zapier-v9-multi-target

Zapier V9 multi-target

Author: acoumb

src/Umbraco.Cms.Integrations.Automation.Zapier/App_Plugins/UmbracoCms.Integrations/Automation/Zapier/dashboard.html

@@ -81,21 +81,16 @@
                                 <span ng-bind="row.webHookUrl"></span>
                             </div>
                             <div class="umb-table-cell">
-                                <umb-button action="vm.onTrigger(row.contentTypeName, row.webHookUrl)"
+                                <umb-button action="vm.onTrigger(row.webHookUrl, row.contentTypeName)"
                                             label="Trigger Webhook"
                                             type="button"
                                             button-style="info">
                                 </umb-button>
-                                <umb-button action="row.showDeletePrompt = true"
+                                <umb-button action="vm.onDelete(row.id)"
                                             label="Delete"
                                             type="button"
                                             button-style="danger">
                                 </umb-button>
-                                <umb-confirm-action ng-if="row.showDeletePrompt"
-                                                    direction="right"
-                                                    on-confirm="vm.onDelete(row.id)"
-                                                    on-cancel="row.showDeletePrompt = false">
-                                </umb-confirm-action>
                             </div>
                         </div>
                     </div>

src/Umbraco.Cms.Integrations.Automation.Zapier/App_Plugins/UmbracoCms.Integrations/Automation/Zapier/js/zapier.controller.js

@@ -1,4 +1,4 @@
-function zapierController($scope, notificationsService, umbracoCmsIntegrationsAutomationZapierResource, umbracoCmsIntegrationsAutomationZapierValidationService) {
+function zapierController(notificationsService, overlayService, localizationService, umbracoCmsIntegrationsAutomationZapierValidationService, umbracoCmsIntegrationsAutomationZapierResource) {
 
     var vm = this;
 
@@ -19,7 +19,7 @@
             notificationsService.warning("Zapier Content Config", validationResult);
             return;
         }
-        
+
         umbracoCmsIntegrationsAutomationZapierResource.addConfig(vm.webHookUrl, vm.selectedContentType).then(function (response) {
 
             if (response.length > 0) {
@@ -35,11 +35,11 @@
         });
     }
 
-    vm.onTrigger = function (contentTypeName, webHookUrl) {
+    vm.onTrigger = function (webHookUrl, contentTypeName) {
 
         vm.loading = true;
 
-        umbracoCmsIntegrationsAutomationZapierResource.triggerWebHook(webHookUrl, contentTypeName).then(function(response) {
+        umbracoCmsIntegrationsAutomationZapierResource.triggerWebHook(webHookUrl, contentTypeName).then(function (response) {
 
             vm.loading = false;
 
@@ -50,12 +50,33 @@
         });
     }
 
-    vm.onDelete = function(id) {
-        umbracoCmsIntegrationsAutomationZapierResource.deleteConfig(id).then(function () {
-            getContentTypes();
-
-            getContentConfigs();
-        });
+    vm.onDelete = function (id) {
+
+        localizationService.localizeMany(["zapierDashboard_promptDeleteTitle", "zapierDashboard_promptDeleteContent", "general_yes", "general_no"])
+            .then(function (labels) {
+                var overlay = {
+                    view: "confirm",
+                    title: labels[0],
+                    content: labels[1],
+                    closeButtonLabel: labels[3],
+                    submitButtonLabel: labels[2],
+                    submitButtonStyle: "danger",
+                    close: function () {
+                        overlayService.close();
+                    },
+                    submit: function () {
+
+                        umbracoCmsIntegrationsAutomationZapierResource.deleteConfig(id).then(function () {
+                            getContentTypes();
+
+                            getContentConfigs();
+                        });
+
+                        overlayService.close();
+                    }
+                };
+                overlayService.open(overlay);
+            });
     }
 
     function getContentTypes() {
@@ -75,7 +96,7 @@
         vm.selectedContentType = "";
     }
 
-    
+
 }
 
 angular.module("umbraco")

src/Umbraco.Cms.Integrations.Automation.Zapier/App_Plugins/UmbracoCms.Integrations/Automation/Zapier/js/zapier.resource.js

@@ -17,11 +17,11 @@
                 return umbRequestHelper.resourcePromise(
                     $http.get(`${apiEndpoint}/GetAll`), "Failed to get resource");
             },
-            triggerWebHook: function(webHookUrl, contentTypeName) {
+            triggerWebHook: function (webHookUrl, contentTypeName) {
                 return umbRequestHelper.resourcePromise(
-                    $http.post(`${apiEndpoint}/TriggerAsync`, { contentTypeName: contentTypeName, webHookUrl: webHookUrl }), "Failed to get resource");
+                    $http.post(`${apiEndpoint}/TriggerWebHook`, { contentTypeName: contentTypeName, webHookUrl: webHookUrl }), "Failed to get resource");
             },
-            deleteConfig: function(id) {
+            deleteConfig: function (id) {
                 return umbRequestHelper.resourcePromise(
                     $http.delete(`${apiEndpoint}/Delete?id=${id}`), "Failed to get resource");
             }

src/Umbraco.Cms.Integrations.Automation.Zapier/App_Plugins/UmbracoCms.Integrations/Automation/Zapier/lang/en-US.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <language>
-	<area alias="dashboardTabs">
-		<key alias="zapierDashboard">Zapier Integrations</key>
+	<area alias="zapierDashboard">
+		<key alias="title">Zapier Integrations</key>
+		<key alias="promptDeleteTitle">Delete Registered Webhook</key>
+		<key alias="promptDeleteContent">Are you sure?</key>
 	</area>
-</language>
+</language>

src/Umbraco.Cms.Integrations.Automation.Zapier/Components/NewContentPublishedComponent.cs

@@ -1,13 +1,13 @@
-using System;
+#if NETFRAMEWORK
+using System;
 using System.Collections.Generic;
-using System.Net.Http;
 using System.Threading.Tasks;
+
 using Umbraco.Cms.Integrations.Automation.Zapier.Services;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Events;
 using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;
 
@@ -68,3 +68,4 @@ private void ContentServiceOnPublished(IContentService sender, ContentPublishedE
         }
     }
 }
+#endif

src/Umbraco.Cms.Integrations.Automation.Zapier/Components/NewContentPublishedNotification.cs

@@ -0,0 +1,54 @@
+#if NETCOREAPP
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+using Microsoft.Extensions.Logging;
+
+using Umbraco.Cms.Core.Events;
+using Umbraco.Cms.Core.Notifications;
+using Umbraco.Cms.Integrations.Automation.Zapier.Services;
+
+namespace Umbraco.Cms.Integrations.Automation.Zapier.Components
+{
+    public class NewContentPublishedNotification : INotificationHandler<ContentPublishedNotification>
+    {
+        private readonly ZapConfigService _zapConfigService;
+
+        private readonly ZapierService _zapierService;
+
+        private readonly ILogger<NewContentPublishedNotification> _logger;
+
+        public NewContentPublishedNotification(ZapConfigService zapConfigService, ZapierService zapierService, ILogger<NewContentPublishedNotification> logger)
+        {
+            _zapConfigService = zapConfigService;
+
+            _zapierService = zapierService;
+
+            _logger = logger;
+        }
+
+        public void Handle(ContentPublishedNotification notification)
+        {
+            foreach (var node in notification.PublishedEntities)
+            {
+                var zapContentConfig = _zapConfigService.GetByName(node.ContentType.Name);
+                if (zapContentConfig == null) continue;
+
+                var content = new Dictionary<string, string>
+                {
+                    { Constants.Content.Name, node.Name },
+                    { Constants.Content.PublishDate, DateTime.UtcNow.ToString() }
+                };
+
+                var t = Task.Run(async () => await _zapierService.TriggerAsync(zapContentConfig.WebHookUrl, content));
+
+                var result = t.Result;
+
+                if (!string.IsNullOrEmpty(result))
+                    _logger.LogError(result);
+            }
+        }
+    }
+}
+#endif

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

@@ -0,0 +1,19 @@
+using System.Collections.Specialized;
+
+namespace Umbraco.Cms.Integrations.Automation.Zapier.Configuration
+{
+    public class ZapierSettings
+    {
+        public ZapierSettings()
+        {
+
+        }
+
+        public ZapierSettings(NameValueCollection appSettings)
+        {
+            UserGroup = appSettings[Constants.UmbracoCmsIntegrationsAutomationZapierUserGroup];
+        }
+
+        public string UserGroup { get; set; }
+    }
+}

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

@@ -5,6 +5,17 @@ public class Constants
     {
         public const string ZapContentConfigTable = "zapContentConfig";
 
+        public const string MigrationPlanName = "ZapContentConfig";
+
+        public const string TargetStateName = "zapiercontentconfigurations-db";
+
+        public const string UmbracoCmsIntegrationsAutomationZapierUserGroup = "Umbraco.Cms.Integrations.Automation.Zapier.UserGroup";
+
+        public static class Configuration
+        {
+            public const string Settings = "Umbraco:Forms:Integrations:Automation:Zapier:Settings";
+        }
+
         public static class Content
         {
             public const string Name = "Name";

src/Umbraco.Cms.Integrations.Automation.Zapier/Controllers/AuthController.cs

@@ -1,33 +1,70 @@
-using System.Configuration;
-using System.Linq;
-using System.Web.Http;
+using System.Linq;
+using System.Threading.Tasks;
 
+using Umbraco.Cms.Integrations.Automation.Zapier.Configuration;
 using Umbraco.Cms.Integrations.Automation.Zapier.Models;
-using Umbraco.Core.Services;
+
+
+#if NETCOREAPP
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Options;
+using Umbraco.Cms.Web.Common.Controllers;
+using Umbraco.Cms.Core.Security;
+using Umbraco.Cms.Core.Services;
+#else
+using System.Web.Http;
+using System.Configuration;
+
 using Umbraco.Web.WebApi;
+using Umbraco.Core.Services;
+#endif
 
 namespace Umbraco.Cms.Integrations.Automation.Zapier.Controllers
 {
     public class AuthController : UmbracoApiController
     {
-        private const string UmbracoCmsIntegrationsAutomationZapierUserGroup = "Umbraco.Cms.Integrations.Automation.Zapier.UserGroup";
+        private readonly ZapierSettings Options;
+
+        private readonly IUserService _userService;
+
+#if NETCOREAPP
+        private readonly IBackOfficeUserManager _backOfficeUserManager;
+
+        public AuthController(IBackOfficeUserManager backOfficeUserManager, IUserService userService, IOptions<ZapierSettings> options)
+        {
+            _backOfficeUserManager = backOfficeUserManager;
+
+            _userService = userService;
+
+            Options = options.Value;
+        }
+#else
+        public AuthController(IUserService userService)
+        {
+            Options = new ZapierSettings(ConfigurationManager.AppSettings);
+
+            _userService = userService;
+        }
+#endif
 
         [HttpPost]
-        public bool ValidateUser([FromBody] UserModel userModel)
+        public async Task<bool> ValidateUser([FromBody] UserModel userModel)
         {
+#if NETCOREAPP
+            var isUserValid =
+                await _backOfficeUserManager.ValidateCredentialsAsync(userModel.Username, userModel.Password);
+#else
             var isUserValid = Security.ValidateBackOfficeCredentials(userModel.Username, userModel.Password);
+#endif
+
             if (!isUserValid) return false;
 
-            var userGroup = ConfigurationManager.AppSettings[UmbracoCmsIntegrationsAutomationZapierUserGroup];
+            var userGroup = Options.UserGroup;
             if (!string.IsNullOrEmpty(userGroup))
             {
-                IUserService userService = Services.UserService;
-
-                var user = userService.GetByUsername(userModel.Username);
-
-                var isValid = user != null && user.Groups.Any(p => p.Name == userGroup);
+                var user = _userService.GetByUsername(userModel.Username);
 
-                return isValid;
+                return user != null && user.Groups.Any(p => p.Name == userGroup);
             }
 
             return true;

src/Umbraco.Cms.Integrations.Automation.Zapier/Controllers/ZapConfigController.cs

@@ -1,25 +1,39 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using System.Web.Http;
 
 using Umbraco.Cms.Integrations.Automation.Zapier.Models.Dtos;
 using Umbraco.Cms.Integrations.Automation.Zapier.Services;
+
+#if NETCOREAPP
+using Microsoft.AspNetCore.Mvc;
+
+using Umbraco.Cms.Web.BackOffice.Controllers;
+using Umbraco.Cms.Web.Common.Attributes;
+using Umbraco.Cms.Core.Services;
+#else
+using System.Web.Http;
+
 using Umbraco.Core.Services;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.WebApi;
+#endif
 
 namespace Umbraco.Cms.Integrations.Automation.Zapier.Controllers
 {
     [PluginController("UmbracoCmsIntegrationsAutomationZapier")]
     public class ZapConfigController : UmbracoAuthorizedApiController
     {
+        private readonly IContentTypeService _contentTypeService;
+
         private readonly ZapConfigService _zapConfigService;
 
         private readonly ZapierService _zapierService;
 
-        public ZapConfigController(ZapConfigService zapConfigService, ZapierService zapierService)
+        public ZapConfigController(IContentTypeService contentTypeService, ZapConfigService zapConfigService, ZapierService zapierService)
         {
+            _contentTypeService = contentTypeService;
+
             _zapConfigService = zapConfigService;
 
             _zapierService = zapierService;
@@ -28,9 +42,7 @@ public ZapConfigController(ZapConfigService zapConfigService, ZapierService zapi
         [HttpGet]
         public IEnumerable<ContentTypeDto> GetContentTypes()
         {
-            IContentTypeService contentTypeService = Services.ContentTypeService;
-
-            var contentTypes = contentTypeService.GetAll();
+            var contentTypes = _contentTypeService.GetAll();
 
             var configEntities = _zapConfigService.GetAll().Select(p => p.ContentTypeName);
 
@@ -61,7 +73,7 @@ public string Add([FromBody] ContentConfigDto dto)
         public string Delete(int id) => _zapConfigService.Delete(id);
 
         [HttpPost]
-        public async Task<string> TriggerAsync([FromBody] ContentConfigDto dto)
+        public async Task<string> TriggerWebHook([FromBody] ContentConfigDto dto)
         {
             return await _zapierService.TriggerAsync(dto.WebHookUrl,
                 new Dictionary<string, string> { { Constants.Content.Name, dto.ContentTypeName } });