Skip to content

Commit 42014d3

Browse files
committed
Pass user group alias for validation
1 parent d667235 commit 42014d3

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ public ZapierSettings()
1111

1212
public ZapierSettings(NameValueCollection appSettings)
1313
{
14-
UserGroup = appSettings[Constants.UmbracoCmsIntegrationsAutomationZapierUserGroup];
14+
UserGroupAlias = appSettings[Constants.UmbracoCmsIntegrationsAutomationZapierUserGroupAlias];
1515

1616
ApiKey = appSettings[Constants.UmbracoCmsIntegrationsAutomationZapierApiKey];
1717
}
1818

19-
public string UserGroup { get; set; }
19+
public string UserGroupAlias { get; set; }
2020

2121
public string ApiKey { get; set; }
2222
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class Constants
99

1010
public const string TargetStateName = "zapiersubscriptionhook-db";
1111

12-
public const string UmbracoCmsIntegrationsAutomationZapierUserGroup = "Umbraco.Cms.Integrations.Automation.Zapier.UserGroup";
12+
public const string UmbracoCmsIntegrationsAutomationZapierUserGroupAlias = "Umbraco.Cms.Integrations.Automation.Zapier.UserGroupAlias";
1313

1414
public const string UmbracoCmsIntegrationsAutomationZapierApiKey = "Umbraco.Cms.Integrations.Automation.Zapier.ApiKey";
1515

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public bool IsAccessValid()
6969
if (!string.IsNullOrEmpty(apiKey))
7070
return apiKey == Options.ApiKey;
7171

72-
var isAuthorized = _userValidationService.Validate(username, password, Options.UserGroup).GetAwaiter()
72+
var isAuthorized = _userValidationService.Validate(username, password, Options.UserGroupAlias).GetAwaiter()
7373
.GetResult();
7474
if (!isAuthorized) return false;
7575

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ public async Task<bool> Validate(string username, string password, string apiKey
6161

6262
if (!isUserValid) return false;
6363

64-
if (!string.IsNullOrEmpty(_zapierSettings.UserGroup))
64+
if (!string.IsNullOrEmpty(_zapierSettings.UserGroupAlias))
6565
{
6666
var user = _userService.GetByUsername(username);
6767

68-
return user != null && user.Groups.Any(p => p.Name == _zapierSettings.UserGroup);
68+
return user != null && user.Groups.Any(p => p.Alias == _zapierSettings.UserGroupAlias);
6969
}
7070

7171
return true;

0 commit comments

Comments
 (0)