majiameng / OAuth2

src/Gateways/Github.php

Spacing +4 added lines, -4 removed lines

@@ -40,9 +40,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);
     }
 
     /**
@@ -98,11 +98,11 @@ 
     {
         $this->getToken();
 
-        $url = self::API_BASE . "user";
+        $url = self::API_BASE."user";
         $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($url, [], $headers);

src/Gateways/Google.php

Spacing +6 added lines, -6 removed lines

@@ -40,7 +40,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);
     }
 
     /**
@@ -67,7 +67,7 @@ 
             'gender'  => isset($result['gender']) ? $this->getGender($result['gender']) : ConstCode::GENDER,
             'avatar'  => $result['picture'],
         ];
-        if(isset($result['email'])){
+        if (isset($result['email'])) {
             $userInfo['email'] = $result['email'];
         }
         return $userInfo;
@@ -78,14 +78,14 @@ 
      */
     public function getUserInfo()
     {
-        if($this->type == 'app'){//App登录
-            if(!isset($_REQUEST['code']) ){
+        if ($this->type == 'app') {//App登录
+            if (!isset($_REQUEST['code'])) {
                 throw new \Exception("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/Gateways/Facebook.php

Spacing +5 added lines, -5 removed lines

@@ -43,7 +43,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);
     }
 
     /**
@@ -77,12 +77,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 \Exception("Facebook APP登录 需要传输access_token参数! ");
             }
             $this->token['access_token'] = $_REQUEST['access_token'];
-        }else {
+        } else {
             $this->getToken();
         }
         $fields = isset($this->config['fields']) ? $this->config['fields'] : 'id,name,gender,picture.width(400)';
@@ -102,7 +102,7 @@ 
         $method  = strtoupper($method);
         $request = [
             'method' => $method,
-            'uri'    => self::API_BASE . $api,
+            'uri'    => self::API_BASE.$api,
         ];
 
         $data = $this->$method($request['uri'], $params);

src/Gateways/Qq.php

Spacing +12 added lines, -12 removed lines

@@ -41,7 +41,7 @@ 
             'scope'         => $this->config['scope'],
             'display'       => $this->display,
         ];
-        return $this->AuthorizeURL . '?' . http_build_query($params);
+        return $this->AuthorizeURL.'?'.http_build_query($params);
     }
 
     /**
@@ -62,7 +62,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'])),
         ];
         return $userInfo;
     }
@@ -83,7 +83,7 @@ 
             'access_token'=>$this->token['access_token'],
             'format'=>'json',
         ];
-        $data = $this->get(self::API_BASE . 'user/get_user_info', $params);
+        $data = $this->get(self::API_BASE.'user/get_user_info', $params);
         return json_decode($data, true);
     }
 
@@ -96,12 +96,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 \Exception("腾讯QQ,APP登录 需要传输access_token参数! ");
             }
             $this->token['access_token'] = $_REQUEST['access_token'];
-        }else{
+        } else {
             /** 获取token */
             $this->getToken();
         }
@@ -127,7 +127,7 @@ 
         if (isset($data['access_token'])) {
             return $data;
         } else {
-            throw new \Exception("获取腾讯QQ ACCESS_TOKEN 出错：" . $token);
+            throw new \Exception("获取腾讯QQ ACCESS_TOKEN 出错：".$token);
         }
     }
 
@@ -138,7 +138,7 @@ 
      * @return mixed|string
      * @throws \Exception
      */
-    private function getOpenID(){
+    private function getOpenID() {
         $query = [
             'access_token' => $this->token['access_token']
         ];
@@ -147,12 +147,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 \Exception("获取用户openid出错：" . $data['error_description']);
+            throw new \Exception("获取用户openid出错：".$data['error_description']);
         }
     }
 
@@ -161,7 +161,7 @@ 
      * M代表男性,F代表女性
      * @param $gender
      */
-    public function getGender($gender){
+    public function getGender($gender) {
         return $gender == '男' ? ConstCode::GENDER_MAN : ConstCode::GENDER_WOMEN;
     }
 }

src/Gateways/Naver.php

Spacing +6 added lines, -6 removed lines

@@ -38,7 +38,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);
     }
 
     /**
@@ -74,13 +74,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 \Exception("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');
@@ -103,10 +103,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

Spacing +9 added lines, -9 removed lines

@@ -37,7 +37,7 @@ 
             'state'        => $this->config['state'],
             'display'      => $this->display,
         ];
-        return $this->AuthorizeURL . '?' . http_build_query($params);
+        return $this->AuthorizeURL.'?'.http_build_query($params);
     }
 
     /**
@@ -88,16 +88,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 \Exception("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();
         }
 
@@ -117,11 +117,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);
     }
 
@@ -162,8 +162,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/Gateways/Wechat.php

Spacing +15 added lines, -15 removed lines

@@ -41,7 +41,7 @@ 
         $this->saveState();
 
         //获取代理链接
-        if(isset($this->config['proxy_url'])){
+        if (isset($this->config['proxy_url'])) {
             return $this->getProxyURL();
         }
 
@@ -54,7 +54,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';
     }
 
     /**
@@ -72,7 +72,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);
     }
 
     /**
@@ -108,12 +108,12 @@ 
             'open_id' => $this->openid(),
             'union_id'=> isset($this->token['unionid']) ? $this->token['unionid'] : '',
             'channel' => ConstCode::TYPE_WECHAT,
-            'nickname'=> $result['nickname']??'',
+            'nickname'=> $result['nickname'] ?? '',
             'gender'  => isset($result['sex']) ? $result['sex'] : ConstCode::GENDER,
-            'avatar'  => $result['headimgurl']??'',
-            'session_key'  => $result['session_key']??'',
+            'avatar'  => $result['headimgurl'] ?? '',
+            'session_key'  => $result['session_key'] ?? '',
         ];
-        $userInfo['type'] = ConstCode::getTypeConst($userInfo['channel'],$this->type);
+        $userInfo['type'] = ConstCode::getTypeConst($userInfo['channel'], $this->type);
         return $userInfo;
     }
 
@@ -126,15 +126,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 \Exception("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();
         }
@@ -145,7 +145,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);
     }
 
@@ -153,13 +153,13 @@ 
      * @return array|mixed|null
      * @throws \Exception
      */
