feat: improved error handling

tngraf · tngraf · commit 339ae55fa860 · 2022-03-13T17:56:43.000+01:00
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,5 +1,8 @@
 # ChangeLog - FOSSology.REST.dotnet
 
+## NEXT
+* improved error handling.
+
 ## 1.1.0 (2020-06-25)
 * supports FOSSology REST API v1.0.16 (FOSSology 3.8.0 built @ 2020/06/19).
 * new method GetToken().
diff --git a/Fossology.Rest.Dotnet/RestApi.cs b/Fossology.Rest.Dotnet/RestApi.cs
@@ -1,6 +1,6 @@
 ﻿// ---------------------------------------------------------------------------
 // <copyright file="RestApi.cs" company="Tethys">
-//   Copyright (C) 2019-2020 T. Graf
+//   Copyright (C) 2019-2022 T. Graf
 // </copyright>
 //
 // Licensed under the MIT License.
@@ -348,9 +348,22 @@ private static void CheckForErrors(IRestResponse response)
             FossologyApiException exception;
             try
             {
-                var result = Newtonsoft.Json.JsonConvert.DeserializeObject<Result>(response.Content);
-                exception = new FossologyApiException(
-                    ErrorCode.RestApiError, (HttpStatusCode)result.Code, result.Message, null);
+                if (string.IsNullOrEmpty(response.Content))
+                {
+                    exception = new FossologyApiException(
+                        ErrorCode.RestApiError, response.StatusCode, string.Empty, null);
+                }
+                else if (response.Content.ToLower().StartsWith("<html>"))
+                {
+                    exception = new FossologyApiException(
+                        ErrorCode.RestApiError, response.StatusCode, response.Content, null);
+                }
+                else
+                {
+                    var result = Newtonsoft.Json.JsonConvert.DeserializeObject<Result>(response.Content);
+                    exception = new FossologyApiException(
+                        ErrorCode.RestApiError, (HttpStatusCode)result.Code, result.Message, null);
+                } // if
             }
             catch
             {
