majiameng / OAuth2

src/Gateways/Csdn.php

Spacing +5 added lines, -5 removed lines

@@ -67,7 +67,7 @@ 
             'state'         => $this->config['state'],
             'scope'         => $this->config['scope'],
         ];
-        return $this->AuthorizeURL . '?' . http_build_query($params);
+        return $this->AuthorizeURL.'?'.http_build_query($params);
     }
 
     /**
@@ -78,13 +78,13 @@ 
     public function getUserInfo()
     {
         $this->openid();
-        $data = $this->get(static::API_BASE . $this->UserInfoURL, [
+        $data = $this->get(static::API_BASE.$this->UserInfoURL, [
             'access_token' => $this->token['access_token']
         ]);
         $data = json_decode($data, true);
         
-        if(!isset($data['username'])) {
-            throw new OAuthException("获取CSDN用户信息失败：" . ($data['error_description'] ?? '未知错误'));
+        if (!isset($data['username'])) {
+            throw new OAuthException("获取CSDN用户信息失败：".($data['error_description'] ?? '未知错误'));
         }
         return $data;
     }
@@ -112,7 +112,7 @@ 
         if (isset($data['access_token'])) {
             return $data;
         }
-        throw new OAuthException("获取CSDN ACCESS_TOKEN出错：" . ($data['error_description'] ?? '未知错误'));
+        throw new OAuthException("获取CSDN ACCESS_TOKEN出错：".($data['error_description'] ?? '未知错误'));
     }
 
     /**

src/Gateways/Baidu.php

Spacing +11 added lines, -11 removed lines

@@ -44,7 +44,7 @@ 
             'state'         => $this->config['state'],
             'scope'         => $this->config['scope'],
         ];
-        return $this->AuthorizeURL . '?' . http_build_query($params);
+        return $this->AuthorizeURL.'?'.http_build_query($params);
     }
 
     /**
@@ -61,9 +61,9 @@ 
             'open_id' => isset($result['uid']) ? $result['uid'] : '',
             'union_id'=> isset($result['aid']) ? $result['aid'] : '',
             'channel' => ConstCode::TYPE_BAIDU,
-            'nickname'=> $result['uname'] ?? $result['login_name'] ?? '',  // 优先使用 uname
+            'nickname'=> $result['uname'] ?? $result['login_name'] ?? '', // 优先使用 uname
             'gender'  => isset($result['sex']) ? (($result['sex'] == '男' ? 1 : ($result['sex'] == '女' ? 2 : 0))) : ConstCode::GENDER,
-            'avatar'  => $result['portrait'] ?? '',  // 百度返回的头像字段
+            'avatar'  => $result['portrait'] ?? '', // 百度返回的头像字段
             'birthday'=> '',
             'access_token'=> $this->token['access_token'] ?? '',
             'native'=> $result,
@@ -87,8 +87,8 @@ 
         $data = $this->get($this->UserInfoURL, [], $headers);
         $data = json_decode($data, true);
         
-        if(!isset($data['uid'])) {
-            throw new OAuthException("获取百度用户信息失败：" . ($data['error_description'] ?? '未知错误'));
+        if (!isset($data['uid'])) {
+            throw new OAuthException("获取百度用户信息失败：".($data['error_description'] ?? '未知错误'));
         }
         return $data;
     }
@@ -112,7 +112,7 @@ 
      * @author: JiaMeng <666@majiameng.com>
      * Updater:
      */
