Add CustomRedirectHandler to handle 307 redirects

Author: msft-shahins

CSharp/Library/Microsoft.Bot.Connector.NetCore/Content/Microsoft.Bot.Connector.NetCore.XML

@@ -31,18 +31,32 @@ public ConnectorClient(Uri baseUri, string microsoftAppId = null, string microso
         /// <param name="addJwtTokenRefresher">True, if JwtTokenRefresher should be included; False otherwise.</param>
         /// <param name="handlers">Optional. The delegating handlers to add to the http client pipeline.</param>
         public ConnectorClient(Uri baseUri, MicrosoftAppCredentials credentials, bool addJwtTokenRefresher = true, params DelegatingHandler[] handlers)
-            : this(baseUri, addJwtTokenRefresher ? AddJwtTokenRefresher(handlers, credentials) : handlers)
+            : this(baseUri, addJwtTokenRefresher ? AddJwtTokenRefresher(handlers, credentials): handlers)
         {
             this.Credentials = credentials;
         }
 
+        /// <summary>
+        /// Create a new instances of the ConnectorClient.
+        /// </summary>
+        /// <param name="baseUri">Base URI for the Connector service</param>
+        /// <param name="credentials">Credentials for the Connector service</param>
+        /// <param name="httpClientHandler">The httpClientHandler used by http client</param>
+        /// <param name="addJwtTokenRefresher">True, if JwtTokenRefresher should be included; False otherwise.</param>
+        /// <param name="handlers">Optional. The delegating handlers to add to the http client pipeline.</param>
+        public ConnectorClient(Uri baseUri, MicrosoftAppCredentials credentials, HttpClientHandler httpClientHandler, bool addJwtTokenRefresher = true, params DelegatingHandler[] handlers)
+            : this(baseUri, httpClientHandler, addJwtTokenRefresher ? AddJwtTokenRefresher(handlers, credentials) : handlers)
+        {
+            this.Credentials = credentials;
+        }
+        
         private static DelegatingHandler[] AddJwtTokenRefresher(DelegatingHandler[] srcHandlers, MicrosoftAppCredentials credentials)
         {
             var handlers = new List<DelegatingHandler>(srcHandlers);
             handlers.Add(new JwtTokenRefresher(credentials));
             return handlers.ToArray();
         }
-
+        
         // client defaults to sending the expect: continue header, which isn't very efficient, 
         partial void CustomInitialize()
         {

CSharp/Library/Microsoft.Bot.Connector.NetFramework/Content/Microsoft.Bot.Connector.xml

@@ -61,4 +61,26 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
             return response;
         }
     }
+    
+    /// <summary>
+    /// A custom redirect handler for <see cref="HttpStatusCode.RedirectKeepVerb"/>.
+    /// </summary>
+    /// <remarks>
+    /// This makes sure that authorization headers stay intact between 307 redirects.
+    /// </remarks>
+    public sealed class CustomRedirectHandler : DelegatingHandler
+    {
+        protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+        {
+            HttpResponseMessage response = await base.SendAsync(request, cancellationToken).ConfigureAwait(false);
+
+            if(response.StatusCode == HttpStatusCode.RedirectKeepVerb && response.Headers.Contains("Location"))
+            {
+                request.RequestUri = new Uri(request.RequestUri, response.Headers.Location);
+                response.Dispose();
+                response = await base.SendAsync(request, cancellationToken).ConfigureAwait(false);
+            }
+            return response;
+        }
+    }
 }