influxdata · bednar · Apr 20, 2020 · Apr 20, 2020
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### Bug Fixes
 1. [#81](https://github.com/influxdata/influxdb-client-csharp/pull/81): Fixed potentially hangs on of WriteApi.Dispose()
 1. [#82](https://github.com/influxdata/influxdb-client-csharp/pull/82): Avoid to deadlock when is client used in UI
+1. [#83](https://github.com/influxdata/influxdb-client-csharp/pull/83): Fixed parsing error response for 1.x
 
 ## 1.7.0 [2020-04-17]
 

diff --git a/Client.Core/Exceptions/InfluxException.cs b/Client.Core/Exceptions/InfluxException.cs
@@ -1,8 +1,10 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Net;
 using InfluxDB.Client.Core.Internal;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using RestSharp;
 
@@ -53,40 +55,64 @@ public HttpException(string message, int status) : base(message, 0)
         /// </summary>
         public int? RetryAfter { get; set; }
 
-        public static HttpException Create(IRestResponse requestResult)
+        public static HttpException Create(IRestResponse requestResult, object body)
         {
             Arguments.CheckNotNull(requestResult, nameof(requestResult));
 
             var httpHeaders = LoggingHandler.ToHeaders(requestResult.Headers);
 
-            return Create(requestResult.Content, httpHeaders, requestResult.ErrorMessage, requestResult.StatusCode);
+            return Create(body, httpHeaders, requestResult.ErrorMessage, requestResult.StatusCode);
         }
 
-        public static HttpException Create(IHttpResponse requestResult)
+        public static HttpException Create(IHttpResponse requestResult, object body)
         {
             Arguments.CheckNotNull(requestResult, nameof(requestResult));
 
-            return Create(requestResult.Content, requestResult.Headers, requestResult.ErrorMessage, requestResult.StatusCode);
+            return Create(body, requestResult.Headers, requestResult.ErrorMessage, requestResult.StatusCode);
         }
 
-        public static HttpException Create(string content, IList<HttpHeader> headers, string ErrorMessage, HttpStatusCode statusCode)
+        public static HttpException Create(object content, IList<HttpHeader> headers, string ErrorMessage, HttpStatusCode statusCode)
         {
+            string stringBody = null;
+            var errorBody = new JObject();
             string errorMessage = null;
-            JObject errorBody;
 
             int? retryAfter = null;
             {
                 var retryHeader = headers.FirstOrDefault(header => header.Name.Equals("Retry-After"));
                 if (retryHeader != null) retryAfter = Convert.ToInt32(retryHeader.Value);
             }
 
-            if (string.IsNullOrEmpty(content))
-                errorBody = new JObject();
-            else
-                errorBody = JObject.Parse(content);
-
-            if (errorBody.ContainsKey("message")) errorMessage = errorBody.GetValue("message").ToString();
+            if (content != null)
+            {
+                if (content is Stream)
+                {
+                    var stream = content as Stream;
+                    var sr = new StreamReader(stream);
+                    stringBody = sr.ReadToEnd();
+                }
+                else
+                {
+                    stringBody = content.ToString();
+                }
+            }
 
+            if (!string.IsNullOrEmpty(stringBody))
+            {
+                try
+                {
+                    errorBody = JObject.Parse(stringBody);
+                    if (errorBody.ContainsKey("message"))
+                    {
+                        errorMessage = errorBody.GetValue("message").ToString();
+                    }
+                }
+                catch (JsonException)
+                {
+                    errorBody = new JObject();
+                }
+            }
+
             var keys = new[] {"X-Platform-Error-Code", "X-Influx-Error", "X-InfluxDb-Error"};
 
             if (string.IsNullOrEmpty(errorMessage))
@@ -95,6 +121,7 @@ public static HttpException Create(string content, IList<HttpHeader> headers, st
                     .Select(header => header.Value.ToString()).FirstOrDefault();
 
             if (string.IsNullOrEmpty(errorMessage)) errorMessage = ErrorMessage;
+            if (string.IsNullOrEmpty(errorMessage)) errorMessage = stringBody;
 
             return new HttpException(errorMessage, (int) statusCode)
                 {ErrorBody = errorBody, RetryAfter = retryAfter};

diff --git a/Client.Core/Internal/AbstractQueryClient.cs b/Client.Core/Internal/AbstractQueryClient.cs
@@ -87,11 +87,11 @@ protected async Task Query(RestRequest query, Action<ICancellable, Stream> consu
                 {
                     responseStream = AfterIntercept((int)response.StatusCode, () => response.Headers, responseStream);
 
-                    RaiseForInfluxError(response);
+                    RaiseForInfluxError(response, responseStream);
                     consumer(cancellable, responseStream);
                 };
 
-                await Task.Run(() => { RestClient.DownloadData(query, true); });
+                await Task.Run(() => { RestClient.DownloadData(query, true); }).ConfigureAwait(true);
                 if (!cancellable.IsCancelled())
                 {
                     onComplete();
@@ -195,7 +195,7 @@ private bool IsCloseException(Exception exception)
             return exception is EndOfStreamException;
         }
 
-        protected void RaiseForInfluxError(object result)
+        protected void RaiseForInfluxError(object result, object body)
         {
             if (result is IRestResponse restResponse)
             {
@@ -206,7 +206,7 @@ protected void RaiseForInfluxError(object result)
                     throw restResponse.ErrorException;
                 }
 
-                throw HttpException.Create(restResponse);
+                throw HttpException.Create(restResponse, body);
             }
 
             var httpResponse = (IHttpResponse) result;
@@ -220,7 +220,7 @@ protected void RaiseForInfluxError(object result)
                 throw httpResponse.ErrorException;
             }
 
-            throw HttpException.Create(httpResponse);
+            throw HttpException.Create(httpResponse, body);
         }
 
         protected class FluxResponseConsumerRecord : FluxCsvParser.IFluxResponseConsumer

diff --git a/Client.Legacy.Test/FluxClientQueryTest.cs b/Client.Legacy.Test/FluxClientQueryTest.cs
@@ -10,6 +10,7 @@
 using NUnit.Framework;
 using WireMock.Matchers;
 using WireMock.RequestBuilders;
+using WireMock.ResponseBuilders;
 
 namespace Client.Legacy.Test
 {
@@ -75,6 +76,30 @@ public async Task QueryError()
             }
         }
 
+        [Test]
+        public async Task ErrorAsStream()
+        {
+            var response = Response.Create()
+                .WithStatusCode(403)
+                .WithBody("Flux query service disabled. Verify flux-enabled=true in the [http] section of the InfluxDB config.");
+
+            MockServer.Given(Request.Create().WithPath("/api/v2/query").UsingPost())
+                .RespondWith(response);
+
+            try
+            {
+                await FluxClient.QueryAsync("from(bucket:\"telegraf\")");
+
+                Assert.Fail();
+            }
+            catch (InfluxException e)
+            {
+                Assert.AreEqual(e.Status, 403);
+                Assert.AreEqual(e.Message,
+                    "Flux query service disabled. Verify flux-enabled=true in the [http] section of the InfluxDB config.");
+            }
+        }
+
         [Test]
         public async Task QueryErrorSuccessResponse()
         {

diff --git a/Client.Legacy/FluxClient.cs b/Client.Legacy/FluxClient.cs
@@ -416,7 +416,7 @@ private async Task<IRestResponse> ExecuteAsync(RestRequest request)
 
             var response = await Task.Run(() => RestClient.Execute(request)).ConfigureAwait(false);
 
-            RaiseForInfluxError(response);
+            RaiseForInfluxError(response, response.Content);
 
             response.Content = AfterIntercept(
                 (int) response.StatusCode,

diff --git a/Client/InfluxDBClient.cs b/Client/InfluxDBClient.cs
@@ -42,7 +42,7 @@ protected internal InfluxDBClient(InfluxDBClientOptions options)
             _apiClient.RestClient.UserAgent = $"influxdb-client-csharp/{version}";
 
             _exceptionFactory = (methodName, response) =>
-                !response.IsSuccessful ? HttpException.Create(response) : null;
+                !response.IsSuccessful ? HttpException.Create(response, response.Content) : null;
 
             _setupService = new SetupService((Configuration) _apiClient.Configuration)
             {

diff --git a/Client/WriteApi.cs b/Client/WriteApi.cs
@@ -148,7 +148,7 @@ protected internal WriteApi(InfluxDBClientOptions options, WriteService service,
                             // ReSharper disable once ConvertIfStatementToReturnStatement
                             if (result.IsSuccessful) return Notification.CreateOnNext(result);
 
-                            return Notification.CreateOnError<IRestResponse>(HttpException.Create(result));
+                            return Notification.CreateOnError<IRestResponse>(HttpException.Create(result, result.Content));
                         })
                         .Catch<Notification<IRestResponse>, Exception>(ex =>
                         {