blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-04-06 03:58:04 +08:00
Code Issues Projects Releases Wiki Activity

页面授权优化

Browse Source
This commit is contained in:
Anyon 2020-12-21 13:17:05 +08:00
parent 3abdc309c1
commit effeaab4e5
1 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
app/wechat/service/WechatService.php
View File

@ -227,42 +227,48 @@ class WechatService extends Service
{ {
$appid = $this->getAppid(); $appid = $this->getAppid();
$openid = $this->app->session->get("{$appid}_openid"); $openid = $this->app->session->get("{$appid}_openid");
$fansinfo = $this->app->session->get("{$appid}_fansinfo"); $userinfo = $this->app->session->get("{$appid}_fansinfo");
if ((empty($isfull) && !empty($openid)) || (!empty($isfull) && !empty($openid) && !empty($fansinfo))) { if ((empty($isfull) && !empty($openid)) || (!empty($isfull) && !empty($openid) && !empty($userinfo))) {
empty($fansinfo) || FansService::instance()->set($fansinfo, $appid); empty($userinfo) || FansService::instance()->set($userinfo, $appid);
return ['openid' => $openid, 'fansinfo' => $fansinfo]; return ['openid' => $openid, 'fansinfo' => $userinfo];
} }
// 解析 GET 参数
parse_str(parse_url($source, PHP_URL_QUERY), $params);
$getVars = [
'code' => $params['code'] ?? input('code', ''),
'rcode' => $params['rcode'] ?? input('rcode', ''),
'state' => $params['state'] ?? input('state', ''),
];
if ($this->getType() === 'api') { if ($this->getType() === 'api') {
// 解析 GET 参数
parse_str(parse_url($source, PHP_URL_QUERY), $params);
$getVars = [
'code' => $params['code'] ?? input('code', ''),
'rcode' => $params['rcode'] ?? input('rcode', ''),
'state' => $params['state'] ?? input('state', ''),
];
$wechat = self::WeChatOauth(); $wechat = self::WeChatOauth();
if ($getVars['state'] !== $appid || empty($getVars['code'])) { if ($getVars['state'] !== $appid || empty($getVars['code'])) {
$params['rcode'] = enbase64url($source); $params['rcode'] = enbase64url($source);
$snsapi = empty($isfull) ? 'snsapi_base' : 'snsapi_userinfo'; $location = strstr("{$source}?", '?', true) . '?' . http_build_query($params);
$oauthurl = $wechat->getOauthRedirect(strstr("{$source}?", '?', true) . '?' . http_build_query($params), $appid, $snsapi); $oauthurl = $wechat->getOauthRedirect($location, $appid, $isfull ? 'snsapi_userinfo' : 'snsapi_base');
throw new HttpResponseException($redirect ? redirect($oauthurl, 301) : response("window.location.href='{$oauthurl}'")); throw new HttpResponseException($redirect ? redirect($oauthurl, 301) : response("window.location.href='{$oauthurl}'"));
} elseif (($token = $wechat->getOauthAccessToken($getVars['code'])) && isset($token['openid'])) { } elseif (($token = $wechat->getOauthAccessToken($getVars['code'])) && isset($token['openid'])) {
$this->app->session->set("{$appid}_openid", $openid = $token['openid']); $this->app->session->set("{$appid}_openid", $openid = $token['openid']);
if (empty($isfull) && $getVars['rcode']) throw new HttpResponseException(redirect(debase64url($getVars['rcode']), 301)); if ($isfull && !empty($token['access_token'])) {
$this->app->session->set("{$appid}_fansinfo", $fansinfo = $wechat->getUserInfo($token['access_token'], $openid)); $userinfo = $wechat->getUserInfo($token['access_token'], $openid);
empty($fansinfo) || FansService::instance()->set($fansinfo, $appid); $this->app->session->set("{$appid}_fansinfo", $userinfo);
empty($userinfo) || FansService::instance()->set($userinfo, $appid);
}
} }
if ($getVars['rcode']) { if ($getVars['rcode']) {
$location = debase64url($getVars['rcode']); $location = debase64url($getVars['rcode']);
throw new HttpResponseException($redirect ? redirect($location, 301) : response("window.location.href='{$location}'")); throw new HttpResponseException($redirect ? redirect($location, 301) : response("window.location.href='{$location}'"));
} elseif ((empty($isfull) && !empty($openid)) || (!empty($isfull) && !empty($openid) && !empty($userinfo))) {
return ['openid' => $openid, 'fansinfo' => $userinfo];
} else {
throw new \think\Exception('Query Params [rcode] not find.');
} }
} else { } else {
$result = self::ThinkServiceConfig()->oauth($this->app->session->getId(), $source, $isfull); $result = self::ThinkServiceConfig()->oauth($this->app->session->getId(), $source, $isfull);
$this->app->session->set("{$appid}_openid", $openid = $result['openid']); $this->app->session->set("{$appid}_openid", $openid = $result['openid']);
$this->app->session->set("{$appid}_fansinfo", $fansinfo = $result['fans']); $this->app->session->set("{$appid}_fansinfo", $userinfo = $result['fans']);
if ((empty($isfull) && !empty($openid)) || (!empty($isfull) && !empty($openid) && !empty($fansinfo))) { if ((empty($isfull) && !empty($openid)) || (!empty($isfull) && !empty($openid) && !empty($userinfo))) {
if (!empty($fansinfo)) FansService::instance()->set($fansinfo, $appid); if (!empty($userinfo)) FansService::instance()->set($userinfo, $appid);
return ['openid' => $openid, 'fansinfo' => $fansinfo]; return ['openid' => $openid, 'fansinfo' => $userinfo];
} }
if ($redirect && !empty($result['url'])) { if ($redirect && !empty($result['url'])) {
throw new HttpResponseException(redirect($result['url'], 301)); throw new HttpResponseException(redirect($result['url'], 301));