Use HttpClientHandler as final handler for PS 5.1.

Author: peombwa

src/Authentication/Authentication/Handlers/RequestHeaderHandler.cs

@@ -2,12 +2,10 @@
 //  Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
 // ------------------------------------------------------------------------------
 
-using Microsoft.Graph.PowerShell.Authentication.Cmdlets;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
-using System.Net.Http.Headers;
 using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
@@ -21,37 +19,30 @@ namespace Microsoft.Graph.PowerShell.Authentication.Handlers
     internal class RequestHeaderHandler : DelegatingHandler
     {
         /// The version for current assembly.
-        private static readonly AssemblyName _assemblyInfo = typeof(ConnectMgGraph).GetTypeInfo().Assembly.GetName();
+        private static readonly AssemblyName _assemblyInfo = typeof(RequestHeaderHandler).GetTypeInfo().Assembly.GetName();
 
         public RequestHeaderHandler() { }
 
-        public RequestHeaderHandler(HttpRequestHeaders requestHeaders, HttpMessageHandler innerHandler) : base(innerHandler) { }
-
         protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
         {
-            SetRequestHeaders(request);
-            return base.SendAsync(request, cancellationToken);
-        }
-
-        private static void SetRequestHeaders(HttpRequestMessage request)
-        {
-            string sdkVersionHeaderValue = string.Format(request.RequestUri.AbsolutePath.StartsWith("/beta") ? Constants.PSSDKHeaderValueBeta : Constants.PSSDKHeaderValueV1, _assemblyInfo.Version.Major, _assemblyInfo.Version.Minor, _assemblyInfo.Version.Build);
-            PrependHeader(request, CoreConstants.Headers.SdkVersionHeaderName, sdkVersionHeaderValue);
-        }
-
-        private static void PrependHeader(HttpRequestMessage request, string headerName, string headerValue)
-        {
-            if (request.Headers.TryGetValues(headerName, out IEnumerable<string> previousSDKHeaders))
+            string psSdkVersionHeader = string.Format(request.RequestUri.AbsolutePath.StartsWith("/beta") ? Constants.PSSDKHeaderValueBeta
+                : Constants.PSSDKHeaderValueV1, _assemblyInfo.Version.Major, _assemblyInfo.Version.Minor, _assemblyInfo.Version.Build);
+            if (request.Headers.TryGetValues(CoreConstants.Headers.SdkVersionHeaderName, out IEnumerable<string> previousSDKHeaders))
             {
-                request.Headers.Remove(headerName);
-                request.Headers.Add(headerName, new[] {
-                    headerValue, previousSDKHeaders.Where(h => h.StartsWith(Constants.DotNetSDKHeaderValue, StringComparison.InvariantCultureIgnoreCase)).FirstOrDefault()
-                });
+                var dotNetSdkHeader = previousSDKHeaders.Where(h => h.StartsWith(Constants.DotNetSDKHeaderValue, StringComparison.InvariantCultureIgnoreCase)).FirstOrDefault();
+                request.Headers.Remove(CoreConstants.Headers.SdkVersionHeaderName);
+                request.Headers.Add(CoreConstants.Headers.SdkVersionHeaderName, new[] { psSdkVersionHeader, dotNetSdkHeader });
             }
             else
             {
-                request.Headers.Add(headerName, headerValue);
+                request.Headers.Add(CoreConstants.Headers.SdkVersionHeaderName, psSdkVersionHeader);
             }
+
+            if (request.Headers.Contains(CoreConstants.Headers.ClientRequestId))
+                request.Headers.Remove(CoreConstants.Headers.ClientRequestId);
+            request.Headers.Add(CoreConstants.Headers.ClientRequestId, Guid.NewGuid().ToString());
+
+            return base.SendAsync(request, cancellationToken);
         }
     }
 }

src/Authentication/Authentication/Helpers/HttpHelpers.cs

@@ -6,6 +6,7 @@
 using Microsoft.Graph.PowerShell.Authentication.Handlers;
 using System.Collections.Generic;
 using System.Globalization;
+using System.Net;
 using System.Net.Http;
 
 namespace Microsoft.Graph.PowerShell.Authentication.Helpers
@@ -46,7 +47,6 @@ private static HttpClient GetGraphHttpClient(IAuthenticationProvider authProvide
                 throw new AuthenticationException(string.Format(CultureInfo.InvariantCulture, Core.ErrorConstants.Message.MissingSessionProperty, nameof(requestContext)));
 
             IList<DelegatingHandler> delegatingHandlers = new List<DelegatingHandler> {
-                new RequestHeaderHandler(),
                 new AuthenticationHandler(authProvider),
                 new NationalCloudHandler(),
                 new ODataQueryOptionsHandler(),
@@ -57,10 +57,26 @@ private static HttpClient GetGraphHttpClient(IAuthenticationProvider authProvide
                     MaxRetry = requestContext.MaxRetry,
                     RetriesTimeLimit= requestContext.RetriesTimeLimit
                 }),
-                new RedirectHandler()
+                new RedirectHandler(),
+                new RequestHeaderHandler() // Should always be last.
             };
 
-            HttpClient httpClient = GraphClientFactory.Create(delegatingHandlers);
+            HttpClient httpClient;
+            if (!RuntimeUtils.IsPsCore())
+            {
+                httpClient = GraphClientFactory.Create(delegatingHandlers,
+                finalHandler: new HttpClientHandler
+                {
+                    Proxy = null,
+                    AllowAutoRedirect = false,
+                    AutomaticDecompression = DecompressionMethods.None
+                });
+            }
+            else
+            {
+                httpClient = GraphClientFactory.Create(delegatingHandlers);
+            }
+
             httpClient.Timeout = requestContext.ClientTimeout;
             return httpClient;
         }

src/Authentication/Authentication/Helpers/RuntimeUtils.cs

@@ -0,0 +1,24 @@
+// ------------------------------------------------------------------------------
+//  Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
+// ------------------------------------------------------------------------------
+
+using System;
+
+namespace Microsoft.Graph.PowerShell.Authentication.Helpers
+{
+    /// <summary>
+    /// Utility class containing runtime utility methods.
+    /// </summary>
+    internal static class RuntimeUtils
+    {
+        /// <summary>
+        /// Determines if the PSEdition of the current process is Core.
+        /// </summary>
+        /// <returns><see cref="true"/> when PSEdition is core, else <see cref="false"/>.</returns>
+        internal static bool IsPsCore()
+        {
+            var psCoreVersion = new Version(6, 0, 0);
+            return GraphSession.Instance.AuthContext.PSHostVersion >= psCoreVersion;
+        }
+    }
+}