Merge bde57f9 into 96518fd

michaelvs97 · Sep 28, 2022 · fba4ca2 · fba4ca2
2 parents 96518fd + bde57f9
commit fba4ca2
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 2 deletions.
diff --git a/AspNetCore.ReCaptcha/ReCaptchaGenerator.cs b/AspNetCore.ReCaptcha/ReCaptchaGenerator.cs
@@ -62,12 +62,12 @@ public static IHtmlContent ReCaptchaV3(Uri baseUrl, string siteKey, string actio
             content.AppendHtml(@$"<input id=""g-recaptcha-response-{id}"" name=""g-recaptcha-response"" type=""hidden"" value="""" />");
             content.AppendFormat(@"<script src=""{0}api.js?render={1}&hl={2}""></script>", baseUrl, siteKey, language);
             content.AppendHtml("<script>");
-            content.AppendHtml("function updateReCaptcha() {");
+            content.AppendHtml($"function updateReCaptcha{id}() {{");
             content.AppendFormat("grecaptcha.execute('{0}', {{action: '{1}'}}).then(function(token){{", siteKey, action);
             content.AppendHtml($"document.getElementById('g-recaptcha-response-{id}').value = token;");
             content.AppendHtml("});");
             content.AppendHtml("}");
-            content.AppendHtml("grecaptcha.ready(function() {setInterval(updateReCaptcha, 100000); updateReCaptcha()});");
+            content.AppendHtml($"grecaptcha.ready(function() {{setInterval(updateReCaptcha{id}, 100000); updateReCaptcha{id}()}});");
             content.AppendHtml("</script>");
             content.AppendLine();
 

diff --git a/Samples/AspNetCore.ReCaptcha.Net60/Pages/Contact.cshtml b/Samples/AspNetCore.ReCaptcha.Net60/Pages/Contact.cshtml
@@ -59,3 +59,41 @@ function submitForm() {
         </div>
     }
 </form>
+
+<form method="post">
+    <div asp-validation-summary="All"></div>
+
+    <div class="form-group">
+        <label asp-for="Name" class="control-label"></label>
+        <input asp-for="Name" class="form-control"/>
+    </div>
+
+    <div class="form-group">
+        <label asp-for="Body" class="control-label"></label>
+        <textarea asp-for="Body" class="form-control"></textarea>
+    </div>
+
+    <div class="form-group">
+        @switch (ReCaptchaSettings.Value.Version)
+        {
+            case ReCaptchaVersion.V2:
+                // Optionally override language of the recaptcha
+                // @Html.ReCaptcha(language: "en")
+                <recaptcha />
+                break;
+            case ReCaptchaVersion.V2Invisible:
+                <recaptcha class-name="btn btn-primary" callback="submitForm" text="Submit Invisible ReCaptcha" />
+                break;
+            case ReCaptchaVersion.V3:
+                <recaptcha action="contact" />
+                break;
+        }
+    </div>
+
+    @if (ReCaptchaSettings.Value.Version != ReCaptchaVersion.V2Invisible)
+    {
+        <div class="form-group">
+            <input type="submit" value="Submit" class="btn btn-primary"/>
+        </div>
+    }
+</form>