Return 400 when recaptcha example fails (ampproject#20668)

estherkim · Feb 14, 2019 · 893ff3f · 893ff3f
1 parent 3f0d6c6
commit 893ff3f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/build-system/recaptcha-router.js b/build-system/recaptcha-router.js
@@ -61,7 +61,18 @@ recaptchaRouter.post(
         responseJson[bodyKey] = req.body[bodyKey];
       });
 
-      res.status(200).json(responseJson);
+      const containsRecaptchaInResponse = Object.keys(responseJson)
+          .some(responseJsonKey => {
+            return responseJsonKey.toLowerCase().includes('recaptcha');
+          });
+
+      if (containsRecaptchaInResponse) {
+        res.status(200).json(responseJson);
+      } else {
+        res.status(400).json({
+          message: 'Did not include a recaptcha token',
+        });
+      }
     }
 );
 

diff --git a/examples/recaptcha.amp.html b/examples/recaptcha.amp.html
@@ -131,7 +131,7 @@ <h1>You searched for: {{term}}</h1>
             <div submit-error>
               <template type="amp-mustache">
                 <h1>Error! Please check the JS Console in your dev tools.</h1>
-                <p>{{error}}</p>
+                <p>{{message}}</p>
               </template>
             </div>
 
@@ -193,7 +193,7 @@ <h1>You searched for: {{term}}</h1>
         <div submit-error>
           <template type="amp-mustache">
             <h1>Error! Please check the JS Console in your dev tools.</h1>
-            <p>{{error}}</p>
+            <p>{{message}}</p>
           </template>
         </div>
 
@@ -305,7 +305,7 @@ <h1>You searched for: {{term}}</h1>
         <div submit-error>
           <template type="amp-mustache">
             <h1>Error! Please check the JS Console in your dev tools.</h1>
-            <p>{{error}}</p>
+            <p>{{message}}</p>
           </template>
         </div>