Merge branch 'feature/allow-additional-config-of-httpclients' of https://github.com/kola-tm/pnpcore into pr1659

Author: bjansen

src/sdk/PnP.Core/Services/Builder/PnPCoreServiceCollectionExtensions.cs

@@ -13,21 +13,39 @@ public static class PnPCoreServiceCollectionExtensions
         /// <summary>
         /// Configures PnP Core SDK with default options
         /// </summary>
+        /// <remarks>
+        /// <para>
+        /// Optional additional configuration can be provided for <see cref="SharePointRestClient"/> and/or <see cref="MicrosoftGraphClient"/>
+        /// </para>
+        /// </remarks>
         /// <param name="services">The collection of services in an <see cref="IServiceCollection" /></param>
+        /// <param name="configureSharePointRest">additional configuration to <see cref="SharePointRestClient"/></param>
+        /// <param name="configureMicrosoftGraph">additional configuration to <see cref="MicrosoftGraphClient"/></param>
         /// <returns>A PnPCoreBuilder instance</returns>
-        public static IPnPCoreBuilder AddPnPCore(this IServiceCollection services)
+        public static IPnPCoreBuilder AddPnPCore(this IServiceCollection services,
+            Action<IHttpClientBuilder> configureSharePointRest = null,
+            Action<IHttpClientBuilder> configureMicrosoftGraph = null)
         {
-            return AddPnPCore(services, null);
+            return AddPnPCore(services, null, configureSharePointRest, configureMicrosoftGraph);
         }
 
         /// <summary>
         /// Configures PnP Core SDK with custom options
         /// </summary>
+        /// <remarks>
+        /// <para>
+        /// Optional additional configuration can be provided for <see cref="SharePointRestClient"/> and/or <see cref="MicrosoftGraphClient"/>
+        /// </para>
+        /// </remarks>
         /// <param name="services">The collection of services in an <see cref="IServiceCollection" /></param>
         /// <param name="options">An Action to configure the PnP Core options</param>
