Skip to content

Commit 1bc59aa

Browse files
committed
移除 5.0 支持
1 parent cb52f08 commit 1bc59aa

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
],
1212
"require": {
1313
"illuminate/container": "^5.1 || ^6.0 || ^7.0 || ^8.0",
14-
"overtrue/wechat": "^4.0 || ^5.0"
14+
"overtrue/wechat": "^4.0"
1515
},
1616
"require-dev": {
1717
"laravel/framework": "^8.5",

src/Middleware/OAuthAuthenticate.php

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,7 @@ public function handle($request, Closure $next, $account = 'default', $scope = n
5959
$enforceHttps = Arr::get($config, 'oauth.enforce_https', false);
6060

6161
if ($request->has('code')) {
62-
if (\is_callable([$officialAccount->oauth, 'user'])) {
63-
$user = $officialAccount->oauth->user();
64-
} else {
65-
$user = $officialAccount->oauth->userFromCode($request->query('code'));
66-
}
67-
68-
session([$sessionKey => $user]);
62+
session([$sessionKey => $officialAccount->oauth->user()]);
6963

7064
event(new WeChatUserAuthorized(session($sessionKey), true, $account));
7165

@@ -76,7 +70,7 @@ public function handle($request, Closure $next, $account = 'default', $scope = n
7670

7771
// 跳转到微信授权页
7872
return redirect()->away(
79-
$officialAccount->oauth->scopes($scope)->redirect($this->getRedirectUrl($request, $enforceHttps))
73+
$officialAccount->oauth->scopes($scope)->redirect($this->getRedirectUrl($request, $enforceHttps))->getTargetUrl()
8074
);
8175
}
8276

0 commit comments

Comments
 (0)