Merge pull request #10 from umbraco/feature/zapier-integration

Update user group configuration

Author: acoumb

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

@@ -1,4 +1,5 @@
-using System.Linq;
+using System.Configuration;
+using System.Linq;
 using System.Web.Http;
 
 using Umbraco.Core.Services;
@@ -9,17 +10,25 @@ namespace Umbraco.Forms.Integrations.Automation.Zapier.Controllers
 {
     public class AuthController : UmbracoApiController
     {
+        private const string UmbracoCmsIntegrationsAutomationZapierUserGroup = "Umbraco.Cms.Integrations.Automation.Zapier.UserGroup";
+
         [HttpPost]
         public bool ValidateUser([FromBody] UserModel userModel)
         {
             var isUserValid = Security.ValidateBackOfficeCredentials(userModel.Username, userModel.Password);
             if (!isUserValid) return false;
 
-            IUserService userService = Services.UserService;
+            var userGroup = ConfigurationManager.AppSettings[UmbracoCmsIntegrationsAutomationZapierUserGroup];
+            if (!string.IsNullOrEmpty(userGroup))
+            {
+                IUserService userService = Services.UserService;
+
+                var user = userService.GetByUsername(userModel.Username);
 
-            var user = userService.GetByUsername(userModel.Username);
+                return user != null && user.Groups.Any(p => p.Name == userGroup);
+            }
 
-            return user != null && user.Groups.Any(p => p.Name == userModel.UserGroup);
+            return true;
         }
     }
 }

src/Umbraco.Forms.Integrations.Automation.Zapier/Models/UserModel.cs

@@ -6,7 +6,5 @@ public class UserModel
         public string Username { get; set; }
 
         public string Password  { get; set; }
-
-        public string UserGroup { get; set; }
     }
 }

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

@@ -14,8 +14,6 @@ namespace Umbraco.Forms.Integrations.Automation.Zapier
 {
     public class ZapierWorkflow : WorkflowType
     {
-        private const string UserGroup = "Umbraco.Cms.Integrations.Automation.Zapier.UserGroup";
-
         private readonly IUmbracoContextAccessor _umbracoContextAccessor;
 
         public ZapierWorkflow(IUmbracoContextAccessor umbracoContextAccessor)
@@ -79,9 +77,6 @@ public override List<Exception> ValidateSettings()
             var validator = new WebHookValidator();
             validator.IsValid(WebHookUri, ref exceptions);
 
-            if(string.IsNullOrEmpty(ConfigurationManager.AppSettings[UserGroup]))
-                exceptions.Add(new Exception("User group setting is required."));
-
             return exceptions;
         }