merge back to develop

src/GeekLearning.RestKit.Core/ClientBase.cs

@@ -1,21 +1,32 @@
-using Microsoft.Extensions.Options;
-using System.Collections.Generic;
-using System.Net;
-using System.Net.Http;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace GeekLearning.RestKit.Core
+namespace GeekLearning.RestKit.Core
 {
+    using Microsoft.Extensions.Options;
+    using System;
+    using System.Linq;
+    using System.Collections.Generic;
+    using System.Net;
+    using System.Net.Http;
+    using System.Text;
+    using System.Threading.Tasks;
+    using Microsoft.Extensions.DependencyInjection;
+
     public abstract class ClientBase<TOptions>
-       where TOptions : class, new()
+       where TOptions : class, IProvideRequestFilters, new()
     {
         private IMediaFormatterProvider mediaFormatterProvider;
+        private IServiceProvider serviceProvider;
+        private Lazy<IRequestFilter[]> requestFilters;
 
-        public ClientBase(IOptions<TOptions> options, IMediaFormatterProvider mediaFormatterProvider)
+        public ClientBase(IOptions<TOptions> options,
+            IMediaFormatterProvider mediaFormatterProvider,
+            IServiceProvider serviceProvider)
         {
             this.Options = options.Value;
             this.mediaFormatterProvider = mediaFormatterProvider;
+            this.serviceProvider = serviceProvider;
+            this.requestFilters = new Lazy<IRequestFilter[]>(() =>
+                this.Options.RequestFilters.Select(x=> ActivatorUtilities.CreateInstance(this.serviceProvider, x.Type, x.Arguments)).Cast<IRequestFilter>().ToArray()
+            );
         }
 
         protected TOptions Options { get; private set; }
@@ -30,6 +41,17 @@ protected Task<TTarget> TransformResponseAsync<TTarget>(HttpResponseMessage mess
             return mediaFormatter.TransformAsync<TTarget>(message.Content);
         }
 
+        protected HttpRequestMessage ApplyFilters(HttpRequestMessage requestMessage, params string[] securityDefinitions)
+        {
+            HttpRequestMessage finalMessage = requestMessage;
+            foreach (var filter in this.requestFilters.Value)
+            {
+                finalMessage = filter.Apply(requestMessage, securityDefinitions) ?? finalMessage;
+            }
+
+            return finalMessage;
+        }
+
         protected HttpContent TransformRequestBody(object data, string mediaType)
         {
             IMediaFormatter mediaFormatter = this.mediaFormatterProvider.GetMediaFormatter(mediaType);

src/GeekLearning.RestKit.Core/ClientOptionsBase.cs

@@ -0,0 +1,29 @@
+namespace GeekLearning.RestKit.Core
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+
+    public abstract class ClientOptionsBase : IProvideRequestFilters
+    {
+        private List<InjectionDescriptor> requestfilters = new List<InjectionDescriptor>();
+
+        public void AddFilter<TRequestFilter>(params object[] arguments)
+            where TRequestFilter: IRequestFilter
+        {
+            this.requestfilters.Add(new InjectionDescriptor {
+                Type = typeof(TRequestFilter),
+                Arguments = arguments
+            });
+        }
+
+        public IEnumerable<InjectionDescriptor> RequestFilters
+        {
+            get
+            {
+                return requestfilters;
+            }
+        }
+    }
+}

src/GeekLearning.RestKit.Core/IProvideRequestFilters.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace GeekLearning.RestKit.Core
+{
+    public interface IProvideRequestFilters
+    {
+        IEnumerable<InjectionDescriptor> RequestFilters { get; }
+    }
+}

src/GeekLearning.RestKit.Core/IRequestFilter.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+
+namespace GeekLearning.RestKit.Core
+{
+    public interface IRequestFilter
+    {
+        HttpRequestMessage Apply(HttpRequestMessage requestMessage, string[] securityDefinitions);
+    }
+}

src/GeekLearning.RestKit.Core/InjectionDescriptor.cs

@@ -0,0 +1,14 @@
+namespace GeekLearning.RestKit.Core
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+
+
+    public struct InjectionDescriptor
+    {
+        public Type Type;
+        public object[] Arguments;
+    }
+}