vaultwarden/Bitwarden-app-android-iphone-ios
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Show exception message from Api errors

Browse Source
This commit is contained in:
Kyle Spearrin 2019-11-15 08:55:22 -05:00
parent ac7e90c0aa
commit 55f160d125
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Core/Services/ApiService.cs
View File

@ -97,9 +97,9 @@ namespace Bit.Core.Services
{ {
response = await _httpClient.SendAsync(requestMessage); response = await _httpClient.SendAsync(requestMessage);
} }
catch catch (Exception e)
{ {
throw new ApiException(HandleWebError()); throw new ApiException(HandleWebError(e));
} }
JObject responseJObject = null; JObject responseJObject = null;
if(IsJsonResponse(response)) if(IsJsonResponse(response))
@ -318,9 +318,9 @@ namespace Bit.Core.Services
{ {
response = await _httpClient.SendAsync(requestMessage); response = await _httpClient.SendAsync(requestMessage);
} }
catch catch (Exception e)
{ {
throw new ApiException(HandleWebError()); throw new ApiException(HandleWebError(e));
} }
if(!response.IsSuccessStatusCode) if(!response.IsSuccessStatusCode)
{ {
@ -397,9 +397,9 @@ namespace Bit.Core.Services
{ {
response = await _httpClient.SendAsync(requestMessage); response = await _httpClient.SendAsync(requestMessage);
} }
catch catch (Exception e)
{ {
throw new ApiException(HandleWebError()); throw new ApiException(HandleWebError(e));
} }
if(hasResponse && response.IsSuccessStatusCode) if(hasResponse && response.IsSuccessStatusCode)
{ {
@ -443,9 +443,9 @@ namespace Bit.Core.Services
{ {
response = await _httpClient.SendAsync(requestMessage); response = await _httpClient.SendAsync(requestMessage);
} }
catch catch (Exception e)
{ {
throw new ApiException(HandleWebError()); throw new ApiException(HandleWebError(e));
} }
if(response.IsSuccessStatusCode) if(response.IsSuccessStatusCode)
{ {
@ -461,12 +461,12 @@ namespace Bit.Core.Services
} }
} }
private ErrorResponse HandleWebError() private ErrorResponse HandleWebError(Exception e)
{ {
return new ErrorResponse return new ErrorResponse
{ {
StatusCode = HttpStatusCode.BadGateway, StatusCode = HttpStatusCode.BadGateway,
Message = "There is a problem connecting to the server." Message = "Exception message: " + e.Message
}; };
} }