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.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Add new permission - System
KrzysztofPajak88cb32760c63
diff --git a/src/Business/Grand.Business.Common/Services/Security/PermissionProvider.cs b/src/Business/Grand.Business.Common/Services/Security/PermissionProvider.csindex 77e2f9bbd..c803006a6 100644--- a/src/Business/Grand.Business.Common/Services/Security/PermissionProvider.cs+++ b/src/Business/Grand.Business.Common/Services/Security/PermissionProvider.cs@@ -74,6 +74,7 @@ namespace Grand.Business.Common.Services.SecurityStandardPermission.ManageMessageQueue,StandardPermission.ManageMessageContactForm,StandardPermission.ManageMaintenance,+ StandardPermission.ManageSystem,StandardPermission.ManageFiles,StandardPermission.ManagePictures,StandardPermission.ManageUserFields,@@ -160,6 +161,7 @@ namespace Grand.Business.Common.Services.SecurityStandardPermission.ManageMessageQueue,StandardPermission.ManageMessageContactForm,StandardPermission.ManageMaintenance,+ StandardPermission.ManageSystem,StandardPermission.ManageFiles,StandardPermission.ManagePictures,StandardPermission.ManageUserFields,diff --git a/src/Business/Grand.Business.Common/Services/Security/PermissionSystemName.cs b/src/Business/Grand.Business.Common/Services/Security/PermissionSystemName.csindex fcdbf96c2..fe746f239 100644--- a/src/Business/Grand.Business.Common/Services/Security/PermissionSystemName.cs+++ b/src/Business/Grand.Business.Common/Services/Security/PermissionSystemName.cs@@ -67,6 +67,7 @@public const string MessageQueue = "ManageMessageQueue";public const string MessageContactForm = "ManageMessageContactForm";public const string Maintenance = "ManageMaintenance";+ public const string System = "ManageSystem";public const string Files = "ManageFiles";public const string Pictures = "ManagePictures";public const string UserFields = "UserFields";diff --git a/src/Business/Grand.Business.Common/Services/Security/StandardPermissionSystem.cs b/src/Business/Grand.Business.Common/Services/Security/StandardPermissionSystem.csindex ccf77c71e..11ddff603 100644--- a/src/Business/Grand.Business.Common/Services/Security/StandardPermissionSystem.cs+++ b/src/Business/Grand.Business.Common/Services/Security/StandardPermissionSystem.cs@@ -37,6 +37,12 @@ namespace Grand.Business.Common.Services.SecurityArea = "Admin area",Category = CategorySystem};+ public static readonly Permission ManageSystem = new Permission {+ Name = "Manage System",+ SystemName = PermissionSystemName.System,+ Area = "Admin area",+ Category = CategorySystem+ };public static readonly Permission ManageFiles = new Permission{Name = "Manage Files",diff --git a/src/Business/Grand.Business.System/Utilities/StandardAdminSiteMap.cs b/src/Business/Grand.Business.System/Utilities/StandardAdminSiteMap.csindex 3d7cf34d0..bcdb2f3c2 100644--- a/src/Business/Grand.Business.System/Utilities/StandardAdminSiteMap.cs+++ b/src/Business/Grand.Business.System/Utilities/StandardAdminSiteMap.cs@@ -965,7 +965,7 @@ namespace Grand.Business.System.UtilitiesSystemName = "System",ResourceName = "Admin.System",PermissionNames = new List<string> { PermissionSystemName.SystemLog, PermissionSystemName.MessageQueue, PermissionSystemName.MessageContactForm,- PermissionSystemName.Maintenance, PermissionSystemName.ScheduleTasks },+ PermissionSystemName.Maintenance, PermissionSystemName.ScheduleTasks, PermissionSystemName.System },IconClass = "icon-info",ChildNodes = new List<AdminSiteMap>() {new AdminSiteMap {@@ -979,8 +979,8 @@ namespace Grand.Business.System.Utilitiesnew AdminSiteMap {SystemName = "System information",ResourceName = "Admin.System.SystemInfo",- PermissionNames = new List<string> { PermissionSystemName.Maintenance },- ControllerName = "Common",+ PermissionNames = new List<string> { PermissionSystemName.System },+ ControllerName = "System",ActionName = "SystemInfo",IconClass = "fa fa-dot-circle-o"},@@ -1019,7 +1019,7 @@ namespace Grand.Business.System.Utilitiesnew AdminSiteMap {SystemName = "Developer tools",ResourceName = "Admin.System.DeveloperTools",- PermissionNames = new List<string> { PermissionSystemName.Maintenance },+ PermissionNames = new List<string> { PermissionSystemName.Maintenance, PermissionSystemName.System },IconClass = "fa fa-dot-circle-o",ChildNodes = new List<AdminSiteMap>() {new AdminSiteMap {@@ -1033,8 +1033,8 @@ namespace Grand.Business.System.Utilitiesnew AdminSiteMap {SystemName = "Roslyn compiler",ResourceName = "Admin.System.Roslyn",- PermissionNames = new List<string> { PermissionSystemName.Maintenance },- ControllerName = "Common",+ PermissionNames = new List<string> { PermissionSystemName.System },+ ControllerName = "System",ActionName = "Roslyn",IconClass = "fa fa-dot-circle-o"},diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/_AdminLayout.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/_AdminLayout.cshtmlindex fcbe80d80..3afd42d63 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/_AdminLayout.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/_AdminLayout.cshtml@@ -30,6 +30,7 @@//has "Manage Maintenance" permission?var canManageMaintenance = await permissionService.Authorize(StandardPermission.ManageMaintenance);+ var canManageSystem = await permissionService.Authorize(StandardPermission.ManageSystem);}<!DOCTYPE html>@@ -133,7 +134,7 @@</li></ul></li>- @if (canManageMaintenance)+ @if (canManageSystem){<li role="presentation" class="dropdown"><a href="javascript:;" class="dropdown-toggle info-number" data-toggle="dropdown" aria-expanded="false">@@ -141,14 +142,14 @@</a><ul id="menu1" class="dropdown-menu dropdown-menu-right list-unstyled msg_list overflow-h" role="menu"><li>- <a href="@Url.Action("ClearCache", "Common", new { memory = true, returnurl = this.Context.Request.GetEncodedPathAndQuery(), area = Constants.AreaAdmin })">+ <a href="@Url.Action("ClearCache", "System", new { memory = true, returnurl = this.Context.Request.GetEncodedPathAndQuery(), area = Constants.AreaAdmin })"><i class="icon-refresh"></i>@Loc["Admin.Header.ClearCacheMemory"]</a></li><li>- <a href="@Url.Action("RestartApplication", "Common", new { returnurl = this.Context.Request.GetEncodedPathAndQuery(), area = Constants.AreaAdmin })" id="restart-application">+ <a href="@Url.Action("RestartApplication", "System", new { returnurl = this.Context.Request.GetEncodedPathAndQuery(), area = Constants.AreaAdmin })" id="restart-application"><i class="icon-reload"></i>@Loc["Admin.Header.RestartApplication"]</a>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/System/Roslyn.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/System/Roslyn.cshtmlnew file mode 100644index 000000000..362a4a903--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/System/Roslyn.cshtml@@ -0,0 +1,84 @@+@model bool+@inject AdminAreaSettings adminAreaSettings+@{+ //page title+ ViewBag.Title = Loc["Admin.System.Roslyn"];+}+++<div class="row">+ <div class="col-md-12">+ <div class="x_panel light form-fit">+ <div class="x_title level-caption">+ <div class="caption level-caption">+ <i class="fa fa-sitemap"></i>+ @Loc["Admin.System.Roslyn"]+ </div>+ <vc:admin-widget widget-zone="roslyn_buttons" additional-data="null" />+ </div>+ @if (!Model)+ {+ <div class="note note-success">+ @Loc["Admin.System.Roslyn.Disabled"]+ </div>+ }+ <div class="x_content">+ <vc:admin-widget widget-zone="roslyn_top" additional-data="null" />+ <div id="roslyn-grid"></div>+ <vc:admin-widget widget-zone="roslyn_bottom" additional-data="null" />+ </div>+ </div>+ </div>+</div>++<script>+ $(document).ready(function () {+ $("#roslyn-grid").kendoGrid({+ dataSource: {+ transport: {+ read: {+ url: "@Html.Raw(Url.Action("Roslyn", "System", new { area = Constants.AreaAdmin }))",+ type: "POST",+ dataType: "json",+ data: addAntiForgeryToken+ }+ },+ schema: {+ data: "Data",+ total: "Total",+ errors: "Errors"+ },+ error: function(e) {+ display_kendoui_grid_error(e);+ // Cancel the changes+ this.cancelChanges();+ },+ pageSize: @(adminAreaSettings.DefaultGridPageSize),+ serverPaging: true,+ serverFiltering: true,+ serverSorting: true+ },+ pageable: {+ refresh: true,+ pageSizes: [@(adminAreaSettings.GridPageSizes)]+ },+ scrollable: false,+ columns: [{+ field: "FileName",+ title: "@Loc["Admin.System.Roslyn.FileName"]",+ width: 100,+ },{+ field: "IsCompiled",+ title: "@Loc["Admin.System.Roslyn.IsCompiled"]",+ width: 50,+ headerAttributes: { style: "text-align:center" },+ attributes: { style: "text-align:center" },+ template: '# if(IsCompiled) {# <i class="fa fa-check" aria-hidden="true" style="color:green"></i> #} else {# <i class="fa fa-times" aria-hidden="true" style="color:red"></i> #} #'+ }, {+ field: "Errors",+ title: "@Loc["Admin.System.Roslyn.Errors"]",+ width: 500+ }]+ });+ });+</script>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/System/SystemInfo.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/System/SystemInfo.cshtmlnew file mode 100644index 000000000..5d9e07460--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/System/SystemInfo.cshtml@@ -0,0 +1,214 @@+@model SystemInfoModel++@inject Microsoft.AspNetCore.Http.IHttpContextAccessor httpContextAccessor;++@{+ //page title+ ViewBag.Title = Loc["Admin.System.SystemInfo"];+}++<div class="row">+ <div class="col-md-12">+ <div class="x_panel light form-fit">+ <div class="x_title">+ <div class="caption level-caption">+ <i class="fa fa-tasks"></i>+ @Loc["Admin.System.SystemInfo"]+ </div>+ <vc:admin-widget widget-zone="system_info_buttons" additional-data="null" />+ </div>+ <div class="x_content form">+ <vc:admin-widget widget-zone="system_info_top" additional-data="null" />+ <div class="form-horizontal">+ <div class="form-body">+ <div class="x_content">+ <div class="form-horizontal">+ <div class="form-body">+ <div class="form-group">+ <admin-label asp-for="GrandVersion" />+ <div class="col-md-9 col-sm-9">+ <label class="control-label">@Model.GrandVersion</label>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="OperatingSystem" />+ <div class="col-md-9 col-sm-9">+ <label class="control-label">@Model.OperatingSystem</label>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="MachineName" />+ <div class="col-md-9 col-sm-9">+ <label class="control-label">@Model.MachineName</label>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="AspNetInfo" />+ <div class="col-md-9 col-sm-9">+ <label class="control-label">@Model.AspNetInfo</label>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="ServerTimeZone" />+ <div class="col-md-9 col-sm-9">+ <label class="control-label">@Model.ServerTimeZone</label>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="ServerLocalTime" />+ <div class="col-md-9 col-sm-9">+ <label class="control-label">@Model.ServerLocalTime.ToString("F")</label>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="ApplicationTime" />+ <div class="col-md-9 col-sm-9">+ <label class="control-label">@Model.ApplicationTime.ToString("F")</label>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="UtcTime" />+ <div class="col-md-9 col-sm-9">+ <label class="control-label">@Model.UtcTime.ToString("F")</label>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="RequestScheme" />+ <div class="col-md-9 col-sm-9">+ <label class="control-label">@httpContextAccessor.HttpContext.Request.Scheme</label>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="IsHttps" />+ <div class="col-md-9 col-sm-9">+ <label class="control-label">@httpContextAccessor.HttpContext.Request.IsHttps</label>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="ServerVariables" />+ <div class="col-md-9 col-sm-9">+ <label class="control-label">+ <a id="serverVariablesShowHide" href="javascript:toggleLoadedServerVariables();">@Loc["Admin.Common.Show"]</a>+ </label>+ <div id="pnlServerVariables" style="display:none">+ @foreach (var serverVariable in Model.ServerVariables)+ {+ @serverVariable.Name<text>:</text> @serverVariable.Value+ <br />+ }+ </div>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="LoadedAssemblies" />+ <div class="col-md-9 col-sm-9">+ <label class="control-label"><a id="loadedAssembliesShowHide" href="javascript:toggleLoadedAssemblies();">@Loc["Admin.Common.Show"]</a></label>+ <div id="pnlLoadedAssemblies" style="display:none">+ @foreach (var assembly in Model.LoadedAssemblies)+ {+ @assembly.FullName+ if (!String.IsNullOrEmpty(assembly.Location))+ {+ <br />+ <em>@assembly.Location</em>+ }+ <br />+ }+ </div>+ </div>+ </div>+ </div>++ </div>+ </div>+ </div>+ </div>+ <vc:admin-widget widget-zone="system_info_bottom" additional-data="null" />+ </div>+ </div>+ </div>+</div>+<div class="row">+ <div class="col-md-12">+ <div class="x_panel light form-fit">+ <div class="x_title">+ <div class="caption level-caption">+ <i class="fa fa-tasks"></i>+ @Loc["Admin.System.Warnings"]+ </div>+ <vc:admin-widget widget-zone="warnings_buttons" additional-data="null" />+ </div>+ <vc:admin-widget widget-zone="warnings_top" additional-data="null" />+ <div class="form-horizontal">+ <div class="form-body">+ <div class="x_content">+ <div class="form-horizontal">+ @foreach (var warning in Model.SystemWarnings)+ {+ switch (warning.Level)+ {+ case SystemInfoModel.SystemWarningModel.SystemWarningLevel.Pass:+ {+ <div class="form-group">+ <div class="offset-md-2 col-md-10 col-sm-10">+ <label class="control-label">+ @warning.Text+ </label>+ </div>+ </div>+ }+ break;+ case SystemInfoModel.SystemWarningModel.SystemWarningLevel.Warning:+ {+ <div class="form-group">+ <div class="offset-md-2 col-md-10 col-sm-10">+ <label class="control-label">+ @warning.Text+ </label>+ </div>+ </div>+ }+ break;+ case SystemInfoModel.SystemWarningModel.SystemWarningLevel.Fail:+ {+ <div class="form-group">+ <div class="offset-md-2 col-md-10 col-sm-10">+ <label class="control-label">+ @warning.Text+ </label>+ </div>+ </div>+ }+ break;+ }+ }+ <vc:admin-widget widget-zone="warnings_bottom" additional-data="null" />+ </div>+ </div>+ </div>+ </div>+ </div>+ </div>+</div>++<script>+ function toggleLoadedAssemblies() {+ $('#pnlLoadedAssemblies').toggle();+ if ($('#pnlLoadedAssemblies').css('display') == 'none') {+ $('#loadedAssembliesShowHide').html('@Loc["Admin.Common.Show"]');+ }+ else {+ $('#loadedAssembliesShowHide').html('@Loc["Admin.Common.Hide"]');+ }+ }++ function toggleLoadedServerVariables() {+ $('#pnlServerVariables').toggle();+ if ($('#pnlServerVariables').css('display') == 'none') {+ $('#serverVariablesShowHide').html('@Loc["Admin.Common.Show"]');+ }+ else {+ $('#serverVariablesShowHide').html('@Loc["Admin.Common.Hide"]');+ }+ }+</script>diff --git a/src/Web/Grand.Web.Admin/Controllers/CommonController.cs b/src/Web/Grand.Web.Admin/Controllers/CommonController.csindex d26371897..29cd687f5 100644--- a/src/Web/Grand.Web.Admin/Controllers/CommonController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/CommonController.cs@@ -1,39 +1,24 @@-using Grand.Business.Checkout.Enum;-using Grand.Business.Checkout.Interfaces.Payments;-using Grand.Business.Checkout.Interfaces.Shipping;-using Grand.Business.Common.Extensions;+using Grand.Business.Common.Extensions;using Grand.Business.Common.Interfaces.Directory;using Grand.Business.Common.Interfaces.Localization;using Grand.Business.Common.Interfaces.Logging;using Grand.Business.Common.Interfaces.Seo;-using Grand.Business.Common.Interfaces.Stores;using Grand.Business.Common.Services.Security;using Grand.Business.Customers.Interfaces;using Grand.Business.Storage.Interfaces;using Grand.Business.System.Commands.Models.Common;-using Grand.Business.System.Interfaces.MachineNameProvider;-using Grand.Domain.Directory;using Grand.Domain.Media;using Grand.Domain.Seo;-using Grand.Infrastructure;-using Grand.Infrastructure.Caching;-using Grand.Infrastructure.Configuration;-using Grand.Infrastructure.Roslyn;-using Grand.SharedKernel.Extensions;using Grand.Web.Admin.Extensions;using Grand.Web.Admin.Models.Common;using Grand.Web.Common.DataSource;using Grand.Web.Common.Security.Authorization;using MediatR;-using Microsoft.AspNetCore.Http;using Microsoft.AspNetCore.Mvc;using Microsoft.AspNetCore.Mvc.Rendering;-using Microsoft.Extensions.Hosting;using SkiaSharp;using System;using System.Collections.Generic;-using System.Linq;-using System.Runtime.InteropServices;using System.Threading.Tasks;namespace Grand.Web.Admin.Controllers@@ -43,61 +28,32 @@ namespace Grand.Web.Admin.Controllers{#region Fields- private readonly IPaymentService _paymentService;- private readonly IShippingService _shippingService;- private readonly ICurrencyService _currencyService;- private readonly IMeasureService _measureService;private readonly ICustomerService _customerService;private readonly ISlugService _slugService;private readonly IDateTimeService _dateTimeService;private readonly ILanguageService _languageService;- private readonly IWorkContext _workContext;private readonly ITranslationService _translationService;- private readonly IMachineNameProvider _machineNameProvider;- private readonly IHostApplicationLifetime _applicationLifetime;private readonly IMediator _mediator;private readonly IMediaFileStore _mediaFileStore;- private readonly CurrencySettings _currencySettings;- private readonly MeasureSettings _measureSettings;- private readonly AppConfig _appConfig;#endregion#region Constructors- public CommonController(IPaymentService paymentService,- IShippingService shippingService,- ICurrencyService currencyService,- IMeasureService measureService,+ public CommonController(ICustomerService customerService,ISlugService slugService,IDateTimeService dateTimeService,ILanguageService languageService,- IWorkContext workContext,ITranslationService translationService,- IMachineNameProvider machineNameProvider,- IHostApplicationLifetime applicationLifetime,IMediator mediator,- IMediaFileStore mediaFileStore,- CurrencySettings currencySettings,- MeasureSettings measureSettings,- AppConfig appConfig)+ IMediaFileStore mediaFileStore){- _paymentService = paymentService;- _shippingService = shippingService;- _currencyService = currencyService;- _measureService = measureService;_customerService = customerService;_slugService = slugService;- _currencySettings = currencySettings;- _measureSettings = measureSettings;_dateTimeService = dateTimeService;_languageService = languageService;- _workContext = workContext;_translationService = translationService;- _applicationLifetime = applicationLifetime;- _appConfig = appConfig;- _machineNameProvider = machineNameProvider;_mediaFileStore = mediaFileStore;_mediator = mediator;}@@ -106,195 +62,10 @@ namespace Grand.Web.Admin.Controllers#region Methods- public async Task<IActionResult> SystemInfo()- {- var model = new SystemInfoModel();- model.GrandVersion = GrandVersion.FullVersion;- try- {- model.OperatingSystem = RuntimeInformation.OSDescription;- }- catch (Exception) { }- try- {- model.AspNetInfo = RuntimeEnvironment.GetSystemVersion();- }- catch (Exception) { }-- model.MachineName = _machineNameProvider.GetMachineName();-- model.ServerTimeZone = TimeZoneInfo.Local.StandardName;- model.ServerLocalTime = DateTime.Now;- model.ApplicationTime = _dateTimeService.ConvertToUserTime(DateTime.UtcNow, TimeZoneInfo.Utc, _dateTimeService.CurrentTimeZone);- model.UtcTime = DateTime.UtcNow;- foreach (var header in HttpContext.Request.Headers)- {- model.ServerVariables.Add(new SystemInfoModel.ServerVariableModel {- Name = header.Key,- Value = header.Value- });- }- foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies().ToList().OrderBy(x => x.FullName))- {- model.LoadedAssemblies.Add(new SystemInfoModel.LoadedAssembly {- FullName = assembly.FullName,- });- }- //store URL- var currentStoreUrl = _workContext.CurrentHost.Url;- if (!String.IsNullOrEmpty(currentStoreUrl) && (currentStoreUrl.Equals(HttpContext.Request.Host.Host, StringComparison.OrdinalIgnoreCase)))- model.SystemWarnings.Add(new SystemInfoModel.SystemWarningModel {- Level = SystemInfoModel.SystemWarningModel.SystemWarningLevel.Pass,- Text = _translationService.GetResource("Admin.System.Warnings.URL.Match")- });- else- model.SystemWarnings.Add(new SystemInfoModel.SystemWarningModel {- Level = SystemInfoModel.SystemWarningModel.SystemWarningLevel.Warning,- Text = string.Format(_translationService.GetResource("Admin.System.Warnings.URL.NoMatch"), currentStoreUrl, HttpContext.Request.Host.Host)- });--- //primary exchange rate currency- var perCurrency = await _currencyService.GetCurrencyById(_currencySettings.PrimaryExchangeRateCurrencyId);- if (perCurrency != null)- {- model.SystemWarnings.Add(new SystemInfoModel.SystemWarningModel {- Level = SystemInfoModel.SystemWarningModel.SystemWarningLevel.Pass,- Text = _translationService.GetResource("Admin.System.Warnings.ExchangeCurrency.Set"),- });- if (perCurrency.Rate != 1)- {- model.SystemWarnings.Add(new SystemInfoModel.SystemWarningModel {- Level = SystemInfoModel.SystemWarningModel.SystemWarningLevel.Fail,- Text = _translationService.GetResource("Admin.System.Warnings.ExchangeCurrency.Rate1")- });- }- }- else- {- model.SystemWarnings.Add(new SystemInfoModel.SystemWarningModel {- Level = SystemInfoModel.SystemWarningModel.SystemWarningLevel.Fail,- Text = _translationService.GetResource("Admin.System.Warnings.ExchangeCurrency.NotSet")- });- }-- //primary store currency- var pscCurrency = await _currencyService.GetCurrencyById(_currencySettings.PrimaryStoreCurrencyId);- if (pscCurrency != null)- {- model.SystemWarnings.Add(new SystemInfoModel.SystemWarningModel {- Level = SystemInfoModel.SystemWarningModel.SystemWarningLevel.Pass,- Text = _translationService.GetResource("Admin.System.Warnings.PrimaryCurrency.Set"),- });- }- else- {- model.SystemWarnings.Add(new SystemInfoModel.SystemWarningModel {- Level = SystemInfoModel.SystemWarningModel.SystemWarningLevel.Fail,- Text = _translationService.GetResource("Admin.System.Warnings.PrimaryCurrency.NotSet")- });- }--- //base measure weight- var bWeight = await _measureService.GetMeasureWeightById(_measureSettings.BaseWeightId);- if (bWeight != null)- {- model.SystemWarnings.Add(new SystemInfoModel.SystemWarningModel {- Level = SystemInfoModel.SystemWarningModel.SystemWarningLevel.Pass,- Text = _translationService.GetResource("Admin.System.Warnings.DefaultWeight.Set"),- });-- if (bWeight.Ratio != 1)- {- model.SystemWarnings.Add(new SystemInfoModel.SystemWarningModel {- Level = SystemInfoModel.SystemWarningModel.SystemWarningLevel.Fail,- Text = _translationService.GetResource("Admin.System.Warnings.DefaultWeight.Ratio1")- });- }- }- else- {- model.SystemWarnings.Add(new SystemInfoModel.SystemWarningModel {- Level = SystemInfoModel.SystemWarningModel.SystemWarningLevel.Fail,- Text = _translationService.GetResource("Admin.System.Warnings.DefaultWeight.NotSet")- });- }--- //base dimension weight- var bDimension = await _measureService.GetMeasureDimensionById(_measureSettings.BaseDimensionId);- if (bDimension != null)- {- model.SystemWarnings.Add(new SystemInfoModel.SystemWarningModel {- Level = SystemInfoModel.SystemWarningModel.SystemWarningLevel.Pass,- Text = _translationService.GetResource("Admin.System.Warnings.DefaultDimension.Set"),- });-- if (bDimension.Ratio != 1)- {- model.SystemWarnings.Add(new SystemInfoModel.SystemWarningModel {- Level = SystemInfoModel.SystemWarningModel.SystemWarningLevel.Fail,- Text = _translationService.GetResource("Admin.System.Warnings.DefaultDimension.Ratio1")- });- }- }- else- {- model.SystemWarnings.Add(new SystemInfoModel.SystemWarningModel {- Level = SystemInfoModel.SystemWarningModel.SystemWarningLevel.Fail,- Text = _translationService.GetResource("Admin.System.Warnings.DefaultDimension.NotSet")- });- }-- //shipping rate coputation methods- var srcMethods = await _shippingService.LoadActiveShippingRateCalculationProviders();- if (srcMethods.Count == 0)- model.SystemWarnings.Add(new SystemInfoModel.SystemWarningModel {- Level = SystemInfoModel.SystemWarningModel.SystemWarningLevel.Fail,- Text = _translationService.GetResource("Admin.System.Warnings.Shipping.NoComputationMethods")- });- if (srcMethods.Count(x => x.ShippingRateCalculationType == ShippingRateCalculationType.Off) > 1)- model.SystemWarnings.Add(new SystemInfoModel.SystemWarningModel {- Level = SystemInfoModel.SystemWarningModel.SystemWarningLevel.Warning,- Text = _translationService.GetResource("Admin.System.Warnings.Shipping.OnlyOneOffline")- });-- //payment methods- if ((await _paymentService.LoadActivePaymentMethods()).Any())- model.SystemWarnings.Add(new SystemInfoModel.SystemWarningModel {- Level = SystemInfoModel.SystemWarningModel.SystemWarningLevel.Pass,- Text = _translationService.GetResource("Admin.System.Warnings.PaymentMethods.OK")- });- else- model.SystemWarnings.Add(new SystemInfoModel.SystemWarningModel {- Level = SystemInfoModel.SystemWarningModel.SystemWarningLevel.Fail,- Text = _translationService.GetResource("Admin.System.Warnings.PaymentMethods.NoActive")- });-- //performance settings- if (CommonHelper.IgnoreStoreLimitations)- {- model.SystemWarnings.Add(new SystemInfoModel.SystemWarningModel {- Level = SystemInfoModel.SystemWarningModel.SystemWarningLevel.Warning,- Text = _translationService.GetResource("Admin.System.Warnings.Performance.IgnoreStoreLimitations")- });- }- if (CommonHelper.IgnoreAcl)- {- model.SystemWarnings.Add(new SystemInfoModel.SystemWarningModel {- Level = SystemInfoModel.SystemWarningModel.SystemWarningLevel.Warning,- Text = _translationService.GetResource("Admin.System.Warnings.Performance.IgnoreAcl")- });- }-- return View(model);- }-public IActionResult Maintenance(){var model = new MaintenanceModel() {- DeleteGuests = new MaintenanceModel.DeleteGuestsModel() {+ DeleteGuests = new MaintenanceModel.DeleteGuestsModel() {EndDate = DateTime.UtcNow.AddDays(-7),OnlyWithoutShoppingCart = true,},@@ -369,7 +140,7 @@ namespace Grand.Web.Admin.Controllerspublic async Task<IActionResult> MaintenanceConvertPicture([FromServices] IPictureService pictureService,[FromServices] StorageSettings storageSettings,- [FromServices] MediaSettings mediaSettings,+ [FromServices] MediaSettings mediaSettings,[FromServices] ILogger logger){var numberOfConvertItems = 0;@@ -396,60 +167,6 @@ namespace Grand.Web.Admin.Controllersreturn RedirectToAction("Maintenance");}-- public async Task<IActionResult> ClearCache(string returnUrl, [FromServices] ICacheBase cacheBase)- {- await cacheBase.Clear();-- //home page- if (string.IsNullOrEmpty(returnUrl))- return RedirectToAction("Index", "Home", new { area = Constants.AreaAdmin });- //prevent open redirection attack- if (!Url.IsLocalUrl(returnUrl))- return RedirectToAction("Index", "Home", new { area = Constants.AreaAdmin });- return Redirect(returnUrl);- }--- public IActionResult RestartApplication(string returnUrl = "")- {- //stop application- _applicationLifetime.StopApplication();-- //home page- if (String.IsNullOrEmpty(returnUrl))- return RedirectToAction("Index", "Home", new { area = Constants.AreaAdmin });- //prevent open redirection attack- if (!Url.IsLocalUrl(returnUrl))- return RedirectToAction("Index", "Home", new { area = Constants.AreaAdmin });- return Redirect(returnUrl);- }-- public IActionResult Roslyn()- {- return View(_appConfig.UseRoslynScripts);- }-- [HttpPost]- public IActionResult Roslyn(DataSourceRequest command)- {- var scripts = RoslynCompiler.ReferencedScripts != null ? RoslynCompiler.ReferencedScripts.ToList() : new List<ResultCompiler>();-- var gridModel = new DataSourceResult {- Data = scripts.Select(x =>- {- return new- {- FileName = x.OriginalFile,- IsCompiled = x.IsCompiled,- Errors = string.Join(",", x.ErrorInfo)- };- }),- Total = scripts.Count- };- return Json(gridModel);- }-public IActionResult SeNames(){var model = new UrlEntityListModel();@@ -651,8 +368,6 @@ namespace Grand.Web.Admin.Controllers}}--#endregion}}\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Controllers/SystemController.cs b/src/Web/Grand.Web.Admin/Controllers/SystemController.csnew file mode 100644index 000000000..324c37ecb--- /dev/null+++ b/src/Web/Grand.Web.Admin/Controllers/SystemController.cs@@ -0,0 +1,328 @@+using Grand.Business.Checkout.Enum;+using Grand.Business.Checkout.Interfaces.Payments;+using Grand.Business.Checkout.Interfaces.Shipping;+using Grand.Business.Common.Interfaces.Directory;+using Grand.Business.Common.Interfaces.Localization;+using Grand.Business.Common.Services.Security;+using Grand.Business.Storage.Interfaces;+using Grand.Business.System.Interfaces.MachineNameProvider;+using Grand.Domain.Directory;+using Grand.Infrastructure;+using Grand.Infrastructure.Caching;+using Grand.Infrastructure.Configuration;+using Grand.Infrastructure.Roslyn;+using Grand.SharedKernel.Extensions;+using Grand.Web.Admin.Extensions;+using Grand.Web.Admin.Models.Common;+using Grand.Web.Common.DataSource;+using Grand.Web.Common.Security.Authorization;+using Microsoft.AspNetCore.Http;+using Microsoft.AspNetCore.Mvc;+using Microsoft.Extensions.Hosting;+using System;+using System.Collections.Generic;+using System.Linq;+using System.Runtime.InteropServices;+using System.Threading.Tasks;++namespace Grand.Web.Admin.Controllers+{+ [PermissionAuthorize(PermissionSystemName.System)]+ public partial class SystemController : BaseAdminController+ {+ #region Fields++ private readonly IPaymentService _paymentService;+ private readonly IShippingService _shippingService;+ private readonly ICurrencyService _currencyService;+ private readonly IMeasureService _measureService;+ private readonly IDateTimeService _dateTimeService;+ private readonly IWorkContext _workContext;+ private readonly ITranslationService _translationService;+ private readonly IMachineNameProvider _machineNameProvider;+ private readonly IHostApplicationLifetime _applicationLifetime;+ private readonly IMediaFileStore _mediaFileStore;++ private readonly CurrencySettings _currencySettings;+ private readonly MeasureSettings _measureSettings;+ private readonly AppConfig _appConfig;+ #endregion++ #region Constructors++ public SystemController(IPaymentService paymentService,+ IShippingService shippingService,+ ICurrencyService currencyService,+ IMeasureService measureService,+ IDateTimeService dateTimeService,+ IWorkContext workContext,+ ITranslationService translationService,+ IMachineNameProvider machineNameProvider,+ IHostApplicationLifetime applicationLifetime,+ IMediaFileStore mediaFileStore,+ CurrencySettings currencySettings,+ MeasureSettings measureSettings,+ AppConfig appConfig)+ {+ _paymentService = paymentService;+ _shippingService = shippingService;+ _currencyService = currencyService;+ _measureService = measureService;+ _currencySettings = currencySettings;+ _measureSettings = measureSettings;+ _dateTimeService = dateTimeService;+ _workContext = workContext;+ _translationService = translationService;+ _applicationLifetime = applicationLifetime;+ _appConfig = appConfig;+ _machineNameProvider = machineNameProvider;+ _mediaFileStore = mediaFileStore;+ }++ #endregion++ #region Methods++ public async Task<IActionResult> SystemInfo()+ {+ var model = new SystemInfoModel();+ model.GrandVersion = GrandVersion.FullVersion;+ try+ {+ model.OperatingSystem = RuntimeInformation.OSDescription;+ }+ catch (Exception) { }+ try+ {+ model.AspNetInfo = RuntimeEnvironment.GetSystemVersion();+ }+ catch (Exception) { }++ model.MachineName = _machineNameProvider.GetMachineName();++ model.ServerTimeZone = TimeZoneInfo.Local.StandardName;+ model.ServerLocalTime = DateTime.Now;+ model.ApplicationTime = _dateTimeService.ConvertToUserTime(DateTime.UtcNow, TimeZoneInfo.Utc, _dateTimeService.CurrentTimeZone);+ model.UtcTime = DateTime.UtcNow;+ foreach (var header in HttpContext.Request.Headers)+ {+ model.ServerVariables.Add(new SystemInfoModel.ServerVariableModel {+ Name = header.Key,+ Value = header.Value+ });+ }+ foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies().ToList().OrderBy(x => x.FullName))+ {+ model.LoadedAssemblies.Add(new SystemInfoModel.LoadedAssembly {+ FullName = assembly.FullName,+ });+ }+ //store URL+ var currentStoreUrl = _workContext.CurrentHost.Url;+ if (!String.IsNullOrEmpty(currentStoreUrl) && (currentStoreUrl.Equals(HttpContext.Request.Host.Host, StringComparison.OrdinalIgnoreCase)))+ model.SystemWarnings.Add(new SystemInfoModel.SystemWarningModel {+ Level = SystemInfoModel.SystemWarningModel.SystemWarningLevel.Pass,+ Text = _translationService.GetResource("Admin.System.Warnings.URL.Match")+ });+ else+ model.SystemWarnings.Add(new SystemInfoModel.SystemWarningModel {+ Level = SystemInfoModel.SystemWarningModel.SystemWarningLevel.Warning,+ Text = string.Format(_translationService.GetResource("Admin.System.Warnings.URL.NoMatch"), currentStoreUrl, HttpContext.Request.Host.Host)+ });+++ //primary exchange rate currency+ var perCurrency = await _currencyService.GetCurrencyById(_currencySettings.PrimaryExchangeRateCurrencyId);+ if (perCurrency != null)+ {+ model.SystemWarnings.Add(new SystemInfoModel.SystemWarningModel {+ Level = SystemInfoModel.SystemWarningModel.SystemWarningLevel.Pass,+ Text = _translationService.GetResource("Admin.System.Warnings.ExchangeCurrency.Set"),+ });+ if (perCurrency.Rate != 1)+ {+ model.SystemWarnings.Add(new SystemInfoModel.SystemWarningModel {+ Level = SystemInfoModel.SystemWarningModel.SystemWarningLevel.Fail,+ Text = _translationService.GetResource("Admin.System.Warnings.ExchangeCurrency.Rate1")+ });+ }+ }+ else+ {+ model.SystemWarnings.Add(new SystemInfoModel.SystemWarningModel {+ Level = SystemInfoModel.SystemWarningModel.SystemWarningLevel.Fail,+ Text = _translationService.GetResource("Admin.System.Warnings.ExchangeCurrency.NotSet")+ });+ }++ //primary store currency+ var pscCurrency = await _currencyService.GetCurrencyById(_currencySettings.PrimaryStoreCurrencyId);+ if (pscCurrency != null)+ {+ model.SystemWarnings.Add(new SystemInfoModel.SystemWarningModel {+ Level = SystemInfoModel.SystemWarningModel.SystemWarningLevel.Pass,+ Text = _translationService.GetResource("Admin.System.Warnings.PrimaryCurrency.Set"),+ });+ }+ else+ {+ model.SystemWarnings.Add(new SystemInfoModel.SystemWarningModel {+ Level = SystemInfoModel.SystemWarningModel.SystemWarningLevel.Fail,+ Text = _translationService.GetResource("Admin.System.Warnings.PrimaryCurrency.NotSet")+ });+ }+++ //base measure weight+ var bWeight = await _measureService.GetMeasureWeightById(_measureSettings.BaseWeightId);+ if (bWeight != null)+ {+ model.SystemWarnings.Add(new SystemInfoModel.SystemWarningModel {+ Level = SystemInfoModel.SystemWarningModel.SystemWarningLevel.Pass,+ Text = _translationService.GetResource("Admin.System.Warnings.DefaultWeight.Set"),+ });++ if (bWeight.Ratio != 1)+ {+ model.SystemWarnings.Add(new SystemInfoModel.SystemWarningModel {+ Level = SystemInfoModel.SystemWarningModel.SystemWarningLevel.Fail,+ Text = _translationService.GetResource("Admin.System.Warnings.DefaultWeight.Ratio1")+ });+ }+ }+ else+ {+ model.SystemWarnings.Add(new SystemInfoModel.SystemWarningModel {+ Level = SystemInfoModel.SystemWarningModel.SystemWarningLevel.Fail,+ Text = _translationService.GetResource("Admin.System.Warnings.DefaultWeight.NotSet")+ });+ }+++ //base dimension weight+ var bDimension = await _measureService.GetMeasureDimensionById(_measureSettings.BaseDimensionId);+ if (bDimension != null)+ {+ model.SystemWarnings.Add(new SystemInfoModel.SystemWarningModel {+ Level = SystemInfoModel.SystemWarningModel.SystemWarningLevel.Pass,+ Text = _translationService.GetResource("Admin.System.Warnings.DefaultDimension.Set"),+ });++ if (bDimension.Ratio != 1)+ {+ model.SystemWarnings.Add(new SystemInfoModel.SystemWarningModel {+ Level = SystemInfoModel.SystemWarningModel.SystemWarningLevel.Fail,+ Text = _translationService.GetResource("Admin.System.Warnings.DefaultDimension.Ratio1")+ });+ }+ }+ else+ {+ model.SystemWarnings.Add(new SystemInfoModel.SystemWarningModel {+ Level = SystemInfoModel.SystemWarningModel.SystemWarningLevel.Fail,+ Text = _translationService.GetResource("Admin.System.Warnings.DefaultDimension.NotSet")+ });+ }++ //shipping rate coputation methods+ var srcMethods = await _shippingService.LoadActiveShippingRateCalculationProviders();+ if (srcMethods.Count == 0)+ model.SystemWarnings.Add(new SystemInfoModel.SystemWarningModel {+ Level = SystemInfoModel.SystemWarningModel.SystemWarningLevel.Fail,+ Text = _translationService.GetResource("Admin.System.Warnings.Shipping.NoComputationMethods")+ });+ if (srcMethods.Count(x => x.ShippingRateCalculationType == ShippingRateCalculationType.Off) > 1)+ model.SystemWarnings.Add(new SystemInfoModel.SystemWarningModel {+ Level = SystemInfoModel.SystemWarningModel.SystemWarningLevel.Warning,+ Text = _translationService.GetResource("Admin.System.Warnings.Shipping.OnlyOneOffline")+ });++ //payment methods+ if ((await _paymentService.LoadActivePaymentMethods()).Any())+ model.SystemWarnings.Add(new SystemInfoModel.SystemWarningModel {+ Level = SystemInfoModel.SystemWarningModel.SystemWarningLevel.Pass,+ Text = _translationService.GetResource("Admin.System.Warnings.PaymentMethods.OK")+ });+ else+ model.SystemWarnings.Add(new SystemInfoModel.SystemWarningModel {+ Level = SystemInfoModel.SystemWarningModel.SystemWarningLevel.Fail,+ Text = _translationService.GetResource("Admin.System.Warnings.PaymentMethods.NoActive")+ });++ //performance settings+ if (CommonHelper.IgnoreStoreLimitations)+ {+ model.SystemWarnings.Add(new SystemInfoModel.SystemWarningModel {+ Level = SystemInfoModel.SystemWarningModel.SystemWarningLevel.Warning,+ Text = _translationService.GetResource("Admin.System.Warnings.Performance.IgnoreStoreLimitations")+ });+ }+ if (CommonHelper.IgnoreAcl)+ {+ model.SystemWarnings.Add(new SystemInfoModel.SystemWarningModel {+ Level = SystemInfoModel.SystemWarningModel.SystemWarningLevel.Warning,+ Text = _translationService.GetResource("Admin.System.Warnings.Performance.IgnoreAcl")+ });+ }++ return View(model);+ }+++ public async Task<IActionResult> ClearCache(string returnUrl, [FromServices] ICacheBase cacheBase)+ {+ await cacheBase.Clear();++ //home page+ if (string.IsNullOrEmpty(returnUrl))+ return RedirectToAction("Index", "Home", new { area = Constants.AreaAdmin });+ //prevent open redirection attack+ if (!Url.IsLocalUrl(returnUrl))+ return RedirectToAction("Index", "Home", new { area = Constants.AreaAdmin });+ return Redirect(returnUrl);+ }+++ public IActionResult RestartApplication(string returnUrl = "")+ {+ //stop application+ _applicationLifetime.StopApplication();++ //home page+ if (string.IsNullOrEmpty(returnUrl))+ return RedirectToAction("Index", "Home", new { area = Constants.AreaAdmin });+ //prevent open redirection attack+ if (!Url.IsLocalUrl(returnUrl))+ return RedirectToAction("Index", "Home", new { area = Constants.AreaAdmin });+ return Redirect(returnUrl);+ }++ public IActionResult Roslyn()+ {+ return View(_appConfig.UseRoslynScripts);+ }++ [HttpPost]+ public IActionResult Roslyn(DataSourceRequest command)+ {+ var scripts = RoslynCompiler.ReferencedScripts != null ? RoslynCompiler.ReferencedScripts.ToList() : new List<ResultCompiler>();++ var gridModel = new DataSourceResult {+ Data = scripts.Select(x =>+ {+ return new+ {+ FileName = x.OriginalFile,+ IsCompiled = x.IsCompiled,+ Errors = string.Join(",", x.ErrorInfo)+ };+ }),+ Total = scripts.Count+ };+ return Json(gridModel);+ }++ #endregion++ }+}\ No newline at end of file