Merge pull request #24 from umbraco/v8/bugfix/api-key-validation

API key validation and align naming conventions with CMS ones.

Author: acoumb

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

@@ -32,7 +32,7 @@ public FormController(ZapierFormService zapierFormService, IUserValidationServic
 
         public IEnumerable<FormDto> GetForms()
         {
-            if (!IsUserValid()) return Enumerable.Empty<FormDto>();
+            if (!IsAccessValid()) return Enumerable.Empty<FormDto>();
 
             return _zapierFormService.GetAll();
         }

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

@@ -46,7 +46,7 @@ public FormPollingController(ZapierFormService zapierFormService, IRecordStorage
 
         public List<Dictionary<string, string>> GetFormPropertiesById(string id)
         {
-            if (!IsUserValid()) return new List<Dictionary<string, string>>();
+            if (!IsAccessValid()) return new List<Dictionary<string, string>>();
 
             var form = _zapierFormService.GetById(id);
 

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

@@ -36,7 +36,7 @@ public ZapierFormAuthorizedApiController(IUserValidationService userValidationSe
             _userValidationService = userValidationService;
         }
 
-        public bool IsUserValid()
+        public bool IsAccessValid()
         {
             string username = string.Empty;
             string password = string.Empty;
@@ -66,6 +66,9 @@ public bool IsUserValid()
 
             if (string.IsNullOrEmpty(apiKey) && (string.IsNullOrEmpty(username) || string.IsNullOrEmpty(password))) return false;
 
+            if (!string.IsNullOrEmpty(apiKey))
+                return apiKey == Options.ApiKey;
+
             var isAuthorized = _userValidationService.Validate(username, password, Options.ApiKey).GetAwaiter()
                 .GetResult();
             if (!isAuthorized) return false;