From 3c98a63873f7375a12fa7f4fbe87d03608ebf6aa Mon Sep 17 00:00:00 2001
From: Jonas Dellinger <johnny@johnnycrazy.de>
Date: Sat, 22 Dec 2018 21:40:08 +0100
Subject: [PATCH] Added error handling for invalid json errors, 500 gateway
 etc., fixes #303

---
 SpotifyAPI.Web/SpotifyWebClient.cs | 39 ++++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 5 deletions(-)

diff --git a/SpotifyAPI.Web/SpotifyWebClient.cs b/SpotifyAPI.Web/SpotifyWebClient.cs
index 4812bceb..65e829ea 100644
--- a/SpotifyAPI.Web/SpotifyWebClient.cs
+++ b/SpotifyAPI.Web/SpotifyWebClient.cs
@@ -17,6 +17,8 @@ namespace SpotifyAPI.Web
         private readonly Encoding _encoding = Encoding.UTF8;
         private readonly HttpClient _client;
 
+        private const string UnknownErrorJson = "{\"error\": { \"status\": 0, \"message\": \"SpotifyAPI.Web - Unkown Spotify Error\" }}";
+
         public SpotifyWebClient(ProxyConfig proxyConfig = null)
         {
             HttpClientHandler clientHandler = CreateClientHandler(proxyConfig);
@@ -70,13 +72,26 @@ namespace SpotifyAPI.Web
         public Tuple<ResponseInfo, T> DownloadJson<T>(string url, Dictionary<string, string> headers = null)
         {
             Tuple<ResponseInfo, string> response = Download(url, headers);
-            return new Tuple<ResponseInfo, T>(response.Item1, JsonConvert.DeserializeObject<T>(response.Item2, JsonSettings));
+            try
+            {
+                return new Tuple<ResponseInfo, T>(response.Item1, JsonConvert.DeserializeObject<T>(response.Item2, JsonSettings));
+            }
+            catch (JsonException)
+            {
+                return new Tuple<ResponseInfo, T>(response.Item1, JsonConvert.DeserializeObject<T>(UnknownErrorJson, JsonSettings));
+            }
         }
 
         public async Task<Tuple<ResponseInfo, T>> DownloadJsonAsync<T>(string url, Dictionary<string, string> headers = null)
         {
-            Tuple<ResponseInfo, string> response = await DownloadAsync(url, headers).ConfigureAwait(false);
-            return new Tuple<ResponseInfo, T>(response.Item1, JsonConvert.DeserializeObject<T>(response.Item2, JsonSettings));
+            Tuple<ResponseInfo, string> response = await DownloadAsync(url, headers).ConfigureAwait(false);try
+            {
+                return new Tuple<ResponseInfo, T>(response.Item1, JsonConvert.DeserializeObject<T>(response.Item2, JsonSettings));
+            }
+            catch (JsonException)
+            {
+                return new Tuple<ResponseInfo, T>(response.Item1, JsonConvert.DeserializeObject<T>(UnknownErrorJson, JsonSettings));
+            }
         }
 
         public Tuple<ResponseInfo, string> Upload(string url, string body, string method, Dictionary<string, string> headers = null)
@@ -136,13 +151,27 @@ namespace SpotifyAPI.Web
         public Tuple<ResponseInfo, T> UploadJson<T>(string url, string body, string method, Dictionary<string, string> headers = null)
         {
             Tuple<ResponseInfo, string> response = Upload(url, body, method, headers);
-            return new Tuple<ResponseInfo, T>(response.Item1, JsonConvert.DeserializeObject<T>(response.Item2, JsonSettings));
+            try
+            {
+                return new Tuple<ResponseInfo, T>(response.Item1, JsonConvert.DeserializeObject<T>(response.Item2, JsonSettings));
+            }
+            catch (JsonException)
+            {
+                return new Tuple<ResponseInfo, T>(response.Item1, JsonConvert.DeserializeObject<T>(UnknownErrorJson, JsonSettings));
+            }
         }
 
         public async Task<Tuple<ResponseInfo, T>> UploadJsonAsync<T>(string url, string body, string method, Dictionary<string, string> headers = null)
         {
             Tuple<ResponseInfo, string> response = await UploadAsync(url, body, method, headers).ConfigureAwait(false);
-            return new Tuple<ResponseInfo, T>(response.Item1, JsonConvert.DeserializeObject<T>(response.Item2, JsonSettings));
+            try
+            {
+                return new Tuple<ResponseInfo, T>(response.Item1, JsonConvert.DeserializeObject<T>(response.Item2, JsonSettings));
+            }
+            catch (JsonException)
+            {
+                return new Tuple<ResponseInfo, T>(response.Item1, JsonConvert.DeserializeObject<T>(UnknownErrorJson, JsonSettings));
+            }
         }
 
         public void Dispose()