majiameng / OAuth2

src/Gateways/Yahoo.php

Spacing +5 added lines, -5 removed lines

@@ -29,7 +29,7 @@ 
             'state'         => $this->config['state'],
             'nonce'         => md5(uniqid()),
         ];
-        return $this->AuthorizeURL . '?' . http_build_query($params);
+        return $this->AuthorizeURL.'?'.http_build_query($params);
     }
 
     /**
@@ -69,14 +69,14 @@ 
         $this->getToken();
         
         $headers = [
-            'Authorization: Bearer ' . $this->token['access_token'],
+            'Authorization: Bearer '.$this->token['access_token'],
         ];
         
         $data = $this->get($this->UserInfoURL, [], $headers);
         $data = json_decode($data, true);
         
         if (!isset($data['sub'])) {
-            throw new OAuthException('获取Yahoo用户信息失败：' . json_encode($data));
+            throw new OAuthException('获取Yahoo用户信息失败：'.json_encode($data));
         }
         return $data;
     }
@@ -96,7 +96,7 @@ 
             ];
             
             $headers = [
-                'Authorization: Basic ' . base64_encode($this->config['app_id'] . ':' . $this->config['app_secret']),
+                'Authorization: Basic '.base64_encode($this->config['app_id'].':'.$this->config['app_secret']),
                 'Content-Type: application/x-www-form-urlencoded',
             ];
             
@@ -114,6 +114,6 @@ 
         if (isset($data['access_token'])) {
             return $data;
         }
-        throw new OAuthException('获取Yahoo access_token 出错：' . json_encode($data));
+        throw new OAuthException('获取Yahoo access_token 出错：'.json_encode($data));
     }
 }
\ No newline at end of file

example/config/params.php

Spacing +7 added lines, -7 removed lines

@@ -33,7 +33,7 @@ 
             'app_id'     => 'wx6ca7410f8******',
             'app_secret' => '30a206b87b7689b19f11******',
             'callback' => $callback,
-            'scope'      => 'snsapi_userinfo',//静默授权=>snsapi_base;获取用户信息=>snsapi_userinfo
+            'scope'      => 'snsapi_userinfo', //静默授权=>snsapi_base;获取用户信息=>snsapi_userinfo
             //'proxy_url' => 'http://www.abc.com/wx_proxy.php',//如果不需要代理请注释此行
             //'proxy_url' => 'http://www.abc.com/weixin-authorize-proxy.html',//如果不需要代理请注释此行
         ],
@@ -52,7 +52,7 @@ 
             'type'       => 'applets',
         ],
     ],
-    'wecom' => [ // 企业微信
+    'wecom' => [// 企业微信
         'app_id'     => 'ww1234567890******',
         'app_secret' => 'abcdefghijklmn******',
         'callback'   => $callback,
@@ -67,19 +67,19 @@ 
     'douyin'=>[
         //抖音官方：请确保授权回调域网站协议为 https
         'pc'=>[
-            'oauth_type' => \tinymeng\OAuth2\Helper\ConstCode::TYPE_DOUYIN,//抖音douyin，头条toutiao，西瓜xigua，使用\tinymeng\OAuth2\Helper\ConstCode
+            'oauth_type' => \tinymeng\OAuth2\Helper\ConstCode::TYPE_DOUYIN, //抖音douyin，头条toutiao，西瓜xigua，使用\tinymeng\OAuth2\Helper\ConstCode
             'app_id' => 'awenvxxxxxxxx7x4',
             'app_secret' => '5cfbc25badxxxxxxxc7be8c1',
             'callback' => 'https://majiameng.com/app/douyin',
-            'scope'      => 'trial.whitelist,user_info',//trial.whitelist为白名单人员权限,上线后删掉
-            'optionalScope' => '',//应用授权可选作用域,多个授权作用域以英文逗号（,）分隔，每一个授权作用域后需要加上一个是否默认勾选的参数，1为默认勾选，0为默认不勾选
+            'scope'      => 'trial.whitelist,user_info', //trial.whitelist为白名单人员权限,上线后删掉
+            'optionalScope' => '', //应用授权可选作用域,多个授权作用域以英文逗号（,）分隔，每一个授权作用域后需要加上一个是否默认勾选的参数，1为默认勾选，0为默认不勾选
         ],
         'mobile'=>[
             //待完善TODO...
             'app_id' => 'awenvxxxxxxxx7x4',
             'app_secret' => '5cfbc25badxxxxxxxc7be8c1',
             'callback' => 'https://majiameng.com/app/douyin',
-            'scope'      => 'login_id',//login_id为静默授权
+            'scope'      => 'login_id', //login_id为静默授权
         ],
         'app'=>[
             //待完善TODO...
@@ -171,7 +171,7 @@ 
         'app_id'     => '1234567890',
         'app_secret' => 'abcdefgh******',
         'callback'   => $callback,
-        'scope'      => 'public_profile,user_gender',//user_gender需要审核，所以不一定能获取到
+        'scope'      => 'public_profile,user_gender', //user_gender需要审核，所以不一定能获取到
     ],
     'twitter' => [
         'app_id'     => 'abcdefgh******',

example/demo/connect.php

Indentation +7 added lines, -7 removed lines

@@ -30,11 +30,11 @@
     }
 } else {
     $arr = $oauth->login($type);
-     if (isset($arr['code']) && $arr['code'] == 0) {
-         exit("<script language='javascript'>window.location.href='{$arr['url']}';</script>");
-     } elseif (isset($arr['code'])) {
-         exit('登录接口返回：' . $arr['msg']);
-     } else {
-         exit('获取登录地址失败');
-     }
+        if (isset($arr['code']) && $arr['code'] == 0) {
+            exit("<script language='javascript'>window.location.href='{$arr['url']}';</script>");
+        } elseif (isset($arr['code'])) {
+            exit('登录接口返回：' . $arr['msg']);
+        } else {
+            exit('获取登录地址失败');
+        }
 }

Spacing +3 added lines, -3 removed lines

@@ -24,11 +24,11 @@ 
             exit("<script language='javascript'>window.location.href='./';</script>");
 
         } elseif (isset($arr['code'])) {
-            exit('登录失败，返回错误原因：' . $arr['msg']);
+            exit('登录失败，返回错误原因：'.$arr['msg']);
         } else {
             exit('获取登录数据失败');
         }
-    }catch (\Exception $exception){
+    } catch (\Exception $exception) {
         echo $exception->getFile();
         echo $exception->getLine();
         echo $exception->getMessage();
@@ -39,7 +39,7 @@ 
      if (isset($arr['code']) && $arr['code'] == 0) {
          exit("<script language='javascript'>window.location.href='{$arr['url']}';</script>");
      } elseif (isset($arr['code'])) {
-         exit('登录接口返回：' . $arr['msg']);
+         exit('登录接口返回：'.$arr['msg']);
      } else {
          exit('获取登录地址失败');
      }

Braces +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
         } else {
             exit('获取登录数据失败');
         }
-    }catch (\Exception $exception){
+    } catch (\Exception $exception){
         echo $exception->getFile();
         echo $exception->getLine();
         echo $exception->getMessage();

example/demo/index.php

Spacing +4 added lines, -4 removed lines

@@ -24,16 +24,16 @@
 		<div class="list-group">
             <?php foreach ($_SESSION['user'] as $key => $value):?>
                 <div class="form-group">
-                    <label><?php echo $key;?>：</label>
-                    <?php if(is_array($value)):?>
+                    <label><?php echo $key; ?>：</label>
+                    <?php if (is_array($value)):?>
                         <textarea  rows="5" class="form-control" readonly="readonly">
                             <?php echo json_encode($value); ?>
                         </textarea>
                     <?php else:?>
                         <input type="text" value="<?php echo $value; ?>" class="form-control" readonly="readonly"/>
-                    <?php endif;?>
+                    <?php endif; ?>
                 </div>
-            <?php endforeach;?>
+            <?php endforeach; ?>
 		</div>
 	</div>
 </div>

Braces +5 added lines, -2 removed lines

@@ -29,8 +29,11 @@
                         <textarea  rows="5" class="form-control" readonly="readonly">
                             <?php echo json_encode($value); ?>
                         </textarea>
-                    <?php else:?>
-                        <input type="text" value="<?php echo $value; ?>" class="form-control" readonly="readonly"/>
+                    <?php else {
+    :?>
+                        <input type="text" value="<?php echo $value;
+}
+?>" class="form-control" readonly="readonly"/>
                     <?php endif;?>
                 </div>
             <?php endforeach;?>

example/thinkphp/login.php

Spacing +6 added lines, -6 removed lines

@@ -10,20 +10,20 @@
 //引入配置文件
 $params = require('../config/params.php');
 
-try{
-    $name="qq";//登录类型,例:qq / google
+try {
+    $name = "qq"; //登录类型,例:qq / google
     $oauth = new oauth2($params);
     if (empty($_GET['code'])) {
         /** 登录 */
         $result = $oauth->login($name);
 //        var_dump($result['url']);die;
         //重定向到第三方登录页
