Clean up before merging

src/TeaTime.Slack/Controllers/OAuthCallbackController.cs

@@ -7,6 +7,7 @@
     using Microsoft.AspNetCore.Mvc;
     using Microsoft.Extensions.Logging;
     using Models.ViewModels;
+    using Services;
     using static Constants;
 
     public class OAuthCallbackController(

src/TeaTime.Slack/Extensions.cs

@@ -29,7 +29,6 @@ internal static bool TryGetCallbackState(this BaseEvent command, [NotNullWhen(tr
                 return true;
             }
 
-
             callbackData = null;
             return false;
         }

src/TeaTime.Slack/ServiceCollectionExtension.cs

@@ -4,10 +4,8 @@
     using System.Reflection;
     using Client;
     using CommandRouter.Integration.AspNetCore.Extensions;
-    using Common;
     using Common.Features.Orders.Events;
     using Common.Features.Runs.Events;
-    using Common.Options;
     using Configuration;
     using EventHandlers;
     using MediatR;

src/TeaTime.Slack/ISlackAuthenticationService.cs → src/TeaTime.Slack/Services/ISlackAuthenticationService.cs

@@ -1,4 +1,4 @@
-namespace TeaTime.Slack;
+namespace TeaTime.Slack.Services;
 
 using System.Threading;
 using System.Threading.Tasks;

src/TeaTime.Slack/Services/SignedSecretsRequestVerifier.cs

@@ -27,6 +27,8 @@ public bool IsEnabled()
 
     public async Task<bool> VerifyAsync(HttpRequest request, CancellationToken cancellationToken = default)
     {
+        ArgumentNullException.ThrowIfNull(request);
+
         if (!IsEnabled())
             return false;
 
@@ -49,8 +51,9 @@ public async Task<bool> VerifyAsync(HttpRequest request, CancellationToken cance
         }
 
         // Read body and seek back to start
-        string requestBody;
         var bodyStream = request.Body;
+
+        string requestBody;
         using (var reader = new StreamReader(bodyStream, Encoding.UTF8, leaveOpen: true))
             requestBody = await reader.ReadToEndAsync(cancellationToken);
 

src/TeaTime.Slack/SlackAuthenticationService.cs → src/TeaTime.Slack/Services/SlackAuthenticationService.cs

@@ -1,14 +1,14 @@
-namespace TeaTime.Slack;
+namespace TeaTime.Slack.Services;
 
 using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using Client;
-using Configuration;
 using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Primitives;
+using Client;
+using Configuration;
 using Models.Requests;
 using Models.Responses;
 
@@ -42,6 +42,8 @@ public string BuildAuthorizeUrl()
 
     public Task<OAuthTokenResponse> GetOAuthTokenAsync(string code, CancellationToken cancellationToken = default)
     {
+        ArgumentNullException.ThrowIfNull(code);
+
         var oauth = GetOptions();
 
         return slackApiClient.GetOAuthTokenAsync(new OAuthTokenRequest

src/TeaTime.Slack/Services/SlackVerifyRequestMiddleware.cs

@@ -74,7 +74,7 @@ private static async Task CopyToAsync(Stream source, Stream destination, int buf
                 if (bytesRead > MaxLength)
                     throw new Exception("Body too big");
 
-                await destination.WriteAsync(new ReadOnlyMemory<byte>(buffer, 0, bytesRead), cancellationToken).ConfigureAwait(false);
+                await destination.WriteAsync(new ReadOnlyMemory<byte>(buffer, 0, bytesRead), cancellationToken);
             }
         }
         finally

src/TeaTime.Slack/Views/Shared/_SlackButton.cshtml

@@ -1,4 +1,4 @@
-@using TeaTime.Slack
+@using TeaTime.Slack.Services
 @inject ISlackAuthenticationService SlackAuthenticationService
 
 @if (SlackAuthenticationService.OAuthEnabled())