-    protected function getToken(){
+    protected function getToken() {
         if (empty($this->token)) {
             /** 验证state参数 */
             $this->CheckState();
@@ -121,8 +121,8 @@ 
             $params = $this->accessTokenParams();
 
             /** 获取access_token */
-            $this->AccessTokenURL = $this->AccessTokenURL . '?' . http_build_query($params);
-            $token =  $this->post($this->AccessTokenURL);
+            $this->AccessTokenURL = $this->AccessTokenURL.'?'.http_build_query($params);
+            $token = $this->post($this->AccessTokenURL);
             /** 解析token值(子类实现此方法) */
             $this->token = $this->parseToken($token);
         }
@@ -162,8 +162,8 @@ 
             'client_secret' => $this->config['app_secret'],
         ];
         
-        $this->AccessTokenURL = static::API_BASE . 'oauth/2.0/token';
-        $token = $this->post($this->AccessTokenURL . '?' . http_build_query($params));
+        $this->AccessTokenURL = static::API_BASE.'oauth/2.0/token';
+        $token = $this->post($this->AccessTokenURL.'?'.http_build_query($params));
         $token = $this->parseToken($token);
         
         if (isset($token['access_token'])) {
@@ -182,7 +182,7 @@ 
     {
         try {
             $accessToken = $accessToken ?? $this->token['access_token'];
-            $headers = ['Authorization: Bearer ' . $accessToken];
+            $headers = ['Authorization: Bearer '.$accessToken];
             $data = $this->get($this->UserInfoURL, [], $headers);
             $data = json_decode($data, true);
             return isset($data['uid']);

src/Gateways/Qq.php

Spacing +11 added lines, -11 removed lines

@@ -55,7 +55,7 @@ 
             'scope'         => $this->config['scope'],
             'display'       => $this->display,
         ];
-        return $this->AuthorizeURL . '?' . http_build_query($params);
+        return $this->AuthorizeURL.'?'.http_build_query($params);
     }
 
     /**
@@ -77,7 +77,7 @@ 
             'nickname'=> $result['nickname'],
             'gender'  => isset($result['gender']) ? $this->getGender($result['gender']) : ConstCode::GENDER,
             'avatar'  => $result['figureurl_qq_2'] ? $result['figureurl_qq_2'] : $result['figureurl_qq_1'],
-            'birthday'=> date('Y-m-d',strtotime($result['year'])),
+            'birthday'=> date('Y-m-d', strtotime($result['year'])),
             'native'   => $result,
         ];
         return $userInfo;
@@ -112,12 +112,12 @@ 
      */
     public function openid()
     {
-        if($this->type == 'app'){//App登录
-            if(!isset($_REQUEST['access_token'])){
+        if ($this->type == 'app') {//App登录
+            if (!isset($_REQUEST['access_token'])) {
                 throw new OAuthException("腾讯QQ,APP登录 需要传输access_token参数! ");
             }
             $this->token['access_token'] = $_REQUEST['access_token'];
-        }else{
+        } else {
             /** 获取token */
             $this->getToken();
         }
@@ -143,7 +143,7 @@ 
         if (isset($data['access_token'])) {
             return $data;
         } else {
-            throw new OAuthException("获取腾讯QQ ACCESS_TOKEN 出错：" . $token);
+            throw new OAuthException("获取腾讯QQ ACCESS_TOKEN 出错：".$token);
         }
     }
 
@@ -154,7 +154,7 @@ 
      * @return mixed|string
      * @throws OAuthException
      */
-    private function getOpenID(){
+    private function getOpenID() {
         $query = [
             'access_token' => $this->token['access_token']
         ];
@@ -163,12 +163,12 @@ 
             $query['unionid'] = 1;
         }
 
-        $data = $this->get(self::API_BASE . 'oauth2.0/me',$query);
-        $data     = json_decode(trim(substr($data, 9), " );\n"), true);
+        $data = $this->get(self::API_BASE.'oauth2.0/me', $query);
+        $data = json_decode(trim(substr($data, 9), " );\n"), true);
         if (isset($data['openid'])) {
             return $data;
         } else {
-            throw new OAuthException("获取用户openid出错：" . $data['error_description']);
+            throw new OAuthException("获取用户openid出错：".$data['error_description']);
         }
     }
 
@@ -177,7 +177,7 @@ 
      * M代表男性,F代表女性
      * @param $gender
      */
-    public function getGender($gender){
+    public function getGender($gender) {
         return $gender == '男' ? ConstCode::GENDER_MAN : ConstCode::GENDER_WOMEN;
     }
 

Braces +1 added lines, -1 removed lines

@@ -117,7 +117,7 @@
                 throw new OAuthException("腾讯QQ,APP登录 需要传输access_token参数! ");
             }
             $this->token['access_token'] = $_REQUEST['access_token'];
-        }else{
+        } else{
             /** 获取token */
             $this->getToken();
         }

src/Gateways/Twitter.php

Spacing +7 added lines, -7 removed lines

@@ -28,7 +28,7 @@ 
         $this->saveState();
         //登录参数
         $oauthToken = $this->call('oauth/request_token', ['oauth_callback' => $this->config['callback']], 'POST');
-        return self::API_BASE . 'oauth/authenticate?oauth_token=' . $oauthToken['oauth_token'];
+        return self::API_BASE.'oauth/authenticate?oauth_token='.$oauthToken['oauth_token'];
     }
 
     /**
@@ -70,7 +70,7 @@ 
             if (isset($this->token['oauth_token_secret'])) {
                 $this->tokenSecret = $this->token['oauth_token_secret'];
             } else {
-                throw new OAuthException("获取Twitter ACCESS_TOKEN 出错：" . json_encode($this->token));
+                throw new OAuthException("获取Twitter ACCESS_TOKEN 出错：".json_encode($this->token));
             }
         }
 
@@ -90,7 +90,7 @@ 
         $method  = strtoupper($method);
         $request = [
             'method' => $method,
-            'uri'    => self::API_BASE . $api,
+            'uri'    => self::API_BASE.$api,
         ];
         $oauthParams                    = $this->getOAuthParams($params);
         $oauthParams['oauth_signature'] = $this->signature($request, $oauthParams);
@@ -135,8 +135,8 @@ 
     {
         ksort($params);
         $sign_str = Str::buildParams($params, true);
-        $sign_str = $request['method'] . '&' . rawurlencode($request['uri']) . '&' . rawurlencode($sign_str);
-        $sign_key = $this->config['app_secret'] . '&' . $this->tokenSecret;
+        $sign_str = $request['method'].'&'.rawurlencode($request['uri']).'&'.rawurlencode($sign_str);
+        $sign_key = $this->config['app_secret'].'&'.$this->tokenSecret;
 
         return rawurlencode(base64_encode(hash_hmac('sha1', $sign_str, $sign_key, true)));
     }
@@ -151,7 +151,7 @@ 
     {
         $return = 'OAuth ';
         foreach ($params as $k => $param) {
-            $return .= $k . '="' . $param . '", ';
+            $return .= $k.'="'.$param.'", ';
         }
         return rtrim($return, ', ');
     }
@@ -172,7 +172,7 @@ 
      * 解析access_token方法请求后的返回值
      * @param string $token 获取access_token的方法的返回值
      */
-    protected function parseToken($token){
+    protected function parseToken($token) {
         return $token;
     }
 

src/Gateways/Gitlab.php

Spacing +6 added lines, -6 removed lines

@@ -31,7 +31,7 @@ 
             'state'         => $this->config['state'],
             'scope'         => $this->config['scope'] ?: 'read_user',
         ];
-        return $this->AuthorizeURL . '?' . http_build_query($params);
+        return $this->AuthorizeURL.'?'.http_build_query($params);
     }
 
     public function userInfo()
@@ -53,12 +53,12 @@ 
     public function getUserInfo()
     {
         $this->openid();
-        $headers = ['Authorization: Bearer ' . $this->token['access_token']];
-        $data = $this->get(static::API_BASE . $this->UserInfoURL, [], $headers);
+        $headers = ['Authorization: Bearer '.$this->token['access_token']];
+        $data = $this->get(static::API_BASE.$this->UserInfoURL, [], $headers);
         $data = json_decode($data, true);
         
-        if(!isset($data['id'])) {
-            throw new OAuthException("获取GitLab用户信息失败：" . ($data['error_description'] ?? '未知错误'));
+        if (!isset($data['id'])) {
+            throw new OAuthException("获取GitLab用户信息失败：".($data['error_description'] ?? '未知错误'));
         }
         return $data;
     }
@@ -106,7 +106,7 @@ 
         if (isset($data['access_token'])) {
             return $data;
         }
-        throw new OAuthException("获取GitLab ACCESS_TOKEN出错：" . ($data['error_description'] ?? '未知错误'));
+        throw new OAuthException("获取GitLab ACCESS_TOKEN出错：".($data['error_description'] ?? '未知错误'));
     }
 
     /**

src/Gateways/Alipay.php

Spacing +10 added lines, -10 removed lines

@@ -81,7 +81,7 @@ 
             $this->AuthorizeURL = str_replace("alipay", "alipaydev", $this->AuthorizeURL);
         }
 
-        return $this->AuthorizeURL . '?' . http_build_query($params);
+        return $this->AuthorizeURL.'?'.http_build_query($params);
     }
 
     /**
@@ -114,17 +114,17 @@ 
 
         $userInfo = [
             'open_id'  => $this->openid(),
-            'union_id'  => $this->token['union_id']??'',
+            'union_id'  => $this->token['union_id'] ?? '',
             'channel' => ConstCode::TYPE_ALIPAY,
             'nickname'    => $result['nick_name'],
             'gender'  => isset($result['gender']) ? $this->getGender($result['gender']) : ConstCode::GENDER,
             'avatar'  => $result['avatar'],
             // 拓展字段
-            'access_token'  => $this->token['access_token']??'',
+            'access_token'  => $this->token['access_token'] ?? '',
             'user_id'  => $this->token['user_id'],
             'native'   => $result,
         ];
-        $userInfo['type'] = ConstCode::getTypeConst($userInfo['channel'],$this->type);
+        $userInfo['type'] = ConstCode::getTypeConst($userInfo['channel'], $this->type);
         return $userInfo;
     }
 
@@ -137,12 +137,12 @@ 
      */
     public function getUserInfo()
     {
-        if($this->type == 'app'){//App登录
-            if(!isset($_REQUEST['access_token']) ){
+        if ($this->type == 'app') {//App登录
+            if (!isset($_REQUEST['access_token'])) {
                 throw new OAuthException("AliPay APP登录 需要传输access_token参数! ");
             }
             $this->token['access_token'] = $_REQUEST['access_token'];
-        }else {
+        } else {
             /** 获取token信息 */
             $this->getToken();
         }
@@ -160,7 +160,7 @@ 
 
         $data = $this->post(self::API_BASE, $params);
         $data = mb_convert_encoding($data, 'utf-8', 'gbk');
-        $result =  json_decode($data, true);
+        $result = json_decode($data, true);
         return $result['alipay_user_info_share_response'];
     }
 
@@ -237,7 +237,7 @@ 
             throw new OAuthException('支付宝RSA密钥未配置');
         }
         $rsa    = str_replace([PHP_EOL, $header, $footer], '', $rsa);
-        $rsaVal = $header . PHP_EOL . chunk_split($rsa, 64, PHP_EOL) . $footer;
+        $rsaVal = $header.PHP_EOL.chunk_split($rsa, 64, PHP_EOL).$footer;
         return $rsaVal;
     }
 
@@ -256,7 +256,7 @@ 
 
         if (isset($data['alipay_system_oauth_token_response'])) {
             $data           = $data['alipay_system_oauth_token_response'];
-            $data['openid'] = $data['open_id']??$data['user_id'];
+            $data['openid'] = $data['open_id'] ?? $data['user_id'];
             return $data;
         } else {
             throw new OAuthException("获取支付宝 ACCESS_TOKEN 出错：{$token}");

Braces +1 added lines, -1 removed lines

@@ -142,7 +142,7 @@
                 throw new OAuthException("AliPay APP登录 需要传输access_token参数! ");
             }
             $this->token['access_token'] = $_REQUEST['access_token'];
-        }else {
+        } else {
             /** 获取token信息 */
             $this->getToken();
         }