-        header('Location: ' . $result['url']);
-    }else{
+        header('Location: '.$result['url']);
+    } else {
         /** 登录回调 */
         $result = $this->callback($name);
-        var_dump($result);die;
+        var_dump($result); die;
     }
-}catch(Exception $e){
+} catch (Exception $e) {
     echo 'Oauth登录失败！'.$e->getMessage();
 }
\ No newline at end of file

Braces +2 added lines, -2 removed lines

@@ -19,11 +19,11 @@
 //        var_dump($result['url']);die;
         //重定向到第三方登录页
         header('Location: ' . $result['url']);
-    }else{
+    } else{
         /** 登录回调 */
         $result = $this->callback($name);
         var_dump($result);die;
     }
-}catch(Exception $e){
+} catch(Exception $e){
     echo 'Oauth登录失败！'.$e->getMessage();
 }
\ No newline at end of file

src/Gateways/Google.php

Spacing +6 added lines, -6 removed lines

@@ -41,7 +41,7 @@ 
             'scope'         => $this->config['scope'],
             'state'         => $this->config['state'],
         ];
-        return self::AUTHORIZE_URL . '?' . http_build_query($params);
+        return self::AUTHORIZE_URL.'?'.http_build_query($params);
     }
 
     /**
@@ -70,7 +70,7 @@ 
             'avatar'  => $result['picture'],
             'native'   => $result,
         );
-        if(isset($result['email'])){
+        if (isset($result['email'])) {
             $userInfo['email'] = $result['email'];
         }
         return $userInfo;
@@ -81,14 +81,14 @@ 
      */
     public function getUserInfo()
     {
-        if($this->type == 'app'){//App登录
-            if(!isset($_REQUEST['code']) ){
+        if ($this->type == 'app') {//App登录
+            if (!isset($_REQUEST['code'])) {
                 throw new OAuthException("Google APP登录 需要传输code参数! ");
             }
         }
         $this->getToken();
-        $headers = ['Authorization: Bearer ' . $this->token['access_token']];
-        $data = $this->get(self::API_BASE . 'oauth2/v2/userinfo', '', $headers);
+        $headers = ['Authorization: Bearer '.$this->token['access_token']];
+        $data = $this->get(self::API_BASE.'oauth2/v2/userinfo', '', $headers);
         return json_decode($data, true);
     }
 

src/Connector/Gateway.php

Spacing +19 added lines, -19 removed lines

@@ -112,7 +112,7 @@ 
         if (!$config) {
             throw new OAuthException('传入的配置不能为空');
         }
-        if(isset($_GET['referer']) && $config['callback']){
+        if (isset($_GET['referer']) && $config['callback']) {
             $config['callback'] .= ((strpos($config['callback'], '?') !== false) ? '&' : '?').'referer='.$_GET['referer'];
         }
         //默认参数
@@ -125,11 +125,11 @@ 
             'proxy'         => '',
             'state'         => '',
             'type'          => '',
-            'is_sandbox'    => false,//是否是沙箱环境
+            'is_sandbox'    => false, //是否是沙箱环境
         ];
-        $this->config    = array_merge($_config, $config);
-        foreach($this->config as $key=>$val){
-            if(property_exists($this,$key)) $this->$key=$val;
+        $this->config = array_merge($_config, $config);
+        foreach ($this->config as $key=>$val) {
+            if (property_exists($this, $key)) $this->$key = $val;
         }
         $this->timestamp = time();
     }
@@ -165,7 +165,7 @@ 
      * Updater:
      * @return $this
      */
-    public function mustCheckState(){
+    public function mustCheckState() {
         $this->checkState = true;
         return $this;
     }
@@ -175,7 +175,7 @@ 
      * @Author: TinyMeng <666@majiameng.com>
      * @return array
      */
-    public function getConfig(){
+    public function getConfig() {
         return $this->config;
     }
 
@@ -184,7 +184,7 @@ 
      * @param $token
      * @return $this
      */
-    public function setToken($token){
+    public function setToken($token) {
         $this->token = $token;
         return $this;
     }
@@ -193,14 +193,14 @@ 
      * 存储state
      * @Author: TinyMeng <666@majiameng.com>
      */
-    public function saveState(){
+    public function saveState() {
         if ($this->checkState === true) {
             //是否开启session
             if (session_status() !== PHP_SESSION_ACTIVE) {
                 session_start();
             }
-            if(empty($this->config['state'])){
-                $this->config['state'] = Str::random();//生成随机state
+            if (empty($this->config['state'])) {
+                $this->config['state'] = Str::random(); //生成随机state
             }
             //存储到session
             $_SESSION['tinymeng_oauth_state'] = $this->config['state'];
@@ -212,7 +212,7 @@ 
      * @Author: TinyMeng <666@majiameng.com>
      * @throws OAuthException
      */
-    public function checkState(){
+    public function checkState() {
         if ($this->checkState === true) {
             if (session_status() !== PHP_SESSION_ACTIVE) {
                 session_start();
@@ -229,7 +229,7 @@ 
      * @author: JiaMeng <666@majiameng.com>
      * @return string
      */
-    public function getCode(){
+    public function getCode() {
         return isset($_REQUEST['code']) ? $_REQUEST['code'] : '';
     }
 
@@ -239,7 +239,7 @@ 
      * Updater:
      * @return array
      */
-    protected function accessTokenParams(){
+    protected function accessTokenParams() {
         $params = [
             'client_id'     => $this->config['app_id'],
             'client_secret' => $this->config['app_secret'],
@@ -255,7 +255,7 @@ 
      * @author: JiaMeng <666@majiameng.com>
      * Updater:
      */
-    protected function getToken(){
+    protected function getToken() {
         if (empty($this->token)) {
             /** 验证state参数 */
             $this->checkState();
@@ -264,10 +264,10 @@ 
             $params = $this->accessTokenParams();
 
             /** 获取access_token */
-            $token =  $this->post($this->AccessTokenURL, $params,$this->getHeaders());
+            $token = $this->post($this->AccessTokenURL, $params, $this->getHeaders());
             /** 解析token值(子类实现此方法) */
             $this->token = $this->parseToken($token);
-        }else{
+        } else {
             return $this->token;
         }
     }
@@ -277,8 +277,8 @@ 
      * M代表男性,F代表女性
      * @param $gender
      */
-    public function getGender($gender){
-        return strtolower(substr($gender , 0 , 1)) == 'm' ? ConstCode::GENDER_MAN : ConstCode::GENDER_WOMEN;
+    public function getGender($gender) {
+        return strtolower(substr($gender, 0, 1)) == 'm' ? ConstCode::GENDER_MAN : ConstCode::GENDER_WOMEN;
     }
 
 

Braces +4 added lines, -2 removed lines

@@ -129,7 +129,9 @@ 
         ];
         $this->config    = array_merge($_config, $config);
         foreach($this->config as $key=>$val){
-            if(property_exists($this,$key)) $this->$key=$val;
+            if(property_exists($this,$key)) {
+                $this->$key=$val;
+            }
         }
         $this->timestamp = time();
     }
@@ -267,7 +269,7 @@ 
             $token =  $this->post($this->AccessTokenURL, $params,$this->getHeaders());
             /** 解析token值(子类实现此方法) */
             $this->token = $this->parseToken($token);
-        }else{
+        } else{
             return $this->token;
         }
     }

src/Connector/GatewayTrait.php

Spacing +2 added lines, -2 removed lines

@@ -35,7 +35,7 @@ 
      */
     protected function get($url, $params = [], $headers = [])
     {
-        return HttpRequest::httpGet($url, $params,$headers);
+        return HttpRequest::httpGet($url, $params, $headers);
     }
 
     /**
@@ -49,7 +49,7 @@ 
      */
     protected function post($url, $params = [], $headers = [])
     {
-        return HttpRequest::httpPost($url, $params,$headers);
+        return HttpRequest::httpPost($url, $params, $headers);
     }
 
 

src/Gateways/Line.php

Braces +1 added lines, -1 removed lines

@@ -129,7 +129,7 @@
 
             /** 解析token值 */
             $this->token = $this->parseToken($token);
-        }else{
+        } else{
             return $this->token;
         }
     }

Spacing +7 added lines, -7 removed lines

@@ -39,7 +39,7 @@ 
             'scope'         => $this->config['scope'],
             'state'         => $this->config['state'] ?: Str::random(),
         ];
-        return $this->AuthorizeURL . '?' . http_build_query($params);
+        return $this->AuthorizeURL.'?'.http_build_query($params);
     }
 
     /**
@@ -65,7 +65,7 @@ 
             'channel' => ConstCode::TYPE_LINE,
             'nickname'    => $result['displayName'],
             'gender'  => ConstCode::GENDER, //line不返回性别信息
-            'avatar'  => isset($result['pictureUrl']) ? $result['pictureUrl'] . '/large' : '',
+            'avatar'  => isset($result['pictureUrl']) ? $result['pictureUrl'].'/large' : '',
             'native'   => $result,
         ];
         return $userInfo;
@@ -99,10 +99,10 @@ 
         $method  = strtoupper($method);
         $request = [
             'method' => $method,
-            'uri'    => self::API_BASE . $api,
+            'uri'    => self::API_BASE.$api,
         ];
 
-        $headers = ['Authorization: ' . $this->token['token_type'] . ' ' . $this->token['access_token']];
+        $headers = ['Authorization: '.$this->token['token_type'].' '.$this->token['access_token']];
 
         $data = $this->$method($request['uri'], $params, $headers);
 
@@ -115,7 +115,7 @@ 
      * @author: JiaMeng <666@majiameng.com>
      * Updater:
      */
-    protected function getToken(){
+    protected function getToken() {
         if (empty($this->token)) {
             /** 验证state参数 */
             $this->checkState();
@@ -125,11 +125,11 @@ 
             $params = http_build_query($params);
 
             /** 获取access_token */
-            $token =  $this->post($this->AccessTokenURL, $params,$this->getHeaders());
+            $token = $this->post($this->AccessTokenURL, $params, $this->getHeaders());
 
             /** 解析token值 */
             $this->token = $this->parseToken($token);
-        }else{
+        } else {
             return $this->token;
         }
     }