Handling HTTP exceptions

Author: acoumb

src/Umbraco.Cms.Integrations.Crm.Dynamics/Controllers/FormsController.cs

@@ -96,20 +96,24 @@ public async Task<string> GetAccessToken([FromBody] OAuthRequestDto authRequestD
                 { "code", authRequestDto.Code }
             };
 
-            var requestMessage = new HttpRequestMessage
+            string responseContent = string.Empty;
+            try
             {
-                Method = HttpMethod.Post,
-                RequestUri = new Uri(string.Format(AuthorizationService.OAuthProxyTokenEndpoint, AuthorizationService.OAuthProxyBaseUrl)),
-                Content = new FormUrlEncodedContent(data)
-            };
-            requestMessage.Headers.Add("service_name", AuthorizationService.Service);
+                var requestMessage = new HttpRequestMessage
+                {
+                    Method = HttpMethod.Post,
+                    RequestUri = new Uri(string.Format(AuthorizationService.OAuthProxyTokenEndpoint, AuthorizationService.OAuthProxyBaseUrl)),
+                    Content = new FormUrlEncodedContent(data)
+                };
+                requestMessage.Headers.Add("service_name", AuthorizationService.Service);
 
-            var response = await ClientFactory().SendAsync(requestMessage);
-            if (response.IsSuccessStatusCode)
-            {
-                var result = await response.Content.ReadAsStringAsync();
+                var response = await ClientFactory().SendAsync(requestMessage);
 
-                var tokenDto = JsonConvert.DeserializeObject<TokenDto>(result);
+                responseContent = await response.Content.ReadAsStringAsync();
+
+                response.EnsureSuccessStatusCode();
+
+                var tokenDto = JsonConvert.DeserializeObject<TokenDto>(responseContent);
 
                 var identity = await _dynamicsService.GetIdentity(tokenDto.AccessToken);
 
@@ -118,18 +122,25 @@ public async Task<string> GetAccessToken([FromBody] OAuthRequestDto authRequestD
                 else
                     return "Error: " + identity.Error.Message;
 
-                return result;
-            }
+                return responseContent;
 
-            if (response.StatusCode == HttpStatusCode.BadRequest)
+            }
+            catch (HttpRequestException ex) when (ex.Message.Contains(HttpStatusCode.BadRequest.ToString()))
             {
-                var errorResult = await response.Content.ReadAsStringAsync();
-                var errorDto = JsonConvert.DeserializeObject<ErrorDto>(errorResult);
+                var errorDto = JsonConvert.DeserializeObject<ErrorDto>(responseContent);
 
                 return "Error: " + errorDto.ErrorDescription;
             }
+            catch (HttpRequestException ex) when (ex.Message.Contains(HttpStatusCode.Unauthorized.ToString()))
+            {
+                var errorDto = JsonConvert.DeserializeObject<ErrorDto>(responseContent);
 
-            return "Error: An unexpected error occurred.";
+                return "Error: " + errorDto.ErrorDescription;
+            }
+            catch
+            {
+                return "Error: An unexpected error occurred.";
+            }
         }
 
         [HttpGet]