src/Gateways/Coding.php

Spacing +5 added lines, -5 removed lines

@@ -39,7 +39,7 @@ 
             'scope'         => $this->config['scope'],
             'state'         => $this->config['state'],
         ];
-        return $this->AuthorizeURL . '?' . http_build_query($params);
+        return $this->AuthorizeURL.'?'.http_build_query($params);
     }
 
     /**
@@ -59,7 +59,7 @@ 
             'access_token' => $this->token['access_token'] ?? '',
             'channel' => ConstCode::TYPE_CODING,
             'nickname' => $response['name'] ?? '',
-            'gender'   => ConstCode::GENDER,  // Coding 不返回性别信息
+            'gender'   => ConstCode::GENDER, // Coding 不返回性别信息
             'avatar'   => $response['avatar'] ?? '',
             // 额外信息
             'email'    => $response['email'] ?? '',
@@ -80,8 +80,8 @@ 
         ]);
         $data = json_decode($data, true);
         
-        if(!isset($data['id'])) {
-            throw new OAuthException("获取Coding用户信息失败：" . ($data['error_description'] ?? '未知错误'));
+        if (!isset($data['id'])) {
+            throw new OAuthException("获取Coding用户信息失败：".($data['error_description'] ?? '未知错误'));
         }
         return $data;
     }
@@ -129,7 +129,7 @@ 
         if (isset($data['access_token'])) {
             return $data;
         }
-        throw new OAuthException("获取Coding ACCESS_TOKEN出错：" . ($data['error_description'] ?? '未知错误'));
+        throw new OAuthException("获取Coding ACCESS_TOKEN出错：".($data['error_description'] ?? '未知错误'));
     }
 
     /**

src/Gateways/Oschina.php

Spacing +4 added lines, -4 removed lines

@@ -48,8 +48,8 @@ 
         ]);
         $data = json_decode($data, true);
         
-        if(!isset($data['id'])) {
-            throw new OAuthException("获取OSChina用户信息失败：" . ($data['error_description'] ?? '未知错误'));
+        if (!isset($data['id'])) {
+            throw new OAuthException("获取OSChina用户信息失败：".($data['error_description'] ?? '未知错误'));
         }
         return $data;
     }
@@ -68,7 +68,7 @@ 
             'state'         => $this->config['state'],
             'scope'         => $this->config['scope'],
         ];
-        return $this->AuthorizeURL . '?' . http_build_query($params);
+        return $this->AuthorizeURL.'?'.http_build_query($params);
     }
 
     /**
@@ -115,7 +115,7 @@ 
         if (isset($data['access_token'])) {
             return $data;
         }
-        throw new OAuthException("获取OSChina ACCESS_TOKEN出错：" . ($data['error_description'] ?? '未知错误'));
+        throw new OAuthException("获取OSChina ACCESS_TOKEN出错：".($data['error_description'] ?? '未知错误'));
     }
 
     /**

src/Gateways/Wechat.php

Spacing +15 added lines, -15 removed lines

@@ -42,7 +42,7 @@ 
         $this->saveState();
 
         //获取代理链接
-        if(isset($this->config['proxy_url'])){
+        if (isset($this->config['proxy_url'])) {
             return $this->getProxyURL();
         }
 
@@ -55,7 +55,7 @@ 
             'scope'         => $this->config['scope'],
             'state'         => $this->config['state'],
         ];
-        return $this->AuthorizeURL . '?' . http_build_query($params) . '#wechat_redirect';
+        return $this->AuthorizeURL.'?'.http_build_query($params).'#wechat_redirect';
     }
 
     /**
@@ -73,7 +73,7 @@ 
             'state'         => $this->config['state'],
             'redirect_uri'    => $this->config['callback'],
         ];
-        return $this->config['proxy_url'] . '?' . http_build_query($params);
+        return $this->config['proxy_url'].'?'.http_build_query($params);
     }
 
     /**
@@ -110,12 +110,12 @@ 
             'union_id'=> $this->token['unionid'] ?? '',
             'access_token'=> $this->token['access_token'] ?? '',
             'channel' => ConstCode::TYPE_WECHAT,
-            'nickname'=> $result['nickname']??'',
+            'nickname'=> $result['nickname'] ?? '',
             'gender'  => $result['sex'] ?? ConstCode::GENDER,
-            'avatar'  => $result['headimgurl']??'',
+            'avatar'  => $result['headimgurl'] ?? '',
             'type'    => ConstCode::getTypeConst(ConstCode::TYPE_WECHAT, $this->type),
             // 额外信息
-            'session_key'  => $result['session_key']??'',
+            'session_key'  => $result['session_key'] ?? '',
             'native'   => $result,
         ];
         return $userInfo;
@@ -130,15 +130,15 @@ 
      */
     public function getUserInfo()
     {
-        if($this->type == 'app'){//App登录
-            if(!isset($_REQUEST['access_token']) ){
+        if ($this->type == 'app') {//App登录
+            if (!isset($_REQUEST['access_token'])) {
                 throw new OAuthException("Wechat APP登录 需要传输access_token参数! ");
             }
             $this->token['access_token'] = $_REQUEST['access_token'];
-        }elseif ($this->type == 'applets'){
+        }elseif ($this->type == 'applets') {
             //小程序
             return $this->applets();
-        }else {
+        } else {
             /** 获取token信息 */
             $this->getToken();
         }
@@ -149,7 +149,7 @@ 
             'openid'=>$this->openid(),
             'lang'=>'zh_CN',
         ];
-        $data = $this->get(self::API_BASE . 'userinfo', $params);
+        $data = $this->get(self::API_BASE.'userinfo', $params);
         return json_decode($data, true);
     }
 
@@ -157,13 +157,13 @@ 
      * @return array|mixed|null
      * @throws OAuthException
      */
-    public function applets(){
+    public function applets() {
         /** 获取参数 */
         $params = $this->accessTokenParams();
         $params['js_code'] = $params['code'];
 
         /** 获取access_token */
-        $token =  $this->get($this->jsCode2Session, $params);
+        $token = $this->get($this->jsCode2Session, $params);
         /** 解析token值(子类实现此方法) */
         $this->token = $this->parseToken($token);
         return $this->token;
@@ -219,7 +219,7 @@ 
         $data = json_decode($token, true);
         if (isset($data['access_token'])) {
             return $data;
-        }elseif (isset($data['session_key'])){
+        }elseif (isset($data['session_key'])) {
             //小程序登录
             return $data;
         } else {
@@ -298,7 +298,7 @@ 
                 'access_token' => $accessToken,
                 'openid'      => $this->openid(),
             ];
-            $result = $this->get(self::API_BASE . 'auth', $params);
+            $result = $this->get(self::API_BASE.'auth', $params);
             $result = json_decode($result, true);
             return isset($result['errcode']) && $result['errcode'] == 0;
         } catch (\Exception $e) {

Braces +3 added lines, -3 removed lines

@@ -135,10 +135,10 @@ 
                 throw new OAuthException("Wechat APP登录 需要传输access_token参数! ");
             }
             $this->token['access_token'] = $_REQUEST['access_token'];
-        }elseif ($this->type == 'applets'){
+        } elseif ($this->type == 'applets'){
             //小程序
             return $this->applets();
-        }else {
+        } else {
             /** 获取token信息 */
             $this->getToken();
         }
@@ -219,7 +219,7 @@ 
         $data = json_decode($token, true);
         if (isset($data['access_token'])) {
             return $data;
-        }elseif (isset($data['session_key'])){
+        } elseif (isset($data['session_key'])){
             //小程序登录
             return $data;
         } else {