- adds support for middleware options in dotnet abstractions and core

microsoft · Jul 14, 2021 · fed27a4 · fed27a4
1 parent e05c3c0
commit fed27a4
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 0 deletions.
diff --git a/abstractions/dotnet/src/IMiddlewareOption.cs b/abstractions/dotnet/src/IMiddlewareOption.cs
@@ -0,0 +1,7 @@
+namespace Microsoft.Kiota.Abstractions {
+    /// <summary>
+    /// Represents a middleware option.
+    /// </summary>
+    public interface IMiddlewareOption {
+    }
+}
diff --git a/abstractions/dotnet/src/RequestInfo.cs b/abstractions/dotnet/src/RequestInfo.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Collections.Generic;
 using System.IO;
 using Microsoft.Kiota.Abstractions.Serialization;
@@ -12,6 +13,30 @@ public class RequestInfo
         public IDictionary<string, object> QueryParameters { get; set; } = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
         public IDictionary<string, string> Headers { get; set; } = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
         public Stream Content { get; set; }
+        private Dictionary<string, IMiddlewareOption> _middlewareOptions = new Dictionary<string, IMiddlewareOption>(StringComparer.OrdinalIgnoreCase);
+        /// <summary>
+        /// Gets the middleware options for this request. Options are unique by type. If an option of the same type is added twice, the last one wins.
+        /// </summary>
+        public IEnumerable<IMiddlewareOption> MiddlewareOptions { get { return _middlewareOptions.Values; } }
+        /// <summary>
+        /// Adds a middleware option to the request.
+        /// </summary>
+        /// <param name="middlewareOption">The middleware option to add.</param>
+        public void AddMiddlewareOptions(params IMiddlewareOption[] options) {
+            if(!options?.Any() ?? false) throw new ArgumentNullException(nameof(options));
+            foreach(var option in options.Where(x => x != null))
+                if(!_middlewareOptions.TryAdd(option.GetType().FullName, option))
+                    _middlewareOptions[option.GetType().FullName] = option;
+        }
+        /// <summary>
+        /// Removes given middleware options from the current request.
+        /// </summary>
+        /// <param name="options">Middleware options to remove.</param>
+        public void RemoveMiddlewareOptions(params IMiddlewareOption[] options) {
+            if(!options?.Any() ?? false) throw new ArgumentNullException(nameof(options));
+            foreach(var optionName in options.Where(x => x != null).Select(x => x.GetType().FullName))
+                _middlewareOptions.Remove(optionName);
+        }
         private const string binaryContentType = "application/octet-stream";
         private const string contentTypeHeader = "Content-Type";
         public void SetStreamContent(Stream content) {

diff --git a/http/dotnet/httpclient/src/HttpCore.cs b/http/dotnet/httpclient/src/HttpCore.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Net.Http;
@@ -128,6 +129,8 @@ private HttpRequestMessage GetRequestMessageFromRequestInfo(RequestInfo requestI
                                             string.Empty)),
 
             };
+            if(requestInfo.MiddlewareOptions.Any())
+                requestInfo.MiddlewareOptions.ToList().ForEach(x => message.Options.Set(new HttpRequestOptionsKey<IMiddlewareOption>(x.GetType().FullName), x));
             if(requestInfo.Headers?.Any() ?? false)
                 requestInfo.Headers.Where(x => !contentTypeHeaderName.Equals(x.Key, StringComparison.OrdinalIgnoreCase)).ToList().ForEach(x => message.Headers.Add(x.Key, x.Value));
             if(requestInfo.Content != null) {