Resolved #951

w7corp · Oct 22, 2017 · 1b448aa · 1b448aa
1 parent e2de73d
commit 1b448aa
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/src/Kernel/AccessToken.php b/src/Kernel/AccessToken.php
@@ -136,22 +136,23 @@ public function refresh(): AccessTokenInterface
 
     /**
      * @param array $credentials
-     *
      * @param bool  $toArray
      *
      * @return \Psr\Http\Message\ResponseInterface|\EasyWeChat\Kernel\Support\Collection|array|object|string
+     *
      * @throws \EasyWeChat\Kernel\Exceptions\HttpException
      */
     public function requestToken(array $credentials, $toArray = false)
     {
         $response = $this->sendRequest($credentials);
         $result = json_decode($response->getBody()->getContents(), true);
+        $formatted = $this->resolveResponse($response, $this->app['config']->get('response_type', 'array'));
 
         if (empty($result[$this->tokenKey])) {
-            throw new HttpException('Request access_token fail: '.json_encode($result, JSON_UNESCAPED_UNICODE), $response);
+            throw new HttpException('Request access_token fail: '.json_encode($result, JSON_UNESCAPED_UNICODE), $response, $formatted);
         }
 
-        return $toArray ? $result : $this->resolveResponse($response, $this->app['config']->get('response_type', 'array'));
+        return $toArray ? $result : $formatted;
     }
 
     /**

diff --git a/src/Kernel/Exceptions/HttpException.php b/src/Kernel/Exceptions/HttpException.php
@@ -25,18 +25,25 @@ class HttpException extends Exception
      */
     public $response;
 
+    /**
+     * @var \Psr\Http\Message\ResponseInterface|\EasyWeChat\Kernel\Support\Collection|array|object|string
+     */
+    public $formattedResponse;
+
     /**
      * HttpException constructor.
      *
      * @param string                                   $message
      * @param \Psr\Http\Message\ResponseInterface|null $response
+     * @param null                                     $formattedResponse
      * @param int|null                                 $code
      */
-    public function __construct($message, ResponseInterface $response = null, $code = null)
+    public function __construct($message, ResponseInterface $response = null, $formattedResponse = null, $code = null)
     {
         parent::__construct($message, $code);
 
         $this->response = $response;
+        $this->formattedResponse = $formattedResponse;
 
         if ($response) {
             $response->getBody()->rewind();

diff --git a/tests/Kernel/AccessTokenTest.php b/tests/Kernel/AccessTokenTest.php
@@ -146,9 +146,14 @@ public function testRequestToken()
         $response = new Response(200, [], '{"error_msg":"mock-error-message"}');
         $token->expects()->sendRequest($credentials)->andReturn($response)->once();
 
-        $this->expectException(HttpException::class);
-        $this->expectExceptionMessage('Request access_token fail: {"error_msg":"mock-error-message"}');
-        $token->requestToken($credentials);
+        try {
+            $token->requestToken($credentials);
+        } catch (\Exception $e) {
+            $this->assertInstanceOf(HttpException::class, $e);
+            $this->assertSame('Request access_token fail: {"error_msg":"mock-error-message"}', $e->getMessage());
+            $this->assertInstanceOf(Collection::class, $e->formattedResponse);
+            $this->assertSame('mock-error-message', $e->formattedResponse->get('error_msg'));
+        }
     }
 
     public function testApplyToRequest()