From 3e161144cdfb01f9255bb37b10ba613a52091b39 Mon Sep 17 00:00:00 2001 From: Brant DeBow Date: Mon, 31 Mar 2025 09:33:09 -0400 Subject: [PATCH] Update Slack and Webhook handlers to use new Repositories --- .../Implementations/SlackEventHandler.cs | 4 +- .../Implementations/WebhookEventHandler.cs | 4 +- .../Services/SlackEventHandlerTests.cs | 59 ++++++++----------- .../Services/WebhookEventHandlerTests.cs | 52 ++++++++-------- 4 files changed, 52 insertions(+), 67 deletions(-) diff --git a/src/Core/AdminConsole/Services/Implementations/SlackEventHandler.cs b/src/Core/AdminConsole/Services/Implementations/SlackEventHandler.cs index 1b40fb69a4..b22f8b9cc4 100644 --- a/src/Core/AdminConsole/Services/Implementations/SlackEventHandler.cs +++ b/src/Core/AdminConsole/Services/Implementations/SlackEventHandler.cs @@ -13,12 +13,12 @@ public class SlackEventHandler( { public async Task HandleEventAsync(EventMessage eventMessage) { - var organizationId = eventMessage.OrganizationId ?? Guid.Empty; + var organizationId = eventMessage.OrganizationId ?? new Guid("f431e04c-f2c3-473c-8cd1-b291014b0236"); var configurations = await configurationRepository.GetConfigurationsAsync(organizationId, IntegrationType.Slack, eventMessage.Type); foreach (var configuration in configurations) { - var config = JsonSerializer.Deserialize(configuration.Configuration ?? string.Empty); + var config = configuration.MergedConfiguration.Deserialize(); if (config is null) { continue; diff --git a/src/Core/AdminConsole/Services/Implementations/WebhookEventHandler.cs b/src/Core/AdminConsole/Services/Implementations/WebhookEventHandler.cs index 778850acc1..8e38b6fdfe 100644 --- a/src/Core/AdminConsole/Services/Implementations/WebhookEventHandler.cs +++ b/src/Core/AdminConsole/Services/Implementations/WebhookEventHandler.cs @@ -20,13 +20,13 @@ public class WebhookEventHandler( public async Task HandleEventAsync(EventMessage eventMessage) { - var organizationId = eventMessage.OrganizationId ?? Guid.Empty; + var organizationId = eventMessage.OrganizationId ?? new Guid("f431e04c-f2c3-473c-8cd1-b291014b0236"); var configurations = await configurationRepository.GetConfigurationsAsync(organizationId, IntegrationType.Webhook, eventMessage.Type); foreach (var configuration in configurations) { - var config = JsonSerializer.Deserialize(configuration.Configuration ?? string.Empty); + var config = configuration.MergedConfiguration.Deserialize(); if (config is null) { continue; diff --git a/test/Core.Test/AdminConsole/Services/SlackEventHandlerTests.cs b/test/Core.Test/AdminConsole/Services/SlackEventHandlerTests.cs index 24977f240b..4c2c2ec23c 100644 --- a/test/Core.Test/AdminConsole/Services/SlackEventHandlerTests.cs +++ b/test/Core.Test/AdminConsole/Services/SlackEventHandlerTests.cs @@ -1,6 +1,7 @@ -using Bit.Core.Enums; +using System.Text.Json; +using Bit.Core.Enums; using Bit.Core.Models.Data; -using Bit.Core.Models.Data.Integrations; +using Bit.Core.Models.Data.Organizations; using Bit.Core.Repositories; using Bit.Core.Services; using Bit.Test.Common.AutoFixture; @@ -22,9 +23,9 @@ public class SlackEventHandlerTests private readonly string _token2 = "xoxb-another-test-token"; private SutProvider GetSutProvider( - List> integrationConfigurations) + List integrationConfigurations) { - _repository.GetConfigurationsAsync(Arg.Any(), + _repository.GetConfigurationsAsync(Arg.Any(), IntegrationType.Slack, Arg.Any()) .Returns(integrationConfigurations); @@ -34,39 +35,33 @@ public class SlackEventHandlerTests .Create(); } - private List> NoConfigurations() + private List NoConfigurations() { return []; } - private List> OneConfiguration() + private List OneConfiguration() { - return - [ - new IntegrationConfiguration - { - Configuration = new SlackConfiguration(channelId: _channelId, token: _token), - Template = "Date: #Date#, Type: #Type#, UserId: #UserId#" - } - ]; + var config = Substitute.For(); + config.Configuration = JsonSerializer.Serialize(new { token = _token }); + config.IntegrationConfiguration = JsonSerializer.Serialize(new { channelId = _channelId }); + config.Template = "Date: #Date#, Type: #Type#, UserId: #UserId#"; + + return [config]; } - private List> TwoConfigurations() + private List TwoConfigurations() { - return - [ - new IntegrationConfiguration - { - Configuration = new SlackConfiguration(channelId: _channelId, token: _token), - Template = "Date: #Date#, Type: #Type#, UserId: #UserId#" - }, + var config = Substitute.For(); + config.Configuration = JsonSerializer.Serialize(new { token = _token }); + config.IntegrationConfiguration = JsonSerializer.Serialize(new { channelId = _channelId }); + config.Template = "Date: #Date#, Type: #Type#, UserId: #UserId#"; + var config2 = Substitute.For(); + config2.Configuration = JsonSerializer.Serialize(new { token = _token2 }); + config2.IntegrationConfiguration = JsonSerializer.Serialize(new { channelId = _channelId2 }); + config2.Template = "Date: #Date#, Type: #Type#, UserId: #UserId#"; - new IntegrationConfiguration - { - Configuration = new SlackConfiguration(channelId: _channelId2, token: _token2), - Template = "Date: #Date#, Type: #Type#, UserId: #UserId#" - } - ]; + return [config, config2]; } [Theory, BitAutoData] @@ -124,7 +119,6 @@ public class SlackEventHandlerTests Assert.Equal(eventMessages.Count, received.Count()); - var index = 0; foreach (var eventMessage in eventMessages) { Assert.True(calls.MoveNext()); @@ -133,8 +127,6 @@ public class SlackEventHandlerTests Assert.Equal($"Date: {eventMessage.Date}, Type: {eventMessage.Type}, UserId: {eventMessage.UserId}", arguments[1] as string); Assert.Equal(_channelId, arguments[2] as string); - - index++; } } @@ -146,11 +138,10 @@ public class SlackEventHandlerTests await sutProvider.Sut.HandleManyEventsAsync(eventMessages); var received = sutProvider.GetDependency().ReceivedCalls(); - var calls = received.GetEnumerator(); + using var calls = received.GetEnumerator(); Assert.Equal(eventMessages.Count * 2, received.Count()); - var index = 0; foreach (var eventMessage in eventMessages) { Assert.True(calls.MoveNext()); @@ -166,8 +157,6 @@ public class SlackEventHandlerTests Assert.Equal($"Date: {eventMessage.Date}, Type: {eventMessage.Type}, UserId: {eventMessage.UserId}", arguments2[1] as string); Assert.Equal(_channelId2, arguments2[2] as string); - - index++; } } } diff --git a/test/Core.Test/AdminConsole/Services/WebhookEventHandlerTests.cs b/test/Core.Test/AdminConsole/Services/WebhookEventHandlerTests.cs index 59f3b1a99c..1436382b66 100644 --- a/test/Core.Test/AdminConsole/Services/WebhookEventHandlerTests.cs +++ b/test/Core.Test/AdminConsole/Services/WebhookEventHandlerTests.cs @@ -1,8 +1,9 @@ using System.Net; using System.Net.Http.Json; +using System.Text.Json; using Bit.Core.Enums; using Bit.Core.Models.Data; -using Bit.Core.Models.Data.Integrations; +using Bit.Core.Models.Data.Organizations; using Bit.Core.Repositories; using Bit.Core.Services; using Bit.Test.Common.AutoFixture; @@ -41,13 +42,13 @@ public class WebhookEventHandlerTests } private SutProvider GetSutProvider( - List> configurations) + List configurations) { var clientFactory = Substitute.For(); clientFactory.CreateClient(WebhookEventHandler.HttpClientName).Returns(_httpClient); var repository = Substitute.For(); - repository.GetConfigurationsAsync(Arg.Any(), + repository.GetConfigurationsAsync(Arg.Any(), IntegrationType.Webhook, Arg.Any()).Returns(configurations); return new SutProvider() @@ -56,38 +57,33 @@ public class WebhookEventHandlerTests .Create(); } - List> NoConfigurations() + List NoConfigurations() { - return new List>(); + return []; } - List> OneConfiguration() + List OneConfiguration() { - return new List> - { - new IntegrationConfiguration - { - Configuration = new WebhookConfiguration { Url = _webhookUrl }, - Template = _template - } - }; + var config = Substitute.For(); + config.Configuration = null; + config.IntegrationConfiguration = JsonSerializer.Serialize(new { url = _webhookUrl }); + config.Template = _template; + + return [config]; } - List> TwoConfigurations() + List TwoConfigurations() { - return new List> - { - new IntegrationConfiguration - { - Configuration = new WebhookConfiguration { Url = _webhookUrl }, - Template = _template - }, - new IntegrationConfiguration - { - Configuration = new WebhookConfiguration { Url = _webhookUrl2 }, - Template = _template - } - }; + var config = Substitute.For(); + config.Configuration = null; + config.IntegrationConfiguration = JsonSerializer.Serialize(new { url = _webhookUrl }); + config.Template = _template; + var config2 = Substitute.For(); + config2.Configuration = null; + config2.IntegrationConfiguration = JsonSerializer.Serialize(new { url = _webhookUrl2 }); + config2.Template = _template; + + return [config, config2]; } [Theory, BitAutoData]