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
KnowledgebaseController - move validator logic from Controller to Validator
supporta01fe16cae07
diff --git a/src/Web/Grand.Web/Controllers/KnowledgebaseController.cs b/src/Web/Grand.Web/Controllers/KnowledgebaseController.csindex 70e74a185..e7d29acd8 100644--- a/src/Web/Grand.Web/Controllers/KnowledgebaseController.cs+++ b/src/Web/Grand.Web/Controllers/KnowledgebaseController.cs@@ -252,31 +252,17 @@ namespace Grand.Web.Controllers[HttpPost][AutoValidateAntiforgeryToken]- [ValidateCaptcha][DenySystemAccount]- public virtual async Task<IActionResult> ArticleCommentAdd(string articleId, KnowledgebaseArticleModel model, bool captchaValid,- [FromServices] IWorkContext workContext,- [FromServices] IGroupService groupService,+ public virtual async Task<IActionResult> ArticleCommentAdd(KnowledgebaseArticleModel model,[FromServices] ICustomerService customerService){if (!_knowledgebaseSettings.Enabled)return RedirectToRoute("HomePage");- var article = await _knowledgebaseService.GetPublicKnowledgebaseArticle(articleId);+ var article = await _knowledgebaseService.GetPublicKnowledgebaseArticle(model.ArticleId);if (article is not { AllowComments: true })return RedirectToRoute("HomePage");- if (await groupService.IsGuest(workContext.CurrentCustomer) && !_knowledgebaseSettings.AllowNotRegisteredUsersToLeaveComments)- {- ModelState.AddModelError("", _translationService.GetResource("Knowledgebase.Article.Comments.OnlyRegisteredUsersLeaveComments"));- }-- //validate CAPTCHA- if (_captchaSettings.Enabled && _captchaSettings.ShowOnArticleCommentPage && !captchaValid)- {- ModelState.AddModelError("", _captchaSettings.GetWrongCaptchaMessage(_translationService));- }-if (ModelState.IsValid){var customer = _workContext.CurrentCustomer;diff --git a/src/Web/Grand.Web/Models/Knowledgebase/KnowledgebaseArticleModel.cs b/src/Web/Grand.Web/Models/Knowledgebase/KnowledgebaseArticleModel.csindex e7d36156e..0d3689a8e 100644--- a/src/Web/Grand.Web/Models/Knowledgebase/KnowledgebaseArticleModel.cs+++ b/src/Web/Grand.Web/Models/Knowledgebase/KnowledgebaseArticleModel.cs@@ -1,4 +1,5 @@using Grand.Infrastructure.Models;+using Grand.Web.Models.Common;namespace Grand.Web.Models.Knowledgebase{@@ -11,7 +12,7 @@ namespace Grand.Web.Models.KnowledgebaseComments = new List<KnowledgebaseArticleCommentModel>();AddNewComment = new AddKnowledgebaseArticleCommentModel();}-+ public string ArticleId { get; set; }public string Name { get; set; }public string Content { get; set; }@@ -27,7 +28,9 @@ namespace Grand.Web.Models.Knowledgebasepublic string MetaTitle { get; set; }public bool AllowComments { get; set; }-++ public ICaptchaValidModel Captcha { get; set; } = new CaptchaModel();+public IList<KnowledgebaseArticleModel> RelatedArticles { get; set; }public List<KnowledgebaseCategoryModel> CategoryBreadcrumb { get; set; }diff --git a/src/Web/Grand.Web/Validators/Knowledgebase/KnowledgebaseArticleValidator.cs b/src/Web/Grand.Web/Validators/Knowledgebase/KnowledgebaseArticleValidator.csindex 9c3758c34..56a4993fb 100644--- a/src/Web/Grand.Web/Validators/Knowledgebase/KnowledgebaseArticleValidator.cs+++ b/src/Web/Grand.Web/Validators/Knowledgebase/KnowledgebaseArticleValidator.cs@@ -1,7 +1,15 @@using FluentValidation;+using Grand.Business.Core.Interfaces.Cms;+using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Domain.Knowledgebase;+using Grand.Infrastructure;+using Grand.Infrastructure.Models;using Grand.Infrastructure.Validators;+using Grand.Web.Common.Security.Captcha;+using Grand.Web.Common.Validators;using Grand.Web.Models.Knowledgebase;+using Microsoft.AspNetCore.Http;namespace Grand.Web.Validators.Knowledgebase{@@ -9,10 +17,35 @@ namespace Grand.Web.Validators.Knowledgebase{public KnowledgebaseArticleValidator(IEnumerable<IValidatorConsumer<KnowledgebaseArticleModel>> validators,+ IEnumerable<IValidatorConsumer<ICaptchaValidModel>> validatorsCaptcha,+ IWorkContext workContext, IGroupService groupService,+ IKnowledgebaseService knowledgebaseService, KnowledgebaseSettings knowledgebaseSettings,+ CaptchaSettings captchaSettings,+ IHttpContextAccessor contextAccessor, GoogleReCaptchaValidator googleReCaptchaValidator,ITranslationService translationService): base(validators){RuleFor(x => x.AddNewComment.CommentText).NotEmpty().WithMessage(translationService.GetResource("Grand.knowledgebase.addarticlecomment.result")).When(x => x.AddNewComment != null);++ RuleFor(x => x).CustomAsync(async (x, context, _) =>+ {+ if (await groupService.IsGuest(workContext.CurrentCustomer) && !knowledgebaseSettings.AllowNotRegisteredUsersToLeaveComments)+ {+ context.AddFailure(translationService.GetResource("Knowledgebase.Article.Comments.OnlyRegisteredUsersLeaveComments"));+ }+ var article = await knowledgebaseService.GetPublicKnowledgebaseArticle(x.ArticleId);+ if (article is not { AllowComments: true })+ context.AddFailure(translationService.GetResource("Knowledgebase.Article.Comments.NotAllowed"));+ });++ if (captchaSettings.Enabled && captchaSettings.ShowOnArticleCommentPage)+ {+ RuleFor(x => x.Captcha).NotNull()+ .WithMessage(translationService.GetResource("Account.Captcha.Required"));+ RuleFor(x => x.Captcha)+ .SetValidator(new CaptchaValidator(validatorsCaptcha, contextAccessor, googleReCaptchaValidator));+ }+}}}\ No newline at end of filediff --git a/src/Web/Grand.Web/Views/Knowledgebase/Article.cshtml b/src/Web/Grand.Web/Views/Knowledgebase/Article.cshtmlindex e8f2d65ca..f4e6be609 100644--- a/src/Web/Grand.Web/Views/Knowledgebase/Article.cshtml+++ b/src/Web/Grand.Web/Views/Knowledgebase/Article.cshtml@@ -68,7 +68,7 @@<div class="fieldset new-comment generalMarginSupporter" id="comments"><h4 class="generalTitle generalMarginSupporter">@Loc["Knowledgebase.Article.Comments.LeaveYourComment"]</h4><div class="notifications">- <div asp-validation-summary="ModelOnly" class="message-error"></div>+ <div asp-validation-summary="All" class="message-error"></div>@{var result = TempData["Grand.knowledgebase.addarticlecomment.result"] as string;}@@ -115,7 +115,7 @@</small></div></div>- <div class="col-12 px-0">+ <div class="card-body"><div class="row"><div class="col">@comment.CommentText