Merge pull request #330 from microsoftgraph/HttpProviderWithGraphClientFactory

Http provider with graph client factory

Author: MIchaelMainer

src/Microsoft.Graph.Core/Requests/AsyncMonitor.cs

@@ -44,8 +44,6 @@ public async Task<T> PollForOperationCompletionAsync(IProgress<AsyncOperationSta
             {
                 using (var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, this.monitorUrl))
                 {
-                    await this.client.AuthenticationProvider.AuthenticateRequestAsync(httpRequestMessage).ConfigureAwait(false);
-
                     using (var responseMessage = await this.client.HttpProvider.SendAsync(httpRequestMessage).ConfigureAwait(false))
                     {
                         // The monitor service will return an Accepted status for any monitor operation that hasn't completed.

src/Microsoft.Graph.Core/Requests/AuthenticationHandler.cs

@@ -23,14 +23,6 @@ public class AuthenticationHandler: DelegatingHandler
         /// </summary>
         public IAuthenticationProvider AuthenticationProvider { get; set; }
 
-        /// <summary>
-        /// Construct a new <see cref="AuthenticationHandler"/>
-        /// </summary>
-        public AuthenticationHandler()
-        {
-
-        }
-
         /// <summary>
         /// Construct a new <see cref="AuthenticationHandler"/>
         /// <param name="authenticationProvider">An authentication provider to pass to <see cref="AuthenticationHandler"/> for authenticating requests.</param>
@@ -103,18 +95,27 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
             if (AuthenticationProvider != null)
             {
                 await AuthenticationProvider.AuthenticateRequestAsync(httpRequestMessage);
-            }
 
-            HttpResponseMessage response = await base.SendAsync(httpRequestMessage, cancellationToken);
+                HttpResponseMessage response = await base.SendAsync(httpRequestMessage, cancellationToken);
+
+                // Chcek if response is a 401 & is not a streamed body (is buffered)
+                if (IsUnauthorized(response) && httpRequestMessage.IsBuffered())
+                {
+                    // re-issue the request to get a new access token
+                    response = await SendRetryAsync(response, cancellationToken);
+                }
 
-            // Chcek if response is a 401 & is not a streamed body (is buffered)
-            if (IsUnauthorized(response) && httpRequestMessage.IsBuffered() && (AuthenticationProvider != null))
+                return response;
+            }
+            else
             {
-                // re-issue the request to get a new access token
-                response = await SendRetryAsync(response, cancellationToken);
+                throw new ServiceException(
+                    new Error
+                    {
+                        Code = ErrorConstants.Codes.InvalidRequest,
+                        Message = ErrorConstants.Messages.AuthenticationProviderMissing,
+                    });
             }
-            
-            return response;
         }
     }
 }

src/Microsoft.Graph.Core/Requests/BaseClient.cs

@@ -25,15 +25,9 @@ public BaseClient(
             IHttpProvider httpProvider = null)
         {
             this.BaseUrl = baseUrl;
-            this.AuthenticationProvider = authenticationProvider;
-            this.HttpProvider = httpProvider ?? new HttpProvider(new Serializer());
+            this.HttpProvider = httpProvider ?? new HttpProvider(authenticationProvider, new Serializer());
         }
 
-        /// <summary>
-        /// Gets the <see cref="IAuthenticationProvider"/> for authenticating requests.
-        /// </summary>
-        public IAuthenticationProvider AuthenticationProvider { get; set; }
-
         /// <summary>
         /// Gets or sets the base URL for requests of the client.
         /// </summary>

src/Microsoft.Graph.Core/Requests/BaseRequest.cs

