majiameng / OAuth2

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

Spacing +27 added lines, -27 removed lines

@@ -21,21 +21,21 @@ 
  */
 class Douyin extends Gateway
 {
-    protected $ApiBase            = 'https://open.douyin.com';
+    protected $ApiBase = 'https://open.douyin.com';
     protected $AuthorizeURL   = 'https://open.douyin.com/platform/oauth/connect/';
-    protected $AuthorizeSilenceURL   = 'https://open.douyin.com/oauth/authorize/v2/';//抖音静默授权
+    protected $AuthorizeSilenceURL = 'https://open.douyin.com/oauth/authorize/v2/'; //抖音静默授权
     protected $AccessTokenURL = 'oauth/access_token/';
     protected $UserInfoURL = 'oauth/userinfo/';
 
     protected $jsCode2Session = 'https://minigame.zijieapi.com/mgplatform/api/apps/jscode2session';
 
     protected $API_BASE_ARRAY = [
-        'douyin'=>'https://open.douyin.com/',//抖音
-        'toutiao'=>'https://open.snssdk.com/',//头条
-        'xigua'=>'https://open-api.ixigua.com/',//西瓜
+        'douyin'=>'https://open.douyin.com/', //抖音
+        'toutiao'=>'https://open.snssdk.com/', //头条
+        'xigua'=>'https://open-api.ixigua.com/', //西瓜
     ];
 
-    public $oauth_type = ConstCode::TYPE_DOUYIN;//抖音
+    public $oauth_type = ConstCode::TYPE_DOUYIN; //抖音
 
     /**
      * Description:  得到跳转地址
@@ -55,17 +55,17 @@ 
             'redirect_uri'  => $this->config['callback'],
             'response_type' => $this->config['response_type'],
             'scope'         => $this->config['scope'],
-            'optionalScope' => $this->config['optionalScope']??'',
+            'optionalScope' => $this->config['optionalScope'] ?? '',
             'state'         => $this->config['state'],
         ];
-        if($params['state'] == 'login_id'){
+        if ($params['state'] == 'login_id') {
             /**
              * 抖音静默获取授权码
              * https://developer.open-douyin.com/docs/resource/zh-CN/dop/develop/openapi/account-permission/douyin-default-get-permission-code
              */
-            return $this->AuthorizeSilenceURL . '?' . http_build_query($params);
-        }else{
-            return $this->AuthorizeURL . '?' . http_build_query($params);
+            return $this->AuthorizeSilenceURL.'?'.http_build_query($params);
+        } else {
+            return $this->AuthorizeURL.'?'.http_build_query($params);
         }
     }
 
@@ -105,11 +105,11 @@ 
             'open_id' => $this->openid(),
             'union_id'=> isset($this->token['unionid']) ? $this->token['unionid'] : '',
             'channel' => $this->oauth_type,
-            'nickname'=> $result['nickname']??'',
+            'nickname'=> $result['nickname'] ?? '',
             'gender'  => isset($result['gender']) ? $result['gender'] : ConstCode::GENDER,
-            'avatar'  => $result['avatar']??'',
+            'avatar'  => $result['avatar'] ?? '',
         ];
-        $userInfo['type'] = ConstCode::getTypeConst($userInfo['channel'],$this->type);
+        $userInfo['type'] = ConstCode::getTypeConst($userInfo['channel'], $this->type);
         return $userInfo;
     }
 
