Fix QQ error_description and missing OpenidMode::UNION_ID_FIRST (#18)

* Fix QQ error_description * Fix missing OpenidMode::UNION_ID_FIRST
Yurunsoft · Dec 7, 2021 · 3f67cc3 · 3f67cc3
1 parent 0f5fe7b
commit 3f67cc3
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 22 deletions.
diff --git a/src/QQ/OAuth2.php b/src/QQ/OAuth2.php
@@ -86,28 +86,20 @@ public function getAuthUrl($callbackUrl = null, $state = null, $scope = null)
      */
     protected function __getAccessToken($storeState, $code = null, $state = null)
     {
-        $content = $this->http->get($this->getUrl('oauth2.0/token', [
-            'grant_type'	    => 'authorization_code',
-            'client_id'		    => $this->appid,
-            'client_secret'	 => $this->appSecret,
-            'code'			        => isset($code) ? $code : (isset($_GET['code']) ? $_GET['code'] : ''),
-            'state'			       => isset($state) ? $state : (isset($_GET['state']) ? $_GET['state'] : ''),
-            'redirect_uri'	  => $this->getRedirectUri(),
-        ]))->body();
-        $jsonData = json_decode($content, true);
-        if ($jsonData)
-        {
-            $this->result = $jsonData;
-            throw new ApiException($jsonData['error_description'], $jsonData['error']);
-        }
-        parse_str($content, $result);
-        $this->result = $result;
-        if (isset($this->result['code']) && 0 != $this->result['code'])
-        {
-            throw new ApiException($this->result['msg'], $this->result['code']);
-        }
-        else
-        {
+        $this->result = $this->http->get(
+            $this->getUrl('oauth2.0/token', [
+                'grant_type' => 'authorization_code',
+                'client_id' => $this->appid,
+                'client_secret' => $this->appSecret,
+                'code' => isset($code) ? $code : (isset($_GET['code']) ? $_GET['code'] : ''),
+                'state' => isset($state) ? $state : (isset($_GET['state']) ? $_GET['state'] : ''),
+                'redirect_uri' => $this->getRedirectUri(),
+                'fmt' => 'json',
+            ])
+        )->json(true);
+        if (isset($this->result['error'])) {
+            throw new ApiException($this->result['error_description'], $this->result['error']);
+        } else {
             return $this->accessToken = $this->result['access_token'];
         }
     }

diff --git a/src/QQ/OpenidMode.php b/src/QQ/OpenidMode.php
@@ -13,4 +13,9 @@ class OpenidMode
      * 使用unionid.
      */
     const UNION_ID = 2;
+
+    /**
+     * 优先使用unionid，否则使用openid.
+     */
+    const UNION_ID_FIRST = 3;
 }