incoke captcha helper with target action descriptor

commerble · Jun 27, 2024 · fffd49d · fffd49d
1 parent f38f7a0
commit fffd49d
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 12 deletions.
diff --git a/templates/Modd/Purchase/Confirm.cshtml b/templates/Modd/Purchase/Confirm.cshtml
@@ -1,4 +1,4 @@
-@{
+@{
     var cart = Page.ViewData.Model as ShoppingCartBase;
     var viewData = Page.ViewData[BasicController.ViewMessageKey] as ViewMessages;
     var hasErrors = viewData.Errors.Any();
@@ -9,7 +9,7 @@
     <h1 class="h-underline">購入</h1>
     @DisplayViewMessages(viewData)
     <form action="@PurchaseUrl(cart.CartDefinition.CartId)" method="post">
-                @Page.Html.SessionAntiForgeryToken()
+        @Page.Html.SessionAntiForgeryToken()
         @Page.Html.PartialEx("ModdSharedCartItems", cart, new { total=true, action=false })
         <h2 class="h-centerline mt"><span>ご注文詳細情報</span></h2>
         <h3 class="h-title">お客様情報</h3>
@@ -113,5 +113,5 @@
     </form>
 </main>
 @section ScriptBlock {
-    @Page.Template.RecaptchaRenderInclude()
+    @Page.Template.RecaptchaRenderInclude("Purchase/Create")
 }
diff --git a/templates/Modd/Purchase/Payment.cshtml b/templates/Modd/Purchase/Payment.cshtml
@@ -132,8 +132,12 @@
             </dd>
         </dl>
         <div class="block block-vertical">
-            <button type="submit" class="btn btn-action btn-large btn-next">内容の確認に進む</button>
+            <button type="submit" class="btn btn-action btn-large btn-next" data-cb-recaptcha="trigger">内容の確認に進む</button>
             <a href="@PurchaseShippingUrl(payment.CartId)" class="btn btn-primary btn-text btn-prev">配送情報を変更する</a>
         </div>
+        <input type="hidden" name="CAPTCHA" data-cb-recaptcha="token">
     </form>
 </main>
+@section ScriptBlock {
+    @Page.Template.RecaptchaRenderInclude("Purchase/Payment")
+}
diff --git a/templates/Modd/Site/Account.cshtml b/templates/Modd/Site/Account.cshtml
@@ -13,6 +13,7 @@
     <h1 class="h-underline">新規会員登録</h1>
     @DisplayViewMessages(viewData)
     <form action="@RegisterUrl()" method="post">
+        <input type="hidden" name="CAPTCHA" data-cb-recaptcha="token">
         @Page.Html.SessionAntiForgeryToken()
         <dl class="field required">
             <dt class="field-title">氏名</dt>
@@ -159,7 +160,10 @@
         </dl>
         <p class="text-center"><a href="@Href("~/page/privacy")" target="_blank">プライバシーポリシー</a>、<a href="@Href("~/page/terms")" target="_blank">ご利用規約</a>をお読みください。</p>
         <div class="block">
-            <button type="submit" name="confirm" value="confirm" class="btn btn-primary btn-next">同意して登録内容を確認する</button>
+            <button type="submit" name="confirm" value="confirm" class="btn btn-primary btn-next" data-cb-recaptcha="trigger">同意して登録内容を確認する</button>
         </div>
     </form>
 </main>
+@section ScriptBlock {
+    @Page.Template.RecaptchaRenderInclude("Site/Account/Confirm")
+}
diff --git a/templates/Modd/Site/AccountConfirm.cshtml b/templates/Modd/Site/AccountConfirm.cshtml
@@ -53,8 +53,12 @@
             </dd>
         </dl>
         <div class="block block-vertical">
-            <button type="submit" class="btn btn-action btn-large" name="create" value="create">この内容で登録する</button>
+            <button type="submit" class="btn btn-action btn-large" name="create" value="create" data-cb-recaptcha="trigger">この内容で登録する</button>
             <button type="submit" class="btn btn-primary btn-text btn-prev">登録内容を変更する</button>
         </div>
+        <input type="hidden" name="CAPTCHA" data-cb-recaptcha="token">
     </form>
 </main>
+@section ScriptBlock {
+    @Page.Template.RecaptchaRenderInclude("Site/Account/Create")
+}
diff --git a/templates/Modd/Site/ActivateRequest.cshtml b/templates/Modd/Site/ActivateRequest.cshtml
@@ -26,7 +26,11 @@
             </dd>
         </dl>
         <div class="block">
-            <button type="submit" name="request" value="post" class="btn btn-primary btn-next">認証メールを再送信する</button>
+            <button type="submit" name="request" value="post" class="btn btn-primary btn-next" data-cb-recaptcha="trigger">認証メールを再送信する</button>
         </div>
+        <input type="hidden" name="CAPTCHA" data-cb-recaptcha="token">
     </form>
 </main>
+@section ScriptBlock {
+    @Page.Template.RecaptchaRenderInclude("Site/Activate/Request")
+}
diff --git a/templates/Modd/Site/Inquiry.cshtml b/templates/Modd/Site/Inquiry.cshtml
@@ -66,7 +66,11 @@
             </dd>
         </dl>
         <div class="block">
-            <button type="submit" name="confirm" value="post" class="btn btn-primary btn-next">お問い合わせ内容を確認する</button>
+            <button type="submit" name="confirm" value="post" class="btn btn-primary btn-next" data-cb-recaptcha="trigger">お問い合わせ内容を確認する</button>
         </div>
+        <input type="hidden" name="CAPTCHA" data-cb-recaptcha="token">
     </form>
 </main>
+@section ScriptBlock {
+    @Page.Template.RecaptchaRenderInclude("Site/Inquiry/Confirm")
+}
diff --git a/templates/Modd/Site/InquiryConfirm.cshtml b/templates/Modd/Site/InquiryConfirm.cshtml
@@ -34,8 +34,12 @@
             </dd>
         </dl>
         <div class="block block-vertical">
-            <button type="submit" class="btn btn-action btn-large" name="create" value="create">この内容で送信する</button>
+            <button type="submit" class="btn btn-action btn-large" name="create" value="create" data-cb-recaptcha="trigger">この内容で送信する</button>
             <button type="submit" class="btn btn-primary btn-text btn-prev">入力内容を変更する</button>
         </div>
+        <input type="hidden" name="CAPTCHA" data-cb-recaptcha="token">
     </form>
 </main>
+@section ScriptBlock {
+    @Page.Template.RecaptchaRenderInclude("Site/Inquiry/Create")
+}
diff --git a/templates/Modd/Site/Login.cshtml b/templates/Modd/Site/Login.cshtml
@@ -1,4 +1,4 @@
-@{
+@{
     var viewData = Page.ViewData[BasicController.ViewMessageKey] as ViewMessages;
     var returnUrl = Page.ViewData.Eval("returnUrl") as string ?? string.Empty;
     var showGuestLogin = returnUrl.StartsWith(Href("~/Purchase/"), StringComparison.OrdinalIgnoreCase);
@@ -52,5 +52,5 @@
     </div>
 </aside>
 @section ScriptBlock {
-    @Page.Template.RecaptchaRenderInclude()
+    @Page.Template.RecaptchaRenderInclude("Site/Login")
 }
diff --git a/templates/Modd/Site/Recovery.cshtml b/templates/Modd/Site/Recovery.cshtml
@@ -26,7 +26,11 @@
             </dd>
         </dl>
         <div class="block">
-            <button type="submit" name="request" value="post" class="btn btn-primary btn-next">パスワード再設定メールを送信する</button>
+            <button type="submit" name="request" value="post" class="btn btn-primary btn-next" data-cb-recaptcha="trigger">パスワード再設定メールを送信する</button>
         </div>
+        <input type="hidden" name="CAPTCHA" data-cb-recaptcha="token">
     </form>
 </main>
+@section ScriptBlock {
+    @Page.Template.RecaptchaRenderInclude("Site/Recovery/Request")
+}