majiameng / OAuth2

src/Gateways/Naver.php

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

src/Gateways/Facebook.php

Spacing +5 added lines, -5 removed lines

@@ -54,7 +54,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);
     }
 
     /**
@@ -91,12 +91,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("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)';
@@ -116,7 +116,7 @@ 
         $method  = strtoupper($method);
         $request = [
             'method' => $method,
-            'uri'    => self::API_BASE . $api,
+            'uri'    => self::API_BASE.$api,
         ];
 
         $data = $this->$method($request['uri'], $params);

Braces +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
                 throw new OAuthException("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)';

src/Connector/GatewayTrait.php

Spacing +3 added lines, -3 removed lines

@@ -19,7 +19,7 @@ 
      */
     protected function get($url, $params = [], $headers = [])
     {
-        return \tinymeng\tools\HttpRequest::httpGet($url, $params,$headers);
+        return \tinymeng\tools\HttpRequest::httpGet($url, $params, $headers);
     }
 
     /**
@@ -33,8 +33,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);
     }
 
 

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);
+            $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/Helper/Encryptor.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 
 use tinymeng\OAuth2\Exception\OAuthException;
 
-class Encryptor{
+class Encryptor {
 
     /**
      * 解密数据（微信小程序手机号）

src/OAuth.php

Spacing +4 added lines, -4 removed lines

@@ -35,7 +35,7 @@ 
      */
     protected static function init($gateway, $config)
     {
-        if(empty($config)){
+        if (empty($config)) {
             throw new OAuthException("第三方登录 [$gateway] config配置不能为空");
         }
         $baseConfig = [
@@ -45,14 +45,14 @@ 
             'scope'     => '',
             'type'      => '',
         ];
-        if($gateway == 'weixin'){
+        if ($gateway == 'weixin') {
             /** 兼容 tinymeng/oauth v1.0.0完美升级 */
             $gateway = 'wechat';
         }
         $gateway = Str::uFirst($gateway);
-        $class = __NAMESPACE__ . '\\Gateways\\' . $gateway;
+        $class = __NAMESPACE__.'\\Gateways\\'.$gateway;
         if (class_exists($class)) {
-            $app = new $class(array_replace_recursive($baseConfig,$config));
+            $app = new $class(array_replace_recursive($baseConfig, $config));
             if ($app instanceof GatewayInterface) {
                 return $app;
             }