majiameng / OAuth2

src/Gateways/Naver.php

Braces +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
             }
             $this->token['token_type'] = 'Bearer';
             $this->token['access_token'] = $_REQUEST['access_token'];
-        }else {
+        } else {
             $this->getToken();
         }
         $data = $this->call('nid/me', $this->token, 'GET');

Spacing +6 added lines, -6 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);
     }
 
     /**
@@ -76,13 +76,13 @@ 
      */
     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("Naver APP登录 需要传输access_token参数! ");
             }
             $this->token['token_type'] = 'Bearer';
             $this->token['access_token'] = $_REQUEST['access_token'];
-        }else {
+        } else {
             $this->getToken();
         }
         $data = $this->call('nid/me', $this->token, 'GET');
@@ -105,10 +105,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);
 

src/Gateways/Sina.php

Braces +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
             }
             $this->token['access_token'] = $_REQUEST['access_token'];
             $this->token['openid'] = $_REQUEST['uid'];
-        }else{
+        } else{
             /** 获取参数 */
             $params = $this->accessTokenParams();
             $this->AccessTokenURL = $this->AccessTokenURL. '?' . http_build_query($params);//get传参

Spacing +9 added lines, -9 removed lines

@@ -38,7 +38,7 @@ 
             'state'        => $this->config['state'],
             'display'      => $this->display,
         ];
