Merge branch 'master' into f/org_id

Author: MJMortimer

Xero.Api/Infrastructure/OAuth/OAuthTokens.cs

@@ -77,7 +77,12 @@ public IToken GetToken(string baseUri, IToken consumer, string endPoint, string
 
             if (response.StatusCode != HttpStatusCode.OK)
             {
-                throw new OAuthException(response.Body);
+                if (response.Body.Contains("oauth_problem"))
+                {
+                    throw new OAuthException(response.Body);
+                }
+
+                throw new UnexpectedOauthResponseException(response.StatusCode, response.Body);
             }
 
             var qs = HttpUtility.ParseQueryString(response.Body);

Xero.Api/Infrastructure/OAuth/UnexpectedOauthResponseException.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Net;
+
+namespace Xero.Api.Infrastructure.OAuth
+{
+    public class UnexpectedOauthResponseException : Exception
+    {
+        public HttpStatusCode ResponseStatusCode { get; set; }
+        public string ResponseBody { get; set; }
+
+        public UnexpectedOauthResponseException(HttpStatusCode responseStatusCode, string responseBody) : base("An unexpected HTTP response was returned while performing OAuth operations")
+        {
+            ResponseStatusCode = responseStatusCode;
+            ResponseBody = responseBody;
+        }
+    }
+}

Xero.Api/Xero.Api.csproj

@@ -249,6 +249,7 @@
     <Compile Include="Infrastructure\Interfaces\ITokenStore.cs" />
     <Compile Include="Infrastructure\Exceptions\XeroApiException.cs" />
     <Compile Include="Core\Endpoints\BrandingThemesEndpoint.cs" />
+    <Compile Include="Infrastructure\OAuth\UnexpectedOauthResponseException.cs" />
     <Compile Include="Infrastructure\RateLimiter\IRateLimiter.cs" />
     <Compile Include="Infrastructure\RateLimiter\RateLimiter.cs" />
     <Compile Include="Infrastructure\ThirdParty\HttpUtility\UrlEncoder.cs" />