majiameng / OAuth2

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/Gateways/Line.php

Spacing +4 added lines, -4 removed lines

@@ -33,7 +33,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);
     }
 
     /**
@@ -57,7 +57,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' : '',
         ];
         return $userInfo;
     }
@@ -90,10 +90,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/OAuth.php

Spacing +4 added lines, -4 removed lines

@@ -34,7 +34,7 @@ 
      */
     protected static function init($gateway, $config)
     {
-        if(empty($config)){
+        if (empty($config)) {
             throw new \Exception("第三方登录 [$gateway] config配置不能为空");
         }
         $baseConfig = [
@@ -44,14 +44,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;
             }

src/Gateways/Twitter.php

Spacing +7 added lines, -7 removed lines

@@ -27,7 +27,7 @@ 
         $this->saveState();
         //登录参数
         $oauthToken = $this->call('oauth/request_token', ['oauth_callback' => $this->config['callback']], 'POST');
-        return self::API_BASE . 'oauth/authenticate?oauth_token=' . $oauthToken['oauth_token'];
+        return self::API_BASE.'oauth/authenticate?oauth_token='.$oauthToken['oauth_token'];
     }
 
     /**
@@ -66,7 +66,7 @@ 
             if (isset($this->token['oauth_token_secret'])) {
                 $this->tokenSecret = $this->token['oauth_token_secret'];
             } else {
-                throw new \Exception("获取Twitter ACCESS_TOKEN 出错：" . json_encode($this->token));
+                throw new \Exception("获取Twitter ACCESS_TOKEN 出错：".json_encode($this->token));
             }
         }
 
@@ -86,7 +86,7 @@ 
         $method  = strtoupper($method);
         $request = [
             'method' => $method,
-            'uri'    => self::API_BASE . $api,
+            'uri'    => self::API_BASE.$api,
         ];
         $oauthParams                    = $this->getOAuthParams($params);
         $oauthParams['oauth_signature'] = $this->signature($request, $oauthParams);
@@ -131,8 +131,8 @@ 
     {
         ksort($params);
         $sign_str = Str::buildParams($params, true);
-        $sign_str = $request['method'] . '&' . rawurlencode($request['uri']) . '&' . rawurlencode($sign_str);
-        $sign_key = $this->config['app_secret'] . '&' . $this->tokenSecret;
+        $sign_str = $request['method'].'&'.rawurlencode($request['uri']).'&'.rawurlencode($sign_str);
+        $sign_key = $this->config['app_secret'].'&'.$this->tokenSecret;
 
         return rawurlencode(base64_encode(hash_hmac('sha1', $sign_str, $sign_key, true)));
     }
@@ -147,7 +147,7 @@ 
     {
         $return = 'OAuth ';
         foreach ($params as $k => $param) {
-            $return .= $k . '="' . $param . '", ';
+            $return .= $k.'="'.$param.'", ';
         }
         return rtrim($return, ', ');
     }
@@ -168,7 +168,7 @@ 
      * 解析access_token方法请求后的返回值
      * @param string $token 获取access_token的方法的返回值
      */
-    protected function parseToken($token){
+    protected function parseToken($token) {
         return $token;
     }
 }

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_QQ_APP           = 21; //qqAPP
@@ -47,24 +47,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/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);
     }
 
     /**
@@ -68,7 +68,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;
@@ -79,14 +79,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/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);
         }