Introduce cancellation token

Remora · Aug 18, 2023 · d138cb9 · d138cb9
1 parent bb09117
commit d138cb9
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 131 deletions.
diff --git a/Backend/Remora.Discord.Gateway/DiscordGatewayClient.cs b/Backend/Remora.Discord.Gateway/DiscordGatewayClient.cs
@@ -705,7 +705,7 @@ private async Task<Result> CreateNewSessionAsync(CancellationToken ct = default)
             (
                 new Identify
                 (
-                    await _tokenStore.GetTokenAsync(),
+                    await _tokenStore.GetTokenAsync(ct),
                     _gatewayOptions.ConnectionProperties,
                     false,
                     _gatewayOptions.LargeThreshold,
@@ -811,7 +811,7 @@ private async Task<Result> ResumeExistingSessionAsync(CancellationToken ct = def
             (
                 new Resume
                 (
-                    await _tokenStore.GetTokenAsync(),
+                    await _tokenStore.GetTokenAsync(ct),
                     _sessionInformation.SessionID,
                     _sessionInformation.SequenceNumber
                 )

diff --git a/Backend/Remora.Discord.Rest/Handlers/TokenAuthorizationHandler.cs b/Backend/Remora.Discord.Rest/Handlers/TokenAuthorizationHandler.cs
@@ -53,7 +53,7 @@ protected override async Task<HttpResponseMessage> SendAsync
         CancellationToken cancellationToken
     )
     {
-        var token = await _tokenStore.GetTokenAsync();
+        var token = await _tokenStore.GetTokenAsync(cancellationToken);
         var tokenType = _tokenStore.TokenType;
 
         if (string.IsNullOrWhiteSpace(token))

diff --git a/Backend/Remora.Discord.Rest/IAsyncTokenStore.cs b/Backend/Remora.Discord.Rest/IAsyncTokenStore.cs
@@ -20,6 +20,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
+using System.Threading;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
 
@@ -34,8 +35,9 @@ public interface IAsyncTokenStore
     /// <summary>
     /// Gets the token.
     /// </summary>
+    /// <param name="cancellationToken">A cancellation token to cancel operation.</param>
     /// <returns>The token's value.</returns>
-    ValueTask<string> GetTokenAsync();
+    ValueTask<string> GetTokenAsync(CancellationToken cancellationToken);
 
     /// <summary>
     /// Gets the type of the token.

diff --git a/Backend/Remora.Discord.Rest/LazyTokenStore.cs b/Backend/Remora.Discord.Rest/LazyTokenStore.cs
diff --git a/Backend/Remora.Discord.Rest/StaticTokenStore.cs b/Backend/Remora.Discord.Rest/StaticTokenStore.cs
@@ -20,6 +20,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
+using System.Threading;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
 
@@ -34,7 +35,7 @@ public class StaticTokenStore : IAsyncTokenStore
     private readonly ValueTask<string> _token;
 
     /// <inheritdoc />
-    public ValueTask<string> GetTokenAsync() => _token;
+    public ValueTask<string> GetTokenAsync(CancellationToken cancellationToken) => _token;
 
     /// <inheritdoc />
     public DiscordTokenType TokenType { get; }

diff --git a/Tests/Remora.Discord.Tests/Tests/Core/TokenStore/LazyTokenStoreTests.cs b/Tests/Remora.Discord.Tests/Tests/Core/TokenStore/LazyTokenStoreTests.cs
diff --git a/Tests/Remora.Discord.Tests/Tests/Core/TokenStore/StaticTokenStoreTests.cs b/Tests/Remora.Discord.Tests/Tests/Core/TokenStore/StaticTokenStoreTests.cs
@@ -44,7 +44,7 @@ public async Task ReturnsCorrectValue()
         {
             var tokenStore = new StaticTokenStore("Hello world!", DiscordTokenType.Bearer);
 
-            Assert.Equal("Hello world!", await tokenStore.GetTokenAsync());
+            Assert.Equal("Hello world!", await tokenStore.GetTokenAsync(default));
         }
     }