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/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/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';
             }
 

example/oauth2.php

Spacing +15 added lines, -15 removed lines

@@ -5,7 +5,7 @@ 
 /**
  *
  */
-class oauth2{
+class oauth2 {
 
     /**
      * 全部配置文件
@@ -26,7 +26,7 @@ 
     /**
      * @param $conf
      */
-    public function __construct($conf){
+    public function __construct($conf) {
         $this->configAll = $conf;
     }
 
@@ -37,15 +37,15 @@ 
      * Updater:
      * @param $name
      */
-    public function getConfig($name){
-        $this->config = $this->configAll[$name]??[];
-        if($name == 'wechat'){
-            if(!Tool::isMobile()){
-                $this->config = $this->config['pc'];//微信pc扫码登录
-            }elseif(Tool::isWeiXin()){
-                $this->config = $this->config['mobile'];//微信浏览器中打开
-            }else{
-                echo '请使用微信打开!';exit();//手机浏览器打开
+    public function getConfig($name) {
+        $this->config = $this->configAll[$name] ?? [];
+        if ($name == 'wechat') {
+            if (!Tool::isMobile()) {
+                $this->config = $this->config['pc']; //微信pc扫码登录
+            }elseif (Tool::isWeiXin()) {
+                $this->config = $this->config['mobile']; //微信浏览器中打开
+            } else {
+                echo '请使用微信打开!'; exit(); //手机浏览器打开
             }
         }
         //可以设置代理服务器，一般用于调试国外平台
@@ -57,15 +57,15 @@ 
      * Author: JiaMeng <666@majiameng.com>
      * Updater:
      */
-    public function login($name,$state=""){
+    public function login($name, $state = "") {
         /** 获取配置 */
-        if($name == 'wx') $name = 'wechat';
+        if ($name == 'wx') $name = 'wechat';
         $this->getConfig($name);
         $this->config['state'] = $state;
 
         /** 初始化实例类 */
         $oauth = OAuth::$name($this->config);
-        if(Tool::isMobile() || Tool::isWeiXin()){
+        if (Tool::isMobile() || Tool::isWeiXin()) {
             /**
              * 对于微博，如果登录界面要适用于手机，则需要设定->setDisplay('mobile')
              * 对于微信，如果是公众号登录，则需要设定->setDisplay('mobile')，否则是WEB网站扫码登录
@@ -94,7 +94,7 @@ 
     public function callback($name)
     {
         /** 获取配置 */
-        if($name == 'wx') $name = 'wechat';
+        if ($name == 'wx') $name = 'wechat';
         $this->getConfig($name);
 
         /** 初始化实例类 */

Braces +8 added lines, -4 removed lines

@@ -42,9 +42,9 @@ 
         if($name == 'wechat'){
             if(!Tool::isMobile()){
                 $this->config = $this->config['pc'];//微信pc扫码登录
-            }elseif(Tool::isWeiXin()){
+            } elseif(Tool::isWeiXin()){
                 $this->config = $this->config['mobile'];//微信浏览器中打开
-            }else{
+            } else{
                 echo '请使用微信打开!';exit();//手机浏览器打开
             }
         }
@@ -59,7 +59,9 @@ 
      */
     public function login($name,$state=""){
         /** 获取配置 */
-        if($name == 'wx') $name = 'wechat';
+        if($name == 'wx') {
+            $name = 'wechat';
+        }
         $this->getConfig($name);
         $this->config['state'] = $state;
 
@@ -94,7 +96,9 @@ 
     public function callback($name)
     {
         /** 获取配置 */
-        if($name == 'wx') $name = 'wechat';
+        if($name == 'wx') {
+            $name = 'wechat';
+        }
         $this->getConfig($name);
 
         /** 初始化实例类 */

src/Gateways/Gitee.php

Spacing +5 added lines, -5 removed lines

@@ -34,7 +34,7 @@ 
             'state'         => $this->config['state'],

             'scope'         => $this->config['scope'],

         ];

-        return $this->AuthorizeURL . '?' . http_build_query($params);

+        return $this->AuthorizeURL.'?'.http_build_query($params);

     }

 

     /**

@@ -73,7 +73,7 @@ 
         $params = [

             'access_token'=>$this->token['access_token'],

         ];

-        $data = $this->get($this->UserInfoURL,$params);

+        $data = $this->get($this->UserInfoURL, $params);

         return json_decode($data, true);

     }

 

@@ -91,7 +91,7 @@ 
     /**

      * Description:  获取AccessToken

      */

-    protected function getToken(){

+    protected function getToken() {

         if (empty($this->token)) {

             /** 验证state参数 */

             $this->CheckState();

@@ -100,8 +100,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);

         }