Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

Add BaseAdminPluginController abstract class for controllers with admin configuration in plugins

supportd670ac42696f
diff --git a/src/Plugins/Authentication.Google/Areas/Admin/Controllers/GoogleAuthenticationSettingsController.cs b/src/Plugins/Authentication.Google/Areas/Admin/Controllers/GoogleAuthenticationSettingsController.cs
index 1e09e4902..838e44115 100644
--- a/src/Plugins/Authentication.Google/Areas/Admin/Controllers/GoogleAuthenticationSettingsController.cs
+++ b/src/Plugins/Authentication.Google/Areas/Admin/Controllers/GoogleAuthenticationSettingsController.cs
@@ -11,10 +11,8 @@ using Microsoft.Extensions.Configuration;
namespace Authentication.Google.Areas.Admin.Controllers
{
- [AuthorizeAdmin]
- [Area("Admin")]
[PermissionAuthorize(PermissionSystemName.ExternalAuthenticationMethods)]
- public class GoogleAuthenticationSettingsController : BasePluginController
+ public class GoogleAuthenticationSettingsController : BaseAdminPluginController
{
#region Fields
diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/CustomerGroupsController.cs b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/CustomerGroupsController.cs
index bdc188ad6..316f0552c 100644
--- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/CustomerGroupsController.cs
+++ b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/CustomerGroupsController.cs
@@ -11,9 +11,7 @@ using Microsoft.AspNetCore.Mvc.Rendering;
namespace DiscountRules.Standard.Areas.Admin.Controllers
{
- [Area("Admin")]
- [AuthorizeAdmin]
- public class CustomerGroupsController : BasePluginController
+ public class CustomerGroupsController : BaseAdminPluginController
{
private readonly IDiscountService _discountService;
private readonly IGroupService _groupService;
diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HadSpentAmountController.cs b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HadSpentAmountController.cs
index 1db1723f8..a68a5de70 100644
--- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HadSpentAmountController.cs
+++ b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HadSpentAmountController.cs
@@ -10,9 +10,7 @@ using System.Globalization;
namespace DiscountRules.Standard.Areas.Admin.Controllers
{
- [Area("Admin")]
- [AuthorizeAdmin]
- public class HadSpentAmountController : BasePluginController
+ public class HadSpentAmountController : BaseAdminPluginController
{
private readonly IDiscountService _discountService;
private readonly IPermissionService _permissionService;
diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasAllProductsController.cs b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasAllProductsController.cs
index ba89820c0..d56e2d750 100644
--- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasAllProductsController.cs
+++ b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasAllProductsController.cs
@@ -18,9 +18,7 @@ using Microsoft.AspNetCore.Mvc.Rendering;
namespace DiscountRules.Standard.Areas.Admin.Controllers
{
- [Area("Admin")]
- [AuthorizeAdmin]
- public class HasAllProductsController : BasePluginController
+ public class HasAllProductsController : BaseAdminPluginController
{
private readonly IDiscountService _discountService;
private readonly IPermissionService _permissionService;
diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasOneProductController.cs b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasOneProductController.cs
index a52d5e0cd..a832ee3da 100644
--- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasOneProductController.cs
+++ b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasOneProductController.cs
@@ -18,9 +18,7 @@ using Microsoft.AspNetCore.Mvc.Rendering;
namespace DiscountRules.Standard.Areas.Admin.Controllers
{
- [Area("Admin")]
- [AuthorizeAdmin]
- public class HasOneProductController : BasePluginController
+ public class HasOneProductController : BaseAdminPluginController
{
private readonly IDiscountService _discountService;
private readonly IPermissionService _permissionService;
diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/ShoppingCartAmountController.cs b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/ShoppingCartAmountController.cs
index b2bd7833e..6ee9b061b 100644
--- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/ShoppingCartAmountController.cs
+++ b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/ShoppingCartAmountController.cs
@@ -10,9 +10,7 @@ using System.Globalization;
namespace DiscountRules.Standard.Areas.Admin.Controllers
{
- [AuthorizeAdmin]
- [Area("Admin")]
- public class ShoppingCartAmountController : BasePluginController
+ public class ShoppingCartAmountController : BaseAdminPluginController
{
private readonly IDiscountService _discountService;
private readonly IPermissionService _permissionService;
diff --git a/src/Plugins/Tax.CountryStateZip/Areas/Admin/Controllers/TaxCountryStateZipController.cs b/src/Plugins/Tax.CountryStateZip/Areas/Admin/Controllers/TaxCountryStateZipController.cs
index b4c887e84..7441f4866 100644
--- a/src/Plugins/Tax.CountryStateZip/Areas/Admin/Controllers/TaxCountryStateZipController.cs
+++ b/src/Plugins/Tax.CountryStateZip/Areas/Admin/Controllers/TaxCountryStateZipController.cs
@@ -14,10 +14,8 @@ using Tax.CountryStateZip.Services;
namespace Tax.CountryStateZip.Areas.Admin.Controllers
{
- [AuthorizeAdmin]
- [Area("Admin")]
[PermissionAuthorize(PermissionSystemName.TaxSettings)]
- public class TaxCountryStateZipController : BasePluginController
+ public class TaxCountryStateZipController : BaseAdminPluginController
{
private readonly ITaxCategoryService _taxCategoryService;
private readonly ICountryService _countryService;
diff --git a/src/Plugins/Tax.FixedRate/Areas/Admin/Controllers/TaxFixedRateController.cs b/src/Plugins/Tax.FixedRate/Areas/Admin/Controllers/TaxFixedRateController.cs
index 42311dce4..766da9d60 100644
--- a/src/Plugins/Tax.FixedRate/Areas/Admin/Controllers/TaxFixedRateController.cs
+++ b/src/Plugins/Tax.FixedRate/Areas/Admin/Controllers/TaxFixedRateController.cs
@@ -10,10 +10,8 @@ using Tax.FixedRate.Models;
namespace Tax.FixedRate.Areas.Admin.Controllers
{
- [AuthorizeAdmin]
- [Area("Admin")]
[PermissionAuthorize(PermissionSystemName.TaxSettings)]
- public class TaxFixedRateController : BasePluginController
+ public class TaxFixedRateController : BaseAdminPluginController
{
private readonly ITaxCategoryService _taxCategoryService;
private readonly ISettingService _settingService;
diff --git a/src/Plugins/Widgets.FacebookPixel/Areas/Admin/Controllers/WidgetsFacebookPixelController.cs b/src/Plugins/Widgets.FacebookPixel/Areas/Admin/Controllers/WidgetsFacebookPixelController.cs
index 8791fa5de..a664eb168 100644
--- a/src/Plugins/Widgets.FacebookPixel/Areas/Admin/Controllers/WidgetsFacebookPixelController.cs
+++ b/src/Plugins/Widgets.FacebookPixel/Areas/Admin/Controllers/WidgetsFacebookPixelController.cs
@@ -13,10 +13,8 @@ using Widgets.FacebookPixel.Models;
namespace Widgets.FacebookPixel.Areas.Admin.Controllers
{
- [Area("Admin")]
- [AuthorizeAdmin]
[PermissionAuthorize(PermissionSystemName.Widgets)]
- public class WidgetsFacebookPixelController : BasePluginController
+ public class WidgetsFacebookPixelController : BaseAdminPluginController
{
private readonly IWorkContext _workContext;
private readonly IStoreService _storeService;
diff --git a/src/Plugins/Widgets.GoogleAnalytics/Areas/Admin/Controllers/WidgetsGoogleAnalyticsController.cs b/src/Plugins/Widgets.GoogleAnalytics/Areas/Admin/Controllers/WidgetsGoogleAnalyticsController.cs
index 4caa465b8..5914500b5 100644
--- a/src/Plugins/Widgets.GoogleAnalytics/Areas/Admin/Controllers/WidgetsGoogleAnalyticsController.cs
+++ b/src/Plugins/Widgets.GoogleAnalytics/Areas/Admin/Controllers/WidgetsGoogleAnalyticsController.cs
@@ -13,10 +13,8 @@ using Widgets.GoogleAnalytics.Models;
namespace Widgets.GoogleAnalytics.Areas.Admin.Controllers
{
- [Area("Admin")]
- [AuthorizeAdmin]
[PermissionAuthorize(PermissionSystemName.Widgets)]
- public class WidgetsGoogleAnalyticsController : BasePluginController
+ public class WidgetsGoogleAnalyticsController : BaseAdminPluginController
{
private readonly IWorkContext _workContext;
private readonly IStoreService _storeService;
diff --git a/src/Plugins/Widgets.Slider/Areas/Admin/Controllers/WidgetsSliderController.cs b/src/Plugins/Widgets.Slider/Areas/Admin/Controllers/WidgetsSliderController.cs
index 21a6abf6a..47b849f25 100644
--- a/src/Plugins/Widgets.Slider/Areas/Admin/Controllers/WidgetsSliderController.cs
+++ b/src/Plugins/Widgets.Slider/Areas/Admin/Controllers/WidgetsSliderController.cs
@@ -14,10 +14,8 @@ using Grand.Business.Core.Interfaces.Common.Directory;
namespace Widgets.Slider.Areas.Admin.Controllers
{
- [AuthorizeAdmin]
- [Area("Admin")]
[PermissionAuthorize(PermissionSystemName.Widgets)]
- public class WidgetsSliderController : BasePluginController
+ public class WidgetsSliderController : BaseAdminPluginController
{
private readonly IPictureService _pictureService;
private readonly ITranslationService _translationService;
diff --git a/src/Web/Grand.Web.Common/Controllers/BaseAdminPluginController.cs b/src/Web/Grand.Web.Common/Controllers/BaseAdminPluginController.cs
new file mode 100644
index 000000000..533affdfa
--- /dev/null
+++ b/src/Web/Grand.Web.Common/Controllers/BaseAdminPluginController.cs
@@ -0,0 +1,15 @@
+using Grand.Web.Common.Filters;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Grand.Web.Common.Controllers
+{
+ /// <summary>
+ /// Base controller for plugins
+ /// </summary>
+ [AuthorizeAdmin]
+ [Area("Admin")]
+ [AuthorizeMenu]
+ public abstract class BaseAdminPluginController : BaseController
+ {
+ }
+}
\ No newline at end of file