From a84e80cb46d992203b4b8d1790445422b74a750f Mon Sep 17 00:00:00 2001
From: Engincan VESKE <43685404+EngincanV@users.noreply.github.com>
Date: Thu, 24 Aug 2023 14:53:54 +0300
Subject: [PATCH] CMS: Should provide recaptcha token if it's enabled for
 newsletter

---
 .../CmsKitPublicCommentsController.cs         | 19 ++++++++++++++++---
 .../Controllers/CmsKitPublicControllerBase.cs | 12 ++++++++++++
 .../CmsKitPublicGlobalResourcesController.cs  |  2 +-
 .../CmsKitPublicWidgetsController.cs          |  2 +-
 4 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 modules/cms-kit/src/Volo.CmsKit.Public.Web/Controllers/CmsKitPublicControllerBase.cs

diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Controllers/CmsKitPublicCommentsController.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Controllers/CmsKitPublicCommentsController.cs
index e5613cb625..a2e2dea013 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Controllers/CmsKitPublicCommentsController.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Controllers/CmsKitPublicCommentsController.cs
@@ -3,6 +3,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
+using Volo.Abp;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.ObjectMapping;
 using Volo.CmsKit.Comments;
@@ -13,7 +14,7 @@ using Volo.CmsKit.Public.Web.Security.Captcha;
 namespace Volo.CmsKit.Public.Web.Controllers;
 
 //[Route("cms-kit/public-comments")]
-public class CmsKitPublicCommentsController : AbpController
+public class CmsKitPublicCommentsController : CmsKitPublicControllerBase
 {
     public ICommentPublicAppService CommentPublicAppService { get; }
     protected CmsKitCommentOptions CmsKitCommentOptions { get; }
@@ -32,8 +33,10 @@ public class CmsKitPublicCommentsController : AbpController
     [HttpPost]
     public virtual async Task ValidateAsync([FromBody] CreateCommentWithParametersInput input)
     {
-        if (CmsKitCommentOptions.IsRecaptchaEnabled && input.CaptchaToken.HasValue)
+        if (CmsKitCommentOptions.IsRecaptchaEnabled)
         {
+            CheckCaptchaTokenNullity(input.CaptchaToken);
+
             SimpleMathsCaptchaGenerator.Validate(input.CaptchaToken.Value, input.CaptchaAnswer);
         }
 
@@ -44,11 +47,21 @@ public class CmsKitPublicCommentsController : AbpController
     [HttpPost]
     public virtual async Task UpdateAsync(Guid id, [FromBody] UpdateCommentInput input)
     {
-        if (CmsKitCommentOptions.IsRecaptchaEnabled && input.CaptchaToken.HasValue)
+        if (CmsKitCommentOptions.IsRecaptchaEnabled)
         {
+            CheckCaptchaTokenNullity(input.CaptchaToken);
+
             SimpleMathsCaptchaGenerator.Validate(input.CaptchaToken.Value, input.CaptchaAnswer);
         }
         
         await CommentPublicAppService.UpdateAsync(id, input);
     }
+
+    private void CheckCaptchaTokenNullity(Guid? captchaToken)
+    {
+        if (!captchaToken.HasValue)
+        {
+            throw new UserFriendlyException(L["CaptchaCodeMissingMessage"]);
+        }
+    }
 }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Controllers/CmsKitPublicControllerBase.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Controllers/CmsKitPublicControllerBase.cs
new file mode 100644
index 0000000000..f22444036d
--- /dev/null
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Controllers/CmsKitPublicControllerBase.cs
@@ -0,0 +1,12 @@
+using Volo.Abp.AspNetCore.Mvc;
+using Volo.CmsKit.Localization;
+
+namespace Volo.CmsKit.Public.Web.Controllers;
+
+public abstract class CmsKitPublicControllerBase : AbpController
+{
+	public CmsKitPublicControllerBase()
+	{
+		LocalizationResource = typeof(CmsKitResource);
+	}
+}
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Controllers/CmsKitPublicGlobalResourcesController.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Controllers/CmsKitPublicGlobalResourcesController.cs
index 115dfd3fcc..eb4356e8b9 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Controllers/CmsKitPublicGlobalResourcesController.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Controllers/CmsKitPublicGlobalResourcesController.cs
@@ -11,7 +11,7 @@ using Volo.CmsKit.Public.GlobalResources;
 namespace Volo.CmsKit.Public.Web.Controllers;
 
 [Route("cms-kit/global-resources")]
-public class CmsKitPublicGlobalResourcesController: AbpController
+public class CmsKitPublicGlobalResourcesController : CmsKitPublicControllerBase
 {
     private readonly IGlobalResourcePublicAppService _globalResourcePublicAppService;
     private readonly IDistributedCache<GlobalResourceDto> _resourceCache;
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Controllers/CmsKitPublicWidgetsController.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Controllers/CmsKitPublicWidgetsController.cs
index c73fba95e7..67a9d64f67 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Controllers/CmsKitPublicWidgetsController.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Controllers/CmsKitPublicWidgetsController.cs
@@ -7,7 +7,7 @@ using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.ReactionSelection;
 
 namespace Volo.CmsKit.Public.Web.Controllers;
 
-public class CmsKitPublicWidgetsController : AbpController
+public class CmsKitPublicWidgetsController : CmsKitPublicControllerBase
 {
     public Task<IActionResult> ReactionSelection(string entityType, string entityId)
     {