Handle a case where google tells us the response is bad, but does not…

… specify error code. For non-json errors throw a Malformed response exception instead of generic exception.
phpninjas · Dec 16, 2014 · b68ab44 · b68ab44
1 parent 55b0c1f
commit b68ab44
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 12 deletions.
diff --git a/src/Google/ReCaptcha.php b/src/Google/ReCaptcha.php
@@ -82,10 +82,12 @@ public function validate($token, $ip = null)
                 return new ReCaptchaResponse(true);
             }elseif(array_key_exists("error-codes", $json) && is_array($json['error-codes'])) {
                 return new ReCaptchaResponse(false, $json['error-codes']);
+            }elseif(array_key_exists("success", $json) && !$json['success']){
+                return new ReCaptchaResponse(false, []);
             }else{
                 throw new MalformedResponseException($response);
             }
         }
-        throw new ReCaptchaException("Non-json response '$response'");
+        throw new MalformedResponseException($response);
     }
 }
diff --git a/src/Google/ReCaptchaResponse.php b/src/Google/ReCaptchaResponse.php
@@ -40,20 +40,39 @@ public function isFailure(){
         return !$this->isSuccess();
     }
 
+    /**
+     * @return bool
+     */
     public function isMissingInputSecret(){
         return array_search(static::MISSING_INPUT_SECRET, $this->errors)!==false;
     }
 
+    /**
+     * @return bool
+     */
     public function isMissingInputResponse(){
         return array_search(static::MISSING_INPUT_RESPONSE, $this->errors)!==false;
     }
 
+    /**
+     * @return bool
+     */
     public function isInvalidInputSecret(){
         return array_search(static::INVALID_INPUT_SECRET, $this->errors)!==false;
     }
 
+    /**
+     * @return bool
+     */
     public function isInvalidInputResponse(){
         return array_search(static::INVALID_INPUT_RESPONSE, $this->errors)!==false;
     }
 
+    /**
+     * @return bool
+     */
+    public function isUnknownError(){
+        return $this->isFailure() && array_diff($this->errors, [static::INVALID_INPUT_RESPONSE, static::INVALID_INPUT_SECRET, static::MISSING_INPUT_SECRET, static::MISSING_INPUT_RESPONSE]) > 0;
+    }
+
 }
diff --git a/test/Google/Test/RecaptchaTest.php b/test/Google/Test/RecaptchaTest.php
@@ -113,17 +113,6 @@ public function testInvalidJSON(){
 
     }
 
-    public function testPartialJSON(){
-
-        $this->setExpectedException("Google\ReCaptchaException");
-
-        $httpAdapter = $this->getMock("Google\HttpClientGetAdapter");
-        $httpAdapter->expects($this->once())->method('get')->will($this->returnValue(json_encode(["success"=>false])));
-
-        $recaptcha = new ReCaptcha("good secret", $httpAdapter);
-        $recaptcha->validate("any token");
-    }
-
     public function testCustomHttpClientExceptionHandling(){
 
         $httpException = new \Exception();
@@ -155,6 +144,32 @@ public function testNonExpectedJSONResponse(){
         $recaptcha->validate("any token");
     }
 
+    /**
+     * This behaviour is given off by google for some reason...
+     */
+    public function testMissingErrorCodes(){
+
+        $httpAdapter = $this->getMock("Google\HttpClientGetAdapter");
+        $httpAdapter->expects($this->once())->method('get')->will($this->returnValue(json_encode(["success"=>false])));
+
+        $recaptcha = new ReCaptcha("some secret", $httpAdapter);
+        $response = $recaptcha->validate("any token");
+
+        $this->assertThat($response->isFailure(), $this->isTrue());
+        $this->assertThat($response->isUnknownError(), $this->isTrue());
+    }
+
+    public function testUnknownErrorCodes(){
+        $httpAdapter = $this->getMock("Google\HttpClientGetAdapter");
+        $httpAdapter->expects($this->once())->method('get')->will($this->returnValue(json_encode(["success"=>false,"error-codes"=>["Something I made up"]])));
+
+        $recaptcha = new ReCaptcha("some secret", $httpAdapter);
+        $response = $recaptcha->validate("any token");
+
+        $this->assertThat($response->isFailure(), $this->isTrue());
+        $this->assertThat($response->isUnknownError(), $this->isTrue());
+    }
+
 
     private function validUrl()
     {