@@ -20,11 +20,6 @@ namespace Microsoft.Graph
     /// </summary>
     public class BaseRequest : IBaseRequest
     {
-        /// The key for the SDK version header.
-        protected string sdkVersionHeaderName;
-        /// The value for the SDK version header.
-        protected string sdkVersionHeaderValue;
-
         /// <summary>
         /// Constructs a new <see cref="BaseRequest"/>.
         /// </summary>
@@ -43,9 +38,6 @@ public BaseRequest(
 
             this.RequestUrl = this.InitializeUrl(requestUrl);
 
-            this.sdkVersionHeaderName = CoreConstants.Headers.SdkVersionHeaderName;
-            this.SdkVersionHeaderPrefix = "Graph";
-
             if (options != null)
             {
                 var headerOptions = options.OfType<HeaderOption>();
@@ -91,11 +83,6 @@ public BaseRequest(
         /// Gets the URL for the request, without query string.
         /// </summary>
         public string RequestUrl { get; internal set; }
-        
-        /// <summary>
-        /// Gets or sets the telemetry header prefix for requests.
-        /// </summary>
-        protected string SdkVersionHeaderPrefix { get; set; }
 
         /// <summary>
         /// Sends the request.
@@ -202,22 +189,10 @@ public async Task<HttpResponseMessage> SendMultiPartRequestAsync(
                     });
             }
 
-            if (this.Client.AuthenticationProvider == null)
-            {
-                throw new ServiceException(
-                    new Error
-                    {
-                        Code = ErrorConstants.Codes.InvalidRequest,
-                        Message = ErrorConstants.Messages.AuthenticationProviderMissing,
-                    });
-            }
-
             if (multipartContent != null)
             {
                 using (var request = this.GetHttpRequestMessage())
                 {
-                    await this.AuthenticateRequest(request).ConfigureAwait(false);
-
                     request.Content = multipartContent;
 
                     return await this.Client.HttpProvider.SendAsync(request, completionOption, cancellationToken).ConfigureAwait(false);
@@ -251,20 +226,8 @@ public async Task<HttpResponseMessage> SendRequestAsync(
                     });
             }
 
-            if (this.Client.AuthenticationProvider == null)
-            {
-                throw new ServiceException(
-                    new Error
-                    {
-                        Code = ErrorConstants.Codes.InvalidRequest,
-                        Message = ErrorConstants.Messages.AuthenticationProviderMissing,
-                    });
-            }
-
             using (var request = this.GetHttpRequestMessage())
             {
-                await this.AuthenticateRequest(request).ConfigureAwait(false);
-
                 if (serializableObject != null)
                 {
                     var inputStream = serializableObject as Stream;
@@ -296,12 +259,25 @@ public HttpRequestMessage GetHttpRequestMessage()
         {
             var queryString = this.BuildQueryString();
             var request = new HttpRequestMessage(new HttpMethod(this.Method), string.Concat(this.RequestUrl, queryString));
-
             this.AddHeadersToRequest(request);
-
             return request;
         }
 
+        /// <summary>
+        /// Adds all of the headers from the header collection to the request.
+        /// </summary>
+        /// <param name="request">The <see cref="HttpRequestMessage"/> representation of the request.</param>
+        private void AddHeadersToRequest(HttpRequestMessage request)
+        {
+            if (this.Headers != null)
+            {
+                foreach (var header in this.Headers)
+                {
+                    request.Headers.TryAddWithoutValidation(header.Name, header.Value);
+                }
+            }
+        }
+
         /// <summary>
         /// Gets a URL that is the request builder's request URL with the segment appended.
         /// </summary>
@@ -340,47 +316,6 @@ internal string BuildQueryString()
             return null;
         }
 
-        /// <summary>
-        /// Adds all of the headers from the header collection to the request.
-        /// </summary>
-        /// <param name="request">The <see cref="HttpRequestMessage"/> representation of the request.</param>
-        private void AddHeadersToRequest(HttpRequestMessage request)
-        {
-            if (this.Headers != null)
-            {
-                foreach (var header in this.Headers)
-                {
-                    request.Headers.TryAddWithoutValidation(header.Name, header.Value);
-                }
-            }
-
-            if (string.IsNullOrEmpty(this.sdkVersionHeaderValue))
-            {
-                var assemblyVersion = this.GetType().GetTypeInfo().Assembly.GetName().Version;
-                this.sdkVersionHeaderValue = string.Format(
-                    CoreConstants.Headers.SdkVersionHeaderValueFormatString,
-                    this.SdkVersionHeaderPrefix,
-                    assemblyVersion.Major,
-                    assemblyVersion.Minor,
-                    assemblyVersion.Build);
-            }
-
-            // Append SDK version header for telemetry
-            request.Headers.Add(
-                this.sdkVersionHeaderName,
-                this.sdkVersionHeaderValue);
-        }
-
-        /// <summary>
-        /// Adds the authentication header to the request.
-        /// </summary>
-        /// <param name="request">The <see cref="HttpRequestMessage"/> representation of the request.</param>
-        /// <returns>The task to await.</returns>
-        private Task AuthenticateRequest(HttpRequestMessage request)
-        {
-            return this.Client.AuthenticationProvider.AuthenticateRequestAsync(request);
-        }
-
         /// <summary>
         /// Initializes the request URL for the request, breaking it into query options and base URL.
         /// </summary>