chore: update RestSharp to 110.1.0 (#509)

influxdata · Apr 27, 2023 · b55ccd4 · b55ccd4
1 parent 7391962
commit b55ccd4
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ Update dependencies:
   - [#497](https://github.com/influxdata/influxdb-client-csharp/pull/497): `NodaTime` to `3.1.9`
   - [#485](https://github.com/influxdata/influxdb-client-csharp/pull/485): `Newtonsoft.Json` to `13.0.3`
   - [#506](https://github.com/influxdata/influxdb-client-csharp/pull/506): `Microsoft.Extensions.ObjectPool` to `7.0.5`
+  - [#509](https://github.com/influxdata/influxdb-client-csharp/pull/509): `RestSharp` to `110.2.0`
 
 #### Examples:
   - [#511](https://github.com/influxdata/influxdb-client-csharp/pull/511): `Radzen.Blazor` to `4.10.1`

diff --git a/Client.Core/Client.Core.csproj b/Client.Core/Client.Core.csproj
@@ -36,7 +36,7 @@
       <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
       <PackageReference Include="NodaTime" Version="3.1.9" />
       <PackageReference Include="NodaTime.Serialization.JsonNet" Version="3.0.1" />
-      <PackageReference Include="RestSharp" Version="108.0.3" />
+      <PackageReference Include="RestSharp" Version="110.1.0" />
     </ItemGroup>
 
 </Project>
diff --git a/Client.Core/Internal/AbstractQueryClient.cs b/Client.Core/Internal/AbstractQueryClient.cs
@@ -39,7 +39,7 @@ protected AbstractQueryClient(IFluxResultMapper mapper, FluxCsvParser csvParser)
             _csvParser = csvParser;
         }
 
-        protected Task Query(Func<Func<HttpResponseMessage, RestResponse>, RestRequest> queryFn,
+        protected Task Query(Func<Func<HttpResponseMessage, RestRequest, RestResponse>, RestRequest> queryFn,
             FluxCsvParser.IFluxResponseConsumer responseConsumer,
             Action<Exception> onError,
             Action onComplete, CancellationToken cancellationToken)
@@ -59,7 +59,7 @@ void Consumer(Stream bufferedStream)
             return Query(queryFn, Consumer, onError, onComplete, cancellationToken);
         }
 
-        protected Task QueryRaw(Func<Func<HttpResponseMessage, RestResponse>, RestRequest> queryFn,
+        protected Task QueryRaw(Func<Func<HttpResponseMessage, RestRequest, RestResponse>, RestRequest> queryFn,
             Action<string> onResponse,
             Action<Exception> onError,
             Action onComplete, CancellationToken cancellationToken)
@@ -79,7 +79,7 @@ void Consumer(Stream bufferedStream)
             return Query(queryFn, Consumer, onError, onComplete, cancellationToken);
         }
 
-        protected void QuerySync(Func<Func<HttpResponseMessage, RestResponse>, RestRequest> queryFn,
+        protected void QuerySync(Func<Func<HttpResponseMessage, RestRequest, RestResponse>, RestRequest> queryFn,
             FluxCsvParser.IFluxResponseConsumer responseConsumer,
             Action<Exception> onError,
             Action onComplete,
@@ -100,7 +100,7 @@ void Consumer(CancellationToken cancellable, Stream bufferedStream)
             QuerySync(queryFn, Consumer, onError, onComplete, cancellationToken);
         }
 
-        private async Task Query(Func<Func<HttpResponseMessage, RestResponse>, RestRequest> queryFn,
+        private async Task Query(Func<Func<HttpResponseMessage, RestRequest, RestResponse>, RestRequest> queryFn,
             Action<Stream> consumer,
             Action<Exception> onError, Action onComplete, CancellationToken cancellationToken)
         {
@@ -111,7 +111,7 @@ private async Task Query(Func<Func<HttpResponseMessage, RestResponse>, RestReque
 
             try
             {
-                var query = queryFn.Invoke(response =>
+                var query = queryFn.Invoke((response, request) =>
                 {
                     var result = GetStreamFromResponse(response, cancellationToken);
                     result = AfterIntercept((int)response.StatusCode,
@@ -121,7 +121,7 @@ private async Task Query(Func<Func<HttpResponseMessage, RestResponse>, RestReque
                     RaiseForInfluxError(response, result);
                     consumer(result);
 
-                    return FromHttpResponseMessage(response);
+                    return FromHttpResponseMessage(response, request);
                 });
 
                 BeforeIntercept(query);
@@ -144,7 +144,7 @@ private async Task Query(Func<Func<HttpResponseMessage, RestResponse>, RestReque
             }
         }
 
-        private void QuerySync(Func<Func<HttpResponseMessage, RestResponse>, RestRequest> queryFn,
+        private void QuerySync(Func<Func<HttpResponseMessage, RestRequest, RestResponse>, RestRequest> queryFn,
             Action<CancellationToken, Stream> consumer,
             Action<Exception> onError, Action onComplete, CancellationToken cancellationToken)
         {
@@ -155,7 +155,7 @@ private void QuerySync(Func<Func<HttpResponseMessage, RestResponse>, RestRequest
 
             try
             {
-                var query = queryFn.Invoke(response =>
+                var query = queryFn.Invoke((response, request) =>
                 {
                     var result = GetStreamFromResponse(response, cancellationToken);
                     result = AfterIntercept((int)response.StatusCode,
@@ -165,7 +165,7 @@ private void QuerySync(Func<Func<HttpResponseMessage, RestResponse>, RestRequest
                     RaiseForInfluxError(response, result);
                     consumer(cancellationToken, result);
 
-                    return FromHttpResponseMessage(response);
+                    return FromHttpResponseMessage(response, request);
                 });
 
                 BeforeIntercept(query);
@@ -188,21 +188,22 @@ private void QuerySync(Func<Func<HttpResponseMessage, RestResponse>, RestRequest
         }
 
         protected async IAsyncEnumerable<T> QueryEnumerable<T>(
-            Func<Func<HttpResponseMessage, RestResponse>, RestRequest> queryFn, Func<FluxRecord, T> convert,
+            Func<Func<HttpResponseMessage, RestRequest, RestResponse>, RestRequest> queryFn,
+            Func<FluxRecord, T> convert,
             [EnumeratorCancellation] CancellationToken cancellationToken)
         {
             Arguments.CheckNotNull(queryFn, nameof(queryFn));
 
             Stream stream = null;
-            var query = queryFn.Invoke(response =>
+            var query = queryFn.Invoke((response, request) =>
             {
                 stream = GetStreamFromResponse(response, cancellationToken);
                 stream = AfterIntercept((int)response.StatusCode,
                     () => response.Headers.ToHeaderParameters(response.Content.Headers), stream);
 
                 RaiseForInfluxError(response, stream);
 
-                return FromHttpResponseMessage(response);
+                return FromHttpResponseMessage(response, request);
             });
 
             BeforeIntercept(query);
@@ -381,9 +382,9 @@ public void Accept(int index, FluxRecord record)
             }
         }
 
-        private RestResponse FromHttpResponseMessage(HttpResponseMessage response)
+        private RestResponse FromHttpResponseMessage(HttpResponseMessage response, RestRequest request)
         {
-            return new RestResponse
+            return new RestResponse(request)
             {
                 ErrorException = response.IsSuccessStatusCode
                     ? null

diff --git a/Client.Core/Internal/RestSharpExtensions.cs b/Client.Core/Internal/RestSharpExtensions.cs
@@ -28,7 +28,7 @@ internal static IEnumerable<HeaderParameter> ToHeaderParameters(this HttpHeaders
         }
 
         internal static RestRequest AddAdvancedResponseHandler(this RestRequest restRequest,
-            Func<HttpResponseMessage, RestResponse> advancedResponseWriter)
+            Func<HttpResponseMessage, RestRequest, RestResponse> advancedResponseWriter)
         {
             var field = restRequest.GetType()
                 .GetField("_advancedResponseHandler", BindingFlags.Instance | BindingFlags.NonPublic);

diff --git a/Client.Legacy/FluxClient.cs b/Client.Legacy/FluxClient.cs
@@ -423,7 +423,7 @@ private RestRequest PingRequest()
             return new RestRequest("ping");
         }
 
-        private Func<Func<HttpResponseMessage, RestResponse>, RestRequest> QueryRequest(string query)
+        private Func<Func<HttpResponseMessage, RestRequest, RestResponse>, RestRequest> QueryRequest(string query)
         {
             return advancedResponseWriter => new RestRequest("api/v2/query", Method.Post)
                 .AddAdvancedResponseHandler(advancedResponseWriter)

diff --git a/Client.Test/WriteApiAsyncTest.cs b/Client.Test/WriteApiAsyncTest.cs
@@ -263,7 +263,8 @@ private string GetRequestBody(RestResponse restResponse)
         {
             var bytes = (byte[])restResponse.Request?.Parameters
                             .GetParameters(ParameterType.RequestBody)
-                            .TryFind("text/plain")?.Value ??
+                            .First()
+                            .Value ??
                         throw new AssertionException("The body is required.");
             return Encoding.Default.GetString(bytes);
         }

diff --git a/Client/Internal/ApiClient.cs b/Client/Internal/ApiClient.cs
@@ -25,6 +25,8 @@ public partial class ApiClient
 
         private bool _initializedSessionTokens = false;
         private bool _signout;
+        private IAuthenticator _authenticator;
+        private CookieContainer _cookieContainerCookieContainer;
 
         public ApiClient(InfluxDBClientOptions options, LoggingHandler loggingHandler, GzipHandler gzipHandler)
         {
@@ -92,6 +94,9 @@ internal void BeforeIntercept(RestRequest request)
                 InitToken();
             }
 
+            request.CookieContainer = _cookieContainerCookieContainer;
+            request.Authenticator = _authenticator;
+
             _loggingHandler.BeforeIntercept(request);
             _gzipHandler.BeforeIntercept(request);
         }
@@ -141,7 +146,12 @@ private void InitToken()
                             .FirstOrDefault(it =>
                                 string.Equals("Set-Cookie", it.Name, StringComparison.OrdinalIgnoreCase));
 
-                        RestClient.Authenticator = new CookieRedirectAuthenticator(headerParameter);
+                        _authenticator = new CookieRedirectAuthenticator(headerParameter);
+                    }
+                    else
+                    {
+                        _cookieContainerCookieContainer = new CookieContainer();
+                        _cookieContainerCookieContainer.Add(authResponse.Cookies);
                     }
                 }
             }
@@ -159,10 +169,11 @@ protected internal void Signout()
             _signout = true;
 
             _initializedSessionTokens = false;
+            _cookieContainerCookieContainer = null;
 
             var request = new RestRequest("/api/v2/signout", Method.Post);
             RestClient.ExecuteAsync(request).ConfigureAwait(false).GetAwaiter().GetResult();
-            RestClient.Authenticator = null;
+            _authenticator = null;
         }
     }
 

diff --git a/Client/InvokableScriptsApi.cs b/Client/InvokableScriptsApi.cs
@@ -300,7 +300,7 @@ private Task InvokeScript(string scriptId, FluxCsvParser.IFluxResponseConsumer c
                 cancellationToken);
         }
 
-        private Func<Func<HttpResponseMessage, RestResponse>, RestRequest> CreateRequest(string scriptId,
+        private Func<Func<HttpResponseMessage, RestRequest, RestResponse>, RestRequest> CreateRequest(string scriptId,
             Dictionary<string, object> bindParams = default)
         {
             Arguments.CheckNonEmptyString(scriptId, nameof(scriptId));

diff --git a/Client/QueryApi.cs b/Client/QueryApi.cs
@@ -783,7 +783,8 @@ private Task QueryAsync(Query query, FluxCsvParser.IFluxResponseConsumer consume
                 cancellationToken);
         }
 
-        private Func<Func<HttpResponseMessage, RestResponse>, RestRequest> CreateRequest(Query query, string org = null)
+        private Func<Func<HttpResponseMessage, RestRequest, RestResponse>, RestRequest> CreateRequest(Query query,
+            string org = null)
         {
             Arguments.CheckNotNull(query, nameof(query));
 

diff --git a/Client/QueryApiSync.cs b/Client/QueryApiSync.cs
@@ -136,7 +136,7 @@ public List<T> QuerySync<T>(Query query, string org = null, CancellationToken ca
 
             var consumer = new FluxResponseConsumerPoco<T>(poco => { measurements.Add(poco); }, Mapper);
 
-            RestRequest QueryFn(Func<HttpResponseMessage, RestResponse> advancedResponseWriter)
+            RestRequest QueryFn(Func<HttpResponseMessage, RestRequest, RestResponse> advancedResponseWriter)
             {
                 return _service
                     .PostQueryWithRestRequest(null, "application/json", null, optionsOrg, null, query)
@@ -188,7 +188,7 @@ public List<FluxTable> QuerySync(Query query, string org = null, CancellationTok
             var optionsOrg = org ?? _options.Org;
             Arguments.CheckNonEmptyString(optionsOrg, OrgArgumentValidation);
 
-            RestRequest QueryFn(Func<HttpResponseMessage, RestResponse> advancedResponseWriter)
+            RestRequest QueryFn(Func<HttpResponseMessage, RestRequest, RestResponse> advancedResponseWriter)
             {
                 return _service
                     .PostQueryWithRestRequest(null, "application/json", null, optionsOrg, null, query)