Update error handling by accepting 403 and 404

qimingyuan · qimingyuan · commit 9cb43c22cc29 · 2015-09-09T13:32:20.000-07:00
diff --git a/Dropbox.Api/ApiException.cs b/Dropbox.Api/ApiException.cs
@@ -1,4 +1,4 @@
-﻿//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 // <copyright file="ApiException.cs" company="Dropbox Inc">
 //  Copyright (c) Dropbox Inc. All rights reserved.
 // </copyright>
@@ -88,7 +88,7 @@ ApiException<TError> IEncodable<ApiException<TError>>.Decode(IDecoder decoder)
         {
             using (var obj = decoder.GetObject())
             {
-                this.ErrorResponse = obj.GetFieldObject<TError>("reason");
+                this.ErrorResponse = obj.GetFieldObject<TError>("error");
             }
 
             return this;
diff --git a/Dropbox.Api/DropboxClient.common.cs b/Dropbox.Api/DropboxClient.common.cs
@@ -447,7 +447,9 @@ private async Task<Result> RequestJsonString(
                 {
                     throw new RetryException(429, uri: uri, isRateLimit: true);
                 }
-                else if (response.StatusCode == HttpStatusCode.Conflict)
+                else if (response.StatusCode == HttpStatusCode.Conflict ||
+                    response.StatusCode == HttpStatusCode.Forbidden ||
+                    response.StatusCode == HttpStatusCode.NotFound)
                 {
                     var reason = await response.Content.ReadAsStringAsync();
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//-----------------------------------------------------------------------------`
	`1`	`+//-----------------------------------------------------------------------------`
`2`	`2`	`// <copyright file="ApiException.cs" company="Dropbox Inc">`
`3`	`3`	`// Copyright (c) Dropbox Inc. All rights reserved.`
`4`	`4`	`// </copyright>`
`@@ -88,7 +88,7 @@ ApiException<TError> IEncodable<ApiException<TError>>.Decode(IDecoder decoder)`
`88`	`88`	`{`
`89`	`89`	`using (var obj = decoder.GetObject())`
`90`	`90`	`{`
`91`		`- this.ErrorResponse = obj.GetFieldObject<TError>("reason");`
	`91`	`+ this.ErrorResponse = obj.GetFieldObject<TError>("error");`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`return this;`
Original file line number	Diff line number	Diff line change
`@@ -447,7 +447,9 @@ private async Task<Result> RequestJsonString(`
`447`	`447`	`{`
`448`	`448`	`throw new RetryException(429, uri: uri, isRateLimit: true);`
`449`	`449`	`}`
`450`		`- else if (response.StatusCode == HttpStatusCode.Conflict)`
	`450`	`+ else if (response.StatusCode == HttpStatusCode.Conflict \|\|`
	`451`	`+ response.StatusCode == HttpStatusCode.Forbidden \|\|`
	`452`	`+ response.StatusCode == HttpStatusCode.NotFound)`
`451`	`453`	`{`
`452`	`454`	`var reason = await response.Content.ReadAsStringAsync();`
`453`	`455`