Only set auth header when Token property set

Author: stoiveyp

Slack.NetStandard.Tests/OauthTests.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Net;
 using System.Net.Http;
+using System.Net.Http.Headers;
 using System.Text;
 using System.Threading.Tasks;
 using Slack.NetStandard.Auth;
@@ -11,6 +12,32 @@ namespace Slack.NetStandard.Tests
 {
     public class OauthTests
     {
+        [Fact]
+        public async Task ClientAuthCheck()
+        {
+            var client = new HttpClient(new ActionHandler(async req =>
+            {
+                Assert.Equal("Bearer", req.Headers.Authorization.Scheme);
+                Assert.Equal("wibble", req.Headers.Authorization.Parameter);
+            }));
+            client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", "wibble");
+            var slackClient = new SlackWebApiClient(client);
+            var response = await slackClient.Auth.Test();
+        }
+
+        [Fact]
+        public async Task ClientTokenCheck()
+        {
+            var client = new HttpClient(new ActionHandler(async req =>
+            {
+                Assert.Equal("Bearer", req.Headers.Authorization.Scheme);
+                Assert.Equal("test", req.Headers.Authorization.Parameter);
+            }));
+            client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", "wibble");
+            var slackClient = new SlackWebApiClient(client, "test");
+            var response = await slackClient.Auth.Test();
+        }
+
         [Fact]
         public void AccessTokenInformation()
         {

Slack.NetStandard/Slack.NetStandard.csproj

@@ -2,10 +2,10 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>3.13.3</Version>
+    <Version>3.13.4</Version>
     <Description>.NET Core package that helps with Slack interactions, events and web API</Description>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
-    <PackageReleaseNotes>bot id added to auth test (thanks @zzullick!)</PackageReleaseNotes>
+    <PackageReleaseNotes>Fix bug where Authorization not being set correctly</PackageReleaseNotes>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 	  <PackageReadmeFile>README.md</PackageReadmeFile>
     <Authors>Steven Pears</Authors>

Slack.NetStandard/SlackWebApiClient.cs

@@ -125,8 +125,8 @@ async Task<TResponse> IWebApiClient.MakeJsonCall<TRequest, TResponse>(string met
                 content.Headers.ContentType = new MediaTypeHeaderValue("application/json") { CharSet = "utf-8" };
 
                 var message = new HttpRequestMessage(HttpMethod.Post, MethodUrl(methodName)) { Content = content };
-                message.Headers.Authorization = new AuthenticationHeaderValue("Bearer", Token);
-
+                HandleAuth(message);
+                
                 var response = await Client.SendAsync(message);
                 return await GenerateResponseFromMessage<TResponse>(response);
             }
@@ -137,6 +137,14 @@ async Task<TResponse> IWebApiClient.MakeJsonCall<TRequest, TResponse>(string met
             }
         }
 
+        private void HandleAuth(HttpRequestMessage message)
+        {
+            if (!string.IsNullOrWhiteSpace(Token))
+            {
+                message.Headers.Authorization = new AuthenticationHeaderValue("Bearer", Token);
+            }
+        }
+
         private async Task<TResponse> GenerateResponseFromMessage<TResponse>(HttpResponseMessage message) where TResponse : WebApiResponseBase
         {
             var response = DeserializeResponse<TResponse>(await message.Content.ReadAsStreamAsync());
@@ -166,7 +174,7 @@ Task<HttpResponseMessage> IWebApiClient.MakeRawUrlEncodedCall(string methodName,
             content.Headers.ContentType.CharSet = "utf-8";
 
             var message = new HttpRequestMessage(HttpMethod.Post, MethodUrl(methodName)) { Content = content };
-            message.Headers.Authorization = new AuthenticationHeaderValue("Bearer", Token);
+            HandleAuth(message);
 
             return Client.SendAsync(message);
         }
@@ -183,7 +191,7 @@ async Task<TResponse> IWebApiClient.MakeUrlEncodedCall<TResponse>(string methodN
             try
             {
                 var message = new HttpRequestMessage(HttpMethod.Post, MethodUrl(methodName)) { Content = content };
-                message.Headers.Authorization = new AuthenticationHeaderValue("Bearer", Token);
+                HandleAuth(message);
                 var response = await Client.SendAsync(message);
                 return await GenerateResponseFromMessage<TResponse>(response);
             }
@@ -223,7 +231,7 @@ async Task<TResponse> IWebApiClient.MakeMultiPartCall<TResponse>(string methodNa
             try
             {
                 var message = new HttpRequestMessage(HttpMethod.Post, MethodUrl(methodName)) { Content = content };
-                message.Headers.Authorization = new AuthenticationHeaderValue("Bearer", Token);
+                HandleAuth(message);
                 var response = await Client.SendAsync(message);
                 return await GenerateResponseFromMessage<TResponse>(response);
             }