fix third login

shirne · Oct 16, 2024 · 378ae6d · 378ae6d
1 parent 9ca3940
commit 378ae6d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/src/application/index/controller/BaseController.php b/src/application/index/controller/BaseController.php
@@ -304,7 +304,7 @@ protected function checkLogin()
 
             // 使用第三方登陆
             $oauth = OAuthFactory::getInstence('wechat', $this->wechat['appid'], $this->wechat['appsecret'], $callbackurl, true);
-            $oauth->redirect()->send();
+            redirect($oauth->redirect())->send();
             exit;
         }
         $this->assign('wechatUser', $this->wechatUser);

diff --git a/src/application/index/controller/LoginController.php b/src/application/index/controller/LoginController.php
@@ -92,7 +92,7 @@ public function index($type = 0)
             $oauth = OAuthFactory::getInstence($app['type'], $app['appid'], $app['appkey'], $callbackurl);
             $url = $oauth->redirect();
 
-            return redirect($url->getTargetUrl());
+            return redirect($url);
         }
     }
 
@@ -120,14 +120,14 @@ public function callback($type = null, $code = null)
         }
 
         try {
-            $userInfo = $oauth->user();
+            $userInfo = $oauth->userFromCode($code);
             $data['openid'] = $userInfo['id'];
             $data['nickname'] = $userInfo['nickname'];
             $data['name'] = $userInfo['name'];
             $data['email'] = $userInfo['email'];
             $data['avatar'] = $userInfo['avatar'];
 
-            $origin = $userInfo->getOriginal();
+            $origin = $userInfo->getRaw();
             $data['gender'] = empty($origin['gender']) ? 0 : $this->parseGender($origin['gender']);
             $data['unionid'] = empty($origin['unionid']) ? '' : $origin['unionid'];
             $data['data'] = json_encode($origin);

diff --git a/src/extend/shirne/sdk/OAuthFactory.php b/src/extend/shirne/sdk/OAuthFactory.php
@@ -11,25 +11,25 @@
  */
 class OAuthFactory
 {
-    public static function getInstence($type,$appid,$appkey,$url='',$iswechat=false)
+    public static function getInstence($type, $appid, $appkey, $url = '', $iswechat = false)
     {
-        if($type=='wechat')$iswechat=true;
-        if($type=='wechat_open')$type='wechat';
-        $config=[
-            $type=>[
+        if ($type == 'wechat') $iswechat = true;
+        if ($type == 'wechat_open') $type = 'wechat';
+        $config = [
+            $type => [
                 'client_id' => $appid,
                 'client_secret' => $appkey,
                 'redirect' => $url,
             ],
-            'guzzle'=>[
-                'verify'=>false
+            'guzzle' => [
+                'verify' => false
             ]
         ];
-        $factory=new SocialiteManager($config);
-        $driver = $factory->driver($type);
-        if($iswechat){
+        $factory = new SocialiteManager($config);
+        $driver = $factory->create($type);
+        if ($iswechat) {
             $driver->scopes(['snsapi_userinfo']);
         }
         return $driver;
     }
-}
+}