-        return $this->AuthorizeURL . '?' . http_build_query($params);
+        return $this->AuthorizeURL.'?'.http_build_query($params);
     }
 
     /**
@@ -91,16 +91,16 @@ 
      */
     public function getUserInfo()
     {
-        if($this->type == 'app'){//App登录
-            if(!isset($_REQUEST['access_token']) || !isset($_REQUEST['uid'])){
+        if ($this->type == 'app') {//App登录
+            if (!isset($_REQUEST['access_token']) || !isset($_REQUEST['uid'])) {
                 throw new OAuthException("Sina APP登录 需要传输access_token和uid参数! ");
             }
             $this->token['access_token'] = $_REQUEST['access_token'];
             $this->token['openid'] = $_REQUEST['uid'];
-        }else{
+        } else {
             /** 获取参数 */
             $params = $this->accessTokenParams();
-            $this->AccessTokenURL = $this->AccessTokenURL. '?' . http_build_query($params);//get传参
+            $this->AccessTokenURL = $this->AccessTokenURL.'?'.http_build_query($params); //get传参
             $this->getToken();
         }
 
@@ -120,11 +120,11 @@ 
     {
         $method = strtoupper($method);
 
-        if(isset($this->token['access_token'])){
+        if (isset($this->token['access_token'])) {
             $params['access_token'] = $this->token['access_token'];
         }
 
-        $data = $this->$method(self::API_BASE . $api, $params);
+        $data = $this->$method(self::API_BASE.$api, $params);
         return json_decode($data, true);
     }
 
@@ -165,8 +165,8 @@ 
      * @param $data
      * @return mixed
      */
-    public function statusesShare($data){
-        return $this->call('statuses/share.json', json_encode($data),'POST');
+    public function statusesShare($data) {
+        return $this->call('statuses/share.json', json_encode($data), 'POST');
     }
 
 }

src/Helper/Str.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
             if (in_array($k, $except)) {
                 continue;
             }
-            $param_str .= $k . '=';
+            $param_str .= $k.'=';
             $param_str .= $urlencode ? rawurlencode($v) : $v;
             $param_str .= '&';
         }

src/Helper/ConstCode.php

Braces +4 added lines, -4 removed lines

@@ -52,18 +52,18 @@
             case self::TYPE_QQ:
                 if($type == 'app'){
                     $typeConst = self::TYPE_QQ_APP;//qqApp
-                }else{
+                } else{
                     $typeConst = $channel;
                 }
                 break;
             case self::TYPE_WECHAT:
                 if($type == 'app'){
                     $typeConst = self::TYPE_WECHAT_APP;//微信App
-                }else if($type == 'applets'){
+                } else if($type == 'applets'){
                     $typeConst =  self::TYPE_WECHAT_APPLETS;//微信小程序
-                }else if(Tool::isWeiXin()){
+                } else if(Tool::isWeiXin()){
                     $typeConst =  self::TYPE_WECHAT_MOBILE;//微信mobile
-                }else{
+                } else{
                     $typeConst = $channel;
                 }
                 break;

Spacing +20 added lines, -20 removed lines

@@ -6,16 +6,16 @@ 
 
 use tinymeng\tools\Tool;
 
-class ConstCode{
+class ConstCode {
 
     /** 公共状态 */
-    const STATUS_DELETE = 0;//删除
-    const STATUS_NORMAL = 1;//正常
+    const STATUS_DELETE = 0; //删除
+    const STATUS_NORMAL = 1; //正常
 
     /** 性别 */
-    const GENDER = 0;//未知
-    const GENDER_MAN = 1;//男
-    const GENDER_WOMEN = 2;//女
+    const GENDER = 0; //未知
+    const GENDER_MAN = 1; //男
+    const GENDER_WOMEN = 2; //女
 
     /** 登录类型 */
     const TYPE_QQ               = 1; //QQ
@@ -27,8 +27,8 @@ 
     const TYPE_FACEBOOK         = 7; //faceBook
     const TYPE_GOOGLE           = 8; //google
     const TYPE_TWITTER          = 9; //飞鸽
-    const TYPE_LINE             = 10;//line
-    const TYPE_NAVER            = 11;//naver
+    const TYPE_LINE             = 10; //line
+    const TYPE_NAVER            = 11; //naver
     const TYPE_ALIYUN           = 12; //阿里云
     const TYPE_BAIDU            = 13; //百度
     const TYPE_CODING           = 14; //Coding
@@ -53,24 +53,24 @@ 
      * @param bool $type 类型：app applets
      * @return int
      */
-    static public function getTypeConst($channel,$type="")
+    static public function getTypeConst($channel, $type = "")
     {
-        switch ($channel){
+        switch ($channel) {
             case self::TYPE_QQ:
-                if($type == 'app'){
-                    $typeConst = self::TYPE_QQ_APP;//qqApp
-                }else{
+                if ($type == 'app') {
+                    $typeConst = self::TYPE_QQ_APP; //qqApp
+                } else {
                     $typeConst = $channel;
                 }
                 break;
             case self::TYPE_WECHAT:
-                if($type == 'app'){
-                    $typeConst = self::TYPE_WECHAT_APP;//微信App
-                }else if($type == 'applets'){
-                    $typeConst =  self::TYPE_WECHAT_APPLETS;//微信小程序
-                }else if(Tool::isWeiXin()){
-                    $typeConst =  self::TYPE_WECHAT_MOBILE;//微信mobile
-                }else{
+                if ($type == 'app') {
+                    $typeConst = self::TYPE_WECHAT_APP; //微信App
+                } else if ($type == 'applets') {
+                    $typeConst = self::TYPE_WECHAT_APPLETS; //微信小程序
+                } else if (Tool::isWeiXin()) {
+                    $typeConst = self::TYPE_WECHAT_MOBILE; //微信mobile
+                } else {
                     $typeConst = $channel;
                 }
                 break;

src/Gateways/Aliyun.php

Spacing +5 added lines, -5 removed lines

@@ -39,7 +39,7 @@ 
             'state'         => $this->config['state'],
             'scope'         => $this->config['scope'],
         ];
-        return $this->AuthorizeURL . '?' . http_build_query($params);
+        return $this->AuthorizeURL.'?'.http_build_query($params);
     }
 
     /**
@@ -79,7 +79,7 @@ 
         $this->openid();
 
         $headers = ['Authorization: Bearer '.$this->token['access_token']];
-        $data = $this->get($this->UserInfoURL, [],$headers);
+        $data = $this->get($this->UserInfoURL, [], $headers);
         return json_decode($data, true);
     }
 
@@ -101,7 +101,7 @@ 
      * @author: JiaMeng <666@majiameng.com>
      * Updater:
      */
-    protected function getToken(){
+    protected function getToken() {
         if (empty($this->token)) {
             /** 验证state参数 */
             $this->CheckState();
@@ -110,8 +110,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);
         }

src/Connector/Gateway.php

Braces +4 added lines, -2 removed lines

@@ -108,7 +108,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();
     }
@@ -246,7 +248,7 @@ 
             $token =  $this->POST($this->AccessTokenURL, $params);
             /** 解析token值(子类实现此方法) */
             $this->token = $this->parseToken($token);
-        }else{
+        } else{
             return $this->token;
         }
     }

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);
+            $token = $this->POST($this->AccessTokenURL, $params);
             /** 解析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;
     }
 
 

src/Gateways/Github.php

Spacing +3 added lines, -3 removed lines

@@ -51,9 +51,9 @@ 
             'scope'        => $this->config['scope'],
             'state'        => $this->config['state'],
             'display'      => $this->display,
-            'allow_signup' => true,//是否会在OAuth流程中为未经身份验证的用户提供注册GitHub的选项。默认是true。false在策略禁止注册的情况下使用。
+            'allow_signup' => true, //是否会在OAuth流程中为未经身份验证的用户提供注册GitHub的选项。默认是true。false在策略禁止注册的情况下使用。
         ];
-        return $this->AuthorizeURL . '?' . http_build_query($params);
+        return $this->AuthorizeURL.'?'.http_build_query($params);
     }
 
     /**
@@ -113,7 +113,7 @@ 
         $headers = [
             'User-Agent: '.$this->config['application_name'],
             'UserModel-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.100 Safari/537.36 ',
-            'Authorization: token ' . $this->token['access_token'],
+            'Authorization: token '.$this->token['access_token'],
             'Accept: application/json'
         ];
         $response = $this->get($this->UserInfoURL, [], $headers);

example/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

example/proxy/wx_proxy.php

Spacing +10 added lines, -10 removed lines

@@ -12,12 +12,12 @@ 
     /**
      * @Author: TinyMeng <666@majiameng.com>
      */
-    public function run(){
+    public function run() {
         if (isset($_GET['code'])) {
             $state = isset($_GET['state']) ? $_GET['state'] : "";
-            header('Location: ' . $_COOKIE['redirect_uri'] . '?code=' . $_GET['code'] . '&state=' . $state);
+            header('Location: '.$_COOKIE['redirect_uri'].'?code='.$_GET['code'].'&state='.$state);
         } else {
-            if(!isset($_GET['appid']) || !isset($_GET['response_type']) || !isset($_GET['scope'])){
+            if (!isset($_GET['appid']) || !isset($_GET['response_type']) || !isset($_GET['scope'])) {
                 echo "参数缺失";
                 return;
             }
@@ -26,20 +26,20 @@ 
             $protocol = $this->is_HTTPS() ? 'https://' : 'http://';
             $params   = array(
                 'appid'         => $_GET['appid'],
-                'redirect_uri'  => $protocol . $_SERVER['HTTP_HOST'] . $_SERVER['DOCUMENT_URI'],
+                'redirect_uri'  => $protocol.$_SERVER['HTTP_HOST'].$_SERVER['DOCUMENT_URI'],
                 'response_type' => $_GET['response_type'],
                 'scope'         => $_GET['scope'],
                 'state'         => $state,
             );
-            if($_GET['scope'] == 'snsapi_login'){
+            if ($_GET['scope'] == 'snsapi_login') {
                 //扫码登录
-                $AuthorizeURL = $this->AuthorizeURL . '/connect/qrconnect';
-            }else{
-                $AuthorizeURL = $this->AuthorizeURL . '/connect/oauth2/authorize';
+                $AuthorizeURL = $this->AuthorizeURL.'/connect/qrconnect';
+            } else {
+                $AuthorizeURL = $this->AuthorizeURL.'/connect/oauth2/authorize';
             }
 
             setcookie('redirect_uri', urldecode($_GET['redirect_uri']), $_SERVER['REQUEST_TIME'] + 60, '/');
-            header('Location: ' . $AuthorizeURL . '?' . http_build_query($params) . '#wechat_redirect');
+            header('Location: '.$AuthorizeURL.'?'.http_build_query($params).'#wechat_redirect');
         }
     }
 
@@ -48,7 +48,7 @@ 
      * @Author: TinyMeng <666@majiameng.com>
      * @return bool
      */
-    protected function is_HTTPS(){
+    protected function is_HTTPS() {
         if (!isset($_SERVER['HTTPS'])) {
             return false;
         }

Braces +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
             if($_GET['scope'] == 'snsapi_login'){
                 //扫码登录
                 $AuthorizeURL = $this->AuthorizeURL . '/connect/qrconnect';
-            }else{
+            } else{
                 $AuthorizeURL = $this->AuthorizeURL . '/connect/oauth2/authorize';
             }