Skip to content

Commit 145bda1

Browse files
acoumbacoumb
committed
PR feedback updates; namespaces and code cleanup.
1 parent 059d8fa commit 145bda1

File tree

4 files changed

+34
-40
lines changed

4 files changed

+34
-40
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ namespace Umbraco.Forms.Integrations.Automation.Zapier
33
{
44
public class Constants
55
{
6+
public const string ZapierWorkflowTypeId = "d05b95e5-86f8-4c31-99b8-4ec7fc62a787";
7+
68
public const string UmbracoFormsIntegrationsAutomationZapierUserGroup = "Umbraco.Forms.Integrations.Automation.Zapier.UserGroup";
79

810
public static class ZapierAppConfiguration

‎src/Umbraco.Forms.Integrations.Automation.Zapier/Controllers/PollingController.cs

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -28,32 +28,32 @@ public class PollingController : UmbracoApiController
2828

2929
private readonly IFormService _formService;
3030

31-
private readonly IWorkflowService _workflowService;
32-
33-
private readonly IRecordReaderService _recordReaderService;
34-
3531
private readonly IUserValidationService _userValidationService;
3632

3733
#if NETCOREAPP
34+
private readonly IWorkflowService _workflowService;
35+
3836
public PollingController(IOptions<ZapierSettings> options, IFormService formService, IWorkflowService workflowService,
3937
IRecordReaderService recordReaderService, IUserValidationService userValidationService)
4038
#else
41-
public PollingController(IFormService formService, IWorkflowService workflowService,
39+
private readonly IWorkflowServices _workflowServices;
40+
41+
public PollingController(IFormService formService, IWorkflowServices workflowServices,
4242
IRecordReaderService recordReaderService, IUserValidationService userValidationService)
4343
#endif
4444
{
4545
#if NETCOREAPP
4646
Options = options.Value;
47+
48+
_workflowService = workflowService;
4749
#else
4850
Options = new ZapierSettings(ConfigurationManager.AppSettings);
51+
52+
_workflowServices = workflowServices;
4953
#endif
5054

5155
_formService = formService;
5256

53-
_workflowService = workflowService;
54-
55-
_recordReaderService = recordReaderService;
56-
5757
_userValidationService = userValidationService;
5858
}
5959

@@ -72,29 +72,28 @@ public List<Dictionary<string, string>> GetFormsData()
7272
out var passwordValues))
7373
password = passwordValues.First();
7474
#else
75-
if (Request.Headers.TryGetValues(Constants.ZapierAppConfiguration.UsernameHeaderKey,
76-
out var usernameValues))
77-
username = usernameValues.First();
78-
if (Request.Headers.TryGetValues(Constants.ZapierAppConfiguration.PasswordHeaderKey,
79-
out var passwordValues))
80-
password = passwordValues.First();
75+
if (Request.Headers.TryGetValues(Constants.ZapierAppConfiguration.UsernameHeaderKey,
76+
out var usernameValues))
77+
username = usernameValues.First();
78+
if (Request.Headers.TryGetValues(Constants.ZapierAppConfiguration.PasswordHeaderKey,
79+
out var passwordValues))
80+
password = passwordValues.First();
8181
#endif
8282

8383
if (string.IsNullOrEmpty(username) || string.IsNullOrEmpty(password)) return null;
8484

8585
var isAuthorized = _userValidationService.Validate(username, password, Options.UserGroup).GetAwaiter().GetResult();
8686
if (!isAuthorized) return null;
8787

88-
var zapierWorkflowId = new Guid("d05b95e5-86f8-4c31-99b8-4ec7fc62a787");
89-
9088
// 1. get forms
9189
var forms = _formService.Get();
9290
foreach (var form in forms)
9391
{
9492
#if NETCOREAPP
95-
var hasZapierWorkflow = _workflowService.Get(form).Any(p => p.WorkflowTypeId == zapierWorkflowId);
93+
var hasZapierWorkflow = _workflowService.Get(form).Any(p => p.WorkflowTypeId == new Guid(Constants.ZapierWorkflowTypeId));
9694
#else
97-
var hasZapierWorkflow = form.WorkflowIds.Contains(zapierWorkflowId);
95+
var hasZapierWorkflow = _workflowServices.Get(form)
96+
.Any(p => p.WorkflowTypeId == new Guid(Constants.ZapierWorkflowTypeId));
9897
#endif
9998

10099
if (hasZapierWorkflow)

‎src/Umbraco.Forms.Integrations.Automation.Zapier/Controllers/SubscriptionController.cs

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System;
22
using System.Linq;
3-
using System.Net;
43
using Umbraco.Forms.Core.Services;
54
using Umbraco.Forms.Integrations.Automation.Zapier.Configuration;
65
using Umbraco.Forms.Integrations.Automation.Zapier.Models.Dtos;
@@ -45,16 +44,14 @@ public SubscriptionController(IFormService formService, IWorkflowServices workfl
4544
Options = options.Value;
4645

4746
_logger = logger;
48-
#else
49-
Options = new ZapierSettings(ConfigurationManager.AppSettings);
50-
#endif
51-
_formService = formService;
5247

53-
#if NETCOREAPP
5448
_workflowService = workflowService;
5549
#else
50+
Options = new ZapierSettings(ConfigurationManager.AppSettings);
51+
5652
_workflowServices = workflowServices;
5753
#endif
54+
_formService = formService;
5855

5956
_userValidationService = userValidationService;
6057
}
@@ -66,12 +63,12 @@ public bool UpdatePreferences([FromBody] SubscriptionDto dto)
6663
string password = string.Empty;
6764

6865
#if NETCOREAPP
69-
if (Request.Headers.TryGetValue(Constants.ZapierAppConfiguration.UsernameHeaderKey,
70-
out var usernameValues))
71-
username = usernameValues.First();
72-
if (Request.Headers.TryGetValue(Constants.ZapierAppConfiguration.PasswordHeaderKey,
73-
out var passwordValues))
74-
password = passwordValues.First();
66+
if (Request.Headers.TryGetValue(Constants.ZapierAppConfiguration.UsernameHeaderKey,
67+
out var usernameValues))
68+
username = usernameValues.First();
69+
if (Request.Headers.TryGetValue(Constants.ZapierAppConfiguration.PasswordHeaderKey,
70+
out var passwordValues))
71+
password = passwordValues.First();
7572
#else
7673
if (Request.Headers.TryGetValues(Constants.ZapierAppConfiguration.UsernameHeaderKey,
7774
out var usernameValues))
@@ -88,8 +85,6 @@ public bool UpdatePreferences([FromBody] SubscriptionDto dto)
8885

8986
if (dto == null) return false;
9087

91-
var zapierWorkflowTypeId = new Guid("d05b95e5-86f8-4c31-99b8-4ec7fc62a787");
92-
9388
try
9489
{
9590
// 1. get forms
@@ -98,10 +93,11 @@ public bool UpdatePreferences([FromBody] SubscriptionDto dto)
9893
{
9994
// 2. check if 'Trigger Zapier' workflow exists on the form
10095
#if NETCOREAPP
101-
var zapierWorkflows = _workflowService.Get(form).Where(p => p.WorkflowTypeId == zapierWorkflowTypeId).ToList();
96+
var zapierWorkflows = _workflowService.Get(form)
97+
.Where(p => p.WorkflowTypeId == new Guid(Constants.ZapierWorkflowTypeId)).ToList();
10298
#else
10399
var zapierWorkflows = _workflowServices.Get(form)
104-
.Where(p => p.WorkflowTypeId == zapierWorkflowTypeId).ToList();
100+
.Where(p => p.WorkflowTypeId == new Guid(Constants.ZapierWorkflowTypeId)).ToList();
105101
#endif
106102
if (zapierWorkflows.Any())
107103
{

‎src/Umbraco.Forms.Integrations.Automation.Zapier/ZapierWorkflow.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,9 @@
99
using Umbraco.Forms.Integrations.Automation.Zapier.Validators;
1010

1111
#if NETCOREAPP
12-
using System.Threading.Tasks;
1312
using Microsoft.Extensions.Logging;
1413
using Umbraco.Cms.Core.Routing;
15-
using Umbraco.Cms.Core.Web;
1614
using Umbraco.Cms.Web.Common;
17-
1815
#else
1916
using Umbraco.Web;
2017
using Umbraco.Forms.Core.Persistence.Dtos;
@@ -40,7 +37,7 @@ public ZapierWorkflow(IUmbracoHelperAccessor umbracoHelperAccessor, IPublishedUr
4037
_logger = logger;
4138

4239
Name = "Trigger Zap";
43-
Id = new Guid("d05b95e5-86f8-4c31-99b8-4ec7fc62a787");
40+
Id = new Guid(Constants.ZapierWorkflowTypeId);
4441
Description = "Automation workflow for triggering Zaps in Zapier.";
4542
Icon = "icon-tools";
4643
}
@@ -52,7 +49,7 @@ public ZapierWorkflow(IUmbracoContextAccessor umbracoContextAccessor)
5249
_umbracoContextAccessor = umbracoContextAccessor;
5350

5451
Name = "Trigger Zap";
55-
Id = new Guid("d05b95e5-86f8-4c31-99b8-4ec7fc62a787");
52+
Id = new Guid(Constants.ZapierWorkflowTypeId);
5653
Description = "Automation workflow for triggering Zaps in Zapier.";
5754
Icon = "icon-tools";
5855
}

0 commit comments

Comments
 (0)