#7154 Renamed AccessDeniedDataTablesJson method to AccessDeniedJsonAsync

nopSolutions · May 17, 2024 · a60580d · a60580d
1 parent 6a4aab8
commit a60580d
Show file tree

Hide file tree

Showing 67 changed files with 300 additions and 300 deletions.
diff --git a/src/Plugins/Nop.Plugin.Misc.Zettle/Controllers/ZettleAdminController.cs b/src/Plugins/Nop.Plugin.Misc.Zettle/Controllers/ZettleAdminController.cs
@@ -338,7 +338,7 @@ public async Task<IActionResult> RevokeAccess()
     public async Task<IActionResult> SyncRecordList(SyncRecordSearchModel searchModel)
     {
         if (!await _permissionService.AuthorizeAsync(StandardPermissionProvider.ManagePlugins))
-            return await AccessDeniedDataTablesJson();
+            return await AccessDeniedJsonAsync();
 
         var records = await _zettleRecordService.GetAllRecordsAsync(productOnly: true,
             pageIndex: searchModel.Page - 1, pageSize: searchModel.PageSize);
@@ -367,7 +367,7 @@ public async Task<IActionResult> SyncRecordList(SyncRecordSearchModel searchMode
     public async Task<IActionResult> SyncRecordUpdate(SyncRecordModel model)
     {
         if (!await _permissionService.AuthorizeAsync(StandardPermissionProvider.ManagePlugins))
-            return await AccessDeniedDataTablesJson();
+            return await AccessDeniedJsonAsync();
 
         var productRecord = await _zettleRecordService.GetRecordByIdAsync(model.Id)
                             ?? throw new ArgumentException("No record found");
@@ -390,7 +390,7 @@ public async Task<IActionResult> SyncRecordUpdate(SyncRecordModel model)
     public async Task<IActionResult> SyncRecordDelete(ICollection<int> selectedIds)
     {
         if (!await _permissionService.AuthorizeAsync(StandardPermissionProvider.ManagePlugins))
-            return await AccessDeniedDataTablesJson();
+            return await AccessDeniedJsonAsync();
 
         if (!selectedIds?.Any() ?? true)
             return NoContent();
@@ -431,10 +431,10 @@ public async Task<IActionResult> ProductToSync()
     public async Task<IActionResult> ProductListToSync(AddProductToSyncSearchModel searchModel)
     {
         if (!await _permissionService.AuthorizeAsync(StandardPermissionProvider.ManagePlugins))
-            return await AccessDeniedDataTablesJson();
+            return await AccessDeniedJsonAsync();
 
         if (!await _permissionService.AuthorizeAsync(StandardPermissionProvider.ManageProducts))
-            return await AccessDeniedDataTablesJson();
+            return await AccessDeniedJsonAsync();
 
         var products = await _productService.SearchProductsAsync(showHidden: true,
             keywords: searchModel.SearchProductName,
@@ -487,7 +487,7 @@ public async Task<IActionResult> ProductToSync(AddProductToSyncModel model)
     public async Task<IActionResult> SyncStart()
     {
         if (!await _permissionService.AuthorizeAsync(StandardPermissionProvider.ManagePlugins))
-            return await AccessDeniedDataTablesJson();
+            return await AccessDeniedJsonAsync();
 
         await _zettleService.ImportAsync();
 
@@ -497,7 +497,7 @@ public async Task<IActionResult> SyncStart()
     public async Task<IActionResult> SyncUpdate()
     {
         if (!await _permissionService.AuthorizeAsync(StandardPermissionProvider.ManagePlugins))
-            return await AccessDeniedDataTablesJson();
+            return await AccessDeniedJsonAsync();
 
         if (string.IsNullOrEmpty(_zettleSettings.ImportId))
             return ErrorJson("Synchronization not found");

diff --git a/src/Plugins/Nop.Plugin.Misc.Zettle/plugin.json b/src/Plugins/Nop.Plugin.Misc.Zettle/plugin.json
@@ -2,7 +2,7 @@
   "Group": "Misc",
   "FriendlyName": "PayPal Zettle",
   "SystemName": "Misc.Zettle",
-  "Version": "4.70.7",
+  "Version": "4.70.8",
   "SupportedVersions": [ "4.70" ],
   "Author": "nopCommerce team",
   "DisplayOrder": 1,

diff --git a/...p.Plugin.MultiFactorAuth.GoogleAuthenticator/Controllers/GoogleAuthenticatorController.cs b/...p.Plugin.MultiFactorAuth.GoogleAuthenticator/Controllers/GoogleAuthenticatorController.cs
@@ -105,7 +105,7 @@ public async Task<IActionResult> Configure(ConfigurationModel model)
     public async Task<IActionResult> GoogleAuthenticatorList(GoogleAuthenticatorSearchModel searchModel)
     {
         if (!await _permissionService.AuthorizeAsync(StandardPermissionProvider.ManageMultifactorAuthenticationMethods))
-            return await AccessDeniedDataTablesJson();
+            return await AccessDeniedJsonAsync();
 
         //get GoogleAuthenticator configuration records
         var configurations = await _googleAuthenticatorService.GetPagedConfigurationsAsync(searchModel.SearchEmail,

diff --git a/src/Plugins/Nop.Plugin.MultiFactorAuth.GoogleAuthenticator/plugin.json b/src/Plugins/Nop.Plugin.MultiFactorAuth.GoogleAuthenticator/plugin.json
@@ -2,7 +2,7 @@
   "Group": "Multi-factor authentication",
   "FriendlyName": "Google Authenticator",
   "SystemName": "MultiFactorAuth.GoogleAuthenticator",
-  "Version": "4.70.4",
+  "Version": "4.70.5",
   "SupportedVersions": [ "4.70" ],
   "Author": "nopCommerce team",
   "DisplayOrder": 1,

diff --git a/src/Plugins/Nop.Plugin.Pickup.PickupInStore/Controllers/PickupInStoreController.cs b/src/Plugins/Nop.Plugin.Pickup.PickupInStore/Controllers/PickupInStoreController.cs
@@ -79,7 +79,7 @@ public async Task<IActionResult> Configure()
     public async Task<IActionResult> List(StorePickupPointSearchModel searchModel)
     {
         if (!await _permissionService.AuthorizeAsync(StandardPermissionProvider.ManageShippingSettings))
-            return await AccessDeniedDataTablesJson();
+            return await AccessDeniedJsonAsync();
 
         //prepare model
         var model = await _storePickupPointModelFactory.PrepareStorePickupPointListModelAsync(searchModel);
@@ -262,7 +262,7 @@ public async Task<IActionResult> Edit(StorePickupPointModel model)
     public async Task<IActionResult> Delete(int id)
     {
         if (!await _permissionService.AuthorizeAsync(StandardPermissionProvider.ManageShippingSettings))
-            return await AccessDeniedDataTablesJson();
+            return await AccessDeniedJsonAsync();
 
         var pickupPoint = await _storePickupPointService.GetStorePickupPointByIdAsync(id);
         if (pickupPoint == null)

diff --git a/src/Plugins/Nop.Plugin.Pickup.PickupInStore/plugin.json b/src/Plugins/Nop.Plugin.Pickup.PickupInStore/plugin.json
@@ -2,7 +2,7 @@
   "Group": "Pickup points",
   "FriendlyName": "Pickup in store",
   "SystemName": "Pickup.PickupInStore",
-  "Version": "4.70.6",
+  "Version": "4.70.7",
   "SupportedVersions": [ "4.70" ],
   "Author": "nopCommerce team",
   "DisplayOrder": 1,

diff --git a/...ns/Nop.Plugin.Shipping.FixedByWeightByTotal/Controllers/FixedByWeightByTotalController.cs b/...ns/Nop.Plugin.Shipping.FixedByWeightByTotal/Controllers/FixedByWeightByTotalController.cs
@@ -164,7 +164,7 @@ public async Task<IActionResult> SaveMode(bool value)
     public async Task<IActionResult> FixedShippingRateList(ConfigurationModel searchModel)
     {
         if (!await _permissionService.AuthorizeAsync(StandardPermissionProvider.ManageShippingSettings))
-            return await AccessDeniedDataTablesJson();
+            return await AccessDeniedJsonAsync();
 
         var shippingMethods = (await _shippingService.GetAllShippingMethodsAsync()).ToPagedList(searchModel);
 
@@ -207,7 +207,7 @@ public async Task<IActionResult> UpdateFixedShippingRate(FixedRateModel model)
     public async Task<IActionResult> RateByWeightByTotalList(ConfigurationModel searchModel, ConfigurationModel filter)
     {
         if (!await _permissionService.AuthorizeAsync(StandardPermissionProvider.ManageShippingSettings))
-            return await AccessDeniedDataTablesJson();
+            return await AccessDeniedJsonAsync();
 
         //var records = _shippingByWeightService.GetAll(command.Page - 1, command.PageSize);
         var records = await _shippingByWeightService.FindRecordsAsync(

diff --git a/src/Plugins/Nop.Plugin.Shipping.FixedByWeightByTotal/plugin.json b/src/Plugins/Nop.Plugin.Shipping.FixedByWeightByTotal/plugin.json
@@ -2,7 +2,7 @@
   "Group": "Shipping rate computation",
   "FriendlyName": "Manual (Fixed or By Weight and By Total)",
   "SystemName": "Shipping.FixedByWeightByTotal",
-  "Version": "4.70.7",
+  "Version": "4.70.8",
   "SupportedVersions": [ "4.70" ],
   "Author": "nopCommerce team",
   "DisplayOrder": 1,

diff --git a/src/Plugins/Nop.Plugin.Tax.Avalara/Controllers/AvalaraTaxController.cs b/src/Plugins/Nop.Plugin.Tax.Avalara/Controllers/AvalaraTaxController.cs
@@ -98,7 +98,7 @@ public override async Task<IActionResult> Categories(TaxCategorySearchModel sear
             return await base.Categories(searchModel);
 
         if (!await _permissionService.AuthorizeAsync(StandardPermissionProvider.ManageTaxSettings))
-            return await AccessDeniedDataTablesJson();
+            return await AccessDeniedJsonAsync();
 
         //get tax categories
         var taxCategories = (await _taxCategoryService.GetAllTaxCategoriesAsync()).ToPagedList(searchModel);
@@ -155,7 +155,7 @@ public async Task<IActionResult> TaxCategoryAdd(Models.Tax.TaxCategoryModel mode
             return new NullJsonResult();
 
         if (!await _permissionService.AuthorizeAsync(StandardPermissionProvider.ManageTaxSettings))
-            return await AccessDeniedDataTablesJson();
+            return await AccessDeniedJsonAsync();
 
         if (!ModelState.IsValid)
             return ErrorJson(ModelState.SerializeErrors());
@@ -179,7 +179,7 @@ public override async Task<IActionResult> CategoryDelete(int id)
             return new NullJsonResult();
 
         if (!await _permissionService.AuthorizeAsync(StandardPermissionProvider.ManageTaxSettings))
-            return await AccessDeniedDataTablesJson();
+            return await AccessDeniedJsonAsync();
 
         //try to get a tax category with the specified id
         var taxCategory = await _taxCategoryService.GetTaxCategoryByIdAsync(id)

diff --git a/src/Plugins/Nop.Plugin.Tax.Avalara/Controllers/ItemClassificationController.cs b/src/Plugins/Nop.Plugin.Tax.Avalara/Controllers/ItemClassificationController.cs
@@ -68,7 +68,7 @@ public ItemClassificationController(AvalaraTaxManager avalaraTaxManager,
     public async Task<IActionResult> List(ItemClassificationSearchModel searchModel)
     {
         if (!await _permissionService.AuthorizeAsync(StandardPermissionProvider.ManageTaxSettings))
-            return await AccessDeniedDataTablesJson();
+            return await AccessDeniedJsonAsync();
 
         //get item classification
         var itemClassification = await _itemClassificationService.GetItemClassificationAsync(
@@ -100,7 +100,7 @@ public async Task<IActionResult> List(ItemClassificationSearchModel searchModel)
     public async Task<IActionResult> Update(ItemClassificationModel model)
     {
         if (!await _permissionService.AuthorizeAsync(StandardPermissionProvider.ManageTaxSettings))
-            return await AccessDeniedDataTablesJson();
+            return await AccessDeniedJsonAsync();
 
         var item = await _itemClassificationService.GetItemClassificationByIdAsync(model.Id)
             ?? throw new ArgumentException("No record found");
@@ -116,7 +116,7 @@ public async Task<IActionResult> Update(ItemClassificationModel model)
     public async Task<IActionResult> DeleteSelected(List<int> selectedIds)
     {
         if (!await _permissionService.AuthorizeAsync(StandardPermissionProvider.ManageTaxSettings))
-            return await AccessDeniedDataTablesJson();
+            return await AccessDeniedJsonAsync();
 
         if (!selectedIds?.Any() ?? true)
             return NoContent();
@@ -139,7 +139,7 @@ public async Task<IActionResult> DeleteSelected(List<int> selectedIds)
     public async Task<IActionResult> ClearAll()
     {
         if (!await _permissionService.AuthorizeAsync(StandardPermissionProvider.ManageTaxSettings))
-            return await AccessDeniedDataTablesJson();
+            return await AccessDeniedJsonAsync();
 
         await _itemClassificationService.ClearItemClassificationAsync();
 
@@ -169,10 +169,10 @@ public async Task<IActionResult> ProductToClassification()
     public async Task<IActionResult> ProductListToClassification(AddProductToClassificationSearchModel searchModel)
     {
         if (!await _permissionService.AuthorizeAsync(StandardPermissionProvider.ManageTaxSettings))
-            return await AccessDeniedDataTablesJson();
+            return await AccessDeniedJsonAsync();
 
         if (!await _permissionService.AuthorizeAsync(StandardPermissionProvider.ManageProducts))
-            return await AccessDeniedDataTablesJson();
+            return await AccessDeniedJsonAsync();
 
         var products = await _productService.SearchProductsAsync(showHidden: true,
             keywords: searchModel.SearchProductName,
@@ -218,7 +218,7 @@ public async Task<IActionResult> ProductToClassification(AddProductToClassificat
     public async Task<IActionResult> StartClassification()
     {
         if (!await _permissionService.AuthorizeAsync(StandardPermissionProvider.ManageTaxSettings))
-            return await AccessDeniedDataTablesJson();
+            return await AccessDeniedJsonAsync();
 
         var items = (await _itemClassificationService.GetItemClassificationAsync())
             .Where(x => string.IsNullOrEmpty(x.HSClassificationRequestId))

diff --git a/src/Plugins/Nop.Plugin.Tax.Avalara/Controllers/TaxTransactionLogController.cs b/src/Plugins/Nop.Plugin.Tax.Avalara/Controllers/TaxTransactionLogController.cs
@@ -53,7 +53,7 @@ public TaxTransactionLogController(ICustomerService customerService,
     public async Task<IActionResult> LogList(TaxTransactionLogSearchModel searchModel)
     {
         if (!await _permissionService.AuthorizeAsync(StandardPermissionProvider.ManageTaxSettings))
-            return await AccessDeniedDataTablesJson();
+            return await AccessDeniedJsonAsync();
 
         //prepare filter parameters
         var createdFromValue = searchModel.CreatedFrom.HasValue
@@ -87,7 +87,7 @@ public async Task<IActionResult> LogList(TaxTransactionLogSearchModel searchMode
     public async Task<IActionResult> DeleteSelected(ICollection<int> selectedIds)
     {
         if (!await _permissionService.AuthorizeAsync(StandardPermissionProvider.ManageTaxSettings))
-            return await AccessDeniedDataTablesJson();
+            return await AccessDeniedJsonAsync();
 
         if (selectedIds == null || !selectedIds.Any())
             return NoContent();
@@ -142,7 +142,7 @@ public async Task<IActionResult> Delete(int id)
     public async Task<IActionResult> ClearAll()
     {
         if (!await _permissionService.AuthorizeAsync(StandardPermissionProvider.ManageTaxSettings))
-            return await AccessDeniedDataTablesJson();
+            return await AccessDeniedJsonAsync();
 
         await _taxTransactionLogService.ClearLogAsync();
 

diff --git a/src/Plugins/Nop.Plugin.Tax.Avalara/plugin.json b/src/Plugins/Nop.Plugin.Tax.Avalara/plugin.json
@@ -2,7 +2,7 @@
   "Group": "Tax providers",
   "FriendlyName": "Avalara tax provider",
   "SystemName": "Tax.Avalara",
-  "Version": "4.70.10",
+  "Version": "4.70.11",
   "SupportedVersions": [ "4.70" ],
   "Author": "nopCommerce team",
   "DisplayOrder": 1,

diff --git a/...Nop.Plugin.Tax.FixedOrByCountryStateZip/Controllers/FixedOrByCountryStateZipController.cs b/...Nop.Plugin.Tax.FixedOrByCountryStateZip/Controllers/FixedOrByCountryStateZipController.cs
@@ -151,7 +151,7 @@ public async Task<IActionResult> SaveMode(bool value)
     public async Task<IActionResult> FixedRatesList(ConfigurationModel searchModel)
     {
         if (!await _permissionService.AuthorizeAsync(StandardPermissionProvider.ManageTaxSettings))
-            return await AccessDeniedDataTablesJson();
+            return await AccessDeniedJsonAsync();
 
         var categories = (await _taxCategoryService.GetAllTaxCategoriesAsync()).ToPagedList(searchModel);
 
@@ -189,7 +189,7 @@ public async Task<IActionResult> FixedRateUpdate(FixedTaxRateModel model)
     public async Task<IActionResult> RatesByCountryStateZipList(ConfigurationModel searchModel)
     {
         if (!await _permissionService.AuthorizeAsync(StandardPermissionProvider.ManageTaxSettings))
-            return await AccessDeniedDataTablesJson();
+            return await AccessDeniedJsonAsync();
 
         var records = await _taxRateService.GetAllTaxRatesAsync(searchModel.Page - 1, searchModel.PageSize);
 

diff --git a/src/Plugins/Nop.Plugin.Tax.FixedOrByCountryStateZip/plugin.json b/src/Plugins/Nop.Plugin.Tax.FixedOrByCountryStateZip/plugin.json
@@ -2,7 +2,7 @@
   "Group": "Tax providers",
   "FriendlyName": "Manual (Fixed or By Country/State/Zip)",
   "SystemName": "Tax.FixedOrByCountryStateZip",
-  "Version": "4.70.5",
+  "Version": "4.70.6",
   "SupportedVersions": [ "4.70" ],
   "Author": "nopCommerce team",
   "DisplayOrder": 1,

diff --git a/src/Plugins/Nop.Plugin.Widgets.FacebookPixel/Controllers/FacebookPixelController.cs b/src/Plugins/Nop.Plugin.Widgets.FacebookPixel/Controllers/FacebookPixelController.cs
@@ -113,7 +113,7 @@ public async Task<IActionResult> Configure()
     public virtual async Task<IActionResult> List(FacebookPixelSearchModel searchModel)
     {
         if (!await _permissionService.AuthorizeAsync(StandardPermissionProvider.ManageWidgets))
-            return await AccessDeniedDataTablesJson();
+            return await AccessDeniedJsonAsync();
 
         var configurations = await _facebookPixelService.GetPagedConfigurationsAsync(searchModel.StoreId, searchModel.Page - 1, searchModel.PageSize);
         var model = await new FacebookPixelListModel().PrepareToGridAsync(searchModel, configurations, () =>
@@ -263,7 +263,7 @@ public virtual async Task<IActionResult> Delete(int id)
     public virtual async Task<IActionResult> CustomEventList(CustomEventSearchModel searchModel)
     {
         if (!await _permissionService.AuthorizeAsync(StandardPermissionProvider.ManageWidgets))
-            return await AccessDeniedDataTablesJson();
+            return await AccessDeniedJsonAsync();
 
         var configuration = await _facebookPixelService.GetConfigurationByIdAsync(searchModel.ConfigurationId)
             ?? throw new ArgumentException("No configuration found with the specified id", nameof(searchModel.ConfigurationId));
@@ -288,7 +288,7 @@ public virtual async Task<IActionResult> CustomEventList(CustomEventSearchModel
     public virtual async Task<IActionResult> CustomEventAdd(int configurationId, [Validate] CustomEventModel model)
     {
         if (!await _permissionService.AuthorizeAsync(StandardPermissionProvider.ManageWidgets))
-            return await AccessDeniedDataTablesJson();
+            return await AccessDeniedJsonAsync();
 
         if (!ModelState.IsValid)
             return ErrorJson(ModelState.SerializeErrors());
@@ -303,7 +303,7 @@ public virtual async Task<IActionResult> CustomEventAdd(int configurationId, [Va
     public virtual async Task<IActionResult> CustomEventDelete(int configurationId, string id)
     {
         if (!await _permissionService.AuthorizeAsync(StandardPermissionProvider.ManageWidgets))
-            return await AccessDeniedDataTablesJson();
+            return await AccessDeniedJsonAsync();
 
         //save custom events configuration
         var eventName = id;
@@ -315,7 +315,7 @@ public virtual async Task<IActionResult> CustomEventDelete(int configurationId,
     public async Task<IActionResult> CookieSettingsWarning(bool disableForUsersNotAcceptingCookieConsent)
     {
         if (!await _permissionService.AuthorizeAsync(StandardPermissionProvider.ManageWidgets))
-            return await AccessDeniedDataTablesJson();
+            return await AccessDeniedJsonAsync();
 
         if (!disableForUsersNotAcceptingCookieConsent || _storeInformationSettings.DisplayEuCookieLawWarning)
             return Json(new { Result = string.Empty });

diff --git a/src/Plugins/Nop.Plugin.Widgets.FacebookPixel/plugin.json b/src/Plugins/Nop.Plugin.Widgets.FacebookPixel/plugin.json
@@ -2,7 +2,7 @@
   "Group": "Widgets",
   "FriendlyName": "Facebook Pixel",
   "SystemName": "Widgets.FacebookPixel",
-  "Version": "4.70.7",
+  "Version": "4.70.8",
   "SupportedVersions": [ "4.70" ],
   "Author": "nopCommerce team",
   "DisplayOrder": 1,

diff --git a/src/Presentation/Nop.Web.Framework/Controllers/BaseController.cs b/src/Presentation/Nop.Web.Framework/Controllers/BaseController.cs
@@ -222,13 +222,13 @@ protected virtual IActionResult AccessDeniedView()
     }
 
     /// <summary>
-    /// Access denied JSON data for DataTables
+    /// Access denied JSON data
     /// </summary>
     /// <returns>
     /// A task that represents the asynchronous operation
     /// The task result contains the access denied JSON data
     /// </returns>
-    protected virtual async Task<JsonResult> AccessDeniedDataTablesJson()
+    protected virtual async Task<JsonResult> AccessDeniedJsonAsync()
     {
         var localizationService = EngineContext.Current.Resolve<ILocalizationService>();
 

diff --git a/src/Presentation/Nop.Web/Areas/Admin/Controllers/ActivityLogController.cs b/src/Presentation/Nop.Web/Areas/Admin/Controllers/ActivityLogController.cs
@@ -95,7 +95,7 @@ public virtual async Task<IActionResult> ActivityLogs()
     public virtual async Task<IActionResult> ListLogs(ActivityLogSearchModel searchModel)
     {
         if (!await _permissionService.AuthorizeAsync(StandardPermissionProvider.ManageActivityLog))
-            return await AccessDeniedDataTablesJson();
+            return await AccessDeniedJsonAsync();
 
         //prepare model
         var model = await _activityLogModelFactory.PrepareActivityLogListModelAsync(searchModel);
@@ -107,7 +107,7 @@ public virtual async Task<IActionResult> ListLogs(ActivityLogSearchModel searchM
     public virtual async Task<IActionResult> ActivityLogDelete(int id)
     {
         if (!await _permissionService.AuthorizeAsync(StandardPermissionProvider.ManageActivityLog))
-            return await AccessDeniedDataTablesJson();
+            return await AccessDeniedJsonAsync();
 
         //try to get a log item with the specified id
         var logItem = await _customerActivityService.GetActivityByIdAsync(id)