Merge pull request #145 from umbraco/bugfix/zapier-auth-fix

Bugfix/zapier auth fix

Author: acoumb

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

@@ -66,10 +66,7 @@ public bool IsAccessValid()
 
             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()
+            var isAuthorized = _userValidationService.Validate(username, password, apiKey).GetAwaiter()
                 .GetResult();
             if (!isAuthorized) return false;
 

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

@@ -72,16 +72,10 @@ public async Task<bool> Validate(string username, string password, string apiKey
         /// </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;
-        }
+        private bool ValidateByApiKey(string apiKey) =>
+            // Check API key from CMS and Forms settings. 
+            (!string.IsNullOrEmpty(_zapierSettings.ApiKey) && _zapierSettings.ApiKey == apiKey)
+                || (!string.IsNullOrEmpty(_zapierFormsSettings.ApiKey) && _zapierFormsSettings.ApiKey == apiKey);
 
         /// <summary>
         /// Validates user based on provided credentials.

src/Umbraco.Cms.Integrations.Automation.Zapier/Umbraco.Cms.Integrations.Automation.Zapier.csproj

@@ -9,7 +9,7 @@
 		<RepositoryUrl>https://github.com/umbraco/Umbraco.Cms.Integrations</RepositoryUrl>
 		<PackageProjectUrl>https://github.com/umbraco/Umbraco.Cms.Integrations/blob/main/src/Umbraco.Cms.Integrations.Automation.Zapier</PackageProjectUrl>
 		<Product>Umbraco.Cms.Integrations.Automation.Zapier</Product>
-		<Version>1.2.0</Version>
+		<Version>1.2.1</Version>
 		<PackageTags>Umbraco;Umbraco-Marketplace</PackageTags>
 		<PackageIcon>zapier.png</PackageIcon>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>