bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-12-10 17:45:21 -06:00
Code Issues Packages Projects Releases 211 Wiki Activity

Follow up on suggestions from Claude and SonarQube

Browse Source
This commit is contained in:
Brant DeBow 2025-12-02 17:33:35 -05:00
parent c19a8acba9
commit 78d1af2156
No known key found for this signature in database
GPG Key ID: 94411BB25947C72B
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Core/AdminConsole/Services/OrganizationIntegrationConfigurationValidator.cs
View File

@ -15,28 +15,30 @@ public class OrganizationIntegrationConfigurationValidator : IOrganizationIntegr
{
return false;
}
// If Filters are present, they must be valid
if (!IsFiltersValid(configuration.Filters))
{
return false;
}
switch (integrationType)
{
case IntegrationType.CloudBillingSync or IntegrationType.Scim:
return false;
case IntegrationType.Slack:
return IsConfigurationValid<SlackIntegrationConfiguration>(configuration.Configuration) &&
IsFiltersValid(configuration.Filters);
return IsConfigurationValid<SlackIntegrationConfiguration>(configuration.Configuration);
case IntegrationType.Webhook:
return IsConfigurationValid<WebhookIntegrationConfiguration>(configuration.Configuration) &&
IsFiltersValid(configuration.Filters);
return IsConfigurationValid<WebhookIntegrationConfiguration>(configuration.Configuration);
case IntegrationType.Hec:
case IntegrationType.Datadog:
case IntegrationType.Teams:
return configuration.Configuration is null &&
IsFiltersValid(configuration.Filters);
return configuration.Configuration is null;
default:
return false;
}
}
private bool IsConfigurationValid<T>(string? configuration)
private static bool IsConfigurationValid<T>(string? configuration)
{
if (string.IsNullOrWhiteSpace(configuration))
{
@ -54,7 +56,7 @@ public class OrganizationIntegrationConfigurationValidator : IOrganizationIntegr
}
}
private bool IsFiltersValid(string? filters)
private static bool IsFiltersValid(string? filters)
{
if (filters is null)
{

2
test/Core.Test/AdminConsole/EventIntegrations/OrganizationIntegrationConfigurations/UpdateOrganizationIntegrationConfigurationCommandTests.cs
View File

@ -126,7 +126,7 @@ public class UpdateOrganizationIntegrationConfigurationCommandTests
existingConfiguration.EventType = EventType.User_LoggedIn;
updatedConfiguration.Id = configurationId;
updatedConfiguration.OrganizationIntegrationId = integrationId;
existingConfiguration.EventType = EventType.Cipher_Created;
updatedConfiguration.EventType = EventType.Cipher_Created;
sutProvider.GetDependency<IOrganizationIntegrationRepository>()
.GetByIdAsync(integrationId)