Merge pull request #268 from m0ppers/tokenerrors

Better error handling. There might be notices

Author: elliotchance

src/OAuth/OAuth1/Service/Twitter.php

@@ -100,9 +100,11 @@ protected function parseAccessTokenResponse($responseBody)
         parse_str($responseBody, $data);
 
         if (null === $data || !is_array($data)) {
-            throw new TokenResponseException('Unable to parse response.');
+            throw new TokenResponseException('Unable to parse response: ' . $responseBody);
         } elseif (isset($data['error'])) {
             throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
+        } elseif (!isset($data["oauth_token"]) || !isset($data["oauth_token_secret"])) {
+            throw new TokenResponseException('Invalid response. OAuth Token data not set: ' . $responseBody);
         }
 
         $token = new StdOAuth1Token();

tests/Unit/OAuth1/Service/TwitterTest.php

@@ -304,4 +304,80 @@ public function testParseAccessTokenResponseValid()
 
         $this->assertInstanceOf('\\OAuth\\OAuth1\\Token\\StdOAuth1Token', $service->requestAccessToken('foo', 'bar', $token));
     }
+    
+    /**
+     * @covers OAuth\OAuth1\Service\Twitter::parseAccessTokenResponse
+     */
+    public function testParseAccessTokenErrorTotalBullshit()
+    {
+        $client = $this->getMock('\\OAuth\\Common\\Http\\Client\\ClientInterface');
+        $service = new Twitter(
+            $this->getMock('\\OAuth\\Common\\Consumer\\CredentialsInterface'),
+            $client,
+            $this->getMock('\\OAuth\\Common\\Storage\\TokenStorageInterface'),
+            $this->getMock('\\OAuth\\OAuth1\\Signature\\SignatureInterface')
+        );
+        
+        $this->setExpectedException('\\OAuth\\Common\\Http\\Exception\\TokenResponseException');
+        $method = new \ReflectionMethod(get_class($service), 'parseAccessTokenResponse');
+        $method->setAccessible(true);
+        $method->invokeArgs($service, array("hoho"));
+    }
+    
+    /**
+     * @covers OAuth\OAuth1\Service\Twitter::parseAccessTokenResponse
+     */
+    public function testParseAccessTokenErrorItsAnError()
+    {
+        $client = $this->getMock('\\OAuth\\Common\\Http\\Client\\ClientInterface');
+        $service = new Twitter(
+            $this->getMock('\\OAuth\\Common\\Consumer\\CredentialsInterface'),
+            $client,
+            $this->getMock('\\OAuth\\Common\\Storage\\TokenStorageInterface'),
+            $this->getMock('\\OAuth\\OAuth1\\Signature\\SignatureInterface')
+        );
+        
+        $this->setExpectedException('\\OAuth\\Common\\Http\\Exception\\TokenResponseException');
+        $method = new \ReflectionMethod(get_class($service), 'parseAccessTokenResponse');
+        $method->setAccessible(true);
+        $method->invokeArgs($service, array("error=hihihaha"));
+    }
+    
+    /**
+     * @covers OAuth\OAuth1\Service\Twitter::parseAccessTokenResponse
+     */
+    public function testParseAccessTokenErrorItsMissingOauthToken()
+    {
+        $client = $this->getMock('\\OAuth\\Common\\Http\\Client\\ClientInterface');
+        $service = new Twitter(
+            $this->getMock('\\OAuth\\Common\\Consumer\\CredentialsInterface'),
+            $client,
+            $this->getMock('\\OAuth\\Common\\Storage\\TokenStorageInterface'),
+            $this->getMock('\\OAuth\\OAuth1\\Signature\\SignatureInterface')
+        );
+        
+        $this->setExpectedException('\\OAuth\\Common\\Http\\Exception\\TokenResponseException');
+        $method = new \ReflectionMethod(get_class($service), 'parseAccessTokenResponse');
+        $method->setAccessible(true);
+        $method->invokeArgs($service, array("oauth_token_secret=1"));
+    }
+    
+    /**
+     * @covers OAuth\OAuth1\Service\Twitter::parseAccessTokenResponse
+     */
+    public function testParseAccessTokenErrorItsMissingOauthTokenSecret()
+    {
+        $client = $this->getMock('\\OAuth\\Common\\Http\\Client\\ClientInterface');
+        $service = new Twitter(
+            $this->getMock('\\OAuth\\Common\\Consumer\\CredentialsInterface'),
+            $client,
+            $this->getMock('\\OAuth\\Common\\Storage\\TokenStorageInterface'),
+            $this->getMock('\\OAuth\\OAuth1\\Signature\\SignatureInterface')
+        );
+        
+        $this->setExpectedException('\\OAuth\\Common\\Http\\Exception\\TokenResponseException');
+        $method = new \ReflectionMethod(get_class($service), 'parseAccessTokenResponse');
+        $method->setAccessible(true);
+        $method->invokeArgs($service, array("oauth_token=1"));
+    }
 }