majiameng / OAuth2

example/login.php

Spacing +6 added lines, -6 removed lines

@@ -10,20 +10,20 @@
 //引入配置文件
 $params = require('config/params.php');
 
-try{
-    $name="qq";//登录类型,例:qq / google
+try {
+    $name = "qq"; //登录类型,例:qq / google
     $oauth = new oauth2($params);
     if (empty($_GET['code'])) {
         /** 登录 */
         $result = $oauth->login($name);
 //        var_dump($result['url']);die;
         //重定向到第三方登录页
-        header('Location: ' . $result['url']);
-    }else{
+        header('Location: '.$result['url']);
+    } else {
         /** 登录回调 */
         $result = $this->callback($name);
-        var_dump($result);die;
+        var_dump($result); die;
     }
-}catch(Exception $e){
+} catch (Exception $e) {
     echo 'Oauth登录失败！'.$e->getMessage();
 }
\ No newline at end of file

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

example/config/params.php

Spacing +4 added lines, -4 removed lines

@@ -23,7 +23,7 @@ 
             'app_id' => 'wx52e2b2464*****',
             'app_secret' => 'd5dad705a1159d*********',
             'callback' => $callback,
-            'scope'      => 'snsapi_login',//扫码登录
+            'scope'      => 'snsapi_login', //扫码登录
             //'proxy_url' => 'http://www.abc.com/wx_proxy.php',//如果不需要代理请注释此行
             //'proxy_url' => 'http://www.abc.com/weixin-authorize-proxy.html',//如果不需要代理请注释此行
         ],
@@ -31,14 +31,14 @@ 
             'app_id' => 'wx6ca7410f8******',
             'app_secret' => '30a206b87b7689b19f11******',
             'callback' => $callback,
-            'scope'      => 'snsapi_userinfo',//静默授权=>snsapi_base;获取用户信息=>snsapi_userinfo
+            'scope'      => 'snsapi_userinfo', //静默授权=>snsapi_base;获取用户信息=>snsapi_userinfo
             //'proxy_url' => 'http://www.abc.com/wx_proxy.php',//如果不需要代理请注释此行
             //'proxy_url' => 'http://www.abc.com/weixin-authorize-proxy.html',//如果不需要代理请注释此行
         ],
         'app'=>[
             'app_id' => 'wx6ca7410f8******',
             'app_secret' => '30a206b87b7689b19f11******',
-            'type'      => 'app',//登录类型app
+            'type'      => 'app', //登录类型app
         ],
         /**
          * 微信小程序只能获取到 openid session_key
@@ -47,7 +47,7 @@ 
         'applets'=>[
             'app_id' => 'wx6ca7410f8******',
             'app_secret' => '30a206b87b7689b19f11******',
-            'type'      => 'applets',//登录类型小程序
+            'type'      => 'applets', //登录类型小程序
         ],
     ]
     /**

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);
 
         /** 初始化实例类 */

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);

         }

src/Gateways/Alipay.php

Spacing +10 added lines, -10 removed lines

@@ -81,7 +81,7 @@ 
             $this->AuthorizeURL = str_replace("alipay", "alipaydev", $this->AuthorizeURL);
         }
 
-        return $this->AuthorizeURL . '?' . http_build_query($params);
+        return $this->AuthorizeURL.'?'.http_build_query($params);
     }
 
     /**
@@ -114,16 +114,16 @@ 
 
         $userInfo = [
             'open_id'  => $this->openid(),
-            'union_id'  => $this->token['union_id']??'',
+            'union_id'  => $this->token['union_id'] ?? '',
             'channel' => ConstCode::TYPE_ALIPAY,
             'nickname'    => $result['nick_name'],
             'gender'  => isset($result['gender']) ? $this->getGender($result['gender']) : ConstCode::GENDER,
             'avatar'  => $result['avatar'],
             // 拓展字段
-            'access_token'  => $this->token['access_token']??'',
+            'access_token'  => $this->token['access_token'] ?? '',
             'user_id'  => $this->token['user_id'],
         ];
-        $userInfo['type'] = ConstCode::getTypeConst($userInfo['channel'],$this->type);
+        $userInfo['type'] = ConstCode::getTypeConst($userInfo['channel'], $this->type);
         return $userInfo;
     }
 
@@ -136,12 +136,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("AliPay APP登录 需要传输access_token参数! ");
             }
             $this->token['access_token'] = $_REQUEST['access_token'];
-        }else {
+        } else {
             /** 获取token信息 */
             $this->getToken();
         }
@@ -159,7 +159,7 @@ 
 
         $data = $this->post(self::API_BASE, $params);
         $data = mb_convert_encoding($data, 'utf-8', 'gbk');
-        $result =  json_decode($data, true);
+        $result = json_decode($data, true);
         return $result['alipay_user_info_share_response'];
     }
 
@@ -236,7 +236,7 @@ 
             throw new \Exception('支付宝RSA密钥未配置');
         }
         $rsa    = str_replace([PHP_EOL, $header, $footer], '', $rsa);
-        $rsaVal = $header . PHP_EOL . chunk_split($rsa, 64, PHP_EOL) . $footer;
+        $rsaVal = $header.PHP_EOL.chunk_split($rsa, 64, PHP_EOL).$footer;
         return $rsaVal;
     }
 
@@ -255,7 +255,7 @@ 
 
         if (isset($data['alipay_system_oauth_token_response'])) {
             $data           = $data['alipay_system_oauth_token_response'];
-            $data['openid'] = $data['open_id']??$data['user_id'];
+            $data['openid'] = $data['open_id'] ?? $data['user_id'];
             return $data;
         } else {
             throw new \Exception("获取支付宝 ACCESS_TOKEN 出错：{$token}");

src/Helper/Encryptor.php

Spacing +1 added lines, -1 removed lines

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