Skip to content

Commit ab08929

Browse files
committed
Update controllers to prevent routing conflicts
1 parent d0f4df0 commit ab08929

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

src/Umbraco.Forms.Integrations.Automation.Zapier/Controllers/AuthController.cs renamed to src/Umbraco.Forms.Integrations.Automation.Zapier/Controllers/FormsAuthController.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
namespace Umbraco.Forms.Integrations.Automation.Zapier.Controllers
2222
{
23-
public class AuthController : UmbracoApiController
23+
public class FormsAuthController : UmbracoApiController
2424
{
2525
private readonly ZapierSettings Options;
2626

@@ -29,7 +29,7 @@ public class AuthController : UmbracoApiController
2929
#if NETCOREAPP
3030
private readonly IBackOfficeUserManager _backOfficeUserManager;
3131

32-
public AuthController(IBackOfficeUserManager backOfficeUserManager, IUserService userService, IOptions<ZapierSettings> options)
32+
public FormsAuthController(IBackOfficeUserManager backOfficeUserManager, IUserService userService, IOptions<ZapierSettings> options)
3333
{
3434
_backOfficeUserManager = backOfficeUserManager;
3535

@@ -38,7 +38,7 @@ public AuthController(IBackOfficeUserManager backOfficeUserManager, IUserService
3838
Options = options.Value;
3939
}
4040
#else
41-
public AuthController(IUserService userService)
41+
public FormsAuthController(IUserService userService)
4242
{
4343
Options = new ZapierSettings(ConfigurationManager.AppSettings);
4444

src/Umbraco.Forms.Integrations.Automation.Zapier/Controllers/PollingController.cs renamed to src/Umbraco.Forms.Integrations.Automation.Zapier/Controllers/FormsPollingController.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
namespace Umbraco.Forms.Integrations.Automation.Zapier.Controllers
2323
{
24-
public class PollingController : UmbracoApiController
24+
public class FormsPollingController : UmbracoApiController
2525
{
2626
private readonly ZapierSettings Options;
2727

@@ -32,13 +32,13 @@ public class PollingController : UmbracoApiController
3232

3333
private readonly IWorkflowService _workflowService;
3434

35-
public PollingController(IOptions<ZapierSettings> options, IFormService formService, IWorkflowService workflowService, IUserValidationService userValidationService)
35+
public FormsPollingController(IOptions<ZapierSettings> options, IFormService formService, IWorkflowService workflowService, IUserValidationService userValidationService)
3636
#else
3737
private readonly IWorkflowServices _workflowServices;
3838

3939
private readonly IFormStorage _formStorage;
4040

41-
public PollingController(IWorkflowServices workflowServices,
41+
public FormsPollingController(IWorkflowServices workflowServices,
4242
IFormStorage formStorage, IUserValidationService userValidationService)
4343
#endif
4444
{

src/Umbraco.Forms.Integrations.Automation.Zapier/Controllers/SubscriptionController.cs renamed to src/Umbraco.Forms.Integrations.Automation.Zapier/Controllers/FormsSubscriptionController.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020

2121
namespace Umbraco.Forms.Integrations.Automation.Zapier.Controllers
2222
{
23-
public class SubscriptionController : UmbracoApiController
23+
public class FormsSubscriptionController : UmbracoApiController
2424
{
2525
private readonly ZapierSettings Options;
2626

2727
#if NETCOREAPP
28-
private readonly ILogger<SubscriptionController> _logger;
28+
private readonly ILogger<FormsSubscriptionController> _logger;
2929

3030
private readonly IWorkflowService _workflowService;
3131

@@ -39,10 +39,10 @@ public class SubscriptionController : UmbracoApiController
3939
private readonly IUserValidationService _userValidationService;
4040

4141
#if NETCOREAPP
42-
public SubscriptionController(IOptions<ZapierSettings> options, ILogger<SubscriptionController> logger, IFormService formService,
42+
public FormsSubscriptionController(IOptions<ZapierSettings> options, ILogger<FormsSubscriptionController> logger, IFormService formService,
4343
IWorkflowService workflowService, IUserValidationService userValidationService)
4444
#else
45-
public SubscriptionController(IWorkflowServices workflowServices, IFormStorage formStorage, IUserValidationService userValidationService)
45+
public FormsSubscriptionController(IWorkflowServices workflowServices, IFormStorage formStorage, IUserValidationService userValidationService)
4646
#endif
4747
{
4848
#if NETCOREAPP
@@ -135,7 +135,7 @@ public bool UpdatePreferences([FromBody] SubscriptionDto dto)
135135
#if NETCOREAPP
136136
_logger.LogError(e.Message);
137137
#else
138-
Logger.Error(typeof(SubscriptionController), e);
138+
Logger.Error(typeof(FormsSubscriptionController), e);
139139
#endif
140140
return false;
141141
}

0 commit comments

Comments
 (0)