Refactored SlackOAuthController to use SlackService as an injected dependency; added tests for SlackService

test/Api.Test/AdminConsole/Controllers/SlackOAuthControllerTests.cs

@@ -0,0 +1,75 @@
+using Bit.Api.AdminConsole.Controllers;
+using Bit.Core.Services;
+using Bit.Test.Common.AutoFixture;
+using Bit.Test.Common.AutoFixture.Attributes;
+using Microsoft.AspNetCore.Mvc;
+using NSubstitute;
+using Xunit;
+
+namespace Bit.Api.Test.AdminConsole.Controllers;
+
+[ControllerCustomize(typeof(SlackOAuthController))]
+[SutProviderCustomize]
+public class SlackOAuthControllerTests
+{
+    [Theory, BitAutoData]
+    public async Task OAuthCallback_ThrowsBadResultWhenCodeIsEmpty(SutProvider<SlackOAuthController> sutProvider)
+    {
+        sutProvider.Sut.Url = Substitute.For<IUrlHelper>();
+
+        var requestAction = await sutProvider.Sut.OAuthCallback(string.Empty);
+
+        Assert.IsType<BadRequestObjectResult>(requestAction);
+    }
+
+    [Theory, BitAutoData]
+    public async Task OAuthCallback_ThrowsBadResultWhenSlackServiceReturnsEmpty(SutProvider<SlackOAuthController> sutProvider)
+    {
+        sutProvider.Sut.Url = Substitute.For<IUrlHelper>();
+        sutProvider.GetDependency<ISlackService>()
+            .ObtainTokenViaOAuth(Arg.Any<string>(), Arg.Any<string>())
+            .Returns(string.Empty);
+
+        var requestAction = await sutProvider.Sut.OAuthCallback("A_test_code");
+
+        Assert.IsType<BadRequestObjectResult>(requestAction);
+    }
+
+    [Theory, BitAutoData]
+    public async Task OAuthCallback_CompletesSuccessfully(SutProvider<SlackOAuthController> sutProvider)
+    {
+        sutProvider.Sut.Url = Substitute.For<IUrlHelper>();
+        sutProvider.GetDependency<ISlackService>()
+            .ObtainTokenViaOAuth(Arg.Any<string>(), Arg.Any<string>())
+            .Returns("xoxb-test-token");
+
+        var requestAction = await sutProvider.Sut.OAuthCallback("A_test_code");
+
+        Assert.IsType<OkObjectResult>(requestAction);
+    }
+
+    [Theory, BitAutoData]
+    public void Redirect_ShouldRedirectToSlack(SutProvider<SlackOAuthController> sutProvider)
+    {
+        var expectedUrl = "https://localhost/";
+
+        sutProvider.Sut.Url = Substitute.For<IUrlHelper>();
+        sutProvider.GetDependency<ISlackService>().GetRedirectUrl(Arg.Any<string>()).Returns(expectedUrl);
+
+        var requestAction = sutProvider.Sut.RedirectToSlack();
+
+        var redirectResult = Assert.IsType<RedirectResult>(requestAction);
+        Assert.Equal(expectedUrl, redirectResult.Url);
+    }
+
+    [Theory, BitAutoData]
+    public void Redirect_ThrowsBadResultWhenSlackServiceReturnsEmpty(SutProvider<SlackOAuthController> sutProvider)
+    {
+        sutProvider.Sut.Url = Substitute.For<IUrlHelper>();
+        sutProvider.GetDependency<ISlackService>().GetRedirectUrl(Arg.Any<string>()).Returns(string.Empty);
+
+        var requestAction = sutProvider.Sut.RedirectToSlack();
+
+        Assert.IsType<BadRequestObjectResult>(requestAction);
+    }
+}

test/Core.Test/AdminConsole/Services/SlackEventHandlerTests.cs

@@ -86,7 +86,7 @@ public class SlackEventHandlerTests
         var sutProvider = GetSutProvider(OneConfiguration());
 
         await sutProvider.Sut.HandleEventAsync(eventMessage);
