Allow to set captcha theme and captcha score

Author: support

src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/GeneralCommon.TabSecuritySettings.cshtml

@@ -24,6 +24,8 @@
             $('#ssReCaptchaPrivateKeypnl').show();
             $('#ssReCaptchaVersionpnl').show();
             $('#ssCaptchaShowOnVendorReviewPagepnl').show();
+            $('#ssReCaptchaScorepnl').show();
+            $('#ssReCaptchaThemepnl').show();
         }
         else {
             $('#ssCaptchaShowOnLoginPagepnl').hide();
@@ -42,6 +44,8 @@
             $('#ssReCaptchaPrivateKeypnl').hide();
             $('#ssReCaptchaVersionpnl').hide();
             $('#ssCaptchaShowOnVendorReviewPagepnl').hide();
+            $('#ssReCaptchaScorepnl').hide();
+            $('#ssReCaptchaThemepnl').hide();
         }
     }
 </script>
@@ -261,5 +265,23 @@
                 <span asp-validation-for="SecuritySettings.ReCaptchaPrivateKey"></span>
             </div>
         </div>
+        <div class="form-group" id="ssReCaptchaScorepnl">
+            <div class="col-8 col-md-4 col-sm-4 text-right">
+                <admin-label asp-for="SecuritySettings.ReCaptchaScore" class="control-label" />
+            </div>
+            <div class="col-4 col-md-8 col-sm-8">
+                <admin-input asp-for="SecuritySettings.ReCaptchaScore" />
+                <span asp-validation-for="SecuritySettings.ReCaptchaScore"></span>
+            </div>
+        </div>
+        <div class="form-group" id="ssReCaptchaThemepnl">
+            <div class="col-8 col-md-4 col-sm-4 text-right">
+                <admin-label asp-for="SecuritySettings.ReCaptchaTheme" class="control-label" />
+            </div>
+            <div class="col-4 col-md-8 col-sm-8">
+                <admin-input asp-for="SecuritySettings.ReCaptchaTheme" />
+                <span asp-validation-for="SecuritySettings.ReCaptchaTheme"></span>
+            </div>
+        </div>
     </div>
 </div>

src/Web/Grand.Web.Admin/Mapper/CaptchaSettingsProfile.cs

@@ -27,6 +27,8 @@ public CaptchaSettingsProfile()
                 .ForMember(dest => dest.ReCaptchaVersion, mo => mo.MapFrom(p => p.ReCaptchaVersion))
                 .ForMember(dest => dest.ReCaptchaPublicKey, mo => mo.MapFrom(p => p.ReCaptchaPublicKey))
                 .ForMember(dest => dest.ReCaptchaPrivateKey, mo => mo.MapFrom(p => p.ReCaptchaPrivateKey))
+                .ForMember(dest => dest.ReCaptchaScore, mo => mo.MapFrom(p => p.ReCaptchaScore))
+                .ForMember(dest => dest.ReCaptchaTheme, mo => mo.MapFrom(p => p.ReCaptchaTheme))
                 .ForMember(dest => dest.AvailableReCaptchaVersions, mo => mo.Ignore())
                 .ForMember(dest => dest.UserFields, mo => mo.Ignore());
 

src/Web/Grand.Web.Admin/Models/Settings/GeneralCommonSettingsModel.cs

@@ -266,13 +266,17 @@ public SecuritySettingsModel()
             public bool CaptchaShowOnVendorReviewPage { get; set; }
 
             [GrandResourceDisplayName("Admin.Settings.GeneralCommon.reCaptchaPublicKey")]
-
             public string ReCaptchaPublicKey { get; set; }
 
             [GrandResourceDisplayName("Admin.Settings.GeneralCommon.reCaptchaPrivateKey")]
-
             public string ReCaptchaPrivateKey { get; set; }
 
+            [GrandResourceDisplayName("Admin.Settings.GeneralCommon.ReCaptchaTheme")]
+            public string ReCaptchaTheme { get; set; }
+
+            [GrandResourceDisplayName("Admin.Settings.GeneralCommon.ReCaptchaScore")]
+            public decimal ReCaptchaScore { get; set; }
+
             [GrandResourceDisplayName("Admin.Settings.GeneralCommon.reCaptchaVersion")]
             public GoogleReCaptchaVersion ReCaptchaVersion { get; set; }
             public IList<SelectListItem> AvailableReCaptchaVersions { get; set; }

src/Web/Grand.Web.Common/Security/Captcha/CaptchaSettings.cs

@@ -78,6 +78,10 @@ public class CaptchaSettings : ISettings
         /// </summary>
         public string ReCaptchaTheme { get; set; }
         /// <summary>
+        /// reCAPTCHA score
+        /// </summary>
+        public decimal ReCaptchaScore { get; set; }
+        /// <summary>
         /// reCAPTCHA version
         /// </summary>
         public GoogleReCaptchaVersion ReCaptchaVersion { get; set; }

src/Web/Grand.Web.Common/Security/Captcha/GoogleReCaptchaValidator.cs

@@ -49,7 +49,14 @@ private GoogleReCaptchaResponse ParseResponseResult(string responseString)
             var result = new GoogleReCaptchaResponse();
 
             var resultObject = JObject.Parse(responseString);
-            result.IsValid = resultObject.Value<bool>("success");
+            var success = resultObject.Value<bool>("success");
+            if(_captchaSettings.ReCaptchaVersion == GoogleReCaptchaVersion.V3)
+            {
+                decimal score = resultObject.Value<decimal>("score");
+                if (_captchaSettings.ReCaptchaScore > 0)
+                    success = success && score >= _captchaSettings.ReCaptchaScore;
+            }
+            result.IsValid = success;
 
             if (resultObject.Value<JToken>("error-codes") != null &&
                     resultObject.Value<JToken>("error-codes").Values<string>().Any())

src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml

@@ -11430,6 +11430,12 @@
   <Resource Name="Admin.Settings.GeneralCommon.reCaptchaPublicKey">
     <Value>reCAPTCHA public key</Value>
   </Resource>
+  <Resource Name="Admin.Settings.GeneralCommon.ReCaptchaTheme">
+	<Value>Theme for reCAPTCHA (e.g. blackglass, white) </Value>
+  </Resource>
+  <Resource Name="Admin.Settings.GeneralCommon.ReCaptchaScore">
+	<Value>reCAPTCHA v3 Score (1.0 is very likely a very good interaction, 0.0 is very likely a bot)</Value>
+  </Resource>
   <Resource Name="Admin.Settings.GeneralCommon.reCaptchaVersion">
     <Value>reCAPTCHA version</Value>
   </Resource>

src/Web/Grand.Web/App_Data/Resources/Upgrade/en_200.xml

@@ -45,4 +45,10 @@
 	<Resource Name="Products.Mpn">
 		<Value>Manufacturer part number</Value>
 	</Resource>
+	<Resource Name="Admin.Settings.GeneralCommon.ReCaptchaTheme">
+		<Value>Theme for reCAPTCHA (e.g. blackglass, white) </Value>
+	</Resource>
+	<Resource Name="Admin.Settings.GeneralCommon.ReCaptchaScore">
+		<Value>reCAPTCHA v3 Score (1.0 is very likely a very good interaction, 0.0 is very likely a bot)</Value>
+	</Resource>
 </Language>