Cover the new authorization token methods

Author: JimBobSquarePants

tests/ImageSharp.Web.Tests/TestUtilities/AuthenticatedServerTestBase.cs

@@ -43,11 +43,20 @@ public async Task CanRejectUnauthorizedRequestAsync()
             Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
         }
 
-        protected override string AugmentCommand(string command)
+        protected override async Task<string> AugmentCommandAsync(string command)
         {
             string uri = this.relativeImageSouce + command;
-            string token = this.authorizationUtilities.ComputeHMAC(uri, CommandHandling.Sanitize);
+            string token = await this.GetTokenAsync(uri);
             return command + "&" + ImageSharpRequestAuthorizationUtilities.TokenCommand + "=" + token;
         }
+
+        private async Task<string> GetTokenAsync(string uri)
+        {
+            string tokenSync = this.authorizationUtilities.ComputeHMAC(uri, CommandHandling.Sanitize);
+            string tokenAsync = await this.authorizationUtilities.ComputeHMACAsync(uri, CommandHandling.Sanitize);
+
+            Assert.Equal(tokenSync, tokenAsync);
+            return tokenSync;
+        }
     }
 }

tests/ImageSharp.Web.Tests/TestUtilities/ServerTestBase.cs

@@ -51,7 +51,7 @@ public async Task CanProcessAndResolveImageAsync()
             IImageFormat format = Configuration.Default.ImageFormatsManager.FindFormatByFileExtension(ext);
 
             // First response
-            HttpResponseMessage response = await this.HttpClient.GetAsync(url + this.AugmentCommand(this.Fixture.Commands[0]));
+            HttpResponseMessage response = await this.HttpClient.GetAsync(url + await this.AugmentCommandAsync(this.Fixture.Commands[0]));
 
             Assert.NotNull(response);
             Assert.True(response.IsSuccessStatusCode);
@@ -67,7 +67,7 @@ public async Task CanProcessAndResolveImageAsync()
             response.Dispose();
 
             // Cached Response
-            response = await this.HttpClient.GetAsync(url + this.AugmentCommand(this.Fixture.Commands[0]));
+            response = await this.HttpClient.GetAsync(url + await this.AugmentCommandAsync(this.Fixture.Commands[0]));
 
             Assert.NotNull(response);
             Assert.True(response.IsSuccessStatusCode);
@@ -85,7 +85,7 @@ public async Task CanProcessAndResolveImageAsync()
             // 304 response
             var request = new HttpRequestMessage
             {
-                RequestUri = new Uri(url + this.AugmentCommand(this.Fixture.Commands[0])),
+                RequestUri = new Uri(url + await this.AugmentCommandAsync(this.Fixture.Commands[0])),
                 Method = HttpMethod.Get,
             };
 
@@ -108,7 +108,7 @@ public async Task CanProcessAndResolveImageAsync()
             // 412 response
             request = new HttpRequestMessage
             {
-                RequestUri = new Uri(url + this.AugmentCommand(this.Fixture.Commands[0])),
+                RequestUri = new Uri(url + await this.AugmentCommandAsync(this.Fixture.Commands[0])),
                 Method = HttpMethod.Get,
             };
 
@@ -127,8 +127,8 @@ public async Task CanProcessAndResolveImageAsync()
         public async Task CanProcessMultipleIdenticalQueriesAsync()
         {
             string url = this.ImageSource;
-            string command1 = this.AugmentCommand(this.Fixture.Commands[0]);
-            string command2 = this.AugmentCommand(this.Fixture.Commands[1]);
+            string command1 = await this.AugmentCommandAsync(this.Fixture.Commands[0]);
+            string command2 = await this.AugmentCommandAsync(this.Fixture.Commands[1]);
 
             Task[] tasks = Enumerable.Range(0, 100).Select(i => Task.Run(async () =>
             {
@@ -144,6 +144,6 @@ public async Task CanProcessMultipleIdenticalQueriesAsync()
             Assert.True(all.IsCompletedSuccessfully);
         }
 
-        protected virtual string AugmentCommand(string command) => command;
+        protected virtual Task<string> AugmentCommandAsync(string command) => Task.FromResult(command);
     }
 }