-        sutProvider.GetDependency<ISlackService>().Received(1).SendSlackMessageByChannelId(
+        sutProvider.GetDependency<ISlackService>().Received(1).SendSlackMessageByChannelIdAsync(
             Arg.Is(AssertHelper.AssertPropertyEqual(_token)),
             Arg.Is(AssertHelper.AssertPropertyEqual(
                 $"Date: {eventMessage.Date}, Type: {eventMessage.Type}, UserId: {eventMessage.UserId}")),
@@ -100,13 +100,13 @@ public class SlackEventHandlerTests
         var sutProvider = GetSutProvider(TwoConfigurations());
 
         await sutProvider.Sut.HandleEventAsync(eventMessage);
-        sutProvider.GetDependency<ISlackService>().Received(1).SendSlackMessageByChannelId(
+        sutProvider.GetDependency<ISlackService>().Received(1).SendSlackMessageByChannelIdAsync(
             Arg.Is(AssertHelper.AssertPropertyEqual(_token)),
             Arg.Is(AssertHelper.AssertPropertyEqual(
                 $"Date: {eventMessage.Date}, Type: {eventMessage.Type}, UserId: {eventMessage.UserId}")),
             Arg.Is(AssertHelper.AssertPropertyEqual(_channelId))
         );
-        sutProvider.GetDependency<ISlackService>().Received(1).SendSlackMessageByChannelId(
+        sutProvider.GetDependency<ISlackService>().Received(1).SendSlackMessageByChannelIdAsync(
             Arg.Is(AssertHelper.AssertPropertyEqual(_token2)),
             Arg.Is(AssertHelper.AssertPropertyEqual(
                 $"Date: {eventMessage.Date}, Type: {eventMessage.Type}, UserId: {eventMessage.UserId}")),

test/Core.Test/AdminConsole/Services/SlackServiceTests.cs

@@ -6,6 +6,7 @@ using Bit.Test.Common.AutoFixture.Attributes;
 using Bit.Test.Common.MockedHttpClient;
 using NSubstitute;
 using Xunit;
+using GlobalSettings = Bit.Core.Settings.GlobalSettings;
 
 namespace Bit.Core.Test.Services;
 
@@ -195,6 +196,70 @@ public class SlackServiceTests
         Assert.Equal(dmChannelId, result);
     }
 
+
+    [Fact]
+    public void GetRedirectUrl_ReturnsCorrectUrl()
+    {
+        var sutProvider = GetSutProvider();
+        var ClientId = sutProvider.GetDependency<GlobalSettings>().Slack.ClientId;
+        var Scopes = sutProvider.GetDependency<GlobalSettings>().Slack.Scopes;
+        var redirectUrl = "https://example.com/callback";
+        var expectedUrl = $"https://slack.com/oauth/v2/authorize?client_id={ClientId}&scope={Scopes}&redirect_uri={redirectUrl}";
+        var result = sutProvider.Sut.GetRedirectUrl(redirectUrl);
+        Assert.Equal(expectedUrl, result);
+    }
+
+    [Fact]
+    public async Task ObtainTokenViaOAuth_ReturnsAccessToken_WhenSuccessful()
+    {
+        var sutProvider = GetSutProvider();
+        var jsonResponse = JsonSerializer.Serialize(new
+        {
+            ok = true,
+            access_token = "test-access-token"
+        });
+
+        _handler.When("https://slack.com/api/oauth.v2.access")
+            .RespondWith(HttpStatusCode.OK)
+            .WithContent(new StringContent(jsonResponse));
+
+        var result = await sutProvider.Sut.ObtainTokenViaOAuth("test-code", "https://example.com/callback");
+
+        Assert.Equal("test-access-token", result);
+    }
+
+    [Fact]
+    public async Task ObtainTokenViaOAuth_ReturnsEmptyString_WhenErrorResponse()
+    {
+        var sutProvider = GetSutProvider();
+        var jsonResponse = JsonSerializer.Serialize(new
+        {
+            ok = false,
+            error = "invalid_code"
+        });
+
+        _handler.When("https://slack.com/api/oauth.v2.access")
+            .RespondWith(HttpStatusCode.OK)
+            .WithContent(new StringContent(jsonResponse));
+
+        var result = await sutProvider.Sut.ObtainTokenViaOAuth("test-code", "https://example.com/callback");
+
+        Assert.Equal(string.Empty, result);
+    }
+
+    [Fact]
+    public async Task ObtainTokenViaOAuth_ReturnsEmptyString_WhenHttpCallFails()
+    {
+        var sutProvider = GetSutProvider();
+        _handler.When("https://slack.com/api/oauth.v2.access")
+            .RespondWith(HttpStatusCode.InternalServerError)
+            .WithContent(new StringContent(string.Empty));
+
+        var result = await sutProvider.Sut.ObtainTokenViaOAuth("test-code", "https://example.com/callback");
+
+        Assert.Equal(string.Empty, result);
+    }
+
     [Fact]
     public async Task SendSlackMessageByChannelId_Sends_Correct_Message()
     {
@@ -206,7 +271,7 @@ public class SlackServiceTests
             .RespondWith(HttpStatusCode.OK)
             .WithContent(new StringContent(string.Empty));
 
-        await sutProvider.Sut.SendSlackMessageByChannelId(_token, message, channelId);
+        await sutProvider.Sut.SendSlackMessageByChannelIdAsync(_token, message, channelId);
 
         Assert.Single(_handler.CapturedRequests);
         var request = _handler.CapturedRequests[0];