IsMultipartFormData in RestRequest

spoleto-software · May 27, 2024 · dfbd38b · dfbd38b
1 parent 406c571
commit dfbd38b
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 18 deletions.
diff --git a/src/Spoleto.RestClient/Authentication/DynamicAuthenticator.cs b/src/Spoleto.RestClient/Authentication/DynamicAuthenticator.cs
@@ -1,5 +1,6 @@
 using System.Net;
 using System.Net.Http.Headers;
+using System.Security.Authentication;
 
 namespace Spoleto.RestClient.Authentication
 {
@@ -53,7 +54,13 @@ public sealed override async Task Authenticate(IRestClient client, HttpRequestMe
 
         public virtual Task<bool> IsExpired(HttpResponseMessage response) => Task.FromResult(response.StatusCode == HttpStatusCode.Unauthorized);
 
-        public void SetExpired() => _token = null;
+        public void SetExpired()
+        {
+            if (_token == null)
+                throw new AuthenticationException("Cannot authenticate and get an access token. Check the credentials.");
+
+            _token = null;
+        }
 
         protected abstract Task<string> GetAuthenticationToken(IRestClient client);
 

diff --git a/src/Spoleto.RestClient/Client/IRestClient.cs b/src/Spoleto.RestClient/Client/IRestClient.cs
@@ -2,11 +2,11 @@
 {
     public interface IRestClient : IDisposable
     {
-        JsonRestRequest<TObj> CreateJsonRestRequest<TObj>(string uri, HttpMethod httpMethod = HttpMethod.Get, TObj? content = null) where TObj : class;
+        JsonRestRequest<TObj> CreateJsonRestRequest<TObj>(string uri, HttpMethod httpMethod = HttpMethod.Get, bool isMultipartFormData = false, TObj? content = null) where TObj : class;
 
-        XmlRestRequest<TObj> CreateXmlRestRequest<TObj>(string uri, HttpMethod httpMethod = HttpMethod.Get, TObj? content = null) where TObj : class;
+        XmlRestRequest<TObj> CreateXmlRestRequest<TObj>(string uri, HttpMethod httpMethod = HttpMethod.Get, bool isMultipartFormData = false, TObj? content = null) where TObj : class;
 
-        BinaryRestRequest CreateBinaryRestRequest(string uri, HttpMethod httpMethod = HttpMethod.Get, byte[]? content = null);
+        BinaryRestRequest CreateBinaryRestRequest(string uri, HttpMethod httpMethod = HttpMethod.Get, bool isMultipartFormData = false, byte[]? content = null);
 
         Task<TextRestResponse> ExecuteAsStringAsync(RestRequest request, CancellationToken cancellationToken = default);
 

diff --git a/src/Spoleto.RestClient/Client/RestClient.cs b/src/Spoleto.RestClient/Client/RestClient.cs
@@ -18,11 +18,11 @@ public RestClient(HttpClient httpClient, IAuthenticator? authenticator = null, R
             _disposeHttpClient = disposeHttpClient;
         }
 
-        public virtual JsonRestRequest<TObj> CreateJsonRestRequest<TObj>(string uri, HttpMethod httpMethod = HttpMethod.Get, TObj? content = null) where TObj : class => new(uri, httpMethod, content);
+        public virtual JsonRestRequest<TObj> CreateJsonRestRequest<TObj>(string uri, HttpMethod httpMethod = HttpMethod.Get, bool isMultipartFormData = false, TObj? content = null) where TObj : class => new(uri, httpMethod, isMultipartFormData, content);
 
-        public virtual XmlRestRequest<TObj> CreateXmlRestRequest<TObj>(string uri, HttpMethod httpMethod = HttpMethod.Get, TObj? content = null) where TObj : class => new(uri, httpMethod, content);
+        public virtual XmlRestRequest<TObj> CreateXmlRestRequest<TObj>(string uri, HttpMethod httpMethod = HttpMethod.Get, bool isMultipartFormData = false, TObj? content = null) where TObj : class => new(uri, httpMethod, isMultipartFormData, content);
 
-        public virtual BinaryRestRequest CreateBinaryRestRequest(string uri, HttpMethod httpMethod = HttpMethod.Get, byte[]? content = null) => new(uri, httpMethod, content);
+        public virtual BinaryRestRequest CreateBinaryRestRequest(string uri, HttpMethod httpMethod = HttpMethod.Get, bool isMultipartFormData = false, byte[]? content = null) => new(uri, httpMethod, isMultipartFormData, content);
 
         public async Task<TextRestResponse> ExecuteAsStringAsync(RestRequest request, CancellationToken cancellationToken = default)
         {

diff --git a/src/Spoleto.RestClient/RestRequest/BinaryRestRequest.cs b/src/Spoleto.RestClient/RestRequest/BinaryRestRequest.cs
@@ -5,18 +5,23 @@ namespace Spoleto.RestClient
 {
     public record BinaryRestRequest : RestRequest<byte[]>, IBinaryRestRequest
     {
-        public BinaryRestRequest(string uri, HttpMethod httpMethod = HttpMethod.Get, byte[]? content = null)
-            : base(uri, httpMethod, content)
+        public BinaryRestRequest(string uri, HttpMethod httpMethod = HttpMethod.Get, bool isMultipartFormData = false, byte[]? content = null)
+            : base(uri, httpMethod, isMultipartFormData, content)
         {
         }
 
         protected override string GetContentType() => ContentTypes.ApplicationOctetStream;
 
         public override HttpContent GetHttpContent()
         {
-            var content = new ByteArrayContent(Content);
+            HttpContent content = new ByteArrayContent(Content);
             content.Headers.ContentType = MediaTypeHeaderValue.Parse(ContentType);
 
+            if (IsMultipartFormData)
+            {
+                content = new MultipartFormDataContent { { content } };
+            }
+
             return content;
         }
     }

diff --git a/src/Spoleto.RestClient/RestRequest/IRestRequest.cs b/src/Spoleto.RestClient/RestRequest/IRestRequest.cs
@@ -4,6 +4,8 @@ namespace Spoleto.RestClient
     public interface IRestRequest
     {
         HttpMethod HttpMethod { get; }
+
+        bool IsMultipartFormData { get; }
 
         string Uri { get; }
 

diff --git a/src/Spoleto.RestClient/RestRequest/JsonRestRequest.cs b/src/Spoleto.RestClient/RestRequest/JsonRestRequest.cs
@@ -6,16 +6,21 @@ namespace Spoleto.RestClient
 {
     public record JsonRestRequest<TObj> : RestRequest<string>, IJsonRestRequest where TObj : class
     {
-        public JsonRestRequest(string uri, HttpMethod httpMethod = HttpMethod.Get, TObj? obj = null)
-            : base(uri, httpMethod, SerializationManager.Serialize(SerializationManager.DataFomat.Json, obj))
+        public JsonRestRequest(string uri, HttpMethod httpMethod = HttpMethod.Get, bool isMultipartFormData = false, TObj? obj = null)
+            : base(uri, httpMethod, isMultipartFormData, SerializationManager.Serialize(SerializationManager.DataFomat.Json, obj))
         {
         }
 
         protected override string GetContentType() => ContentTypes.ApplicationJson;
 
         public override HttpContent GetHttpContent()
         {
-            var content = new StringContent(Content, Encoding, ContentType);
+            HttpContent content = new StringContent(Content, Encoding, ContentType);
+
+            if (IsMultipartFormData)
+            {
+                content = new MultipartFormDataContent { { content } };
+            }
 
             return content;
         }

diff --git a/src/Spoleto.RestClient/RestRequest/RestRequest.cs b/src/Spoleto.RestClient/RestRequest/RestRequest.cs
@@ -4,17 +4,20 @@ namespace Spoleto.RestClient
 {
     public abstract record RestRequest : IRestRequest
     {
-        protected RestRequest(string uri, HttpMethod httpMethod = HttpMethod.Get)
+        protected RestRequest(string uri, HttpMethod httpMethod = HttpMethod.Get, bool isMultipartFormData = false)
         {
             Uri = uri;
             HttpMethod = httpMethod;
+            IsMultipartFormData = isMultipartFormData;
             ContentType = GetContentType();
         }
 
         public string Uri { get; }
 
         public HttpMethod HttpMethod { get; }
 
+        public bool IsMultipartFormData { get; }
+
         public string ContentType { get; set; }
 
         public virtual Encoding Encoding { get; set; } = Encoding.UTF8;
@@ -28,7 +31,7 @@ protected RestRequest(string uri, HttpMethod httpMethod = HttpMethod.Get)
 
     public abstract record RestRequest<T> : RestRequest, IRestRequestGeneric<T> where T : class
     {
-        protected RestRequest(string uri, HttpMethod httpMethod = HttpMethod.Get, T? content = null)
+        protected RestRequest(string uri, HttpMethod httpMethod = HttpMethod.Get,bool isMultipartFormData=false, T? content = null)
             : base(uri, httpMethod)
         {
             Content = content;

diff --git a/src/Spoleto.RestClient/RestRequest/XmlRestRequest.cs b/src/Spoleto.RestClient/RestRequest/XmlRestRequest.cs
@@ -4,16 +4,21 @@ namespace Spoleto.RestClient
 {
     public record XmlRestRequest<TObj> : RestRequest<string>, IXmlRestRequest where TObj : class
     {
-        public XmlRestRequest(string uri, HttpMethod httpMethod = HttpMethod.Get, TObj? obj = null)
-            : base(uri, httpMethod, SerializationManager.Serialize(SerializationManager.DataFomat.Xml, obj))
+        public XmlRestRequest(string uri, HttpMethod httpMethod = HttpMethod.Get, bool isMultipartFormData = false, TObj? obj = null)
+            : base(uri, httpMethod, isMultipartFormData, SerializationManager.Serialize(SerializationManager.DataFomat.Xml, obj))
         {
         }
 
         protected override string GetContentType() => ContentTypes.ApplicationXml;
 
         public override HttpContent GetHttpContent()
         {
-            var content = new StringContent(Content, Encoding, ContentType);
+            HttpContent content = new StringContent(Content, Encoding, ContentType);
+
+            if (IsMultipartFormData)
+            {
+                content = new MultipartFormDataContent { { content } };
+            }
 
             return content;
         }