@@ -122,15 +122,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("Douyin 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,12 +149,12 @@ 
      * @return array|mixed|null
      * @throws \Exception
      */
-    public function applets(){
+    public function applets() {
         /** 获取参数 */
         $params = $this->jscode2sessionParams();
 
         /** 获取access_token */
-        $token =  $this->get($this->jsCode2Session, $params);
+        $token = $this->get($this->jsCode2Session, $params);
         /** 解析token值(子类实现此方法) */
         $this->token = $this->parseToken($token);
         return $this->token;
@@ -167,10 +167,10 @@ 
      */
     private function switchAccessTokenURL()
     {
-        switch ($this->oauth_type){
-            case ConstCode::TYPE_DOUYIN:$this->ApiBase = $this->API_BASE_ARRAY['douyin'];break;
-            case ConstCode::TYPE_TOUTIAO:$this->ApiBase = $this->API_BASE_ARRAY['toutiao'];break;
-            case ConstCode::TYPE_XIGUA:$this->ApiBase = $this->API_BASE_ARRAY['xigua'];break;
+        switch ($this->oauth_type) {
+            case ConstCode::TYPE_DOUYIN:$this->ApiBase = $this->API_BASE_ARRAY['douyin']; break;
+            case ConstCode::TYPE_TOUTIAO:$this->ApiBase = $this->API_BASE_ARRAY['toutiao']; break;
+            case ConstCode::TYPE_XIGUA:$this->ApiBase = $this->API_BASE_ARRAY['xigua']; break;
             default:throw new \Exception("获取抖音 OAUTH_TYPE 参数出错：{$this->oauth_type}");
         }
         $this->AccessTokenURL = $this->ApiBase.$this->AccessTokenURL;
@@ -207,8 +207,8 @@ 
             'appid'      => $this->config['app_id'],
             'secret'     => $this->config['app_secret'],
         ];
-        if(isset($_REQUEST['code'])) $params['code'] = $_REQUEST['code'];
-        if(isset($_REQUEST['anonymous_code'])) $params['anonymous_code'] = $_REQUEST['anonymous_code'];
+        if (isset($_REQUEST['code'])) $params['code'] = $_REQUEST['code'];
+        if (isset($_REQUEST['anonymous_code'])) $params['anonymous_code'] = $_REQUEST['anonymous_code'];
 
         return $params;
     }
@@ -226,7 +226,7 @@ 
         $data = json_decode($token, true);
         if (isset($data['data']['access_token'])) {
             return $data['data'];
-        }elseif (isset($data['session_key'])){
+        }elseif (isset($data['session_key'])) {
             //小程序登录
             return $data;
         } else {

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

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_QQ_APP           = 21; //qqAPP
     const TYPE_WECHAT_APP       = 22; //微信APP
@@ -46,24 +46,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/Connector/Gateway.php

Spacing +20 added lines, -20 removed lines

@@ -85,7 +85,7 @@ 
         if (!$config) {
             throw new \Exception('传入的配置不能为空');
         }
-        if(isset($_GET['referer']) && $config['callback']){
+        if (isset($_GET['referer']) && $config['callback']) {
             $config['callback'] .= ((strpos($config['callback'], '?') !== false) ? '&' : '?').'referer='.$_GET['referer'];
         }
         //默认参数
@@ -98,11 +98,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();
     }
@@ -138,7 +138,7 @@ 
      * Updater:
      * @return $this
      */
-    public function mustCheckState(){
+    public function mustCheckState() {
         $this->checkState = true;
         return $this;
     }
@@ -148,7 +148,7 @@ 
      * @Author: TinyMeng <666@majiameng.com>
      * @return array
      */
-    public function getConfig(){
+    public function getConfig() {
         return $this->config;
     }
 
@@ -157,7 +157,7 @@ 
      * @param $token
      * @return $this
      */
-    public function setToken($token){
+    public function setToken($token) {
         $this->token = $token;
         return $this;
     }
@@ -166,14 +166,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'];
@@ -185,7 +185,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();
@@ -202,7 +202,7 @@ 
      * Updater:
      * @return array
      */
-    protected function accessTokenParams(){
+    protected function accessTokenParams() {
         $params = [
             'client_id'     => $this->config['app_id'],
             'client_secret' => $this->config['app_secret'],
@@ -218,7 +218,7 @@ 
      * @author: JiaMeng <666@majiameng.com>
      * Updater:
      */
-    protected function getToken(){
+    protected function getToken() {
         if (empty($this->token)) {
             /** 验证state参数 */
             $this->CheckState();
@@ -227,7 +227,7 @@ 
             $params = $this->accessTokenParams();
 
             /** 获取access_token */
-            $token =  $this->POST($this->AccessTokenURL, $params);
+            $token = $this->POST($this->AccessTokenURL, $params);
             /** 解析token值(子类实现此方法) */
             $this->token = $this->parseToken($token);
         }
@@ -244,7 +244,7 @@ 
      */
     protected function get($url, $params = [], $headers = [])
     {
-        return \tinymeng\tools\HttpRequest::httpGet($url, $params,$headers);
+        return \tinymeng\tools\HttpRequest::httpGet($url, $params, $headers);
     }
 
     /**
@@ -258,8 +258,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);
     }
 
     /**
@@ -267,7 +267,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;
     }
 }