diff --git a/GanjooRazor/Areas/User/Pages/LanguageEdit.cshtml.cs b/GanjooRazor/Areas/User/Pages/LanguageEdit.cshtml.cs index 8bb409b7..824e897a 100644 --- a/GanjooRazor/Areas/User/Pages/LanguageEdit.cshtml.cs +++ b/GanjooRazor/Areas/User/Pages/LanguageEdit.cshtml.cs @@ -38,7 +38,6 @@ namespace GanjooRazor.Areas.User.Pages LastMessage = JsonConvert.DeserializeObject(await response.Content.ReadAsStringAsync()); return Page(); } - response.EnsureSuccessStatusCode(); Language = JsonConvert.DeserializeObject(await response.Content.ReadAsStringAsync()); @@ -65,8 +64,6 @@ namespace GanjooRazor.Areas.User.Pages return Page(); } - response.EnsureSuccessStatusCode(); - return Redirect("/User/Languages"); } } diff --git a/GanjooRazor/Areas/User/Pages/Languages.cshtml.cs b/GanjooRazor/Areas/User/Pages/Languages.cshtml.cs index e3cac17e..8def47e4 100644 --- a/GanjooRazor/Areas/User/Pages/Languages.cshtml.cs +++ b/GanjooRazor/Areas/User/Pages/Languages.cshtml.cs @@ -40,7 +40,6 @@ namespace GanjooRazor.Areas.User.Pages LastMessage = JsonConvert.DeserializeObject(await response.Content.ReadAsStringAsync()); return Page(); } - response.EnsureSuccessStatusCode(); Languages = JsonConvert.DeserializeObject(await response.Content.ReadAsStringAsync()); @@ -90,7 +89,10 @@ namespace GanjooRazor.Areas.User.Pages if (await GanjoorSessionChecker.PrepareClient(secureClient, Request, Response)) { var response = await secureClient.DeleteAsync($"{APIRoot.Url}/api/translations/languages/{id}"); - response.EnsureSuccessStatusCode(); + if (!response.IsSuccessStatusCode) + { + return BadRequest(JsonConvert.DeserializeObject(await response.Content.ReadAsStringAsync())); + } return new OkObjectResult(true); } } diff --git a/GanjooRazor/Areas/User/Pages/MyBookmarks.cshtml.cs b/GanjooRazor/Areas/User/Pages/MyBookmarks.cshtml.cs index 9a7c36b4..9b14787b 100644 --- a/GanjooRazor/Areas/User/Pages/MyBookmarks.cshtml.cs +++ b/GanjooRazor/Areas/User/Pages/MyBookmarks.cshtml.cs @@ -49,8 +49,7 @@ namespace GanjooRazor.Areas.User.Pages LastError = JsonConvert.DeserializeObject(await response.Content.ReadAsStringAsync()); return Page(); } - response.EnsureSuccessStatusCode(); - + Bookmarks = JArray.Parse(await response.Content.ReadAsStringAsync()).ToObject>(); string paginnationMetadata = response.Headers.GetValues("paging-headers").FirstOrDefault(); diff --git a/GanjooRazor/Areas/User/Pages/MyComments.cshtml.cs b/GanjooRazor/Areas/User/Pages/MyComments.cshtml.cs index 43e100a5..86b9bc22 100644 --- a/GanjooRazor/Areas/User/Pages/MyComments.cshtml.cs +++ b/GanjooRazor/Areas/User/Pages/MyComments.cshtml.cs @@ -89,7 +89,6 @@ namespace GanjooRazor.Areas.User.Pages LastError = JsonConvert.DeserializeObject(await response.Content.ReadAsStringAsync()); return Page(); } - response.EnsureSuccessStatusCode(); Comments = JArray.Parse(await response.Content.ReadAsStringAsync()).ToObject>(); diff --git a/GanjooRazor/Areas/User/Pages/Notifications.cshtml.cs b/GanjooRazor/Areas/User/Pages/Notifications.cshtml.cs index 97f1921d..63aed656 100644 --- a/GanjooRazor/Areas/User/Pages/Notifications.cshtml.cs +++ b/GanjooRazor/Areas/User/Pages/Notifications.cshtml.cs @@ -52,7 +52,6 @@ namespace GanjooRazor.Areas.User.Pages LastError = JsonConvert.DeserializeObject(await response.Content.ReadAsStringAsync()); return Page(); } - response.EnsureSuccessStatusCode(); Notifications = JArray.Parse(await response.Content.ReadAsStringAsync()).ToObject>(); diff --git a/GanjooRazor/Areas/User/Pages/PoemCorrectionsHistory.cshtml.cs b/GanjooRazor/Areas/User/Pages/PoemCorrectionsHistory.cshtml.cs index 0e520f64..9ee49350 100644 --- a/GanjooRazor/Areas/User/Pages/PoemCorrectionsHistory.cshtml.cs +++ b/GanjooRazor/Areas/User/Pages/PoemCorrectionsHistory.cshtml.cs @@ -53,7 +53,6 @@ namespace GanjooRazor.Areas.User.Pages LastError = JsonConvert.DeserializeObject(await response.Content.ReadAsStringAsync()); return Page(); } - response.EnsureSuccessStatusCode(); Corrections = JArray.Parse(await response.Content.ReadAsStringAsync()).ToObject>(); diff --git a/GanjooRazor/Areas/User/Pages/ReportedComments.cshtml.cs b/GanjooRazor/Areas/User/Pages/ReportedComments.cshtml.cs index f90e93bc..d2db33b7 100644 --- a/GanjooRazor/Areas/User/Pages/ReportedComments.cshtml.cs +++ b/GanjooRazor/Areas/User/Pages/ReportedComments.cshtml.cs @@ -61,7 +61,6 @@ namespace GanjooRazor.Areas.User.Pages LastError = JsonConvert.DeserializeObject(await response.Content.ReadAsStringAsync()); return Page(); } - response.EnsureSuccessStatusCode(); Reports = JArray.Parse(await response.Content.ReadAsStringAsync()).ToObject>(); diff --git a/GanjooRazor/Areas/User/Pages/ReviewSongs.cshtml.cs b/GanjooRazor/Areas/User/Pages/ReviewSongs.cshtml.cs index ff4e9f6c..dd6b061a 100644 --- a/GanjooRazor/Areas/User/Pages/ReviewSongs.cshtml.cs +++ b/GanjooRazor/Areas/User/Pages/ReviewSongs.cshtml.cs @@ -176,7 +176,10 @@ namespace GanjooRazor.Areas.User.Pages if (await GanjoorSessionChecker.PrepareClient(secureClient, Request, Response)) { HttpResponseMessage response = await secureClient.PutAsync($"{APIRoot.Url}/api/ganjoor/rebuild/mundex", null); - response.EnsureSuccessStatusCode(); + if (!response.IsSuccessStatusCode) + { + return BadRequest(JsonConvert.DeserializeObject(await response.Content.ReadAsStringAsync())); + } return new OkObjectResult(true); } } @@ -190,10 +193,16 @@ namespace GanjooRazor.Areas.User.Pages if (await GanjoorSessionChecker.PrepareClient(secureClient, Request, Response)) { HttpResponseMessage response = await secureClient.DeleteAsync($"{APIRoot.Url}/api/ganjoor/page/cache/64899");// =>/mundex - response.EnsureSuccessStatusCode(); + if (!response.IsSuccessStatusCode) + { + return BadRequest(JsonConvert.DeserializeObject(await response.Content.ReadAsStringAsync())); + } response = await secureClient.DeleteAsync($"{APIRoot.Url}/api/ganjoor/page/cache/70833");// =>mundex/bypoet - response.EnsureSuccessStatusCode(); + if (!response.IsSuccessStatusCode) + { + return BadRequest(JsonConvert.DeserializeObject(await response.Content.ReadAsStringAsync())); + } return new OkObjectResult(true); } diff --git a/GanjooRazor/Areas/User/Pages/Translate.cshtml.cs b/GanjooRazor/Areas/User/Pages/Translate.cshtml.cs index a703fc78..1cb65a84 100644 --- a/GanjooRazor/Areas/User/Pages/Translate.cshtml.cs +++ b/GanjooRazor/Areas/User/Pages/Translate.cshtml.cs @@ -192,7 +192,6 @@ namespace GanjooRazor.Areas.User.Pages FatalError = JsonConvert.DeserializeObject(await responseLanguages.Content.ReadAsStringAsync()); return Page(); } - responseLanguages.EnsureSuccessStatusCode(); Languages = JsonConvert.DeserializeObject(await responseLanguages.Content.ReadAsStringAsync()); @@ -210,11 +209,19 @@ namespace GanjooRazor.Areas.User.Pages var pageUrlResponse = await secureClient.GetAsync($"{APIRoot.Url}/api/ganjoor/pageurl?id={poemId}"); - pageUrlResponse.EnsureSuccessStatusCode(); + if (!pageUrlResponse.IsSuccessStatusCode) + { + FatalError = JsonConvert.DeserializeObject(await pageUrlResponse.Content.ReadAsStringAsync()); + return Page(); + } var pageUrl = JsonConvert.DeserializeObject(await pageUrlResponse.Content.ReadAsStringAsync()); var pageQuery = await secureClient.GetAsync($"{APIRoot.Url}/api/ganjoor/page?url={pageUrl}"); - pageQuery.EnsureSuccessStatusCode(); + if (!pageQuery.IsSuccessStatusCode) + { + FatalError = JsonConvert.DeserializeObject(await pageQuery.Content.ReadAsStringAsync()); + return Page(); + } PageInformation = JObject.Parse(await pageQuery.Content.ReadAsStringAsync()).ToObject(); if(Translation == null)