!26 开放登录线上测试2

* 初步完成开放登录，待线上测试2

app/Http/Home/Views/connect/bind_login.volt

@@ -13,8 +13,8 @@
         <div class="layui-input-block">
             <button id="submit-btn" class="layui-btn layui-btn-fluid" lay-submit="true" lay-filter="go">登录并绑定已有帐号</button>
             <input type="hidden" name="provider" value="{{ provider }}">
-            <input type="hidden" name="code" value="{{ request.get.code }}">
+            <input type="hidden" name="code" value="{{ request.get('code') }}">
-            <input type="hidden" name="state" value="{{ request.get.state }}">
+            <input type="hidden" name="state" value="{{ request.get('state') }}">
         </div>
     </div>
 </form>

app/Http/Home/Views/connect/bind_register.volt

@@ -21,8 +21,8 @@
         <div class="layui-input-block">
             <button id="cv-submit-btn" class="layui-btn layui-btn-fluid layui-btn-disabled" disabled="disabled" lay-submit="true" lay-filter="go">注册并绑定帐号</button>
             <input type="hidden" name="provider" value="{{ provider }}">
-            <input type="hidden" name="code" value="{{ request.get.code }}">
+            <input type="hidden" name="code" value="{{ request.get('code') }}">
-            <input type="hidden" name="state" value="{{ request.get.state }}">
+            <input type="hidden" name="state" value="{{ request.get('state') }}">
             <input id="cv-app-id" type="hidden" value="{{ captcha.app_id }}">
             <input id="cv-ticket" type="hidden" name="ticket">
             <input id="cv-rand" type="hidden" name="rand">

app/Http/Home/Views/user/console/account_info.volt

@@ -63,6 +63,7 @@
                 <div class="my-nav">
                     <span class="title">开放登录</span>
                 </div>
+                {% if connects %}
                     <div class="connect-tips">已经绑定的第三方帐号</div>
                     <div class="connect-list">
                         <table class="layui-table">
@@ -85,6 +86,7 @@
                             {% endfor %}
                         </table>
                     </div>
+                {% endif %}
                 <div class="connect-tips">支持绑定的第三方帐号</div>
                 <div class="oauth-list">
                     <a class="layui-icon layui-icon-login-qq login-qq" href="{{ url({'for':'home.oauth.qq'}) }}"></a>

app/Library/OAuth/QQ.php

@@ -33,7 +33,6 @@ class QQ extends OAuth
             'client_secret' => $this->clientSecret,
             'redirect_uri' => $this->redirectUri,
             'grant_type' => 'authorization_code',
-            'state' => 'ok',
         ];
         
         $response = $this->httpPost(self::ACCESS_TOKEN_URL, $params);
@@ -90,7 +89,7 @@ class QQ extends OAuth
         }
         
         if (!isset($result['openid'])) {
-            throw new \Exception("Fetch Openid Failed:{$response}");
+            throw new \Exception("Fetch OpenId Failed:{$response}");
         }
         
         return $result['openid'];
@@ -100,8 +99,8 @@ class QQ extends OAuth
     {
         $data = json_decode($response, true);
 
-        if ($data['ret'] != 0) {
+        if (isset($data['ret']) && $data['ret'] != 0) {
-            throw new \Exception("Fetch User Info Failed：{$data['msg']}");
+            throw new \Exception("Fetch User Info Failed:{$response}");
         }
 
         $userInfo['id'] = $this->openId;

app/Library/OAuth/WeiBo.php

@@ -8,7 +8,7 @@ class WeiBo extends OAuth
 {
 
     const AUTHORIZE_URL = 'https://api.weibo.com/oauth2/authorize';
-    const ACCESS_TOKEN_URL = 'https://api.weibo.com/oauth2/oauth2/access_token';
+    const ACCESS_TOKEN_URL = 'https://api.weibo.com/oauth2/access_token';
     const USER_INFO_URL = 'https://api.weibo.com/2/users/show.json';
 
     public function getAuthorizeUrl()
@@ -61,7 +61,7 @@ class WeiBo extends OAuth
     {
         $data = json_decode($response, true);
 
-        if (!isset($data['access_token']) || isset($data['uid'])) {
+        if (!isset($data['access_token']) || !isset($data['uid'])) {
             throw new \Exception("Fetch Access Token Failed:{$response}");
         }
         
@@ -74,8 +74,8 @@ class WeiBo extends OAuth
     {
         $data = json_decode($response, true);
 
-        if ($data['error_code'] != 0) {
+        if (isset($data['error_code']) && $data['error_code'] != 0) {
-            throw new \Exception("Fetch User Info Failed:{$data['error']}");
+            throw new \Exception("Fetch User Info Failed:{$response}");
         }
 
         $userInfo['id'] = $this->openId;

app/Library/OAuth/WeiXin.php

@@ -62,7 +62,7 @@ class WeiXin extends OAuth
         $data = json_decode($response, true);
         
         if (isset($data['errcode']) && $data['errcode'] != 0) {
-            throw new \Exception("Fetch Access Token Failed:{$data['errmsg']}");
+            throw new \Exception("Fetch Access Token Failed:{$response}");
         }
         
         $this->openId = $data['openid'];
@@ -75,7 +75,7 @@ class WeiXin extends OAuth
         $data = json_decode($response, true);
 
         if (isset($data['errcode']) && $data['errcode'] != 0) {
-            throw new \Exception("Fetch User Info Failed:{$data['errmsg']}");
+            throw new \Exception("Fetch User Info Failed:{$response}");
         }
 
         $userInfo['id'] = $this->openId;