From df2ebff7a9b4cfd1e526321ad0ed1a801a3535a7 Mon Sep 17 00:00:00 2001 From: Brant DeBow Date: Wed, 2 Apr 2025 13:19:09 -0400 Subject: [PATCH] Adjusted Handlers to new repository method names; updated tests to naming convention --- .../Controllers/SlackOAuthController.cs | 2 +- .../Services/Implementations/SlackEventHandler.cs | 5 ++++- .../Implementations/WebhookEventHandler.cs | 6 ++++-- .../Controllers/SlackOAuthControllerTests.cs | 14 +++++++------- .../Services/SlackEventHandlerTests.cs | 12 ++++++------ .../Services/WebhookEventHandlerTests.cs | 12 ++++++------ 6 files changed, 28 insertions(+), 23 deletions(-) diff --git a/src/Api/AdminConsole/Controllers/SlackOAuthController.cs b/src/Api/AdminConsole/Controllers/SlackOAuthController.cs index 442f4c0d73..7a1fd36e0c 100644 --- a/src/Api/AdminConsole/Controllers/SlackOAuthController.cs +++ b/src/Api/AdminConsole/Controllers/SlackOAuthController.cs @@ -63,6 +63,6 @@ public class SlackOAuthController( Type = IntegrationType.Slack, Configuration = JsonSerializer.Serialize(new SlackIntegration(token)), }); - return Ok("Your bot is now installed."); + return Ok(integration.Id); } } diff --git a/src/Core/AdminConsole/Services/Implementations/SlackEventHandler.cs b/src/Core/AdminConsole/Services/Implementations/SlackEventHandler.cs index ace5e730da..b9c881ae13 100644 --- a/src/Core/AdminConsole/Services/Implementations/SlackEventHandler.cs +++ b/src/Core/AdminConsole/Services/Implementations/SlackEventHandler.cs @@ -14,7 +14,10 @@ public class SlackEventHandler( public async Task HandleEventAsync(EventMessage eventMessage) { var organizationId = eventMessage.OrganizationId ?? Guid.Empty; - var configurations = await configurationRepository.GetConfigurationsAsync(organizationId, IntegrationType.Slack, eventMessage.Type); + var configurations = await configurationRepository.GetConfigurationDetailsAsync( + organizationId, + IntegrationType.Slack, + eventMessage.Type); foreach (var configuration in configurations) { diff --git a/src/Core/AdminConsole/Services/Implementations/WebhookEventHandler.cs b/src/Core/AdminConsole/Services/Implementations/WebhookEventHandler.cs index dbd7ef1098..e5f3bf81d3 100644 --- a/src/Core/AdminConsole/Services/Implementations/WebhookEventHandler.cs +++ b/src/Core/AdminConsole/Services/Implementations/WebhookEventHandler.cs @@ -21,8 +21,10 @@ public class WebhookEventHandler( public async Task HandleEventAsync(EventMessage eventMessage) { var organizationId = eventMessage.OrganizationId ?? Guid.Empty; - var configurations = await configurationRepository.GetConfigurationsAsync(organizationId, - IntegrationType.Webhook, eventMessage.Type); + var configurations = await configurationRepository.GetConfigurationDetailsAsync( + organizationId, + IntegrationType.Webhook, + eventMessage.Type); foreach (var configuration in configurations) { diff --git a/test/Api.Test/AdminConsole/Controllers/SlackOAuthControllerTests.cs b/test/Api.Test/AdminConsole/Controllers/SlackOAuthControllerTests.cs index 96ae5da527..11111eb261 100644 --- a/test/Api.Test/AdminConsole/Controllers/SlackOAuthControllerTests.cs +++ b/test/Api.Test/AdminConsole/Controllers/SlackOAuthControllerTests.cs @@ -17,7 +17,7 @@ namespace Bit.Api.Test.AdminConsole.Controllers; public class SlackOAuthControllerTests { [Theory, BitAutoData] - public async Task OAuthCallback_CompletesSuccessfully(SutProvider sutProvider, Guid organizationId) + public async Task OAuthCallback_AllParamsProvided_Succeeds(SutProvider sutProvider, Guid organizationId) { var token = "xoxb-test-token"; sutProvider.Sut.Url = Substitute.For(); @@ -36,7 +36,7 @@ public class SlackOAuthControllerTests } [Theory, BitAutoData] - public async Task OAuthCallback_ThrowsBadResultWhenCodeIsEmpty(SutProvider sutProvider, Guid organizationId) + public async Task OAuthCallback_CodeIsEmpty_ThrowsBadRequest(SutProvider sutProvider, Guid organizationId) { sutProvider.Sut.Url = Substitute.For(); sutProvider.GetDependency() @@ -47,7 +47,7 @@ public class SlackOAuthControllerTests } [Theory, BitAutoData] - public async Task OAuthCallback_ThrowsBadResultWhenSlackServiceReturnsEmpty(SutProvider sutProvider, Guid organizationId) + public async Task OAuthCallback_SlackServiceReturnsEmpty_ThrowsBadRequest(SutProvider sutProvider, Guid organizationId) { sutProvider.Sut.Url = Substitute.For(); sutProvider.GetDependency() @@ -61,7 +61,7 @@ public class SlackOAuthControllerTests } [Theory, BitAutoData] - public async Task OAuthCallback_ThrowsNotFoundIfUserIsNotOrganizationAdmin(SutProvider sutProvider, Guid organizationId) + public async Task OAuthCallback_UserIsNotOrganizationAdmin_ThrowsNotFound(SutProvider sutProvider, Guid organizationId) { var token = "xoxb-test-token"; sutProvider.Sut.Url = Substitute.For(); @@ -76,7 +76,7 @@ public class SlackOAuthControllerTests } [Theory, BitAutoData] - public async Task Redirect_ShouldRedirectToSlack(SutProvider sutProvider, Guid organizationId) + public async Task Redirect_Success(SutProvider sutProvider, Guid organizationId) { var expectedUrl = $"https://localhost/{organizationId}"; @@ -96,7 +96,7 @@ public class SlackOAuthControllerTests } [Theory, BitAutoData] - public async Task Redirect_ThrowsNotFoundWhenSlackServiceReturnsEmpty(SutProvider sutProvider, Guid organizationId) + public async Task Redirect_SlackServiceReturnsEmpty_ThrowsNotFound(SutProvider sutProvider, Guid organizationId) { sutProvider.Sut.Url = Substitute.For(); sutProvider.GetDependency().GetRedirectUrl(Arg.Any()).Returns(string.Empty); @@ -111,7 +111,7 @@ public class SlackOAuthControllerTests } [Theory, BitAutoData] - public async Task Redirect_ThrowsNotFoundWhenUserIsNotOrganizationAdmin(SutProvider sutProvider, + public async Task Redirect_UserIsNotOrganizationAdmin_ThrowsNotFound(SutProvider sutProvider, Guid organizationId) { sutProvider.Sut.Url = Substitute.For(); diff --git a/test/Core.Test/AdminConsole/Services/SlackEventHandlerTests.cs b/test/Core.Test/AdminConsole/Services/SlackEventHandlerTests.cs index 4c2c2ec23c..0c2223aa0d 100644 --- a/test/Core.Test/AdminConsole/Services/SlackEventHandlerTests.cs +++ b/test/Core.Test/AdminConsole/Services/SlackEventHandlerTests.cs @@ -25,7 +25,7 @@ public class SlackEventHandlerTests private SutProvider GetSutProvider( List integrationConfigurations) { - _repository.GetConfigurationsAsync(Arg.Any(), + _repository.GetConfigurationDetailsAsync(Arg.Any(), IntegrationType.Slack, Arg.Any()) .Returns(integrationConfigurations); @@ -65,7 +65,7 @@ public class SlackEventHandlerTests } [Theory, BitAutoData] - public async Task HandleEventAsync_DoesNothingWhenNoConfigurations(EventMessage eventMessage) + public async Task HandleEventAsync_NoConfigurations_DoesNothing(EventMessage eventMessage) { var sutProvider = GetSutProvider(NoConfigurations()); @@ -74,7 +74,7 @@ public class SlackEventHandlerTests } [Theory, BitAutoData] - public async Task HandleEventAsync_SendsEventViaSlackService(EventMessage eventMessage) + public async Task HandleEventAsync_OneConfiguration_SendsEventViaSlackService(EventMessage eventMessage) { var sutProvider = GetSutProvider(OneConfiguration()); @@ -88,7 +88,7 @@ public class SlackEventHandlerTests } [Theory, BitAutoData] - public async Task HandleEventAsync_SendsMultipleWhenConfigured(EventMessage eventMessage) + public async Task HandleEventAsync_TwoConfigurations_SendsMultipleEvents(EventMessage eventMessage) { var sutProvider = GetSutProvider(TwoConfigurations()); @@ -108,7 +108,7 @@ public class SlackEventHandlerTests } [Theory, BitAutoData] - public async Task HandleManyEventsAsync_SendsEventsViaSlackService(List eventMessages) + public async Task HandleManyEventsAsync_OneConfiguration_SendsEventsViaSlackService(List eventMessages) { var sutProvider = GetSutProvider(OneConfiguration()); @@ -131,7 +131,7 @@ public class SlackEventHandlerTests } [Theory, BitAutoData] - public async Task HandleManyEventsAsync_SendsMultipleEventsAndMultipleConfigurations(List eventMessages) + public async Task HandleManyEventsAsync_TwoConfigurations_SendsMultipleEvents(List eventMessages) { var sutProvider = GetSutProvider(TwoConfigurations()); diff --git a/test/Core.Test/AdminConsole/Services/WebhookEventHandlerTests.cs b/test/Core.Test/AdminConsole/Services/WebhookEventHandlerTests.cs index 1436382b66..06e9d1d694 100644 --- a/test/Core.Test/AdminConsole/Services/WebhookEventHandlerTests.cs +++ b/test/Core.Test/AdminConsole/Services/WebhookEventHandlerTests.cs @@ -48,7 +48,7 @@ public class WebhookEventHandlerTests clientFactory.CreateClient(WebhookEventHandler.HttpClientName).Returns(_httpClient); var repository = Substitute.For(); - repository.GetConfigurationsAsync(Arg.Any(), + repository.GetConfigurationDetailsAsync(Arg.Any(), IntegrationType.Webhook, Arg.Any()).Returns(configurations); return new SutProvider() @@ -87,7 +87,7 @@ public class WebhookEventHandlerTests } [Theory, BitAutoData] - public async Task HandleEventAsync_DoesNothingWhenNoConfigurations(EventMessage eventMessage) + public async Task HandleEventAsync_NoConfigurations_DoesNothing(EventMessage eventMessage) { var sutProvider = GetSutProvider(NoConfigurations()); @@ -100,7 +100,7 @@ public class WebhookEventHandlerTests } [Theory, BitAutoData] - public async Task HandleEventAsync_PostsEventToUrl(EventMessage eventMessage) + public async Task HandleEventAsync_OneConfiguration_PostsEventToUrl(EventMessage eventMessage) { var sutProvider = GetSutProvider(OneConfiguration()); @@ -121,7 +121,7 @@ public class WebhookEventHandlerTests } [Theory, BitAutoData] - public async Task HandleManyEventsAsync_DoesNothingWhenNoConfigurations(List eventMessages) + public async Task HandleManyEventsAsync_NoConfigurations_DoesNothing(List eventMessages) { var sutProvider = GetSutProvider(NoConfigurations()); @@ -135,7 +135,7 @@ public class WebhookEventHandlerTests [Theory, BitAutoData] - public async Task HandleManyEventsAsync_PostsEventsToUrl(List eventMessages) + public async Task HandleManyEventsAsync_OneConfiguration_PostsEventsToUrl(List eventMessages) { var sutProvider = GetSutProvider(OneConfiguration()); @@ -160,7 +160,7 @@ public class WebhookEventHandlerTests } [Theory, BitAutoData] - public async Task HandleManyEventsAsync_PostsEventsToMultipleUrls(List eventMessages) + public async Task HandleManyEventsAsync_TwoConfigurations_PostsEventsToMultipleUrls(List eventMessages) { var sutProvider = GetSutProvider(TwoConfigurations());