Toggle API key validation between CMS and Forms package settings

Author: acoumb

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

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Umbraco.Cms.Integrations.Automation.Zapier.Configuration
+{
+    public abstract class AppSettings
+    {
+        public string UserGroupAlias { get; set; }
+
+        public string ApiKey { get; set; }
+    }
+}

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

@@ -0,0 +1,19 @@
+using System.Collections.Specialized;
+
+namespace Umbraco.Cms.Integrations.Automation.Zapier.Configuration
+{
+    public class ZapierFormsSettings : ZapierSettings
+    {
+        public ZapierFormsSettings()
+        {
+
+        }
+
+        public ZapierFormsSettings(NameValueCollection appSettings)
+        {
+            UserGroupAlias = appSettings[Constants.UmbracoFormsIntegrationsAutomationZapierUserGroupAlias];
+
+            ApiKey = appSettings[Constants.UmbracoFormsIntegrationsAutomationZapierApiKey];
+        }
+    }
+}

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

@@ -2,7 +2,7 @@
 
 namespace Umbraco.Cms.Integrations.Automation.Zapier.Configuration
 {
-    public class ZapierSettings
+    public class ZapierSettings : AppSettings
     {
         public ZapierSettings()
         {
@@ -15,9 +15,5 @@ public ZapierSettings(NameValueCollection appSettings)
 
             ApiKey = appSettings[Constants.UmbracoCmsIntegrationsAutomationZapierApiKey];
         }
-
-        public string UserGroupAlias { get; set; }
-
-        public string ApiKey { get; set; }
     }
 }

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

@@ -13,6 +13,10 @@ public class Constants
 
         public const string UmbracoCmsIntegrationsAutomationZapierApiKey = "Umbraco.Cms.Integrations.Automation.Zapier.ApiKey";
 
+        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";
@@ -25,6 +29,8 @@ public static class ZapierAppConfiguration
         public static class Configuration
         {
             public const string Settings = "Umbraco:Cms:Integrations:Automation:Zapier:Settings";
+
+            public const string FormsSettings = "Umbraco:Forms:Integrations:Automation:Zapier:Settings";
         }
 
         public static class ContentProperties

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

@@ -28,6 +28,7 @@ public AuthController(IUserValidationService userValidationService)
         }
 
         [HttpPost]
-        public async Task<bool> ValidateUser([FromBody] UserModel userModel) => await _userValidationService.Validate(userModel.Username, userModel.Password, userModel.ApiKey);
+        public async Task<bool> ValidateUser([FromBody] UserModel userModel) => 
+            await _userValidationService.Validate(userModel.Username, userModel.Password, userModel.ApiKey);
     }
 }

src/Umbraco.Cms.Integrations.Automation.Zapier/Services/UserValidationService.cs

@@ -22,21 +22,30 @@ public class UserValidationService : IUserValidationService
 
         private readonly ZapierSettings _zapierSettings;
 
+        private readonly ZapierFormsSettings _zapierFormsSettings;
+
 #if NETCOREAPP
         private readonly IBackOfficeUserManager _backOfficeUserManager;
 
-        public UserValidationService(IOptions<ZapierSettings> options, IBackOfficeUserManager backOfficeUserManager)
+        public UserValidationService(
+            IOptions<ZapierSettings> options, 
+            IOptions<ZapierFormsSettings> zapierFormsSettings,
+            IBackOfficeUserManager backOfficeUserManager)
         {
             _backOfficeUserManager = backOfficeUserManager;
 
             _zapierSettings = options.Value;
+
+            _zapierFormsSettings = zapierFormsSettings.Value;
         }
 #else
         public UserValidationService(IUserService userService)
         {
             _userService = userService;
 
             _zapierSettings = new ZapierSettings(ConfigurationManager.AppSettings);
+
+            _zapierSettings = new ZapierFormsSettings(ConfigurationManager.AppSettings);
         }
 #endif
 
@@ -50,8 +59,38 @@ public UserValidationService(IUserService userService)
         public async Task<bool> Validate(string username, string password, string apiKey)
         {
             if (!string.IsNullOrEmpty(apiKey))
+            {
+                return ValidateByApiKey(apiKey);
+            }
+
+            return await ValidateByCredentials(username, password);
+        }
+
+        /// <summary>
+        /// Validates user based on provided API key. 
+        /// When both CMS and Forms packages are installed, both settings (CMS/Forms) will be compared.
+        /// </summary>
+        /// <param name="apiKey">Provided API key in the Zap authentication.</param>
+        /// <returns></returns>
+        private bool ValidateByApiKey(string apiKey)
+        {
+            // Check API key from CMS settings, if none, check Forms settings
+            if (!string.IsNullOrEmpty(_zapierSettings.ApiKey))
                 return apiKey == _zapierSettings.ApiKey;
+            else if (!string.IsNullOrEmpty(_zapierFormsSettings.ApiKey))
+                return apiKey == _zapierFormsSettings.ApiKey;
 
+            return false;
+        }
+
+        /// <summary>
+        /// Validates user based on provided credentials.
+        /// </summary>
+        /// <param name="username"></param>
+        /// <param name="password"></param>
+        /// <returns></returns>
+        private async Task<bool> ValidateByCredentials(string username, string password)
+        {
 #if NETCOREAPP
             var isUserValid =
                 await _backOfficeUserManager.ValidateCredentialsAsync(username, password);

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

@@ -21,9 +21,12 @@ public class ZapierComposer : IComposer
 #if NETCOREAPP
         public void Compose(IUmbracoBuilder builder)
         {
-            var options = builder.Services
+            builder.Services
                 .AddOptions<ZapierSettings>()
                 .Bind(builder.Config.GetSection(Constants.Configuration.Settings));
+            builder.Services
+                .AddOptions<ZapierFormsSettings>()
+                .Bind(builder.Config.GetSection(Constants.Configuration.FormsSettings));
 
             builder
                 .AddNotificationHandler<UmbracoApplicationStartingNotification, UmbracoAppStartingHandler>();