From 523135c5b2fbc6fbc4692c3ac0019be88ab8ff20 Mon Sep 17 00:00:00 2001
From: Stanley Dimant <stanley.dimant@varian.com>
Date: Wed, 18 Jan 2023 15:09:36 +0100
Subject: [PATCH] bump version and make ct not optional

---
 MareSynchronos/MareSynchronos.csproj                  |  2 +-
 .../WebAPI/ApIController.Functions.Files.cs           | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/MareSynchronos/MareSynchronos.csproj b/MareSynchronos/MareSynchronos.csproj
index 49f22d6..5bc026c 100644
--- a/MareSynchronos/MareSynchronos.csproj
+++ b/MareSynchronos/MareSynchronos.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Authors></Authors>
     <Company></Company>
-    <Version>0.6.6</Version>
+    <Version>0.6.7</Version>
     <Description></Description>
     <Copyright></Copyright>
     <PackageProjectUrl>https://github.com/Penumbra-Sync/client</PackageProjectUrl>
diff --git a/MareSynchronos/WebAPI/ApIController.Functions.Files.cs b/MareSynchronos/WebAPI/ApIController.Functions.Files.cs
index 9b4c571..7836a90 100644
--- a/MareSynchronos/WebAPI/ApIController.Functions.Files.cs
+++ b/MareSynchronos/WebAPI/ApIController.Functions.Files.cs
@@ -205,13 +205,13 @@ public partial class ApiController
         }
     }
 
-    private async Task<HttpResponseMessage> SendRequestAsync(HttpMethod method, Uri uri, CancellationToken? ct = null)
+    private async Task<HttpResponseMessage> SendRequestAsync(HttpMethod method, Uri uri, CancellationToken ct)
     {
         using var requestMessage = new HttpRequestMessage(method, uri);
         return await SendRequestInternalAsync(requestMessage, ct).ConfigureAwait(false);
     }
 
-    private async Task<HttpResponseMessage> SendRequestInternalAsync(HttpRequestMessage requestMessage, CancellationToken? ct = null)
+    private async Task<HttpResponseMessage> SendRequestInternalAsync(HttpRequestMessage requestMessage, CancellationToken ct)
     {
         requestMessage.Headers.Authorization = new AuthenticationHeaderValue("Bearer", this.Authorization);
 
@@ -224,13 +224,10 @@ public partial class ApiController
             Logger.Debug("Sending " + requestMessage.Method + " to " + requestMessage.RequestUri);
         }
 
-        if (ct.HasValue)
-            return await _httpClient.SendAsync(requestMessage, ct.Value).ConfigureAwait(false);
-
-        return await _httpClient.SendAsync(requestMessage).ConfigureAwait(false);
+        return await _httpClient.SendAsync(requestMessage, ct).ConfigureAwait(false);
     }
 
-    private async Task<HttpResponseMessage> SendRequestAsync<T>(HttpMethod method, Uri uri, T content, CancellationToken? ct = null) where T : class
+    private async Task<HttpResponseMessage> SendRequestAsync<T>(HttpMethod method, Uri uri, T content, CancellationToken ct) where T : class
     {
         using var requestMessage = new HttpRequestMessage(method, uri);
         requestMessage.Content = JsonContent.Create(content);