Removed authentication provider from base client, resolves breaking changes

Author: peombwa

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/BaseClient.cs

@@ -25,15 +25,9 @@ public BaseClient(
             IHttpProvider httpProvider = null)
         {
             this.BaseUrl = baseUrl;
-            this.AuthenticationProvider = authenticationProvider;
-            this.HttpProvider = httpProvider ?? new HttpProvider(this.AuthenticationProvider, 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

@@ -189,16 +189,6 @@ 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())
@@ -236,16 +226,6 @@ 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())
             {
                 if (serializableObject != null)

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

@@ -24,6 +24,15 @@ public class HttpProvider : IHttpProvider
 
         internal HttpMessageHandler httpMessageHandler;
 
+        /// <summary>
+        /// Constructs a new <see cref="HttpProvider"/>.
+        /// </summary>
+        /// <param name="serializer">A serializer for serializing and deserializing JSON objects.</param>
+        public HttpProvider(ISerializer serializer = null)
+            : this(null, (HttpMessageHandler)null, true, serializer)
+        {
+        }
+
         /// <summary>
         /// Constructs a new <see cref="HttpProvider"/>.
         /// </summary>
@@ -39,15 +48,14 @@ public HttpProvider(IAuthenticationProvider authenticationProvider, ISerializer
         /// </summary>
         /// <param name="httpClientHandler">An HTTP client handler to pass to the <see cref="HttpClient"/> for sending requests.</param>
         /// <param name="disposeHandler">Whether or not to dispose the client handler on Dispose().</param>
-        /// <param name="authenticationProvider">The <see cref="IAuthenticationProvider"/> for authenticating request messages.</param>
         /// <param name="serializer">A serializer for serializing and deserializing JSON objects.</param>
         /// <remarks>
         ///     By default, HttpProvider disables automatic redirects and handles redirects to preserve authentication headers. If providing
         ///     an <see cref="HttpClientHandler"/> to the constructor and enabling automatic redirects this could cause issues with authentication
         ///     over the redirect.
         /// </remarks>
-        public HttpProvider(IAuthenticationProvider authenticationProvider, HttpClientHandler httpClientHandler, bool disposeHandler, ISerializer serializer = null)
-            : this(authenticationProvider, (HttpMessageHandler)httpClientHandler, disposeHandler, serializer)
+        public HttpProvider(HttpClientHandler httpClientHandler, bool disposeHandler, ISerializer serializer = null)
+            : this(null, (HttpMessageHandler)httpClientHandler, disposeHandler, serializer)
         {
         }
 
@@ -74,6 +82,35 @@ public HttpProvider(IAuthenticationProvider authenticationProvider, HttpMessageH
             this.httpClient = GraphClientFactory.CreateClient(this.httpMessageHandler, handlers);
         }
 
+        /// <summary>
+        /// Gets or sets the overall request timeout.
+        /// </summary>
+        public TimeSpan OverallTimeout
+        {
+            get
+            {
+                return this.httpClient.Timeout;
+            }
+
+            set
+            {
+                try
+                {
+                    this.httpClient.Timeout = value;
+                }
+                catch (InvalidOperationException exception)
+                {
+                    throw new ServiceException(
+                        new Error
+                        {
+                            Code = ErrorConstants.Codes.NotAllowed,
+                            Message = ErrorConstants.Messages.OverallTimeoutCannotBeSet,
+                        },
+                        exception);
+                }
+            }
+        }
+
         /// <summary>
         /// Gets a serializer for serializing and deserializing JSON objects.
         /// </summary>

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

@@ -9,11 +9,6 @@ namespace Microsoft.Graph
     /// </summary>
     public interface IBaseClient
     {
-        /// <summary>
-        /// Gets the <see cref="IAuthenticationProvider"/> for authenticating HTTP requests.
-        /// </summary>
-        IAuthenticationProvider AuthenticationProvider { get; }
-
         /// <summary>
         /// Gets the base URL for requests of the client.
         /// </summary>

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

@@ -19,6 +19,11 @@ public interface IHttpProvider : IDisposable
         /// </summary>
         ISerializer Serializer { get; }
 
+        /// <summary>
+        /// Gets or sets the timeout interval. The default value is 100 seconds.
+        /// </summary>
+        TimeSpan OverallTimeout { get; set; }
+
         /// <summary>
         /// Sends the request.
         /// </summary>

src/Microsoft.Graph/Requests/UploadChunkRequest.cs

@@ -153,11 +153,6 @@ private async Task<HttpResponseMessage> SendRequestAsync(
                 throw new ArgumentNullException(nameof(this.RequestUrl), "Session Upload URL cannot be null or empty.");
             }
 
-            if (this.Client.AuthenticationProvider == null)
-            {
-                throw new ArgumentNullException(nameof(this.Client.AuthenticationProvider), "Client.AuthenticationProvider must not be null.");
-            }
-
             using (var request = this.GetHttpRequestMessage())
             {
                 request.Content = new StreamContent(stream);

tests/Microsoft.Graph.Core.Test/Requests/AsyncMonitorTests.cs

@@ -43,7 +43,6 @@ public void Setup()
 
             this.client = new Mock<IBaseClient>(MockBehavior.Strict);
             this.client.SetupAllProperties();
-            this.client.SetupGet(client => client.AuthenticationProvider).Returns(this.authenticationProvider.Object);
             this.client.SetupGet(client => client.HttpProvider).Returns(this.httpProvider.Object);
 
             this.progress = new MockProgress();
@@ -94,16 +93,6 @@ public async Task PollForOperationCompletionAsync_OperationCompleted()
                 Assert.IsTrue(called, "Progress not called");
                 Assert.IsNotNull(item, "No item returned.");
                 Assert.AreEqual("id", item.Id, "Unexpected item returned.");
-                
-                this.authenticationProvider.Verify(
-                    provider => provider.AuthenticateRequestAsync(
-                        It.Is<HttpRequestMessage>(message => message.RequestUri.ToString().Equals(AsyncMonitorTests.monitorUrl))),
-                    Times.Once);
-
-                this.authenticationProvider.Verify(
-                    provider => provider.AuthenticateRequestAsync(
-                        It.Is<HttpRequestMessage>(message => message.RequestUri.ToString().Equals(AsyncMonitorTests.itemUrl))),
-                    Times.Once);
             }
         }
 

tests/Microsoft.Graph.DotnetCore.Core.Test/Requests/AsyncMonitorTests.cs

@@ -42,7 +42,6 @@ public AsyncMonitorTests()
 
             this.client = new Mock<IBaseClient>(MockBehavior.Strict);
             this.client.SetupAllProperties();
-            this.client.SetupGet(client => client.AuthenticationProvider).Returns(this.authenticationProvider.Object);
             this.client.SetupGet(client => client.HttpProvider).Returns(this.httpProvider.Object);
 
             this.progress = new MockProgress();
@@ -92,16 +91,6 @@ public async Task PollForOperationCompletionAsync_OperationCompleted()
                 Assert.True(called);
                 Assert.NotNull(item);
                 Assert.Equal("id", item.Id);
-
-                this.authenticationProvider.Verify(
-                    provider => provider.AuthenticateRequestAsync(
-                        It.Is<HttpRequestMessage>(message => message.RequestUri.ToString().Equals(AsyncMonitorTests.monitorUrl))),
-                    Times.Once);
-
-                this.authenticationProvider.Verify(
-                    provider => provider.AuthenticateRequestAsync(
-                        It.Is<HttpRequestMessage>(message => message.RequestUri.ToString().Equals(AsyncMonitorTests.itemUrl))),
-                    Times.Once);
             }
         }
 

tests/Microsoft.Graph.Test/Requests/Functional/ExcelTests.cs

@@ -502,9 +502,6 @@ public async Task ExcelGetImageFromChart()
 
                 HttpRequestMessage hrm = new HttpRequestMessage(HttpMethod.Get, urlToGetImageFromChart);
 
-                // Authenticate (add access token) our HttpRequestMessage
-                await graphClient.AuthenticationProvider.AuthenticateRequestAsync(hrm);
-
                 // Send the request and get the response.
                 HttpResponseMessage response = await graphClient.HttpProvider.SendAsync(hrm);