+        /// <param name="configureSharePointRest">additional configuration to <see cref="SharePointRestClient"/></param>
+        /// <param name="configureMicrosoftGraph">additional configuration to <see cref="MicrosoftGraphClient"/></param>
         /// <returns>A PnPCoreBuilder instance</returns>
         public static IPnPCoreBuilder AddPnPCore(this IServiceCollection services,
-            Action<PnPCoreOptions> options)
+            Action<PnPCoreOptions> options,
+            Action<IHttpClientBuilder> configureSharePointRest = null,
+            Action<IHttpClientBuilder> configureMicrosoftGraph = null)
         {
             if (services == null)
             {
@@ -40,7 +58,7 @@ public static IPnPCoreBuilder AddPnPCore(this IServiceCollection services,
             }
 
             services.ConfigureOptions<PnPCoreOptionsConfigurator>();
-            services.AddPnPContextFactory();
+            services.AddPnPContextFactory(configureSharePointRest, configureMicrosoftGraph);
 
             return new PnPCoreBuilder(services);
         }

src/sdk/PnP.Core/Services/Core/PnPContextFactoryCollectionExtensions.cs

@@ -17,9 +17,18 @@ public static class PnPContextFactoryCollectionExtensions
         /// <summary>
         /// Adds the <see cref="PnPContextFactory"/> to the collection of services
         /// </summary>
+        /// <remarks>
+        /// <para>
+        /// Optional additional configuration can be provided for <see cref="SharePointRestClient"/> and/or <see cref="MicrosoftGraphClient"/>
+        /// </para>
+        /// </remarks>
         /// <param name="collection">Collection of loaded services</param>
+        /// <param name="configureSharePointRest">additional configuration to <see cref="SharePointRestClient"/></param>
+        /// <param name="configureMicrosoftGraph">additional configuration to <see cref="MicrosoftGraphClient"/></param>
         /// <returns>Collection of loaded services</returns>
-        public static IServiceCollection AddPnPContextFactory(this IServiceCollection collection)
+        public static IServiceCollection AddPnPContextFactory(this IServiceCollection collection,
+            Action<IHttpClientBuilder> configureSharePointRest = null,
+            Action<IHttpClientBuilder> configureMicrosoftGraph = null)
         {
             if (collection == null)
             {
@@ -29,17 +38,28 @@ public static IServiceCollection AddPnPContextFactory(this IServiceCollection co
             // Add a SharePoint Online Context Factory service instance
             return collection
                 .AddHttpHandlers()
-                .AddHttpClients()
+                .AddHttpClients(configureSharePointRest, configureMicrosoftGraph)
                 .AddPnPServices();
         }
 
         /// <summary>
-        /// Adds the <see cref="PnPContextFactory"/> to the collection of services with options
+        /// Adds the <see cref="PnPContextFactory"/> to the collection of services with options. 
         /// </summary>
+        /// <remarks>
+        /// <para>
+        /// Optional additional configuration can be provided for <see cref="SharePointRestClient"/> and/or <see cref="MicrosoftGraphClient"/>
+        /// </para>
+        /// </remarks>
         /// <param name="collection">Collection of loaded services</param>
         /// <param name="options"><see cref="PnPContextFactory"/> configuration options</param>
+        /// <param name="configureSharePointRest">additional configuration to <see cref="SharePointRestClient"/></param>
+        /// <param name="configureMicrosoftGraph">additional configuration to <see cref="MicrosoftGraphClient"/></param>
         /// <returns>Collection of loaded services</returns>
-        public static IServiceCollection AddPnPContextFactory(this IServiceCollection collection, Action<PnPContextFactoryOptions> options)
+        public static IServiceCollection AddPnPContextFactory(
+            this IServiceCollection collection,
+            Action<PnPContextFactoryOptions> options,
+            Action<IHttpClientBuilder> configureSharePointRest = null,
+            Action<IHttpClientBuilder> configureMicrosoftGraph = null)
         {
             if (collection == null)
             {
@@ -55,7 +75,7 @@ public static IServiceCollection AddPnPContextFactory(this IServiceCollection co
             // Add a PnP Context Factory service instance
             return collection
                 .AddHttpHandlers()
-                .AddHttpClients()
+                .AddHttpClients(configureSharePointRest, configureMicrosoftGraph)
                 .AddPnPServices();
         }
 
@@ -69,19 +89,22 @@ private static IServiceCollection AddHttpHandlers(this IServiceCollection collec
             return collection;
         }
 
-        private static IServiceCollection AddHttpClients(this IServiceCollection collection)
+        private static IServiceCollection AddHttpClients(this IServiceCollection collection, Action<IHttpClientBuilder> configureSharePointRest = null, Action<IHttpClientBuilder> configureMicrosoftGraph = null)
         {
+            IHttpClientBuilder sharePointRestBuilder;
+            IHttpClientBuilder microsoftGraphBuilder;
+
 #if NET5_0_OR_GREATER
             if (RuntimeInformation.RuntimeIdentifier == "browser-wasm")
             {
-                collection.AddHttpClient<SharePointRestClient>()
+                sharePointRestBuilder = collection.AddHttpClient<SharePointRestClient>()
                     .AddHttpMessageHandler<SharePointRestRetryHandler>();
-                collection.AddHttpClient<MicrosoftGraphClient>()
+                microsoftGraphBuilder = collection.AddHttpClient<MicrosoftGraphClient>()
                     .AddHttpMessageHandler<MicrosoftGraphRetryHandler>();
             }
             else
             {
-                collection.AddHttpClient<SharePointRestClient>()
+                sharePointRestBuilder = collection.AddHttpClient<SharePointRestClient>()
                     .AddHttpMessageHandler<SharePointRestRetryHandler>()
                     // We use cookies by adding them to the header which works great when used from Core framework,
                     // however when running the .NET Standard 2.0 version from .NET Framework we explicetely have to
@@ -91,15 +114,15 @@ private static IServiceCollection AddHttpClients(this IServiceCollection collect
                         UseCookies = false,
                         AutomaticDecompression = DecompressionMethods.All
                     });
-                collection.AddHttpClient<MicrosoftGraphClient>()
+                microsoftGraphBuilder = collection.AddHttpClient<MicrosoftGraphClient>()
                     .AddHttpMessageHandler<MicrosoftGraphRetryHandler>()
                     .ConfigurePrimaryHttpMessageHandler(() => new HttpClientHandler()
                     {
                         AutomaticDecompression = DecompressionMethods.All
                     });
             }
 #else
-            collection.AddHttpClient<SharePointRestClient>()
+            sharePointRestBuilder = collection.AddHttpClient<SharePointRestClient>()
                 .AddHttpMessageHandler<SharePointRestRetryHandler>()
                 // We use cookies by adding them to the header which works great when used from Core framework,
                 // however when running the .NET Standard 2.0 version from .NET Framework we explicetely have to
@@ -109,13 +132,16 @@ private static IServiceCollection AddHttpClients(this IServiceCollection collect
                     UseCookies = false,
                     AutomaticDecompression = DecompressionMethods.GZip
                 });
-            collection.AddHttpClient<MicrosoftGraphClient>()
+            microsoftGraphBuilder = collection.AddHttpClient<MicrosoftGraphClient>()
                 .AddHttpMessageHandler<MicrosoftGraphRetryHandler>()
                 .ConfigurePrimaryHttpMessageHandler(() => new HttpClientHandler()
                 {
                     AutomaticDecompression = DecompressionMethods.GZip
                 });
 #endif
+            configureSharePointRest?.Invoke(sharePointRestBuilder);
+            configureMicrosoftGraph?.Invoke(microsoftGraphBuilder);
+
             return collection;
         }