-    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;
@@ -215,7 +215,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 {

src/Connector/Gateway.php

Spacing +19 added lines, -19 removed lines

@@ -95,11 +95,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();
     }
@@ -135,7 +135,7 @@ 
      * Updater:
      * @return $this
      */
-    public function mustCheckState(){
+    public function mustCheckState() {
         $this->checkState = true;
         return $this;
     }
@@ -145,7 +145,7 @@ 
      * @Author: TinyMeng <666@majiameng.com>
      * @return array
      */
-    public function getConfig(){
+    public function getConfig() {
         return $this->config;
     }
 
@@ -154,7 +154,7 @@ 
      * @param $token
      * @return $this
      */
-    public function setToken($token){
+    public function setToken($token) {
         $this->token = $token;
         return $this;
     }
@@ -163,14 +163,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'];
@@ -182,7 +182,7 @@ 
      * @Author: TinyMeng <666@majiameng.com>
      * @throws \Exception
      */
-    public function CheckState(){
+    public function CheckState() {
         if ($this->checkState === true) {
             if (session_status() !== PHP_SESSION_ACTIVE) {
                 session_start();
@@ -199,7 +199,7 @@ 
      * Updater:
      * @return array
      */
-    protected function accessTokenParams(){
+    protected function accessTokenParams() {
         $params = [
             'client_id'     => $this->config['app_id'],
             'client_secret' => $this->config['app_secret'],
@@ -215,7 +215,7 @@ 
      * @author: JiaMeng <666@majiameng.com>
      * Updater:
      */
-    protected function getToken(){
+    protected function getToken() {
         if (empty($this->token)) {
             /** 验证state参数 */
             $this->CheckState();
@@ -224,7 +224,7 @@ 
             $params = $this->accessTokenParams();
 
             /** 获取access_token */
-            $token =  $this->POST($this->AccessTokenURL, $params);
+            $token = $this->POST($this->AccessTokenURL, $params);
             /** 解析token值(子类实现此方法) */
             $this->token = $this->parseToken($token);
         }
@@ -241,7 +241,7 @@ 
      */
     protected function get($url, $params = [], $headers = [])
     {
-        return \tinymeng\tools\HttpRequest::httpGet($url, $params,$headers);
+        return \tinymeng\tools\HttpRequest::httpGet($url, $params, $headers);
     }
 
     /**
@@ -255,8 +255,8 @@ 
      */
     protected function post($url, $params = [], $headers = [])
     {
-        $headers[] = 'Accept: application/json';//GitHub需要的header
-        return \tinymeng\tools\HttpRequest::httpPost($url, $params,$headers);
+        $headers[] = 'Accept: application/json'; //GitHub需要的header
+        return \tinymeng\tools\HttpRequest::httpPost($url, $params, $headers);
     }
 
     /**
@@ -264,7 +264,7 @@ 
      * 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/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 .= '&';
         }