Merge pull request #16 from Mastercard/feature/updating-restsharp

Updating RestSharp Version

Author: danny-gallagher

Mastercard.Developer.ClientEncryption.RestSharpV2/Interceptors/RestSharpEncryptionInterceptor.cs

@@ -1,9 +1,12 @@
 using System;
 using System.Linq;
+using System.Text.Json;
 using System.Reflection;
 using Mastercard.Developer.ClientEncryption.Core.Encryption;
-using Newtonsoft.Json;
+using Header = RestSharp.HeaderParameter;
 using RestSharp;
+using System.Collections.ObjectModel;
+using System.Collections.Generic;
 
 namespace Mastercard.Developer.ClientEncryption.RestSharpV2.Interceptors
 {
@@ -30,7 +33,7 @@ public static RestSharpEncryptionInterceptor From(EncryptionConfig config)
         /// Encrypt RestSharp request payloads.
         /// </summary>
         /// <param name="request">A RestSharp request object</param>
-        public void InterceptRequest(IRestRequest request)
+        public void InterceptRequest(RestRequest request)
         {
             if (request == null) throw new ArgumentNullException(nameof(request));
 
@@ -50,14 +53,15 @@ public void InterceptRequest(IRestRequest request)
                 var payload = bodyParam.Value;
                 if (!(payload is string))
                 {
-                    payload = request.JsonSerializer.Serialize(payload);
+                    payload = JsonSerializer.Serialize(payload);
                 }
 
                 // Encrypt fields & update headers
                 string encryptedPayload = EncryptPayload(request, payload.ToString());
 
                 // Update body and content length
-                bodyParam.Value = JsonConvert.DeserializeObject(encryptedPayload);
+                request.RemoveParameter(bodyParam);
+                request.AddBody(encryptedPayload);
                 UpdateRequestHeader(request, "Content-Length", encryptedPayload.Length);
             }
             catch (EncryptionException)
@@ -74,7 +78,7 @@ public void InterceptRequest(IRestRequest request)
         /// Decrypt RestSharp response payloads.
         /// </summary>
         /// <param name="response">A RestSharp response object</param>
-        public void InterceptResponse(IRestResponse response)
+        public void InterceptResponse(RestResponse response)
         {
             if (response == null) throw new ArgumentNullException(nameof(response));
 
@@ -109,17 +113,17 @@ public void InterceptResponse(IRestResponse response)
         /// <param name="request">A RestSharp request object</param>
         /// <param name="payload">The payload to be encrypted</param>
         /// <returns>The encrypted payload</returns>
-        internal abstract string EncryptPayload(IRestRequest request, string payload);
+        internal abstract string EncryptPayload(RestRequest request, string payload);
 
         /// <summary>
         /// Decrypt a RestSharp response payload
         /// </summary>
         /// <param name="response">A RestSharp response object</param>
         /// <param name="encryptedPayload">The encrypted payload to be decrypted</param>
         /// <returns>The decrypted payload</returns>
-        internal abstract string DecryptPayload(IRestResponse response, string encryptedPayload);
+        internal abstract string DecryptPayload(RestResponse response, string encryptedPayload);
 
-        internal static void UpdateResponseHeader(IRestResponse response, string name, object value)
+        internal static void UpdateResponseHeader(RestResponse response, string name, object value)
         {
             if (string.IsNullOrEmpty(name))
             {
@@ -128,21 +132,24 @@ internal static void UpdateResponseHeader(IRestResponse response, string name, o
             }
 
             // Scan
-            foreach (Parameter p in response.Headers)
+            List<Header> updatedHeaders = response.Headers.ToList();
+            foreach (Header p in response.Headers)
             {
                 if (p.Name.Equals(name))
                 {
-                    p.Value = value;
+                    updatedHeaders.Remove(p);
+                    updatedHeaders.Add(new Header(name, value.ToString()));
+                    response.Headers = updatedHeaders;
                     return;
                 }
             }
 
             // If we get here, there is no such header, so add one
-            var header = new Parameter(name, value.ToString(), ParameterType.HttpHeader);
-            response.Headers.Add(header);
+            updatedHeaders.Add(new Header(name, value.ToString()));
+            response.Headers = updatedHeaders;
         }
 
-        internal static void UpdateRequestHeader(IRestRequest request, string name, object value)
+        internal static void UpdateRequestHeader(RestRequest request, string name, object value)
         {
             if (string.IsNullOrEmpty(name))
             {
@@ -153,7 +160,7 @@ internal static void UpdateRequestHeader(IRestRequest request, string name, obje
             request.AddHeader(name, value.ToString());
         }
 
-        internal static string ReadAndRemoveHeader(IRestResponse response, string name)
+        internal static string ReadAndRemoveHeader(RestResponse response, string name)
         {
             var header = response.Headers.ToList().Find(h => h.Name == name);
             if (string.IsNullOrEmpty(name) || header == null)
@@ -162,15 +169,8 @@ internal static string ReadAndRemoveHeader(IRestResponse response, string name)
                 return null;
             }
 
-            // The "Headers" collection has been made read only, but we try to remove
-            // the header from the response anyway.
-            var headersField = response.GetType().GetTypeInfo().GetDeclaredField("<Headers>k__BackingField");
-            if (headersField != null)
-            {
-                var updatedHeaders = response.Headers.ToList().FindAll(h => h.Name != name);
-                headersField.SetValue(response, updatedHeaders);
-            }
-
+            var updatedHeaders = response.Headers.ToList().FindAll(h => h.Name != name);
+            response.Headers = updatedHeaders;
             return header.Value?.ToString() ?? string.Empty;
         }
     }

Mastercard.Developer.ClientEncryption.RestSharpV2/Interceptors/RestSharpFieldLevelEncryptionInterceptor.cs

@@ -25,7 +25,7 @@ public RestSharpFieldLevelEncryptionInterceptor(FieldLevelEncryptionConfig confi
         /// <param name="request">A RestSharp request object</param>
         /// <param name="payload">The payload to be encrypted</param>
         /// <returns>The encrypted payload</returns>
-        internal override string EncryptPayload(IRestRequest request, string payload)
+        internal override string EncryptPayload(RestRequest request, string payload)
         {
             // Encrypt fields & update headers
             string encryptedPayload;
@@ -54,7 +54,7 @@ internal override string EncryptPayload(IRestRequest request, string payload)
         /// <param name="response">A RestSharp response object</param>
         /// <param name="encryptedPayload">The encrypted payload to be decrypted</param>
         /// <returns>The decrypted payload</returns>
-        internal override string DecryptPayload(IRestResponse response, string encryptedPayload)
+        internal override string DecryptPayload(RestResponse response, string encryptedPayload)
         {
             // Decrypt fields & update headers
             string decryptedPayload;

Mastercard.Developer.ClientEncryption.RestSharpV2/Interceptors/RestSharpJweEncryptionInterceptor.cs

@@ -26,7 +26,7 @@ public RestSharpJweEncryptionInterceptor(JweConfig config)
         /// <param name="request">A RestSharp request object</param>
         /// <param name="payload">The payload to be encrypted</param>
         /// <returns>The encrypted payload</returns>
-        internal override string EncryptPayload(IRestRequest request, string payload)
+        internal override string EncryptPayload(RestRequest request, string payload)
         {
             return JweEncryption.EncryptPayload(payload, _config);
         }
@@ -37,7 +37,7 @@ internal override string EncryptPayload(IRestRequest request, string payload)
         /// <param name="response">A RestSharp response object</param>
         /// <param name="encryptedPayload">The encrypted payload to be decrypted</param>
         /// <returns>The decrypted payload</returns>
-        internal override string DecryptPayload(IRestResponse response, string encryptedPayload)
+        internal override string DecryptPayload(RestResponse response, string encryptedPayload)
         {
             return JweEncryption.DecryptPayload(encryptedPayload, _config);
         }

Mastercard.Developer.ClientEncryption.RestSharpV2/Mastercard.Developer.ClientEncryption.RestSharpV2.csproj

@@ -34,7 +34,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="RestSharp" Version="106.12.0" />
+    <PackageReference Include="RestSharp" Version="108.0.3" />
   </ItemGroup>
 
   <ItemGroup>

Mastercard.Developer.ClientEncryption.Tests/NetCore2/Interceptors/RestResponseDouble.cs

@@ -2,41 +2,41 @@
 using System.Collections.Generic;
 using System.Net;
 using RestSharp;
-using IRestRequest = RestSharp.IRestRequest;
-using IRestResponse = RestSharp.IRestResponse;
-using Parameter = RestSharp.Parameter;
+using RestRequest = RestSharp.RestRequest;
+using RestResponse = RestSharp.RestResponse;
 
 namespace Mastercard.Developer.ClientEncryption.Tests.NetCore.Interceptors
 {
-    internal class RestResponseDouble : IRestResponse
+    internal class RestResponseDouble : RestResponse
     {
-        public IRestRequest Request { get; set; } = null;
-        public Uri ResponseUri { get; set; } = null;
-        public string Server { get; set; }
-        public byte[] RawBytes { get; set; } = null;
-        public string ContentType { get; set; } = null;
-        public long ContentLength { get; set; }
-        public string ContentEncoding { get; set; }
-        public IList<RestResponseCookie> Cookies { get; } = null;
-        public IList<Parameter> Headers { get; }
-        public ResponseStatus ResponseStatus { get; set; }
-        public string ErrorMessage { get; set; }
-        public Exception ErrorException { get; set; }
+        public new RestRequest Request { get; set; } = null;
+        public new Uri ResponseUri { get; set; } = null;
+        public new string Server { get; set; }
+        public new byte[] RawBytes { get; set; } = null;
+        public new string ContentType { get; set; } = null;
+        public new long ContentLength { get; set; }
+        public new string ContentEncoding { get; set; }
+        public new IList<HeaderParameter> Headers { get; }
+        public new ResponseStatus ResponseStatus { get; set; }
+        public new string ErrorMessage { get; set; }
+        public new Exception ErrorException { get; set; }
         public Version ProtocolVersion { get; set; }
-        public HttpStatusCode StatusCode { get; set; } = HttpStatusCode.OK;
-        public bool IsSuccessful => true;
+        public new HttpStatusCode StatusCode { get; set; } = HttpStatusCode.OK;
+        public new bool IsSuccessful => true;
 
-        public string StatusDescription { get; set; } = null;
+        public new string StatusDescription { get; set; } = null;
 
         private Lazy<string> _content;
 
-        public RestResponseDouble(IList<Parameter> headers, string content)
+        public RestResponseDouble(IList<HeaderParameter> headers, string content)
         {
             Headers = headers;
             Content = content;
+            base.Headers = (IReadOnlyCollection<HeaderParameter>)headers;
+            base.Content = content;
         }
 
-        public string Content
+        public new string Content
         {
             get => _content.Value;
             set => _content = new Lazy<string>(() => value);

Mastercard.Developer.ClientEncryption.Tests/NetCore2/Interceptors/RestSharpV2CbcJweEncryptionInterceptorTest.cs

@@ -4,10 +4,10 @@
 using Mastercard.Developer.ClientEncryption.Tests.NetCore.Test;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Method = RestSharp.Method;
-using Parameter = RestSharp.Parameter;
+using Header = RestSharp.HeaderParameter;
 using ParameterType = RestSharp.ParameterType;
 using RestRequest = RestSharp.RestRequest;
-using IRestResponse = RestSharp.IRestResponse;
+using RestSharp;
 
 namespace Mastercard.Developer.ClientEncryption.Tests.NetCore.Interceptors
 {
@@ -36,7 +36,7 @@ public void TestIntercept_ShouldDoNothing_WhenNoPayload()
             // WHEN
             var request = new RestRequest
             {
-                Method = Method.GET,
+                Method = Method.Get,
                 Resource = "/service"
             };
 
@@ -65,7 +65,7 @@ public void TestInterceptResponse_ShouldDecryptWithA128CBC_HS256Encryption()
             TestUtils.AssertPayloadEquals("{\"foo\":\"bar\"}", payload);
             var contentLengthHeaderParam = response.Headers.FirstOrDefault(param => param.Type == ParameterType.HttpHeader);
             Assert.IsNotNull(contentLengthHeaderParam);
-            Assert.AreEqual(payload.Length, contentLengthHeaderParam.Value);
+            Assert.AreEqual(payload.Length.ToString(), contentLengthHeaderParam.Value);
         }
 
         [TestMethod]
@@ -114,9 +114,9 @@ public void TestInterceptResponse_ShouldThrowException_WhenDecryptionFails()
             fixture.InterceptResponse(response);
         }
 
-        internal static IRestResponse RestResponseWithContentLength(string content)
+        internal static RestResponse RestResponseWithContentLength(string content)
         {
-            Parameter[] headers = { new Parameter("Content-Length", content.Length, ParameterType.HttpHeader) };
+            Header[] headers = { new Header("Content-Length", content.Length.ToString()) };
             return new RestResponseDouble(headers, content);
         }
     }