diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/ScormController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/ScormController.cs index 6a8f7d69..06ea2d88 100644 --- a/LearningHub.Nhs.WebUI/Controllers/Api/ScormController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/Api/ScormController.cs @@ -163,7 +163,7 @@ private async Task Finish(SCO scoObject) try { // Check that SCO content is active - var activeContentList = this.userService.GetActiveContentAsync().Result; + var activeContentList = await this.userService.GetActiveContentAsync(); var activeContent = activeContentList.FirstOrDefault(ac => ac.ScormActivityId == scoObject.InstanceId); if (activeContent == null) @@ -229,7 +229,7 @@ private async Task Commit(SCO scoObject) { try { - var activeContent = this.userService.GetActiveContentAsync().Result; + var activeContent = await this.userService.GetActiveContentAsync(); if (!activeContent.Any(ac => ac.ScormActivityId == scoObject.InstanceId)) { throw new Exception($"User does not have ActiveContent for ScormActivityId={scoObject.InstanceId}"); diff --git a/LearningHub.Nhs.WebUI/Helpers/LearningHubApiFacade.cs b/LearningHub.Nhs.WebUI/Helpers/LearningHubApiFacade.cs index adeb102a..0243e3ca 100644 --- a/LearningHub.Nhs.WebUI/Helpers/LearningHubApiFacade.cs +++ b/LearningHub.Nhs.WebUI/Helpers/LearningHubApiFacade.cs @@ -44,7 +44,7 @@ public async Task GetAsync(string url) if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); vm = JsonConvert.DeserializeObject(result); return vm; @@ -112,7 +112,7 @@ public async Task PostAsync(string url, TBody body) if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); var apiResponse = JsonConvert.DeserializeObject(result); if (apiResponse.Success) { @@ -157,7 +157,7 @@ public async Task PutAsync(string url) if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); var apiResponse = JsonConvert.DeserializeObject(result); if (apiResponse.Success) { @@ -206,7 +206,7 @@ public async Task PutAsync(string url, T body) if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); var apiResponse = JsonConvert.DeserializeObject(result); if (apiResponse.Success) { diff --git a/LearningHub.Nhs.WebUI/Helpers/OpenApiFacade.cs b/LearningHub.Nhs.WebUI/Helpers/OpenApiFacade.cs index 32c529a0..43945360 100644 --- a/LearningHub.Nhs.WebUI/Helpers/OpenApiFacade.cs +++ b/LearningHub.Nhs.WebUI/Helpers/OpenApiFacade.cs @@ -44,7 +44,7 @@ public async Task GetAsync(string url) if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); vm = JsonConvert.DeserializeObject(result); return vm; @@ -112,7 +112,7 @@ public async Task PostAsync(string url, TBody body) if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); var apiResponse = JsonConvert.DeserializeObject(result); if (apiResponse.Success) { @@ -157,7 +157,7 @@ public async Task PutAsync(string url) if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); var apiResponse = JsonConvert.DeserializeObject(result); if (apiResponse.Success) { @@ -206,7 +206,7 @@ public async Task PutAsync(string url, T body) if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); var apiResponse = JsonConvert.DeserializeObject(result); if (apiResponse.Success) { diff --git a/LearningHub.Nhs.WebUI/Services/ActivityService.cs b/LearningHub.Nhs.WebUI/Services/ActivityService.cs index 185dc3a2..09a9181d 100644 --- a/LearningHub.Nhs.WebUI/Services/ActivityService.cs +++ b/LearningHub.Nhs.WebUI/Services/ActivityService.cs @@ -47,7 +47,7 @@ public async Task CreateAssessmentResourceActivityA if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) @@ -82,7 +82,7 @@ public async Task CreateAssessmentResourceActivityInteracti if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewModel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || response.StatusCode == System.Net.HttpStatusCode.Forbidden) @@ -112,7 +112,7 @@ public async Task CreateMediaResourceActivityAsync( if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) @@ -147,7 +147,7 @@ public async Task CreateMediaResourceActivityIntera if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) @@ -182,7 +182,7 @@ public async Task CreateResourceActivityAsync(Creat if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) @@ -215,7 +215,7 @@ public async Task LaunchScormActivityAsync(LaunchScormAc if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); return JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || response.StatusCode == System.Net.HttpStatusCode.Forbidden) @@ -245,7 +245,7 @@ public async Task UpdateScormActivityAsync(ScormAc if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); updateResponse = JsonConvert.DeserializeObject(result); if (!updateResponse.IsValid) @@ -279,7 +279,7 @@ public async Task CompleteScormActivity(ScormActivi LearningHubValidationResult validationResult; if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); validationResult = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || response.StatusCode == System.Net.HttpStatusCode.Forbidden) @@ -330,7 +330,7 @@ public async Task CheckSuspendDataToBeCleared(int lastScormActivityId, int if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); return JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || response.StatusCode == System.Net.HttpStatusCode.Forbidden) diff --git a/LearningHub.Nhs.WebUI/Services/BoomarkService.cs b/LearningHub.Nhs.WebUI/Services/BoomarkService.cs index 15d5509f..4a8815bb 100644 --- a/LearningHub.Nhs.WebUI/Services/BoomarkService.cs +++ b/LearningHub.Nhs.WebUI/Services/BoomarkService.cs @@ -47,7 +47,7 @@ public async Task Create(UserBookmarkViewModel bookmarkViewModel) var bookmarkId = bookmarkViewModel.Id; if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); bookmarkId = Convert.ToInt32(result); } @@ -75,7 +75,7 @@ public async Task Edit(UserBookmarkViewModel bookmarkViewModel) var bookmarkId = bookmarkViewModel.Id; if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); bookmarkId = Convert.ToInt32(result); } @@ -111,7 +111,7 @@ public async Task> GetAllByParent(int? parent if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); return JsonConvert.DeserializeObject>(result); } @@ -139,7 +139,7 @@ public async Task Toggle(UserBookmarkViewModel bookmarkViewModel) var bookmarkId = bookmarkViewModel.Id; if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); bookmarkId = Convert.ToInt32(result); } diff --git a/LearningHub.Nhs.WebUI/Services/CardService.cs b/LearningHub.Nhs.WebUI/Services/CardService.cs index d3aac061..2bc5414a 100644 --- a/LearningHub.Nhs.WebUI/Services/CardService.cs +++ b/LearningHub.Nhs.WebUI/Services/CardService.cs @@ -42,7 +42,7 @@ public async Task GetMyContributionsTotalsAsync( if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); totals = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -74,7 +74,7 @@ public async Task> GetContributionsAsync( if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); myContributionCards = JsonConvert.DeserializeObject>(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -102,7 +102,7 @@ public async Task GetMyResourceViewModelAsync() if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); myresourcecards = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -131,7 +131,7 @@ public async Task GetResourceCardExtendedViewMode if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); resourceCardExtendedViewModel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized diff --git a/LearningHub.Nhs.WebUI/Services/CatalogueService.cs b/LearningHub.Nhs.WebUI/Services/CatalogueService.cs index 3833a4e2..32d8441d 100644 --- a/LearningHub.Nhs.WebUI/Services/CatalogueService.cs +++ b/LearningHub.Nhs.WebUI/Services/CatalogueService.cs @@ -49,7 +49,7 @@ public async Task> GetCataloguesForUserAsync() if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject>(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -78,7 +78,7 @@ public async Task GetCatalogueAsync(string reference) if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || @@ -106,7 +106,7 @@ public async Task GetCatalogueAsync(int catalogueNodeVersion if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || @@ -134,7 +134,7 @@ public async Task GetCatalogueRecordedAsync(string reference if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || @@ -165,7 +165,7 @@ public async Task GetResourcesAsync(Catalogu if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || @@ -352,7 +352,7 @@ public async Task> GetRestricted if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewModel = JsonConvert.DeserializeObject>(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -385,7 +385,7 @@ public async Task GetRestrictedCatalogueSum if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || @@ -420,7 +420,7 @@ public async Task GetRestrictedCatalogueUsers if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewModel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -579,7 +579,7 @@ public async Task RemoveUserFromRestrictedAccessUse ApiResponse apiResponse = null; if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) @@ -593,7 +593,7 @@ public async Task RemoveUserFromRestrictedAccessUse } else if (response.StatusCode == System.Net.HttpStatusCode.BadRequest) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); apiResponse = JsonConvert.DeserializeObject(result); if (apiResponse.ValidationResult == null) { @@ -619,7 +619,7 @@ public async Task GetAllCatalogueAsync(string fil if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || diff --git a/LearningHub.Nhs.WebUI/Services/ContentService.cs b/LearningHub.Nhs.WebUI/Services/ContentService.cs index b6d1f929..01fbb4aa 100644 --- a/LearningHub.Nhs.WebUI/Services/ContentService.cs +++ b/LearningHub.Nhs.WebUI/Services/ContentService.cs @@ -43,7 +43,7 @@ public async Task GetPageByIdAsync(int id, bool preview) if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -70,7 +70,7 @@ public async Task GetPageSectionDetailVideoAssetById if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject(result); if (viewmodel?.VideoAsset?.AzureMediaAssetId > 0) { diff --git a/LearningHub.Nhs.WebUI/Services/ContributeService.cs b/LearningHub.Nhs.WebUI/Services/ContributeService.cs index 68a2b4cf..bffe55dd 100644 --- a/LearningHub.Nhs.WebUI/Services/ContributeService.cs +++ b/LearningHub.Nhs.WebUI/Services/ContributeService.cs @@ -70,7 +70,7 @@ public async Task CreateNewResourceVersionAsync(int if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) @@ -104,7 +104,7 @@ public async Task CreateResourceAuthorAsync(ResourceAuthorViewModel resourc if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) @@ -138,7 +138,7 @@ public async Task CreateResourceKeywordAsync(ResourceKeywordViewModel resou if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) @@ -171,7 +171,7 @@ public async Task DeleteArticleFileAsync(FileDeleteRequestModel model) if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); ApiResponse apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) @@ -201,7 +201,7 @@ public async Task DeleteFileChunkDetailAsync(int fileChunkDetailId) if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); ApiResponse apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) @@ -232,7 +232,7 @@ public async Task DeleteResourceAttributeFileAsync(FileDeleteRequestModel if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); ApiResponse apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) @@ -265,7 +265,7 @@ public async Task DeleteResourceAuthorAsync(AuthorDeleteRequestModel model if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); ApiResponse apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) @@ -298,7 +298,7 @@ public async Task DeleteResourceKeywordAsync(KeywordDeleteRequestModel mod if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); ApiResponse apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) @@ -328,7 +328,7 @@ public async Task DeleteResourceVersionAsync(int re if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); ApiResponse apiResponse = JsonConvert.DeserializeObject(result); if (apiResponse.ValidationResult == null) @@ -364,7 +364,7 @@ public async Task GetFileChunkDetail(int fileChunkDeta if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -807,7 +807,7 @@ public async Task SaveArticleAttachedFileDetailsAsync(FileCreateRequestView if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) @@ -841,7 +841,7 @@ public async Task SaveArticleDetailAsync(ArticleUpdateRequestViewModel arti if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) @@ -875,7 +875,7 @@ public async Task SaveFileChunkDetailsAsync(FileChunkDetailViewModel fileCh if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) @@ -909,7 +909,7 @@ public async Task SaveFileDetailsAsync(FileCreateRequestViewModel fileCreat if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) @@ -943,7 +943,7 @@ public async Task SaveGenericFileDetailAsync(GenericFileUpdateRequestViewMo if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) @@ -977,7 +977,7 @@ public async Task SaveScormDetailAsync(ScormUpdateRequestViewModel scormUpd if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) @@ -1011,7 +1011,7 @@ public async Task SaveHtmlDetailAsync(HtmlResourceUpdateRequestViewModel ht if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) @@ -1045,7 +1045,7 @@ public async Task SaveImageDetailAsync(ImageUpdateRequestViewModel imageVie if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) @@ -1079,7 +1079,7 @@ public async Task SaveResourceAttributeFileDetailsAsync(FileCreateRequestVi if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) @@ -1136,7 +1136,7 @@ public async Task SaveWeblinkDetailAsync(WebLinkViewModel weblinkViewModel) if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) @@ -1170,7 +1170,7 @@ public async Task SaveCaseDetailAsync(CaseViewModel caseViewModel) if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) @@ -1204,7 +1204,7 @@ public async Task SaveAssessmentDetailAsync(AssessmentViewModel assessmentV if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) @@ -1238,7 +1238,7 @@ public async Task SubmitResourceVersionForPublishAs if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) @@ -1343,7 +1343,7 @@ private async Task CreateResourceAsync(ResourceDetailViewModel resourceDeta if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) @@ -1376,7 +1376,7 @@ private async Task UpdateResourceVersionAsync(ResourceDetailViewModel resourceDe if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); ApiResponse apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) diff --git a/LearningHub.Nhs.WebUI/Services/CountryService.cs b/LearningHub.Nhs.WebUI/Services/CountryService.cs index e1afd4b3..d9edc837 100644 --- a/LearningHub.Nhs.WebUI/Services/CountryService.cs +++ b/LearningHub.Nhs.WebUI/Services/CountryService.cs @@ -49,7 +49,7 @@ public async Task GetByIdAsync(int id) if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -78,7 +78,7 @@ public async Task> GetFilteredAsync(string filter) if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject>(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -106,7 +106,7 @@ public async Task> GetAllAsync() if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject>(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized diff --git a/LearningHub.Nhs.WebUI/Services/DashboardService.cs b/LearningHub.Nhs.WebUI/Services/DashboardService.cs index 607d4f2b..3d7978e7 100644 --- a/LearningHub.Nhs.WebUI/Services/DashboardService.cs +++ b/LearningHub.Nhs.WebUI/Services/DashboardService.cs @@ -52,7 +52,7 @@ public async Task GetMyAccessLearningsAsyn if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || @@ -81,7 +81,7 @@ public async Task GetCataloguesAsync(string if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || @@ -110,7 +110,7 @@ public async Task GetResourcesAsync(string d if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || diff --git a/LearningHub.Nhs.WebUI/Services/GradeService.cs b/LearningHub.Nhs.WebUI/Services/GradeService.cs index 37df9b04..0099508f 100644 --- a/LearningHub.Nhs.WebUI/Services/GradeService.cs +++ b/LearningHub.Nhs.WebUI/Services/GradeService.cs @@ -48,7 +48,7 @@ public async Task> GetGradesForJobRoleAsync(int jobRo if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject>(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -78,7 +78,7 @@ public async Task>> GetPagedGradesForJobRo if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject>>(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized diff --git a/LearningHub.Nhs.WebUI/Services/InternalSystemService.cs b/LearningHub.Nhs.WebUI/Services/InternalSystemService.cs index bb19a0f3..bbb3c88f 100644 --- a/LearningHub.Nhs.WebUI/Services/InternalSystemService.cs +++ b/LearningHub.Nhs.WebUI/Services/InternalSystemService.cs @@ -39,7 +39,7 @@ public async Task GetByIdAsync(int id) if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); internalSystemViewModel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized diff --git a/LearningHub.Nhs.WebUI/Services/JobRoleService.cs b/LearningHub.Nhs.WebUI/Services/JobRoleService.cs index 766d05e6..50424c73 100644 --- a/LearningHub.Nhs.WebUI/Services/JobRoleService.cs +++ b/LearningHub.Nhs.WebUI/Services/JobRoleService.cs @@ -51,7 +51,7 @@ public async Task GetByIdAsync(int id) if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -80,7 +80,7 @@ public async Task> GetFilteredAsync(string filter) if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject>(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -111,7 +111,7 @@ public async Task>> GetPagedFilteredAsync if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject>>(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -157,7 +157,7 @@ public async Task ValidateMedicalCouncilNumber(string lastName, int medi if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized diff --git a/LearningHub.Nhs.WebUI/Services/LocationService.cs b/LearningHub.Nhs.WebUI/Services/LocationService.cs index 04423a0b..1392df17 100644 --- a/LearningHub.Nhs.WebUI/Services/LocationService.cs +++ b/LearningHub.Nhs.WebUI/Services/LocationService.cs @@ -48,7 +48,7 @@ public async Task GetByIdAsync(int id) if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -77,7 +77,7 @@ public async Task> GetFilteredAsync(string criteria if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject>(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -108,7 +108,7 @@ public async Task>> GetPagedFilteredAsyn if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject>>(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized diff --git a/LearningHub.Nhs.WebUI/Services/LoginWizardService.cs b/LearningHub.Nhs.WebUI/Services/LoginWizardService.cs index 06fd7e42..f67eb72c 100644 --- a/LearningHub.Nhs.WebUI/Services/LoginWizardService.cs +++ b/LearningHub.Nhs.WebUI/Services/LoginWizardService.cs @@ -82,7 +82,7 @@ public async Task GetLoginWizard(int userId) if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); loginWizardStages = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -110,7 +110,7 @@ public async Task> GetSecurityQuestions() if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); securityQuestions = JsonConvert.DeserializeObject>(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -139,7 +139,7 @@ public async Task GetSecurityQuestionsModel(int user if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); model = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -173,7 +173,7 @@ public async Task SaveLoginWizardStageActivity(LoginWizardStageEnum loginWizardS if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); ApiResponse apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) diff --git a/LearningHub.Nhs.WebUI/Services/MyLearningService.cs b/LearningHub.Nhs.WebUI/Services/MyLearningService.cs index 1e166220..b088fda2 100644 --- a/LearningHub.Nhs.WebUI/Services/MyLearningService.cs +++ b/LearningHub.Nhs.WebUI/Services/MyLearningService.cs @@ -46,7 +46,7 @@ public async Task GetActivityDetailed(MyLearningReq if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewModel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -75,7 +75,7 @@ public async Task> GetPlayedSegments(int resourceId if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewModel = JsonConvert.DeserializeObject>(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -106,7 +106,7 @@ public async Task> GetResourceCertif if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewModel = JsonConvert.DeserializeObject>(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized diff --git a/LearningHub.Nhs.WebUI/Services/NotificationService.cs b/LearningHub.Nhs.WebUI/Services/NotificationService.cs index e836edcd..58dd8c6e 100644 --- a/LearningHub.Nhs.WebUI/Services/NotificationService.cs +++ b/LearningHub.Nhs.WebUI/Services/NotificationService.cs @@ -45,7 +45,7 @@ public async Task Delete(int userNotificationId, int notificationId) NotificationId = notificationId, Dismissed = true, }); - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); var apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.ValidationResult.IsValid) { @@ -105,7 +105,7 @@ public async Task> GetPagedAsync(Pagin if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject>(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || response.StatusCode == System.Net.HttpStatusCode.Forbidden) @@ -132,7 +132,7 @@ public async Task GetUserNotificationIdAsync(int id) if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -161,7 +161,7 @@ public async Task GetUserNotificationDetailsAsync(int id) if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -190,7 +190,7 @@ public async Task GetUserUnreadNotificationCountAsync(int userid) if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); count = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -220,7 +220,7 @@ private async Task PutAsync(UserNotification notification) if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); ApiResponse apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) @@ -253,7 +253,7 @@ private async Task PostAsync(UserNotification notification) if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); var apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) diff --git a/LearningHub.Nhs.WebUI/Services/PartialFileUploadService.cs b/LearningHub.Nhs.WebUI/Services/PartialFileUploadService.cs index 5ef45d68..f1595cbd 100644 --- a/LearningHub.Nhs.WebUI/Services/PartialFileUploadService.cs +++ b/LearningHub.Nhs.WebUI/Services/PartialFileUploadService.cs @@ -154,7 +154,7 @@ public async Task CreatePartialFile(PartialFileViewModel r if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); PartialFileViewModel responseViewModel = JsonConvert.DeserializeObject(result); var blob = this.GetCloudAppendBlob(responseViewModel.FileId); @@ -322,7 +322,7 @@ private async Task GetPartialFile(int fileId) if (response.IsSuccessStatusCode) { - string result = response.Content.ReadAsStringAsync().Result; + string result = await response.Content.ReadAsStringAsync(); PartialFileViewModel responseViewModel = JsonConvert.DeserializeObject(result); return responseViewModel; } diff --git a/LearningHub.Nhs.WebUI/Services/ProviderService.cs b/LearningHub.Nhs.WebUI/Services/ProviderService.cs index ee6119c6..3b842d8e 100644 --- a/LearningHub.Nhs.WebUI/Services/ProviderService.cs +++ b/LearningHub.Nhs.WebUI/Services/ProviderService.cs @@ -55,7 +55,7 @@ public async Task> GetProvidersForUserAsync(int userId) if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject>(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -84,7 +84,7 @@ public async Task> GetProvidersForResourceAsync(int reso if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject>(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -119,7 +119,7 @@ private async Task> GetAllProviders() if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject>(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized diff --git a/LearningHub.Nhs.WebUI/Services/RatingService.cs b/LearningHub.Nhs.WebUI/Services/RatingService.cs index fa72f426..69d5a69a 100644 --- a/LearningHub.Nhs.WebUI/Services/RatingService.cs +++ b/LearningHub.Nhs.WebUI/Services/RatingService.cs @@ -45,7 +45,7 @@ public async Task CreateRatingAsync(RatingViewModel if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) @@ -81,7 +81,7 @@ public async Task GetRatingSummaryAsync(int entityVersio if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -113,7 +113,7 @@ public async Task UpdateRatingAsync(RatingViewModel if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) diff --git a/LearningHub.Nhs.WebUI/Services/RegionService.cs b/LearningHub.Nhs.WebUI/Services/RegionService.cs index f05fc22e..12fd8497 100644 --- a/LearningHub.Nhs.WebUI/Services/RegionService.cs +++ b/LearningHub.Nhs.WebUI/Services/RegionService.cs @@ -43,7 +43,7 @@ public async Task> GetAllAsync() if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject>(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -73,7 +73,7 @@ public async Task>> GetAllPagedAsync(int p if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject>>(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -102,7 +102,7 @@ public async Task GetByIdAsync(int id) if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized diff --git a/LearningHub.Nhs.WebUI/Services/ResourceService.cs b/LearningHub.Nhs.WebUI/Services/ResourceService.cs index ec8eaee3..01f15f1a 100644 --- a/LearningHub.Nhs.WebUI/Services/ResourceService.cs +++ b/LearningHub.Nhs.WebUI/Services/ResourceService.cs @@ -63,7 +63,7 @@ public async Task AcceptSensitiveContentAsync(int r if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) @@ -95,7 +95,7 @@ public async Task GetArticleDetailsByIdAsync(int resourceVersi if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -124,7 +124,7 @@ public async Task GetAudioDetailsByIdAsync(int resourceVersionId if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -153,7 +153,7 @@ public async Task GetByIdAsync(int id) if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -181,7 +181,7 @@ public async Task> GetFileTypeAsync() if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); fileTypeList = JsonConvert.DeserializeObject>(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -210,7 +210,7 @@ public async Task GetGenericFileDetailsByIdAsync(int resou if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -239,7 +239,7 @@ public async Task GetHtmlDetailsByIdAsync(int resourceVer if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -268,7 +268,7 @@ public async Task GetScormDetailsByIdAsync(int resourceVersionId if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || @@ -296,7 +296,7 @@ public async Task GetExternalContentDetailsAsyn if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || @@ -325,7 +325,7 @@ public async Task RecordExternalReferenceUserAgreementAsync(ExternalRefere if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); ApiResponse apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) @@ -357,7 +357,7 @@ public async Task GetImageDetailsByIdAsync(int resourceVersionId if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -386,7 +386,7 @@ public async Task GetInformationByIdAsync(int id) if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); resourceInfo = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -415,7 +415,7 @@ public async Task GetItemByIdAsync(int id) if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); resourceItem = JsonConvert.DeserializeObject(result); @@ -461,7 +461,7 @@ public async Task> GetLicencesAsync() if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); licences = JsonConvert.DeserializeObject>(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -490,7 +490,7 @@ public async Task GetLocationsByIdAsync(int id) if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); resourceLocations = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -519,7 +519,7 @@ public async Task GetResourceVersionAsync(int resourceV if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -548,7 +548,7 @@ public async Task GetResourceVersionViewModelAsync(int if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -577,7 +577,7 @@ public async Task GetResourceVersionExtendedAs if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -617,7 +617,7 @@ public async Task GetVideoDetailsByIdAsync(int resourceVersionId if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -656,7 +656,7 @@ public async Task GetWeblinkDetailsByIdAsync(int resourceVersi if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -685,7 +685,7 @@ public async Task GetCaseDetailsByIdAsync(int resourceVersionId) if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -714,7 +714,7 @@ public async Task GetAssessmentDetailsByIdAsync(int resourc if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -743,7 +743,7 @@ public async Task GetAssessmentContent(int resourceVersionI if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -772,7 +772,7 @@ public async Task GetAssessmentProgressByResourceVe if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -801,7 +801,7 @@ public async Task GetAssessmentProgressByActivity(i if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -831,7 +831,7 @@ public async Task> GetFileStatusDetailsAsync(int[] fileIds) if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject>(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -863,7 +863,7 @@ public async Task UnpublishResourceVersionAsync(int if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) @@ -892,7 +892,7 @@ public async Task UserHasPublishedResourcesAsync() bool hasResources = false; if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); hasResources = bool.Parse(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -924,7 +924,7 @@ public async Task DuplicateResourceAsync(DuplicateR if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) @@ -938,7 +938,7 @@ public async Task DuplicateResourceAsync(DuplicateR } else { - var err = response.Content.ReadAsStringAsync().Result; + var err = await response.Content.ReadAsStringAsync(); apiResponse = JsonConvert.DeserializeObject(err); string message = "ERROR:\r\n"; foreach (string detail in apiResponse.ValidationResult.Details) @@ -971,7 +971,7 @@ public async Task DuplicateBlocksAsync(DuplicateBlo if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) @@ -985,7 +985,7 @@ public async Task DuplicateBlocksAsync(DuplicateBlo } else { - var err = response.Content.ReadAsStringAsync().Result; + var err = await response.Content.ReadAsStringAsync(); apiResponse = JsonConvert.DeserializeObject(err); string message = "ERROR:\r\n"; foreach (string detail in apiResponse.ValidationResult.Details) @@ -1064,7 +1064,7 @@ public async Task GetResourceVersionVa if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -1093,7 +1093,7 @@ public async Task GetResourceVersionExtendedVi if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -1124,7 +1124,7 @@ public async Task RevertToDraft(int resourceVersion if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) @@ -1138,7 +1138,7 @@ public async Task RevertToDraft(int resourceVersion } else if (response.StatusCode == System.Net.HttpStatusCode.BadRequest) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); apiResponse = JsonConvert.DeserializeObject(result); if (apiResponse.ValidationResult == null) { @@ -1168,7 +1168,7 @@ public async Task CreateResourceVersionProviderAsyn if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) @@ -1182,7 +1182,7 @@ public async Task CreateResourceVersionProviderAsyn } else { - var err = response.Content.ReadAsStringAsync().Result; + var err = await response.Content.ReadAsStringAsync(); apiResponse = JsonConvert.DeserializeObject(err); string message = "ERROR:\r\n"; foreach (string detail in apiResponse.ValidationResult.Details) @@ -1214,7 +1214,7 @@ public async Task CreateResourceVersionValidationResultAsync(ResourceVersionVali if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) @@ -1246,7 +1246,7 @@ public async Task DeleteResourceVersionProviderAsyn ApiResponse apiResponse = null; if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) @@ -1260,7 +1260,7 @@ public async Task DeleteResourceVersionProviderAsyn } else if (response.StatusCode == System.Net.HttpStatusCode.BadRequest) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); apiResponse = JsonConvert.DeserializeObject(result); if (apiResponse.ValidationResult == null) { @@ -1286,7 +1286,7 @@ public async Task DeleteAllResourceVersionProviderA ApiResponse apiResponse = null; if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) @@ -1300,7 +1300,7 @@ public async Task DeleteAllResourceVersionProviderA } else if (response.StatusCode == System.Net.HttpStatusCode.BadRequest) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); apiResponse = JsonConvert.DeserializeObject(result); if (apiResponse.ValidationResult == null) { @@ -1328,7 +1328,7 @@ public async Task> GetObsoleteResourceFile(int resourceVersionId, b if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); filePaths = JsonConvert.DeserializeObject>(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized diff --git a/LearningHub.Nhs.WebUI/Services/SearchService.cs b/LearningHub.Nhs.WebUI/Services/SearchService.cs index 578a5861..e850868e 100644 --- a/LearningHub.Nhs.WebUI/Services/SearchService.cs +++ b/LearningHub.Nhs.WebUI/Services/SearchService.cs @@ -356,7 +356,7 @@ public async Task CreateResourceSearchActionAsync(SearchActionResourceModel if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); ApiResponse apiResponse = JsonConvert.DeserializeObject(result) as ApiResponse; if (!apiResponse.Success) @@ -399,7 +399,7 @@ public async Task CreateCatalogueSearchActionAsync(SearchActionCatalogueMod if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); ApiResponse apiResponse = JsonConvert.DeserializeObject(result) as ApiResponse; if (!apiResponse.Success) @@ -438,7 +438,7 @@ public async Task CreateSearchTermEventAsync(SearchRequestModel searchReque if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); ApiResponse apiResponse = JsonConvert.DeserializeObject(result) as ApiResponse; if (!apiResponse.Success) @@ -480,7 +480,7 @@ public async Task GetSearchResultAsync(SearchRequestModel searc if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); searchViewModel = JsonConvert.DeserializeObject(result); if (searchViewModel.DocumentModel != null @@ -518,7 +518,7 @@ public async Task SubmitFeedbackAsync(SearchFeedBackModel model) if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); ApiResponse apiResponse = JsonConvert.DeserializeObject(result) as ApiResponse; if (!apiResponse.Success) @@ -604,7 +604,7 @@ public async Task CreateCatalogueSearchTermEventAsync(CatalogueSearchReques if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); ApiResponse apiResponse = JsonConvert.DeserializeObject(result) as ApiResponse; if (!apiResponse.Success) @@ -688,7 +688,7 @@ public async Task GetAutoSuggestionList(string term) var viewModel = new AutoSuggestionModel(); if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewModel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || response.StatusCode == System.Net.HttpStatusCode.Forbidden) @@ -718,7 +718,7 @@ public async Task SendAutoSuggestionClickActionAsync(AutoSuggestionClickPayloadM if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); ApiResponse apiResponse = JsonConvert.DeserializeObject(result) as ApiResponse; if (!apiResponse.Success) diff --git a/LearningHub.Nhs.WebUI/Services/TermsAndConditionsService.cs b/LearningHub.Nhs.WebUI/Services/TermsAndConditionsService.cs index 6c722049..790ee124 100644 --- a/LearningHub.Nhs.WebUI/Services/TermsAndConditionsService.cs +++ b/LearningHub.Nhs.WebUI/Services/TermsAndConditionsService.cs @@ -60,7 +60,7 @@ public async Task AcceptByUser(int id, int currentUserId) if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); ApiResponse apiResponse = JsonConvert.DeserializeObject(result) as ApiResponse; if (!apiResponse.Success) @@ -96,7 +96,7 @@ public async Task LatestVersionAsync(int tenantId) if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized diff --git a/LearningHub.Nhs.WebUI/Services/UserGroupService.cs b/LearningHub.Nhs.WebUI/Services/UserGroupService.cs index 22729e5d..d0623da7 100644 --- a/LearningHub.Nhs.WebUI/Services/UserGroupService.cs +++ b/LearningHub.Nhs.WebUI/Services/UserGroupService.cs @@ -98,7 +98,7 @@ private async Task> FetchRoleUserGroupDetailAsync() if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject>(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized @@ -122,7 +122,7 @@ private async Task> FetchRoleUserGroupDetailForUser if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject>(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized diff --git a/LearningHub.Nhs.WebUI/Services/UserService.cs b/LearningHub.Nhs.WebUI/Services/UserService.cs index 04a2bf68..f8f34830 100644 --- a/LearningHub.Nhs.WebUI/Services/UserService.cs +++ b/LearningHub.Nhs.WebUI/Services/UserService.cs @@ -396,7 +396,7 @@ public async Task CreateUserProfileAsync(UserProfil if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) @@ -431,7 +431,7 @@ public async Task UpdateUserProfileAsync(UserProfil if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) @@ -588,7 +588,7 @@ public async Task GetTenantDescriptionByUserId(int userId) if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); model = JsonConvert.DeserializeObject(result); } @@ -657,7 +657,7 @@ public async Task GetUserEmploymentByIdAsync(int id) if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); model = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == HttpStatusCode.Unauthorized @@ -682,7 +682,7 @@ public async Task GetPrimaryUserEmploymentForUser(int u if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); model = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == HttpStatusCode.Unauthorized @@ -707,7 +707,7 @@ public async Task GetUserRoleName(int userId) if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); userRoleName = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == HttpStatusCode.Unauthorized @@ -1104,7 +1104,7 @@ public async Task UpdateUserAsync(UserUpdateViewMod if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) @@ -1139,7 +1139,7 @@ public async Task CreateUserAsync(UserCreateViewMod if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); apiResponse = JsonConvert.DeserializeObject(result); if (!apiResponse.Success) @@ -1742,7 +1742,7 @@ public async Task GetUserRoleUpgradeAsync(int userId) if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); model = JsonConvert.DeserializeObject(result); } else if (response.StatusCode == HttpStatusCode.Unauthorized @@ -1853,7 +1853,7 @@ public async Task> GetProvidersByUserIdAsync(int userId) if (response.IsSuccessStatusCode) { - var result = response.Content.ReadAsStringAsync().Result; + var result = await response.Content.ReadAsStringAsync(); viewmodel = JsonConvert.DeserializeObject>(result); } else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized